Merge pull request #356 from streamdal/blinktag/org_rename

Org rename
streamdal · May 4, 2023 · aa85275 · aa85275
2 parents 854d258 + 859a5cd
commit aa85275
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 46 deletions.
diff --git a/.github/workflows/master-test.yaml b/.github/workflows/master-test.yaml
@@ -18,17 +18,17 @@ jobs:
         uses: jakejarvis/wait-action@master
         with:
           time: '30s'
-      - name: Install Code Climate reporter
-        run: |
-          sudo curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-          sudo chmod +x ./cc-test-reporter
-          ./cc-test-reporter before-build
-      - name: Master buld tests
-        run: |
-          make test/coverage
-      - name: Upload coverage information
-        run: |
-          GIT_BRANCH=master ./cc-test-reporter after-build -p github.com/batchcorp/plumber -r ${{ secrets.CC_TEST_REPORTER_ID }}
+#      - name: Install Code Climate reporter
+#        run: |
+#          sudo curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+#          sudo chmod +x ./cc-test-reporter
+#          ./cc-test-reporter before-build
+#      - name: Master buld tests
+#        run: |
+#          make test/coverage
+#      - name: Upload coverage information
+#        run: |
+#          GIT_BRANCH=master ./cc-test-reporter after-build -p github.com/streamdal/plumber -r ${{ secrets.CC_TEST_REPORTER_ID }}
   functional:
     name: Run functional tests
     runs-on: ubuntu-latest

diff --git a/.github/workflows/pr-test.yaml b/.github/workflows/pr-test.yaml
@@ -15,17 +15,17 @@ jobs:
         uses: jakejarvis/wait-action@master
         with:
           time: '30s'
-      - name: Install Code Climate reporter
-        run: |
-          sudo curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-          sudo chmod +x ./cc-test-reporter
-          ./cc-test-reporter before-build
-      - name: Test
-        run: |
-          make test/coverage
-      - name: Upload coverage information
-        run: |
-          GIT_BRANCH="${GITHUB_HEAD_REF}" ./cc-test-reporter after-build -p github.com/batchcorp/plumber -r ${{ secrets.CC_TEST_REPORTER_ID }}
+#      - name: Install Code Climate reporter
+#        run: |
+#          sudo curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
+#          sudo chmod +x ./cc-test-reporter
+#          ./cc-test-reporter before-build
+#      - name: Test
+#        run: |
+#          make test/coverage
+#      - name: Upload coverage information
+#        run: |
+#          GIT_BRANCH="${GITHUB_HEAD_REF}" ./cc-test-reporter after-build -p github.com/streamdal/plumber -r ${{ secrets.CC_TEST_REPORTER_ID }}
 
   functional:
     name: Run functional tests

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -44,11 +44,21 @@ jobs:
           config: "./nfpm.yaml"
           packager: "apk"
           target: "./build"
-      - name: Login to Docker Hub
+
+      - name: Login to Docker Hub (streamdal)
+        uses: docker/login-action@v1
+        with:
+          registry: docker.io
+          username: ${{ secrets.STREAMDAL_DOCKERHUB_USERNAME }}
+          password: ${{ secrets.STREAMDAL_DOCKERHUB_TOKEN }}
+
+      - name: Login to Docker Hub (batchcorp)
         uses: docker/login-action@v1
         with:
+          registry: docker.io
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - name: Build docker image
         run: make docker/build
       - name: Release
@@ -63,6 +73,6 @@ jobs:
         uses: peter-evans/repository-dispatch@v1
         with:
           token: ${{ secrets.DISPATCH_TOKEN }}
-          repository: batchcorp/plumber-helm
+          repository: streamdal/plumber-helm
           event-type: trigger-plumber-helm-workflow
           client-payload: '{"plumber-version": "${{ env.GITHUB_TAG }}"}'
diff --git a/Makefile b/Makefile
@@ -4,9 +4,9 @@ GIT_TAG ?= $(shell git describe --tags --abbrev=0)
 BINARY   = plumber
 ARCH ?= $(shell uname -m)
 
-GO = CGO_ENABLED=$(CGO_ENABLED) GONOPROXY=github.com/batchcorp GOFLAGS=-mod=vendor go
+GO = CGO_ENABLED=$(CGO_ENABLED) GONOPROXY=github.com/streamdal GOFLAGS=-mod=vendor go
 CGO_ENABLED ?= 0
-GO_BUILD_FLAGS = -ldflags "-X 'github.com/batchcorp/plumber/options.VERSION=${VERSION}' -X 'main.TELEMETRY_API_KEY=${TELEMETRY_API_KEY}'"
+GO_BUILD_FLAGS = -ldflags "-X 'github.com/streamdal/plumber/options.VERSION=${VERSION}' -X 'main.TELEMETRY_API_KEY=${TELEMETRY_API_KEY}'"
 
 # Pattern #1 example: "example : description = Description for example target"
 # Pattern #2 example: "### Example separator text
@@ -107,6 +107,10 @@ generate/docs:
 docker/build: description = Build docker image
 docker/build:
 	docker buildx build --push --platform=linux/amd64,linux/arm64 \
+	-t streamdal/$(BINARY):$(SHORT_SHA) \
+	-t streamdal/$(BINARY):$(GIT_TAG) \
+	-t streamdal/$(BINARY):latest \
+	-t streamdal/$(BINARY):local \
 	-t batchcorp/$(BINARY):$(SHORT_SHA) \
 	-t batchcorp/$(BINARY):$(GIT_TAG) \
 	-t batchcorp/$(BINARY):latest \
@@ -116,16 +120,16 @@ docker/build:
 .PHONY: docker/build/local
 docker/build/local: description = Build docker image
 docker/build/local:
-	docker build -t batchcorp/$(SERVICE):$(VERSION) --build-arg TARGETOS=linux --build-arg TARGETARCH=arm64 \
-	-t batchcorp/$(SERVICE):latest \
+	docker build -t streamdal/$(SERVICE):$(VERSION) --build-arg TARGETOS=linux --build-arg TARGETARCH=arm64 \
+	-t streamdal/$(SERVICE):latest \
 	-f ./Dockerfile .
 
 .PHONY: docker/push
 docker/push: description = Push local docker image
 docker/push:
-	docker push batchcorp/$(BINARY):$(SHORT_SHA) && \
-	docker push batchcorp/$(BINARY):$(GIT_TAG) && \
-	docker push batchcorp/$(BINARY):latest
+	docker push streamdal/$(BINARY):$(SHORT_SHA) && \
+	docker push streamdal/$(BINARY):$(GIT_TAG) && \
+	docker push streamdal/$(BINARY):latest
 
 .PHONY: docker/run
 docker/run: description = Run local plumber in Docker
@@ -137,7 +141,7 @@ docker/run:
 		-e PLUMBER_RELAY_SQS_QUEUE_NAME=PlumberTestQueue \
 		-e PLUMBER_RELAY_SQS_AUTO_DELETE=true \
 		-e PLUMBER_DEBUG=true \
-		-d batchcorp/$(BINARY):local aws-sqs
+		-d streamdal/$(BINARY):local aws-sqs
 
 ### Test
 

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 ![Brief Demo](./assets/plumber_logo_full.png)
 
-[![Master build status](https://github.com/batchcorp/plumber/workflows/master/badge.svg)](https://github.com/batchcorp/plumber/actions/workflows/master-test.yaml) [![Go Report Card](https://goreportcard.com/badge/github.com/batchcorp/plumber)](https://goreportcard.com/report/github.com/batchcorp/plumber) [![slack](https://img.shields.io/badge/slack-streamdal-brightgreen.svg?logo=slack)](https://launchpass.com/streamdal)
+[![Master build status](https://github.com/streamdal/plumber/workflows/master/badge.svg)](https://github.com/streamdal/plumber/actions/workflows/master-test.yaml) [![Go Report Card](https://goreportcard.com/badge/github.com/streamdal/plumber)](https://goreportcard.com/report/github.com/streamdal/plumber) [![slack](https://img.shields.io/badge/slack-streamdal-brightgreen.svg?logo=slack)](https://launchpass.com/streamdal)
 
 plumber is a CLI devtool for inspecting, piping, messaging and redirecting data
 in message systems like Kafka, RabbitMQ , GCP PubSub and 
@@ -40,21 +40,21 @@ together or use it for debugging your event driven systems.
 ### Via brew
 
 ```bash
-$ brew tap batchcorp/public
+$ brew tap streamdal/public
 $ brew install plumber
 ```
 
 ### Manually
 
-* [macOS](https://github.com/batchcorp/plumber/releases/latest/download/plumber-darwin)
-* [Linux](https://github.com/batchcorp/plumber/releases/latest/download/plumber-linux)
-* [Windows](https://github.com/batchcorp/plumber/releases/latest/download/plumber-windows.exe)
+* [macOS](https://github.com/streamdal/plumber/releases/latest/download/plumber-darwin)
+* [Linux](https://github.com/streamdal/plumber/releases/latest/download/plumber-linux)
+* [Windows](https://github.com/streamdal/plumber/releases/latest/download/plumber-windows.exe)
 
 Plumber is a single binary, to install you simply need to download it, give it executable
 permissions and call it from your shell. Here's an example set of commands to do this:
 
 ```bash
-$ curl -L -o plumber https://github.com/batchcorp/plumber/releases/latest/download/plumber-darwin
+$ curl -L -o plumber https://github.com/streamdal/plumber/releases/latest/download/plumber-darwin
 $ chmod +x plumber
 $ mv plumber /usr/local/bin/plumber
 ```
@@ -123,10 +123,10 @@ INFO[0000] Successfully wrote message to topic 'foo'  pkg=kafka/write.go
 
 ## Documentation
 
-* [docs/examples.md](https://github.com/batchcorp/plumber/blob/master/docs/examples.md) for more usage examples
-* [docs/env.md](https://github.com/batchcorp/plumber/blob/master/docs/env.md) for list of supported environment variables
-* [docs/metrics.md](https://github.com/batchcorp/plumber/blob/master/docs/metrics.md) for information on metrics that plumber exposes
-* [docs/server.md](https://github.com/batchcorp/plumber/blob/master/docs/server.md) for examples on running plumber in server mode
+* [docs/examples.md](https://github.com/streamdal/plumber/blob/master/docs/examples.md) for more usage examples
+* [docs/env.md](https://github.com/streamdal/plumber/blob/master/docs/env.md) for list of supported environment variables
+* [docs/metrics.md](https://github.com/streamdal/plumber/blob/master/docs/metrics.md) for information on metrics that plumber exposes
+* [docs/server.md](https://github.com/streamdal/plumber/blob/master/docs/server.md) for examples on running plumber in server mode
 
 ## Getting Help
 
@@ -233,7 +233,7 @@ highly available cluster.
 
 You can read more about "server mode" [here](https://docs.streamdal.com/plumber/server-mode).
 
-Server mode examples can be found in [docs/server.md](https://github.com/batchcorp/plumber/blob/master/docs/server.md)
+Server mode examples can be found in [docs/server.md](https://github.com/streamdal/plumber/blob/master/docs/server.md)
 
 ## Acknowledgments
 
@@ -248,12 +248,12 @@ To push a new plumber release:
 1. `git tag v0.18.0 master`
 1. `git push origin v0.18.0`
 1. Watch the github action
-1. New release should be automatically created under https://github.com/batchcorp/plumber/releases/
+1. New release should be automatically created under https://github.com/streamdal/plumber/releases/
 1. Update release to include any relevant info
-1. Update [homebrew](https://github.com/batchcorp/homebrew-public/blob/master/plumber.rb) SHA and version references
+1. Update [homebrew](https://github.com/streamdal/homebrew-public/blob/master/plumber.rb) SHA and version references
 
 ## Contribute
 
 We love contributions! Prior to sending us a PR, open an issue to discuss what
 you intend to work on. When ready to open PR - add good tests and let's get this
-thing merged! For further guidance check out our [contributing guide](https://github.com/batchcorp/plumber/blob/master/CONTRIBUTING.md).
+thing merged! For further guidance check out our [contributing guide](https://github.com/streamdal/plumber/blob/master/CONTRIBUTING.md).