From 2e52927d87b5648419c9e266951409a8bdfe933f Mon Sep 17 00:00:00 2001 From: Juan Peralta <88753706+JuanP3rAlta23@users.noreply.github.com> Date: Mon, 23 May 2022 11:05:23 -0400 Subject: [PATCH 1/3] Create ci.yml --- .github/workflows/ci.yml | 56 +++++++++++++++++++ .../dispatch_turbine_go_dependency.yml | 13 +++-- .github/workflows/golangci-lint.yml | 2 +- .github/workflows/pull_request.yml | 4 +- .github/workflows/release.yml | 14 ++--- .goreleaser.yml | 4 +- README.md | 2 +- cmd/meroxa/root/apps/deploy.go | 2 +- cmd/meroxa/root/apps/init.go | 3 +- cmd/meroxa/root/pipelines/create_test.go | 9 ++- cmd/meroxa/root/resources/create_test.go | 6 ++ etc/man/man1/meroxa-api.1 | 2 +- etc/man/man1/meroxa-apps-deploy.1 | 2 +- etc/man/man1/meroxa-apps-describe.1 | 2 +- etc/man/man1/meroxa-apps-init.1 | 2 +- etc/man/man1/meroxa-apps-list.1 | 2 +- etc/man/man1/meroxa-apps-remove.1 | 2 +- etc/man/man1/meroxa-apps-run.1 | 2 +- etc/man/man1/meroxa-apps.1 | 2 +- etc/man/man1/meroxa-auth-login.1 | 2 +- etc/man/man1/meroxa-auth-logout.1 | 2 +- etc/man/man1/meroxa-auth-whoami.1 | 2 +- etc/man/man1/meroxa-auth.1 | 2 +- etc/man/man1/meroxa-billing.1 | 2 +- etc/man/man1/meroxa-builds-describe.1 | 2 +- etc/man/man1/meroxa-builds-logs.1 | 2 +- etc/man/man1/meroxa-builds.1 | 2 +- etc/man/man1/meroxa-completion.1 | 2 +- etc/man/man1/meroxa-config-describe.1 | 2 +- etc/man/man1/meroxa-config.1 | 2 +- etc/man/man1/meroxa-endpoints-create.1 | 2 +- etc/man/man1/meroxa-endpoints-describe.1 | 2 +- etc/man/man1/meroxa-endpoints-list.1 | 2 +- etc/man/man1/meroxa-endpoints-remove.1 | 2 +- etc/man/man1/meroxa-endpoints.1 | 2 +- etc/man/man1/meroxa-environments-create.1 | 2 +- etc/man/man1/meroxa-environments-describe.1 | 2 +- etc/man/man1/meroxa-environments-list.1 | 2 +- etc/man/man1/meroxa-environments-remove.1 | 2 +- etc/man/man1/meroxa-environments-repair.1 | 2 +- etc/man/man1/meroxa-environments-update.1 | 2 +- etc/man/man1/meroxa-environments.1 | 2 +- etc/man/man1/meroxa-login.1 | 2 +- etc/man/man1/meroxa-logout.1 | 2 +- etc/man/man1/meroxa-open-billing.1 | 2 +- etc/man/man1/meroxa-open.1 | 2 +- etc/man/man1/meroxa-resources-create.1 | 2 +- etc/man/man1/meroxa-resources-describe.1 | 2 +- etc/man/man1/meroxa-resources-list.1 | 2 +- etc/man/man1/meroxa-resources-remove.1 | 2 +- .../man1/meroxa-resources-rotate-tunnel-key.1 | 2 +- etc/man/man1/meroxa-resources-update.1 | 2 +- etc/man/man1/meroxa-resources-validate.1 | 2 +- etc/man/man1/meroxa-resources.1 | 2 +- etc/man/man1/meroxa-transforms-list.1 | 2 +- etc/man/man1/meroxa-transforms.1 | 2 +- etc/man/man1/meroxa-version.1 | 2 +- etc/man/man1/meroxa-whoami.1 | 2 +- etc/man/man1/meroxa.1 | 2 +- go.mod | 4 +- go.sum | 16 +----- .../meroxa/turbine-go/deploy/deploy.go | 2 +- .../github.com/meroxa/turbine-go/function.go | 2 +- .../meroxa/turbine-go/init/template/app.go | 54 +++++++++++------- .../github.com/meroxa/turbine-go/interface.go | 2 +- vendor/modules.txt | 2 +- 66 files changed, 182 insertions(+), 111 deletions(-) create mode 100644 .github/workflows/ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 000000000..417623891 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,56 @@ +name: CI +on: + pull_request: +jobs: + build: + name: Build + runs-on: ubuntu-latest + steps: + - name: Set up Go 1.18 + uses: actions/setup-go@v3 + with: + go-version: ^1.18 + - name: Check out code into the Go module directory + uses: actions/checkout@v3 + - name: Build + run: | + make gomod + make build + - name: Debug + run: | + pwd + echo ${GOPATH} + echo ${GOROOT} + env: + GOPATH: /home/runner/work/cli/go + golangci: + name: Lint + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: golangci-lint + uses: golangci/golangci-lint-action@v2 + with: + version: v1.45.2 + vet: + name: Vet + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - name: Vet + run: go vet ./... + + test: + name: Test + needs: [ build ] + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-go@v3 + with: + go-version: ^1.18 + - name: Run tests + run: | + make test + env: + GOPATH: /home/runner/work/cli/go diff --git a/.github/workflows/dispatch_turbine_go_dependency.yml b/.github/workflows/dispatch_turbine_go_dependency.yml index 455237622..8a458bdd0 100644 --- a/.github/workflows/dispatch_turbine_go_dependency.yml +++ b/.github/workflows/dispatch_turbine_go_dependency.yml @@ -1,6 +1,7 @@ name: Remote Dispatch Turbine Go Dependency Responder -on: [repository_dispatch] +on: + repository_dispatch: jobs: update_turbine_go: @@ -11,12 +12,12 @@ jobs: - name: Event Information run: | echo "Event '${{ github.event.action }}' received from '${{ github.event.client_payload.repository }}' for commit '${{ github.event.client_payload.sha }}'" - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 with: ref: master - - uses: actions/setup-go@v2 + - uses: actions/setup-go@v3 with: - go-version: ^1.17 + go-version: ^1.18 - name: Inject insteadOf configuration env: MEROXA_MACHINE: ${{ secrets.MEROXA_MACHINE }} @@ -43,6 +44,6 @@ jobs: source_branch: ${{ steps.branch.outputs.branch }} destination_branch: "master" github_token: ${{ secrets.MEROXA_MACHINE }} - pr_label: "ktlo, ready for review" + pr_label: "ktlo,ready for review" pr_title: "chore: Upgrade to latest turbine-go" - pr_body: "The following commands were run to generate changes: `go get -u github.com/meroxa/turbine-go@latest` and `make gomod`" \ No newline at end of file + pr_body: "The following commands were run to generate changes: go get -u github.com/meroxa/turbine-go@latest and make gomod" \ No newline at end of file diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 428e639f0..bb3c29883 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -6,7 +6,7 @@ jobs: name: lint runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: golangci-lint uses: golangci/golangci-lint-action@v2 with: diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 513ab1772..e012571a7 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -15,7 +15,7 @@ jobs: enable_data_plane: [true] steps: - name: Checkout Acceptance - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: token: ${{ secrets.MEROXA_MACHINE }} repository: meroxa/acceptance @@ -26,7 +26,7 @@ jobs: # - merman # - platform-dev-setup - name: Checkout CLI - uses: actions/checkout@v2 + uses: actions/checkout@v3 with: path: ./acceptance/cli - name: Build and Run diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 96a8ee9b6..8b3d3baad 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,8 @@ name: release on: push: tags: - - '*' + - 'v*.*.*' + - '!v*.*.*-nightly.*' jobs: goreleaser: @@ -12,14 +13,13 @@ jobs: - name: Checkout uses: actions/checkout@v3 - - - name: Unshallow - run: git fetch --prune --unshallow + with: + fetch-depth: 0 - name: Set up Go - uses: actions/setup-go@v2 + uses: actions/setup-go@v3 with: - go-version: 1.16.x + go-version: 1.18.x - name: Import GPG key id: import_gpg @@ -29,7 +29,7 @@ jobs: passphrase: ${{ secrets.MEROXA_MACHINE_GPG_PASSPHRASE }} - name: Run GoReleaser - uses: goreleaser/goreleaser-action@v2 + uses: goreleaser/goreleaser-action@v3 with: version: latest args: release --rm-dist diff --git a/.goreleaser.yml b/.goreleaser.yml index 15067c75a..d50cfe5e3 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -48,6 +48,4 @@ changelog: filters: exclude: - '^docs:' - - '^test:' -release: - prerelease: true \ No newline at end of file + - '^test:' \ No newline at end of file diff --git a/README.md b/README.md index 91ce84619..7069776e5 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ For a complete guide to contributing to the Meroxa CLI, see the [Contribution Gu ## Installation Guide -Please follow the installation instructions in the [Meroxa Documentation](http://docs.meroxa.com/). +Please follow the [installation instructions in the Meroxa Documentation](https://docs.meroxa.com/cli/installation-guide). ### Build and Install the Binaries from Source (Advanced Install) diff --git a/cmd/meroxa/root/apps/deploy.go b/cmd/meroxa/root/apps/deploy.go index 6cb9ed6db..ded8ac610 100644 --- a/cmd/meroxa/root/apps/deploy.go +++ b/cmd/meroxa/root/apps/deploy.go @@ -319,7 +319,7 @@ func (d *Deploy) uploadFile(ctx context.Context, filePath, url string) error { req.ContentLength = fi.Size() client := &http.Client{} - res, err := client.Do(req) //nolint:bodyclose + res, err := client.Do(req) if err != nil { d.logger.StopSpinnerWithStatus("\t", log.Failed) return err diff --git a/cmd/meroxa/root/apps/init.go b/cmd/meroxa/root/apps/init.go index 66236689d..2d3c87a09 100644 --- a/cmd/meroxa/root/apps/init.go +++ b/cmd/meroxa/root/apps/init.go @@ -151,7 +151,8 @@ func (i *Init) Execute(ctx context.Context) error { } i.logger.Infof(ctx, "Turbine Data Application successfully initialized!\n"+ - "You can start interacting with Meroxa in your app located at \"%s/%s\"", i.path, name) + "You can start interacting with Meroxa in your app located at \"%s/%s\".\n"+ + "Your Application will not be visible in the Meroxa Dashboard until after deployment.", i.path, name) return nil } diff --git a/cmd/meroxa/root/pipelines/create_test.go b/cmd/meroxa/root/pipelines/create_test.go index 46a5ed654..9a3756442 100644 --- a/cmd/meroxa/root/pipelines/create_test.go +++ b/cmd/meroxa/root/pipelines/create_test.go @@ -169,6 +169,7 @@ func TestCreatePipelineWithEnvironmentExecution(t *testing.T) { client: client, logger: logger, } + // Set up feature flags if global.Config == nil { build := builder.BuildCobraCommand(c) @@ -241,7 +242,6 @@ Pipeline %q successfully created! t.Fatalf("expected \"%v\", got \"%v\"", *p, gotPipeline) } - // Clear environments feature flags global.Config.Set(global.UserFeatureFlagsEnv, startingFlags) } @@ -258,6 +258,13 @@ func TestCreatePipelineWithEnvironmentExecutionWithoutFeatureFlag(t *testing.T) logger: logger, } + if global.Config == nil { + build := builder.BuildCobraCommand(c) + _ = global.PersistentPreRunE(build) + } + + global.Config.Set(global.UserFeatureFlagsEnv, "") + pi := &meroxa.CreatePipelineInput{ Name: pName, Environment: &meroxa.EntityIdentifier{Name: null.StringFrom(env)}, diff --git a/cmd/meroxa/root/resources/create_test.go b/cmd/meroxa/root/resources/create_test.go index e30b16af4..6c9d6b78a 100644 --- a/cmd/meroxa/root/resources/create_test.go +++ b/cmd/meroxa/root/resources/create_test.go @@ -320,6 +320,12 @@ func TestCreateResourceExecutionWithEnvironmentUUIDWithoutFeatureFlag(t *testing logger: logger, } + if global.Config == nil { + build := builder.BuildCobraCommand(c) + _ = global.PersistentPreRunE(build) + } + global.Config.Set(global.UserFeatureFlagsEnv, "") + cr := utils.GenerateResourceWithEnvironment() r := meroxa.CreateResourceInput{ diff --git a/etc/man/man1/meroxa-api.1 b/etc/man/man1/meroxa-api.1 index 424b06348..2f29ed794 100644 --- a/etc/man/man1/meroxa-api.1 +++ b/etc/man/man1/meroxa-api.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-apps-deploy.1 b/etc/man/man1/meroxa-apps-deploy.1 index 88f1a894a..80117ff45 100644 --- a/etc/man/man1/meroxa-apps-deploy.1 +++ b/etc/man/man1/meroxa-apps-deploy.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-apps-describe.1 b/etc/man/man1/meroxa-apps-describe.1 index 2b99badc8..e15f3e0da 100644 --- a/etc/man/man1/meroxa-apps-describe.1 +++ b/etc/man/man1/meroxa-apps-describe.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-apps-init.1 b/etc/man/man1/meroxa-apps-init.1 index 4c4985a1a..6793e6fef 100644 --- a/etc/man/man1/meroxa-apps-init.1 +++ b/etc/man/man1/meroxa-apps-init.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-apps-list.1 b/etc/man/man1/meroxa-apps-list.1 index 8ba3253f8..505fb6dec 100644 --- a/etc/man/man1/meroxa-apps-list.1 +++ b/etc/man/man1/meroxa-apps-list.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-apps-remove.1 b/etc/man/man1/meroxa-apps-remove.1 index 0c229b798..203e10ae3 100644 --- a/etc/man/man1/meroxa-apps-remove.1 +++ b/etc/man/man1/meroxa-apps-remove.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-apps-run.1 b/etc/man/man1/meroxa-apps-run.1 index c8c786365..2b354d978 100644 --- a/etc/man/man1/meroxa-apps-run.1 +++ b/etc/man/man1/meroxa-apps-run.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-apps.1 b/etc/man/man1/meroxa-apps.1 index 9e80e5c76..8872652c7 100644 --- a/etc/man/man1/meroxa-apps.1 +++ b/etc/man/man1/meroxa-apps.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-auth-login.1 b/etc/man/man1/meroxa-auth-login.1 index 568d8cf90..6a2dfaa30 100644 --- a/etc/man/man1/meroxa-auth-login.1 +++ b/etc/man/man1/meroxa-auth-login.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-auth-logout.1 b/etc/man/man1/meroxa-auth-logout.1 index 7b2ccd397..4a27173f6 100644 --- a/etc/man/man1/meroxa-auth-logout.1 +++ b/etc/man/man1/meroxa-auth-logout.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-auth-whoami.1 b/etc/man/man1/meroxa-auth-whoami.1 index d542a805b..1e3b1ebef 100644 --- a/etc/man/man1/meroxa-auth-whoami.1 +++ b/etc/man/man1/meroxa-auth-whoami.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-auth.1 b/etc/man/man1/meroxa-auth.1 index af2c5eec0..1345b7171 100644 --- a/etc/man/man1/meroxa-auth.1 +++ b/etc/man/man1/meroxa-auth.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-billing.1 b/etc/man/man1/meroxa-billing.1 index af6b2065c..994ef33c0 100644 --- a/etc/man/man1/meroxa-billing.1 +++ b/etc/man/man1/meroxa-billing.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-builds-describe.1 b/etc/man/man1/meroxa-builds-describe.1 index 87dcdf43c..257b2a1e9 100644 --- a/etc/man/man1/meroxa-builds-describe.1 +++ b/etc/man/man1/meroxa-builds-describe.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-builds-logs.1 b/etc/man/man1/meroxa-builds-logs.1 index 563c25a81..7ee843d60 100644 --- a/etc/man/man1/meroxa-builds-logs.1 +++ b/etc/man/man1/meroxa-builds-logs.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-builds.1 b/etc/man/man1/meroxa-builds.1 index 55c584f6f..f0020f75d 100644 --- a/etc/man/man1/meroxa-builds.1 +++ b/etc/man/man1/meroxa-builds.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-completion.1 b/etc/man/man1/meroxa-completion.1 index 986d993d0..1a4bfc3cb 100644 --- a/etc/man/man1/meroxa-completion.1 +++ b/etc/man/man1/meroxa-completion.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-config-describe.1 b/etc/man/man1/meroxa-config-describe.1 index 9220d1162..525e255e4 100644 --- a/etc/man/man1/meroxa-config-describe.1 +++ b/etc/man/man1/meroxa-config-describe.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-config.1 b/etc/man/man1/meroxa-config.1 index 05a5fbfa5..522cd98ed 100644 --- a/etc/man/man1/meroxa-config.1 +++ b/etc/man/man1/meroxa-config.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-endpoints-create.1 b/etc/man/man1/meroxa-endpoints-create.1 index 335005164..95ec28b14 100644 --- a/etc/man/man1/meroxa-endpoints-create.1 +++ b/etc/man/man1/meroxa-endpoints-create.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-endpoints-describe.1 b/etc/man/man1/meroxa-endpoints-describe.1 index 40bdcd0a6..5ef673e2f 100644 --- a/etc/man/man1/meroxa-endpoints-describe.1 +++ b/etc/man/man1/meroxa-endpoints-describe.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-endpoints-list.1 b/etc/man/man1/meroxa-endpoints-list.1 index c5448616d..6580e528f 100644 --- a/etc/man/man1/meroxa-endpoints-list.1 +++ b/etc/man/man1/meroxa-endpoints-list.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-endpoints-remove.1 b/etc/man/man1/meroxa-endpoints-remove.1 index 297f12494..598df346f 100644 --- a/etc/man/man1/meroxa-endpoints-remove.1 +++ b/etc/man/man1/meroxa-endpoints-remove.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-endpoints.1 b/etc/man/man1/meroxa-endpoints.1 index 800b84cba..d8344f02a 100644 --- a/etc/man/man1/meroxa-endpoints.1 +++ b/etc/man/man1/meroxa-endpoints.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-environments-create.1 b/etc/man/man1/meroxa-environments-create.1 index de2edd4b4..b571e0d99 100644 --- a/etc/man/man1/meroxa-environments-create.1 +++ b/etc/man/man1/meroxa-environments-create.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-environments-describe.1 b/etc/man/man1/meroxa-environments-describe.1 index 29834587a..d0c8e5864 100644 --- a/etc/man/man1/meroxa-environments-describe.1 +++ b/etc/man/man1/meroxa-environments-describe.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-environments-list.1 b/etc/man/man1/meroxa-environments-list.1 index 8dc0837ee..62c39d917 100644 --- a/etc/man/man1/meroxa-environments-list.1 +++ b/etc/man/man1/meroxa-environments-list.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-environments-remove.1 b/etc/man/man1/meroxa-environments-remove.1 index 171e84220..ff5d11419 100644 --- a/etc/man/man1/meroxa-environments-remove.1 +++ b/etc/man/man1/meroxa-environments-remove.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-environments-repair.1 b/etc/man/man1/meroxa-environments-repair.1 index aa779c5cc..2dd7d56d9 100644 --- a/etc/man/man1/meroxa-environments-repair.1 +++ b/etc/man/man1/meroxa-environments-repair.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-environments-update.1 b/etc/man/man1/meroxa-environments-update.1 index 8103ecb46..e6f1e61e3 100644 --- a/etc/man/man1/meroxa-environments-update.1 +++ b/etc/man/man1/meroxa-environments-update.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-environments.1 b/etc/man/man1/meroxa-environments.1 index bfa34aaab..6fe920b45 100644 --- a/etc/man/man1/meroxa-environments.1 +++ b/etc/man/man1/meroxa-environments.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-login.1 b/etc/man/man1/meroxa-login.1 index 10fa58401..d56ed2eef 100644 --- a/etc/man/man1/meroxa-login.1 +++ b/etc/man/man1/meroxa-login.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-logout.1 b/etc/man/man1/meroxa-logout.1 index 421d7874c..a713221d9 100644 --- a/etc/man/man1/meroxa-logout.1 +++ b/etc/man/man1/meroxa-logout.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-open-billing.1 b/etc/man/man1/meroxa-open-billing.1 index 749794dc5..5ee9d0dff 100644 --- a/etc/man/man1/meroxa-open-billing.1 +++ b/etc/man/man1/meroxa-open-billing.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-open.1 b/etc/man/man1/meroxa-open.1 index e021cb66c..f3e8e1afa 100644 --- a/etc/man/man1/meroxa-open.1 +++ b/etc/man/man1/meroxa-open.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-resources-create.1 b/etc/man/man1/meroxa-resources-create.1 index 3ffcac7c7..93c40dbd0 100644 --- a/etc/man/man1/meroxa-resources-create.1 +++ b/etc/man/man1/meroxa-resources-create.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-resources-describe.1 b/etc/man/man1/meroxa-resources-describe.1 index 61dc869ae..c8665cbff 100644 --- a/etc/man/man1/meroxa-resources-describe.1 +++ b/etc/man/man1/meroxa-resources-describe.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-resources-list.1 b/etc/man/man1/meroxa-resources-list.1 index 89a09bd9f..cf4ac8a35 100644 --- a/etc/man/man1/meroxa-resources-list.1 +++ b/etc/man/man1/meroxa-resources-list.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-resources-remove.1 b/etc/man/man1/meroxa-resources-remove.1 index b9580feef..917731415 100644 --- a/etc/man/man1/meroxa-resources-remove.1 +++ b/etc/man/man1/meroxa-resources-remove.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-resources-rotate-tunnel-key.1 b/etc/man/man1/meroxa-resources-rotate-tunnel-key.1 index 7669a533e..99cb83f2c 100644 --- a/etc/man/man1/meroxa-resources-rotate-tunnel-key.1 +++ b/etc/man/man1/meroxa-resources-rotate-tunnel-key.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-resources-update.1 b/etc/man/man1/meroxa-resources-update.1 index 1f461f9ed..bcb427472 100644 --- a/etc/man/man1/meroxa-resources-update.1 +++ b/etc/man/man1/meroxa-resources-update.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-resources-validate.1 b/etc/man/man1/meroxa-resources-validate.1 index f25c7c083..d9faf3475 100644 --- a/etc/man/man1/meroxa-resources-validate.1 +++ b/etc/man/man1/meroxa-resources-validate.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-resources.1 b/etc/man/man1/meroxa-resources.1 index 5ae2dfeb1..123673efd 100644 --- a/etc/man/man1/meroxa-resources.1 +++ b/etc/man/man1/meroxa-resources.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-transforms-list.1 b/etc/man/man1/meroxa-transforms-list.1 index ad7a5628f..d84a65df8 100644 --- a/etc/man/man1/meroxa-transforms-list.1 +++ b/etc/man/man1/meroxa-transforms-list.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-transforms.1 b/etc/man/man1/meroxa-transforms.1 index 3726d3e4a..f023eb706 100644 --- a/etc/man/man1/meroxa-transforms.1 +++ b/etc/man/man1/meroxa-transforms.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-version.1 b/etc/man/man1/meroxa-version.1 index f7f777ca5..fa9daabbe 100644 --- a/etc/man/man1/meroxa-version.1 +++ b/etc/man/man1/meroxa-version.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa-whoami.1 b/etc/man/man1/meroxa-whoami.1 index f1b926937..3825c74de 100644 --- a/etc/man/man1/meroxa-whoami.1 +++ b/etc/man/man1/meroxa-whoami.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/etc/man/man1/meroxa.1 b/etc/man/man1/meroxa.1 index 6d99c15d2..62b8e9861 100644 --- a/etc/man/man1/meroxa.1 +++ b/etc/man/man1/meroxa.1 @@ -1,5 +1,5 @@ .nh -.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual" +.TH "Meroxa" "1" "May 2022" "Meroxa CLI " "Meroxa Manual" .SH NAME .PP diff --git a/go.mod b/go.mod index a5af4b333..6f68caea8 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/meroxa/cli -go 1.17 +go 1.18 require ( github.com/alexeyco/simpletable v0.0.0-20200730140406-5bb24159ccfb @@ -28,7 +28,7 @@ require ( github.com/briandowns/spinner v1.18.1 github.com/docker/docker v20.10.12+incompatible github.com/mattn/go-shellwords v1.0.12 - github.com/meroxa/turbine-go v0.0.0-20220504181413-5639e6491f85 + github.com/meroxa/turbine-go v0.0.0-20220524134641-ccdb7c982741 github.com/stretchr/testify v1.7.0 github.com/volatiletech/null/v8 v8.1.2 ) diff --git a/go.sum b/go.sum index 18e1d8421..24538d66d 100644 --- a/go.sum +++ b/go.sum @@ -115,7 +115,6 @@ github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod h1:bbYlZJ7 github.com/bugsnag/bugsnag-go v0.0.0-20141110184014-b1d153021fcd/go.mod h1:2oa8nejYd4cQ/b0hMIopN0lCRxU0bueqREvZLWFrtK8= github.com/bugsnag/osext v0.0.0-20130617224835-0dd3f918b21b/go.mod h1:obH5gd0BsqsP2LwDJ9aOkm/6J86V6lyAXCoQWGw3K50= github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3kj0zr8ZAKg1AQ6crr+5VwKN5eIywRkfhyM/+dE= -github.com/caarlos0/env/v6 v6.7.2/go.mod h1:FE0jGiAnQqtv2TenJ4KTa8+/T2Ss8kdS5s1VEjasoN0= github.com/cased/cased-go v1.0.4 h1:7HxJb80Z//e0g8o7yIANh0cqNMqv08UIHvADt1uAeX4= github.com/cased/cased-go v1.0.4/go.mod h1:ycyzk9B574kc7XGS6UhhlfTD19Q3D23N3irNe+LQ++A= github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= @@ -257,7 +256,6 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/creack/pty v1.1.7/go.mod h1:lj5s0c3V2DBrqTV7llrYr5NG6My20zk30Fl46Y7DoTY= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/cristalhq/jwt/v3 v3.0.14/go.mod h1:XOnIXst8ozq/esy5N1XOlSyQqBd+84fxJ99FK+1jgL8= github.com/cristalhq/jwt/v3 v3.1.0 h1:iLeL9VzB0SCtjCy9Kg53rMwTcrNm+GHyVcz2eUujz6s= github.com/cristalhq/jwt/v3 v3.1.0/go.mod h1:XOnIXst8ozq/esy5N1XOlSyQqBd+84fxJ99FK+1jgL8= github.com/cyphar/filepath-securejoin v0.2.2/go.mod h1:FpkQEhXnPnOthhzymB7CGsFk2G9VLXONKD9G7QGMM+4= @@ -543,7 +541,6 @@ github.com/mailru/easyjson v0.7.0/go.mod h1:KAzv3t3aY1NaHWoQz1+4F1ccyAH66Jk7yos7 github.com/manifoldco/promptui v0.8.0 h1:R95mMF+McvXZQ7j1g8ucVZE1gLP3Sv6j9vlF9kyRqQo= github.com/manifoldco/promptui v0.8.0/go.mod h1:n4zTdgP0vr0S3w7/O/g98U+e0gwLScEXGwov2nIKuGQ= github.com/marstr/guid v1.1.0/go.mod h1:74gB1z2wpxxInTG6yaqA7KrtM0NZ+RbrcqDvYHefzho= -github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= @@ -565,11 +562,10 @@ github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lL github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/maxbrunsfeld/counterfeiter/v6 v6.2.2/go.mod h1:eD9eIE7cdwcMi9rYluz88Jz2VyhSmden33/aXg4oVIY= -github.com/meroxa/meroxa-go v0.0.0-20220208195203-71ddc3133fab/go.mod h1:HDFszURCM1cOpKE699o5Hs0T2tEIXqY+vFcsur3RiwY= github.com/meroxa/meroxa-go v0.0.0-20220419150435-19df16177640 h1:keSIQO3busIkUlHT/Q7p0ij3VcbjeOrXs1vvSJm33J0= github.com/meroxa/meroxa-go v0.0.0-20220419150435-19df16177640/go.mod h1:BsqYa9jqfyGOAgfkggfK567b2Ahkb+RCH3lXDQGgrh8= -github.com/meroxa/turbine-go v0.0.0-20220504181413-5639e6491f85 h1:cFjrmla/L4jxNWMWSLY51hCSw2YYH6MJm+cRBSKyFuM= -github.com/meroxa/turbine-go v0.0.0-20220504181413-5639e6491f85/go.mod h1:1MRyltZ88DFkJd4PloKVoY1SagIMfF89rjoToMbnlvM= +github.com/meroxa/turbine-go v0.0.0-20220524134641-ccdb7c982741 h1:kpmIjp6VV9eTzu8FGKgLp+wGwxTNw2LLhbW7cqnnrio= +github.com/meroxa/turbine-go v0.0.0-20220524134641-ccdb7c982741/go.mod h1:1MRyltZ88DFkJd4PloKVoY1SagIMfF89rjoToMbnlvM= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/miekg/pkcs11 v1.0.3/go.mod h1:XsNlhZGX73bx86s2hdc/FuaLm2CPZJemRLMA+WTFxgs= github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible/go.mod h1:8AuVvqP/mXw1px98n46wfvcGfQ4ci2FwoAjKYxuo3Z4= @@ -610,7 +606,6 @@ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLA github.com/nirasan/go-oauth-pkce-code-verifier v0.0.0-20170819232839-0fbfe93532da h1:qiPWuGGr+1GQE6s9NPSK8iggR/6x/V+0snIoOPYsBgc= github.com/nirasan/go-oauth-pkce-code-verifier v0.0.0-20170819232839-0fbfe93532da/go.mod h1:DvuJJ/w1Y59rG8UTDxsMk5U+UJXJwuvUgbiJSm9yhX8= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= -github.com/oklog/run v1.1.1-0.20200508094559-c7096881717e/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/olekukonko/tablewriter v0.0.0-20170122224234-a0225b3f23b5/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo= github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -784,7 +779,6 @@ github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I= github.com/tidwall/gjson v1.12.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= -github.com/tidwall/gjson v1.13.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/gjson v1.14.1 h1:iymTbGkQBhveq21bEvAQ81I0LEBork8BFe1CUZXdyuo= github.com/tidwall/gjson v1.14.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= @@ -954,7 +948,6 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= -golang.org/x/net v0.0.0-20211101193420-4a448f8816b3/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220325170049-de3da57026de h1:pZB1TWnKi+o4bENlbzAgLrEbY4RMYmUIRobMcSmfeYc= golang.org/x/net v0.0.0-20220325170049-de3da57026de/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= @@ -969,7 +962,6 @@ golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210413134643-5e61552d6c78/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20211028175245-ba495a64dcb5 h1:v79phzBz03tsVCUTbvTBmmC3CUXF5mKYt7DA4ZVldpM= golang.org/x/oauth2 v0.0.0-20211028175245-ba495a64dcb5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1067,18 +1059,15 @@ golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210906170528-6f6e22806c34/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211025201205-69cdffdb9359/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211116061358-0a5406a5449c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211124211545-fe61309f8881/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f h1:rlezHXNlxYWvBCzNses9Dlc7nGFaNMJeqLolcmQSSZY= golang.org/x/sys v0.0.0-20220330033206-e17cdc41300f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= -golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1266,7 +1255,6 @@ google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.45.0 h1:NEpgUqV3Z+ZjkqMsxMg11IaDrXY4RY6CQukSGK0uI1M= google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11+0rQ= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= diff --git a/vendor/github.com/meroxa/turbine-go/deploy/deploy.go b/vendor/github.com/meroxa/turbine-go/deploy/deploy.go index c7fbf366a..0fd843dbe 100644 --- a/vendor/github.com/meroxa/turbine-go/deploy/deploy.go +++ b/vendor/github.com/meroxa/turbine-go/deploy/deploy.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" "text/template" - + "github.com/meroxa/turbine-go" ) diff --git a/vendor/github.com/meroxa/turbine-go/function.go b/vendor/github.com/meroxa/turbine-go/function.go index 2ade7a42d..0354cbfa3 100644 --- a/vendor/github.com/meroxa/turbine-go/function.go +++ b/vendor/github.com/meroxa/turbine-go/function.go @@ -1,5 +1,5 @@ package turbine type Function interface { - Process(r []Record) ([]Record, []RecordWithError) + Process(r []Record) []Record } diff --git a/vendor/github.com/meroxa/turbine-go/init/template/app.go b/vendor/github.com/meroxa/turbine-go/init/template/app.go index 6afffb37e..728c00044 100644 --- a/vendor/github.com/meroxa/turbine-go/init/template/app.go +++ b/vendor/github.com/meroxa/turbine-go/init/template/app.go @@ -22,13 +22,14 @@ type App struct{} func (a App) Run(v turbine.Turbine) error { // To configure your data stores as resources on the Meroxa Platform - // use the Meroxa Dashboard, CLI, or Meroxa Terraform Provider + // use the Meroxa Dashboard, CLI, or Meroxa Terraform Provider. // For more details refer to: https://docs.meroxa.com/ - + // // Identify an upstream data store for your data app // with the `Resources` function // Replace `source_name` with the resource name the - // data store was configured with on Meroxa + // data store was configured with on Meroxa. + source, err := v.Resources("source_name") if err != nil { return err @@ -37,7 +38,12 @@ func (a App) Run(v turbine.Turbine) error { // Specify which upstream records to pull // with the `Records` function // Replace `collection_name` with a table, collection, - // or bucket name in your data store + // or bucket name in your data store. + // If a configuration is needed for your source, + // you can pass it as a second argument to the `Records` function. For example: + // + // source.Records("collection_name", map[string]interface{"incrementing.field.name":"id"}) + rr, err := source.Records("collection_name", nil) if err != nil { return err @@ -45,13 +51,15 @@ func (a App) Run(v turbine.Turbine) error { // Specify what code to execute against upstream records // with the `Process` function - // Replace `Anonymize` with the name of your function code - res, _ := v.Process(rr, Anonymize{}) + // Replace `Anonymize` with the name of your function code. + + res := v.Process(rr, Anonymize{}) // Identify a downstream data store for your data app // with the `Resources` function // Replace `destination_name` with the resource name the - // data store was configured with on Meroxa + // data store was configured with on Meroxa. + dest, err := v.Resources("destination_name") if err != nil { return err @@ -60,9 +68,15 @@ func (a App) Run(v turbine.Turbine) error { // Specify where to write records downstream // using the `Write` function // Replace `collection_archive` with a table, collection, - // or bucket name in your data store - // if a configuration is needed you can also use - // dest.WriteWithConfig + // or bucket name in your data store. + // If a configuration is needed, you can also use i.e. + // + // dest.WriteWithConfig( + // res, + // "my-archive", + // map[string]interface{"buffer.flush.time", Value: "10"} + // ) + err = dest.Write(res, "collection_archive") if err != nil { return err @@ -73,22 +87,22 @@ func (a App) Run(v turbine.Turbine) error { type Anonymize struct{} -func (f Anonymize) Process(stream []turbine.Record) ([]turbine.Record, []turbine.RecordWithError) { - for i, r := range stream { - e := fmt.Sprintf("%s", r.Payload.Get("after.customer_email")) - if e == "" { - log.Printf("unable to find customer_email value in %d record\n", i) +func (f Anonymize) Process(stream []turbine.Record) []turbine.Record { + for i, record := range stream { + email := fmt.Sprintf("%s", record.Payload.Get("after.customer_email")) + if email == "" { + log.Printf("unable to find customer_email value in record %d\n", i) break } - hashedEmail := consistentHash(e) - err := r.Payload.Set("after.customer_email", hashedEmail) + hashedEmail := consistentHash(email) + err := record.Payload.Set("after.customer_email", hashedEmail) if err != nil { log.Println("error setting value: ", err) - break + continue } - stream[i] = r + stream[i] = record } - return stream, nil + return stream } func consistentHash(s string) string { diff --git a/vendor/github.com/meroxa/turbine-go/interface.go b/vendor/github.com/meroxa/turbine-go/interface.go index b1676ef91..36806ec00 100644 --- a/vendor/github.com/meroxa/turbine-go/interface.go +++ b/vendor/github.com/meroxa/turbine-go/interface.go @@ -6,6 +6,6 @@ type App interface { type Turbine interface { Resources(string) (Resource, error) - Process(Records, Function) (Records, RecordsWithErrors) + Process(Records, Function) Records RegisterSecret(string) error } diff --git a/vendor/modules.txt b/vendor/modules.txt index 0a59c71e7..4b6762b3a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -193,7 +193,7 @@ github.com/mattn/go-shellwords ## explicit; go 1.17 github.com/meroxa/meroxa-go/pkg/meroxa github.com/meroxa/meroxa-go/pkg/mock -# github.com/meroxa/turbine-go v0.0.0-20220504181413-5639e6491f85 +# github.com/meroxa/turbine-go v0.0.0-20220524134641-ccdb7c982741 ## explicit; go 1.17 github.com/meroxa/turbine-go github.com/meroxa/turbine-go/deploy From 4a215eafaa19a9ea0a711a58152e77ec591c3eb1 Mon Sep 17 00:00:00 2001 From: Juan Peralta <88753706+JuanP3rAlta23@users.noreply.github.com> Date: Thu, 26 May 2022 10:31:46 -0400 Subject: [PATCH 2/3] removing echo --- .github/workflows/ci.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 417623891..f0bcd7800 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -16,13 +16,6 @@ jobs: run: | make gomod make build - - name: Debug - run: | - pwd - echo ${GOPATH} - echo ${GOROOT} - env: - GOPATH: /home/runner/work/cli/go golangci: name: Lint runs-on: ubuntu-latest From 93f07ae2320cc57832fa847a6056db67d2678658 Mon Sep 17 00:00:00 2001 From: Juan Peralta <88753706+JuanP3rAlta23@users.noreply.github.com> Date: Thu, 26 May 2022 12:18:36 -0400 Subject: [PATCH 3/3] Updating golangci lint version and removing gomod --- .github/workflows/ci.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f0bcd7800..13c1f5a3e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -6,7 +6,7 @@ jobs: name: Build runs-on: ubuntu-latest steps: - - name: Set up Go 1.18 + - name: Set up Go uses: actions/setup-go@v3 with: go-version: ^1.18 @@ -14,25 +14,24 @@ jobs: uses: actions/checkout@v3 - name: Build run: | - make gomod make build golangci: - name: Lint + name: lint runs-on: ubuntu-latest steps: + - uses: actions/setup-go@v3 + with: + go-version: ^1.18 - uses: actions/checkout@v3 - name: golangci-lint - uses: golangci/golangci-lint-action@v2 - with: - version: v1.45.2 + uses: golangci/golangci-lint-action@v3 vet: name: Vet - runs-on: ubuntu-latest + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - name: Vet run: go vet ./... - test: name: Test needs: [ build ]