Skip to content

Commit

Permalink
chore: Update to turbine-go pkg (#300)
Browse files Browse the repository at this point in the history
* chore: Rename turbine-go pkg

Part of meroxa/turbine-project#131

* chore: Update man pages

* fix circleCI golang config

Co-authored-by: janelletavares <[email protected]>
  • Loading branch information
raulb and janelletavares authored Apr 6, 2022
1 parent c98c955 commit 4d9e8d9
Show file tree
Hide file tree
Showing 72 changed files with 71 additions and 68 deletions.
5 changes: 4 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,10 @@ jobs:
docker:
# specify the version
- image: circleci/golang:1.16

environment:
GO111MODULE: "on"
GOPATH: "/go"
working_directory: /go/src/github.com/meroxa/cli
steps:
- checkout

Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ build: docs
install:
go build -o $$(go env GOPATH)/bin/meroxa cmd/meroxa/main.go

PRIVATE_REPOS = github.com/meroxa/meroxa-go,github.com/meroxa/turbine
PRIVATE_REPOS = github.com/meroxa/meroxa-go,github.com/meroxa/turbine-go
.PHONY: gomod
gomod:
GOPRIVATE=$(PRIVATE_REPOS) go mod tidy && go mod vendor
Expand Down
2 changes: 1 addition & 1 deletion cmd/meroxa/root/apps/deploy.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import (
"github.com/meroxa/cli/config"
"github.com/meroxa/cli/log"
"github.com/meroxa/meroxa-go/pkg/meroxa"
turbine "github.com/meroxa/turbine/deploy"
turbine "github.com/meroxa/turbine-go/deploy"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/meroxa/root/apps/deploy_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import (
"github.com/volatiletech/null/v8"

"github.com/meroxa/meroxa-go/pkg/meroxa"
turbine "github.com/meroxa/turbine/init"
turbine "github.com/meroxa/turbine-go/init"

"github.com/golang/mock/gomock"
"github.com/meroxa/cli/log"
Expand Down
2 changes: 1 addition & 1 deletion cmd/meroxa/root/apps/init.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
turbinejs "github.com/meroxa/cli/cmd/meroxa/turbine_cli/javascript"
turbinepy "github.com/meroxa/cli/cmd/meroxa/turbine_cli/python"
"github.com/meroxa/cli/log"
turbine "github.com/meroxa/turbine/init"
turbine "github.com/meroxa/turbine-go/init"
)

type Init struct {
Expand Down
2 changes: 1 addition & 1 deletion cmd/meroxa/turbine_cli/golang/local_deployment.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"time"

"github.com/docker/docker/pkg/archive"
turbine "github.com/meroxa/turbine/deploy"
turbine "github.com/meroxa/turbine-go/deploy"

"github.com/docker/docker/api/types"
"github.com/docker/docker/client"
Expand Down
4 changes: 2 additions & 2 deletions cmd/meroxa/turbine_cli/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -265,13 +265,13 @@ func GoInit(ctx context.Context, l log.Logger, appPath string, skipInit, vendor
l.Error(ctx, string(output))
return err
}
cmd = exec.Command("go", "get", "github.com/meroxa/turbine")
cmd = exec.Command("go", "get", "github.com/meroxa/turbine-go")
output, err = cmd.CombinedOutput()
if err != nil {
l.Error(ctx, string(output))
return err
}
cmd = exec.Command("go", "get", "github.com/meroxa/turbine/runner")
cmd = exec.Command("go", "get", "github.com/meroxa/turbine-go/runner")
output, err = cmd.CombinedOutput()
if err != nil {
l.Error(ctx, string(output))
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-api.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-auth-login.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-auth-logout.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-auth-whoami.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-auth.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-billing.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-completion.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-config-describe.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-config.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-connect.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-connectors-create.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-connectors-describe.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-connectors-list.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-connectors-logs.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-connectors-remove.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-connectors-update.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-connectors.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-endpoints-create.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-endpoints-describe.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-endpoints-list.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-endpoints-remove.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-endpoints.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-environments-create.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-environments-describe.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-environments-list.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-environments-remove.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-environments-repair.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-environments-update.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-environments.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-login.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-logout.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-open-billing.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-open.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-pipelines-create.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-pipelines-describe.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-pipelines-list.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-pipelines-remove.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-pipelines-update.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-pipelines.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-resources-create.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-resources-describe.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-resources-list.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-resources-remove.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-resources-rotate-tunnel-key.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-resources-update.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
2 changes: 1 addition & 1 deletion etc/man/man1/meroxa-resources-validate.1
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
.nh
.TH "Meroxa" "1" "Mar 2022" "Meroxa CLI " "Meroxa Manual"
.TH "Meroxa" "1" "Apr 2022" "Meroxa CLI " "Meroxa Manual"

.SH NAME
.PP
Expand Down
Loading

0 comments on commit 4d9e8d9

Please sign in to comment.