Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
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.

14 changes: 3 additions & 11 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 @@ -60,12 +60,6 @@ jobs:
sudo rm -rf "/usr/local/share/boost"
sudo rm -rf "$AGENT_TOOLSDIRECTORY"

- name: Login to Docker Hub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKER_HUB_USERNAME }}
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}

- name: Log in to registry
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u $ --password-stdin

Expand All @@ -78,8 +72,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 +94,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: 2 additions & 2 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ linters-settings:
- name: superfluous-else
errcheck:
exclude-functions:
- (*github.com/benthosdev/benthos/v4/internal/batch.Error).Failed
- (*github.com/benthosdev/benthos/v4/public/service.BatchError).Failed
- (*github.com/redpanda-data/benthos/v4/internal/batch.Error).Failed
- (*github.com/redpanda-data/benthos/v4/public/service.BatchError).Failed
govet:
enable-all: true
disable:
Expand Down
76 changes: 44 additions & 32 deletions .goreleaser.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,21 @@
project_name: redpanda-connect
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 ]
hooks:
post:
# The binary is signed and notarized when running a production release, but for snapshot builds notarization is
# skipped and only ad-hoc signing is performed (not cryptographic material is needed).
#
# note: environment variables required for signing and notarization (set in CI) but are not needed for snapshot builds
# QUILL_SIGN_P12, QUILL_SIGN_PASSWORD, QUILL_NOTARY_KEY, QUILL_NOTARY_KEY_ID, QUILL_NOTARY_ISSUER
- cmd: ./resources/scripts/sign_for_darwin.sh "{{ .Os }}" "{{ .Path }}" "{{ .IsSnapshot }}"
env:
- QUILL_LOG_FILE=target/dist/quill-{{ .Target }}.log
ignore:
- goos: windows
goarch: arm
Expand All @@ -14,42 +25,43 @@ 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}}
-X main.BinaryName=redpanda-connect
# - 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 }}"
- licenses
# - 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
7 changes: 3 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,11 @@ Changelog

All notable changes to this project will be documented in this file.

## 4.28.0 - TBD
## 4.28.0 - 2024-05-30

### Added
### Changed

- Go API: Variadic options added to the public `service.RunCLI` function for customising CLI behaviour.
- Go API: New schema APIs added with linting, generation and marshalling capabilities.
- The repository has been moved to `redpanda-data/connect` and no longer contains the core Benthos engine, which is now broken out into `redpanda-data/benthos`.

## 4.27.0 - 2024-04-23

Expand Down
54 changes: 0 additions & 54 deletions CONTRIBUTING.md

This file was deleted.

19 changes: 0 additions & 19 deletions LICENSE

This file was deleted.

Loading