feat(connectors): Add environments (#221)

* feat(connectors): Add environments * lint * review comments * updated meroxa-go * identifier instead of bespoke * chore: Update to latest meroxa-go * feat: Show connector UUID * chore: Update docs Co-authored-by: Raúl Barroso <[email protected]>
meroxa · Dec 1, 2021 · 074fe3e · 074fe3e
1 parent 1bdfdeb
commit 074fe3e
Show file tree

Hide file tree

Showing 60 changed files with 168 additions and 89 deletions.
diff --git a/cmd/meroxa/root/connectors/list_test.go b/cmd/meroxa/root/connectors/list_test.go
@@ -40,6 +40,13 @@ func getConnectors(pipelineID int) []*meroxa.Connector {
 	return connectors
 }
 
+func getConnectorsWithEnvironment(pipelineID int) []*meroxa.Connector {
+	var connectors []*meroxa.Connector
+	c := utils.GenerateConnectorWithEnvironment(pipelineID, "", "my-env")
+	connectors = append(connectors, &c)
+	return connectors
+}
+
 func TestListConnectorsFlags(t *testing.T) {
 	expectedFlags := []struct {
 		name      string
@@ -74,6 +81,7 @@ func TestListConnectorsExecution(t *testing.T) {
 	logger := log.NewTestLogger()
 
 	connectors := getConnectors(1)
+	connectors = append(connectors, getConnectorsWithEnvironment(1)...)
 
 	client.
 		EXPECT().

diff --git a/cmd/meroxa/root/pipelines/create.go b/cmd/meroxa/root/pipelines/create.go
@@ -76,7 +76,7 @@ func (c *Create) Execute(ctx context.Context) error {
 
 	if c.flags.Environment != "" {
 		env = c.flags.Environment
-		p.Environment = &meroxa.PipelineEnvironment{}
+		p.Environment = &meroxa.EnvironmentIdentifier{}
 
 		_, err := uuid.Parse(c.flags.Environment)
 

diff --git a/cmd/meroxa/root/pipelines/create_test.go b/cmd/meroxa/root/pipelines/create_test.go
@@ -166,13 +166,13 @@ func TestCreatePipelineWithEnvironmentExecution(t *testing.T) {
 
 	pi := &meroxa.CreatePipelineInput{
 		Name:        pName,
-		Environment: &meroxa.PipelineEnvironment{Name: env},
+		Environment: &meroxa.EnvironmentIdentifier{Name: env},
 	}
 
 	p := &meroxa.Pipeline{
 		ID:   1,
 		Name: pName,
-		Environment: &meroxa.PipelineEnvironment{
+		Environment: &meroxa.EnvironmentIdentifier{
 			UUID: "2560fbcc-b9ee-461a-a959-fa5656422dc2",
 			Name: env,
 		},

diff --git a/cmd/meroxa/root/resources/create.go b/cmd/meroxa/root/resources/create.go
@@ -122,7 +122,7 @@ func (c *Create) Execute(ctx context.Context) error {
 	}
 
 	if c.flags.Environment != "" {
-		input.Environment = &meroxa.ResourceEnvironment{}
+		input.Environment = &meroxa.EnvironmentIdentifier{}
 		env = c.flags.Environment
 
 		_, err := uuid.Parse(c.flags.Environment)

diff --git a/cmd/meroxa/root/resources/create_test.go b/cmd/meroxa/root/resources/create_test.go
@@ -156,7 +156,7 @@ func TestCreateResourceExecutionWithEnvironmentName(t *testing.T) {
 		URL:         "https://foo.url",
 		Credentials: nil,
 		Metadata:    nil,
-		Environment: &meroxa.ResourceEnvironment{
+		Environment: &meroxa.EnvironmentIdentifier{
 			Name: cr.Environment.Name,
 		},
 	}
@@ -218,7 +218,7 @@ func TestCreateResourceExecutionWithEnvironmentUUID(t *testing.T) {
 		URL:         "https://foo.url",
 		Credentials: nil,
 		Metadata:    nil,
-		Environment: &meroxa.ResourceEnvironment{
+		Environment: &meroxa.EnvironmentIdentifier{
 			UUID: cr.Environment.UUID,
 		},
 	}

diff --git a/etc/man/man1/meroxa-api.1 b/etc/man/man1/meroxa-api.1
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "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
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "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
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "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
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "Meroxa CLI " "Meroxa Manual"
 
 .SH NAME
 .PP

diff --git a/etc/man/man1/meroxa-auth.1 b/etc/man/man1/meroxa-auth.1
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "Meroxa CLI " "Meroxa Manual"
 
 .SH NAME
 .PP

diff --git a/etc/man/man1/meroxa-billing.1 b/etc/man/man1/meroxa-billing.1
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "Meroxa CLI " "Meroxa Manual"
 
 .SH NAME
 .PP

diff --git a/etc/man/man1/meroxa-completion.1 b/etc/man/man1/meroxa-completion.1
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "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
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "Meroxa CLI " "Meroxa Manual"
 
 .SH NAME
 .PP

diff --git a/etc/man/man1/meroxa-config.1 b/etc/man/man1/meroxa-config.1
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "Meroxa CLI " "Meroxa Manual"
 
 .SH NAME
 .PP

diff --git a/etc/man/man1/meroxa-connect.1 b/etc/man/man1/meroxa-connect.1
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "Meroxa CLI " "Meroxa Manual"
 
 .SH NAME
 .PP

diff --git a/etc/man/man1/meroxa-connectors-create.1 b/etc/man/man1/meroxa-connectors-create.1
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "Meroxa CLI " "Meroxa Manual"
 
 .SH NAME
 .PP

diff --git a/etc/man/man1/meroxa-connectors-describe.1 b/etc/man/man1/meroxa-connectors-describe.1
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "Meroxa CLI " "Meroxa Manual"
 
 .SH NAME
 .PP

diff --git a/etc/man/man1/meroxa-connectors-list.1 b/etc/man/man1/meroxa-connectors-list.1
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "Meroxa CLI " "Meroxa Manual"
 
 .SH NAME
 .PP

diff --git a/etc/man/man1/meroxa-connectors-logs.1 b/etc/man/man1/meroxa-connectors-logs.1
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "Meroxa CLI " "Meroxa Manual"
 
 .SH NAME
 .PP

diff --git a/etc/man/man1/meroxa-connectors-remove.1 b/etc/man/man1/meroxa-connectors-remove.1
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "Meroxa CLI " "Meroxa Manual"
 
 .SH NAME
 .PP

diff --git a/etc/man/man1/meroxa-connectors-update.1 b/etc/man/man1/meroxa-connectors-update.1
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "Meroxa CLI " "Meroxa Manual"
 
 .SH NAME
 .PP

diff --git a/etc/man/man1/meroxa-connectors.1 b/etc/man/man1/meroxa-connectors.1
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "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
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "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
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "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
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "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
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "Meroxa CLI " "Meroxa Manual"
 
 .SH NAME
 .PP

diff --git a/etc/man/man1/meroxa-endpoints.1 b/etc/man/man1/meroxa-endpoints.1
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "Meroxa CLI " "Meroxa Manual"
 
 .SH NAME
 .PP

diff --git a/etc/man/man1/meroxa-login.1 b/etc/man/man1/meroxa-login.1
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "Meroxa CLI " "Meroxa Manual"
 
 .SH NAME
 .PP

diff --git a/etc/man/man1/meroxa-logout.1 b/etc/man/man1/meroxa-logout.1
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "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
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "Meroxa CLI " "Meroxa Manual"
 
 .SH NAME
 .PP

diff --git a/etc/man/man1/meroxa-open.1 b/etc/man/man1/meroxa-open.1
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "Meroxa CLI " "Meroxa Manual"
 
 .SH NAME
 .PP

diff --git a/etc/man/man1/meroxa-pipelines-create.1 b/etc/man/man1/meroxa-pipelines-create.1
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "Meroxa CLI " "Meroxa Manual"
 
 .SH NAME
 .PP

diff --git a/etc/man/man1/meroxa-pipelines-describe.1 b/etc/man/man1/meroxa-pipelines-describe.1
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "Meroxa CLI " "Meroxa Manual"
 
 .SH NAME
 .PP

diff --git a/etc/man/man1/meroxa-pipelines-list.1 b/etc/man/man1/meroxa-pipelines-list.1
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "Meroxa CLI " "Meroxa Manual"
 
 .SH NAME
 .PP

diff --git a/etc/man/man1/meroxa-pipelines-remove.1 b/etc/man/man1/meroxa-pipelines-remove.1
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "Meroxa CLI " "Meroxa Manual"
 
 .SH NAME
 .PP

diff --git a/etc/man/man1/meroxa-pipelines-update.1 b/etc/man/man1/meroxa-pipelines-update.1
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "Meroxa CLI " "Meroxa Manual"
 
 .SH NAME
 .PP

diff --git a/etc/man/man1/meroxa-pipelines.1 b/etc/man/man1/meroxa-pipelines.1
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "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
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "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
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "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
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "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
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "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
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "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
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "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
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "Meroxa CLI " "Meroxa Manual"
 
 .SH NAME
 .PP

diff --git a/etc/man/man1/meroxa-resources.1 b/etc/man/man1/meroxa-resources.1
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "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
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "Meroxa CLI " "Meroxa Manual"
 
 .SH NAME
 .PP

diff --git a/etc/man/man1/meroxa-transforms.1 b/etc/man/man1/meroxa-transforms.1
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "Meroxa CLI " "Meroxa Manual"
 
 .SH NAME
 .PP

diff --git a/etc/man/man1/meroxa-version.1 b/etc/man/man1/meroxa-version.1
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "Meroxa CLI " "Meroxa Manual"
 
 .SH NAME
 .PP

diff --git a/etc/man/man1/meroxa-whoami.1 b/etc/man/man1/meroxa-whoami.1
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "Meroxa CLI " "Meroxa Manual"
 
 .SH NAME
 .PP

diff --git a/etc/man/man1/meroxa.1 b/etc/man/man1/meroxa.1
@@ -1,5 +1,5 @@
 .nh
-.TH "Meroxa" "1" "Nov 2021" "Meroxa CLI " "Meroxa Manual"
+.TH "Meroxa" "1" "Dec 2021" "Meroxa CLI " "Meroxa Manual"
 
 .SH NAME
 .PP

diff --git a/go.mod b/go.mod
@@ -13,7 +13,7 @@ require (
 	github.com/manifoldco/promptui v0.8.0
 	github.com/mattn/go-colorable v0.1.8 // indirect
 	github.com/mattn/go-runewidth v0.0.10 // indirect
-	github.com/meroxa/meroxa-go v0.0.0-20211129120745-db529ae4ef81
+	github.com/meroxa/meroxa-go v0.0.0-20211201105336-fe1f1bcf8764
 	github.com/nirasan/go-oauth-pkce-code-verifier v0.0.0-20170819232839-0fbfe93532da
 	github.com/pkg/browser v0.0.0-20210115035449-ce105d075bb4
 	github.com/rivo/uniseg v0.2.0 // indirect