Skip to content

Commit

Permalink
Renames and rework gh actions
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeffail committed May 28, 2024
1 parent 339bfa8 commit a6cafcf
Show file tree
Hide file tree
Showing 39 changed files with 90 additions and 757 deletions.
2 changes: 1 addition & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ resources
icon.png
LICENSE
README.md
target/bin/benthos
target/bin
target/dist
1 change: 0 additions & 1 deletion .github/CODEOWNERS

This file was deleted.

3 changes: 1 addition & 2 deletions .github/workflows/cross_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ on:

jobs:
cross-build:
if: ${{ github.repository == 'benthosdev/benthos' }}
strategy:
fail-fast: false
matrix:
go-version: [1.20.x, 1.21.x]
go-version: [1.21.x, 1.22.x]
os: [ubuntu-latest, macos-latest]
runs-on: ${{ matrix.os }}
env:
Expand Down
59 changes: 0 additions & 59 deletions .github/workflows/docker_edge.yml

This file was deleted.

28 changes: 0 additions & 28 deletions .github/workflows/integration_test.yml

This file was deleted.

8 changes: 3 additions & 5 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: 1.22.x
check-latest: true

- name: Release Notes
Expand Down Expand Up @@ -78,8 +78,7 @@ jobs:
uses: docker/metadata-action@v5
with:
images: |
jeffail/benthos
ghcr.io/${{ github.repository_owner }}/benthos
ghcr.io/${{ github.repository_owner }}/connect
flavor: |
latest=auto
suffix=-cgo
Expand All @@ -101,8 +100,7 @@ jobs:
uses: docker/metadata-action@v5
with:
images: |
jeffail/benthos
ghcr.io/${{ github.repository_owner }}/benthos
ghcr.io/${{ github.repository_owner }}/connect
tags: |
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:

jobs:
test:
if: ${{ github.repository == 'benthosdev/benthos' || github.event_name != 'schedule' }}
if: ${{ github.repository == 'redpanda-data/connect' || github.event_name != 'schedule' }}
runs-on: ubuntu-latest
env:
CGO_ENABLED: 0
Expand All @@ -22,20 +22,21 @@ jobs:
- name: Install Go
uses: actions/setup-go@v5
with:
go-version: 1.21.x
go-version: 1.22.x
check-latest: true

- name: Deps
run: make deps && git diff-index --quiet HEAD || { >&2 echo "Stale go.{mod,sum} detected. This can be fixed with 'make deps'."; exit 1; }

- name: Docs
run: make docs && git diff-index --quiet HEAD || { >&2 echo "Stale docs detected. This can be fixed with 'make docs'."; exit 1; }
# TODO
# - name: Docs
# run: make docs && git diff-index --quiet HEAD || { >&2 echo "Stale docs detected. This can be fixed with 'make docs'."; exit 1; }

- name: Test
run: make test

golangci-lint:
if: ${{ github.repository == 'benthosdev/benthos' || github.event_name != 'schedule' }}
if: ${{ github.repository == 'redpanda-data/connect' || github.event_name != 'schedule' }}
runs-on: ubuntu-latest
env:
CGO_ENABLED: 0
Expand Down
4 changes: 0 additions & 4 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@ linters-settings:
enable-all-rules: false
rules:
- name: superfluous-else
errcheck:
exclude-functions:
- (*github.com/benthosdev/benthos/v4/internal/batch.Error).Failed
- (*github.com/benthosdev/benthos/v4/public/service.BatchError).Failed
govet:
enable-all: true
disable:
Expand Down
62 changes: 31 additions & 31 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
builds:
- id: benthos
main: cmd/benthos/main.go
binary: benthos
- id: connect
main: cmd/redpanda-connect/main.go
binary: redpanda-connect
goos: [ windows, darwin, linux, freebsd, openbsd ]
goarch: [ amd64, arm, arm64 ]
goarm: [ 6, 7 ]
Expand All @@ -14,42 +14,42 @@ builds:
- CGO_ENABLED=0
ldflags: >
-s -w
-X github.com/benthosdev/benthos/v4/internal/cli.Version={{.Version}}
-X github.com/benthosdev/benthos/v4/internal/cli.DateBuilt={{.Date}}
- id: benthos-lambda
main: cmd/serverless/benthos-lambda/main.go
binary: benthos-lambda
env:
- CGO_ENABLED=0
goos: [ linux ]
goarch: [ amd64 ]
- id: benthos-lambda-al2
main: cmd/serverless/benthos-lambda/main.go
binary: bootstrap
env:
- CGO_ENABLED=0
goos: [ linux ]
goarch: [ amd64, arm64 ]
-X main.Version={{.Version}}
-X main.DateBuilt={{.Date}}
# - id: connect-lambda
# main: cmd/serverless/connect-lambda/main.go
# binary: redpanda-connect-lambda
# env:
# - CGO_ENABLED=0
# goos: [ linux ]
# goarch: [ amd64 ]
# - id: connect-lambda-al2
# main: cmd/serverless/connect-lambda/main.go
# binary: bootstrap
# env:
# - CGO_ENABLED=0
# goos: [ linux ]
# goarch: [ amd64, arm64 ]
archives:
- id: benthos
builds: [ benthos ]
- id: connect
builds: [ connect ]
format: tar.gz
files:
- README.md
- CHANGELOG.md
- LICENSE
- id: benthos-lambda
builds: [ benthos-lambda ]
format: zip
name_template: "{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
- id: benthos-lambda-al2
builds: [ benthos-lambda-al2 ]
format: zip
name_template: "benthos-lambda-al2_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
# - id: connect-lambda
# builds: [ connect-lambda ]
# format: zip
# name_template: "{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
# - id: connect-lambda-al2
# builds: [ connect-lambda-al2 ]
# format: zip
# name_template: "connect-lambda-al2_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
dist: target/dist
release:
github:
owner: benthosdev
name: benthos
owner: redpanda-data
name: connect
prerelease: auto
disable: false
54 changes: 0 additions & 54 deletions CONTRIBUTING.md

This file was deleted.

19 changes: 0 additions & 19 deletions LICENSE

This file was deleted.

15 changes: 5 additions & 10 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,11 @@
# Security Policy

## Supported Versions

The current major version of Benthos continually receives security updates. We recommend that users maintain a reasonable upgrade plan that follows current releases of Benthos.

| Version | Supported |
| ------- | ------------------ |
| 3.x | :white_check_mark: |
| < 3.0 | :x: |
Official Redpanda Security Policy can be found on [redpanda.com/security](https://redpanda.com/security)

## Reporting a Vulnerability

If you have found or suspect to have found a vulnerability in Benthos then please proceed to report it to [email protected].
As with any complex system, it is certain that bugs will be found, some of them security-relevant. If you find a security bug please report it privately via email to [[email protected]](mailto:[email protected]). We will fix the issue as soon as possible and coordinate a release date with you. You will be able to choose if you want public acknowledgement of your effort and if you want to be mentioned by name.

## Public Disclosure Timing

Please note, we do not operate a bug bounty program. However, we deeply appreciate any contributions that guide us towards building a better and safer project.
The public disclosure date is agreed between the Redpanda Team and the bug submitter. We prefer to fully disclose the bug as soon as possible, but only after a mitigation or fix is available. We will ask for delay if the bug or the fix is not yet fully understood or the solution is not tested to our standards yet. While there is no fixed time frame for fix & disclosure, we will try our best to be quick and do not expect to need the usual 90 days most companies ask or. For a vulnerability with a straightforward mitigation, we expect report date to disclosure date to be on the order of 7 days.
4 changes: 2 additions & 2 deletions config/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ Config

This directory shows some config examples. Some are real world applications, some are examples of [config unit tests][unit-tests].

If you're looking for specific config examples for a use case you have then try generating one with the `benthos create` subcommand. For example, to create a config that reads Kafka messages, decodes them with a schema registry service, and writes them to NATS JetStream you could use the following command:
If you're looking for specific config examples for a use case you have then try generating one with the `redpanda-connect create` subcommand. For example, to create a config that reads Kafka messages, decodes them with a schema registry service, and writes them to NATS JetStream you could use the following command:

```sh
benthos create kafka/schema_registry_decode/nats_jetstream > example.yaml
```

[unit-tests]: https://www.benthos.dev/docs/configuration/unit_testing
[unit-tests]: https://www.docs.redpanda.com/redpanda-connect/docs/configuration/unit_testing
Loading

0 comments on commit a6cafcf

Please sign in to comment.