Skip to content

Commit

Permalink
remove most usages of benthos. remaining usages will be excised in a …
Browse files Browse the repository at this point in the history
…follow-up.
  • Loading branch information
ryanworl committed May 30, 2024
1 parent 43517e6 commit f49b637
Show file tree
Hide file tree
Showing 1,193 changed files with 4,369 additions and 4,411 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/bento
target/dist
2 changes: 1 addition & 1 deletion .github/workflows/cross_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
cross-build:
if: ${{ github.repository == 'benthosdev/benthos' }}
if: ${{ github.repository == 'warpstreamlabs/bento' }}
strategy:
fail-fast: false
matrix:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/docker_edge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:

jobs:
build:
if: ${{ github.repository == 'benthosdev/benthos' || github.event_name != 'schedule' }}
if: ${{ github.repository == 'warpstreamlabs/bento' || github.event_name != 'schedule' }}
runs-on: ubuntu-latest
permissions:
packages: write
Expand Down Expand Up @@ -48,12 +48,12 @@ jobs:
builder: ${{ steps.buildx.outputs.name }}
platforms: linux/amd64,linux/arm64
push: true
tags: jeffail/benthos:edge,ghcr.io/${{ github.repository_owner }}/benthos:edge
tags: warpstreamlabs/bento:edge,ghcr.io/${{ github.repository_owner }}/bento:edge

- name: Build and push CGO
uses: docker/build-push-action@v5
with:
context: ./
file: ./resources/docker/Dockerfile.cgo
push: true
tags: jeffail/benthos:edge-cgo,ghcr.io/${{ github.repository_owner }}/benthos:edge-cgo
tags: warpstreamlabs/bento:edge-cgo,ghcr.io/${{ github.repository_owner }}/bento:edge-cgo
2 changes: 1 addition & 1 deletion .github/workflows/integration_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:

jobs:
integration-test:
if: ${{ github.repository == 'benthosdev/benthos' || github.event_name != 'schedule' }}
if: ${{ github.repository == 'warpstreamlabs/bento' || github.event_name != 'schedule' }}
runs-on: ubuntu-latest
env:
CGO_ENABLED: 0
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ jobs:
uses: docker/metadata-action@v5
with:
images: |
jeffail/benthos
ghcr.io/${{ github.repository_owner }}/benthos
warpstreamlabs/bento
ghcr.io/${{ github.repository_owner }}/bento
flavor: |
latest=auto
suffix=-cgo
Expand All @@ -101,8 +101,8 @@ jobs:
uses: docker/metadata-action@v5
with:
images: |
jeffail/benthos
ghcr.io/${{ github.repository_owner }}/benthos
warpstreamlabs/bento
ghcr.io/${{ github.repository_owner }}/bento
tags: |
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
Expand Down
4 changes: 2 additions & 2 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 == 'warpstreamlabs/bento' || github.event_name != 'schedule' }}
runs-on: ubuntu-latest
env:
CGO_ENABLED: 0
Expand All @@ -35,7 +35,7 @@ jobs:
run: make test

golangci-lint:
if: ${{ github.repository == 'benthosdev/benthos' || github.event_name != 'schedule' }}
if: ${{ github.repository == 'warpstreamlabs/bento' || 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/warpstreamlabs/bento/v4/internal/batch.Error).Failed
- (*github.com/warpstreamlabs/bento/v4/public/service.BatchError).Failed
govet:
enable-all: true
disable:
Expand Down
38 changes: 19 additions & 19 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: bento
main: cmd/bento/main.go
binary: bento
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
-X github.com/warpstreamlabs/bento/v4/internal/cli.Version={{.Version}}
-X github.com/warpstreamlabs/bento/v4/internal/cli.DateBuilt={{.Date}}
- id: bento-lambda
main: cmd/serverless/bento-lambda/main.go
binary: bento-lambda
env:
- CGO_ENABLED=0
goos: [ linux ]
goarch: [ amd64 ]
- id: benthos-lambda-al2
main: cmd/serverless/benthos-lambda/main.go
- id: bento-lambda-al2
main: cmd/serverless/bento-lambda/main.go
binary: bootstrap
env:
- CGO_ENABLED=0
goos: [ linux ]
goarch: [ amd64, arm64 ]
archives:
- id: benthos
builds: [ benthos ]
- id: bento
builds: [ bento ]
format: tar.gz
files:
- README.md
- CHANGELOG.md
- LICENSE
- id: benthos-lambda
builds: [ benthos-lambda ]
- id: bento-lambda
builds: [ bento-lambda ]
format: zip
name_template: "{{ .Binary }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
- id: benthos-lambda-al2
builds: [ benthos-lambda-al2 ]
- id: bento-lambda-al2
builds: [ bento-lambda-al2 ]
format: zip
name_template: "benthos-lambda-al2_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
name_template: "bento-lambda-al2_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
dist: target/dist
release:
github:
owner: benthosdev
name: benthos
owner: warpstreamlabs
name: bento
prerelease: auto
disable: false
Loading

0 comments on commit f49b637

Please sign in to comment.