latest interface changes

meroxa · Nov 5, 2021 · 2ddc6b1 · 2ddc6b1
1 parent ee83401
commit 2ddc6b1
Show file tree

Hide file tree

Showing 26 changed files with 109 additions and 189 deletions.
diff --git a/cmd/meroxa/root/connectors/connect_test.go b/cmd/meroxa/root/connectors/connect_test.go
@@ -93,10 +93,10 @@ func TestConnectExecution(t *testing.T) {
 	// Create source
 	client.
 		EXPECT().
-		GetResourceByName(
+		GetResourceByNameOrID(
 			ctx,
 			rSource.Name,
-		).AnyTimes().
+		).
 		Return(&rSource, nil)
 
 	client.
@@ -120,7 +120,7 @@ func TestConnectExecution(t *testing.T) {
 	// Create destination
 	client.
 		EXPECT().
-		GetResourceByName(
+		GetResourceByNameOrID(
 			ctx,
 			rDestination.Name,
 		).

diff --git a/cmd/meroxa/root/connectors/create.go b/cmd/meroxa/root/connectors/create.go
@@ -37,7 +37,7 @@ var (
 )
 
 type createConnectorClient interface {
-	GetResourceByName(ctx context.Context, name string) (*meroxa.Resource, error)
+	GetResourceByNameOrID(ctx context.Context, nameOrID string) (*meroxa.Resource, error)
 	CreateConnector(ctx context.Context, input *meroxa.CreateConnectorInput) (*meroxa.Connector, error)
 }
 
@@ -111,7 +111,7 @@ func (c *Create) CreateConnector(ctx context.Context) (*meroxa.Connector, error)
 		return nil, errors.New("requires either a source (--from) or a destination (--to)")
 	}
 
-	res, err := c.client.GetResourceByName(ctx, resourceName)
+	res, err := c.client.GetResourceByNameOrID(ctx, resourceName)
 	if err != nil {
 		return nil, fmt.Errorf("can't fetch resource with name %q: %w", resourceName, err)
 	}

diff --git a/cmd/meroxa/root/connectors/create_test.go b/cmd/meroxa/root/connectors/create_test.go
@@ -120,7 +120,7 @@ func TestCreateConnectorExecution(t *testing.T) {
 
 	client.
 		EXPECT().
-		GetResourceByName(
+		GetResourceByNameOrID(
 			ctx,
 			sourceName,
 		).

diff --git a/cmd/meroxa/root/connectors/describe.go b/cmd/meroxa/root/connectors/describe.go
@@ -36,15 +36,15 @@ var (
 )
 
 type describeConnectorClient interface {
-	GetConnectorByName(ctx context.Context, name string) (*meroxa.Connector, error)
+	GetConnectorByNameOrID(ctx context.Context, nameOrID string) (*meroxa.Connector, error)
 }
 
 type Describe struct {
 	client describeConnectorClient
 	logger log.Logger
 
 	args struct {
-		Name string
+		NameOrID string
 	}
 }
 
@@ -59,7 +59,7 @@ func (d *Describe) Docs() builder.Docs {
 }
 
 func (d *Describe) Execute(ctx context.Context) error {
-	connector, err := d.client.GetConnectorByName(ctx, d.args.Name)
+	connector, err := d.client.GetConnectorByNameOrID(ctx, d.args.NameOrID)
 	if err != nil {
 		return err
 	}
@@ -83,6 +83,6 @@ func (d *Describe) ParseArgs(args []string) error {
 		return errors.New("requires connector name")
 	}
 
-	d.args.Name = args[0]
+	d.args.NameOrID = args[0]
 	return nil
 }
diff --git a/cmd/meroxa/root/connectors/describe_test.go b/cmd/meroxa/root/connectors/describe_test.go
@@ -50,8 +50,8 @@ func TestDescribeConnectorArgs(t *testing.T) {
 			t.Fatalf("expected \"%s\" got \"%s\"", tt.err, err)
 		}
 
-		if tt.name != ar.args.Name {
-			t.Fatalf("expected \"%s\" got \"%s\"", tt.name, ar.args.Name)
+		if tt.name != ar.args.NameOrID {
+			t.Fatalf("expected \"%s\" got \"%s\"", tt.name, ar.args.NameOrID)
 		}
 	}
 }
@@ -69,7 +69,7 @@ func TestDescribeConnectorExecution(t *testing.T) {
 	c.Trace = "exception goes here"
 	client.
 		EXPECT().
-		GetConnectorByName(
+		GetConnectorByNameOrID(
 			ctx,
 			c.Name,
 		).
@@ -79,7 +79,7 @@ func TestDescribeConnectorExecution(t *testing.T) {
 		client: client,
 		logger: logger,
 	}
-	dc.args.Name = c.Name
+	dc.args.NameOrID = c.Name
 
 	err := dc.Execute(ctx)
 	if err != nil {

diff --git a/cmd/meroxa/root/connectors/logs.go b/cmd/meroxa/root/connectors/logs.go
@@ -37,15 +37,15 @@ var (
 )
 
 type logsConnectorClient interface {
-	GetConnectorLogs(ctx context.Context, connectorName string) (*http.Response, error)
+	GetConnectorLogs(ctx context.Context, nameOrID string) (*http.Response, error)
 }
 
 type Logs struct {
 	client logsConnectorClient
 	logger log.Logger
 
 	args struct {
-		Name string
+		NameOrID string
 	}
 }
 
@@ -60,7 +60,7 @@ func (l *Logs) Docs() builder.Docs {
 }
 
 func (l *Logs) Execute(ctx context.Context) error {
-	resp, err := l.client.GetConnectorLogs(ctx, l.args.Name)
+	resp, err := l.client.GetConnectorLogs(ctx, l.args.NameOrID)
 
 	if err != nil {
 		return err
@@ -92,6 +92,6 @@ func (l *Logs) ParseArgs(args []string) error {
 		return errors.New("requires connector name")
 	}
 
-	l.args.Name = args[0]
+	l.args.NameOrID = args[0]
 	return nil
 }
diff --git a/cmd/meroxa/root/connectors/logs_test.go b/cmd/meroxa/root/connectors/logs_test.go
@@ -48,8 +48,8 @@ func TestLogsConnectorArgs(t *testing.T) {
 			t.Fatalf("expected \"%s\" got \"%s\"", tt.err, err)
 		}
 
-		if tt.name != cc.args.Name {
-			t.Fatalf("expected \"%s\" got \"%s\"", tt.name, cc.args.Name)
+		if tt.name != cc.args.NameOrID {
+			t.Fatalf("expected \"%s\" got \"%s\"", tt.name, cc.args.NameOrID)
 		}
 	}
 }
@@ -67,7 +67,7 @@ func TestLogsConnectorExecution(t *testing.T) {
 		logger: logger,
 	}
 
-	c.args.Name = connectorName
+	c.args.NameOrID = connectorName
 
 	var responseDetails = io.NopCloser(bytes.NewReader([]byte(
 		`[2021-04-29T12:16:42Z] Just another log line from my connector`,

diff --git a/cmd/meroxa/root/connectors/remove.go b/cmd/meroxa/root/connectors/remove.go
@@ -28,7 +28,7 @@ import (
 )
 
 type removeConnectorClient interface {
-	GetConnectorByName(ctx context.Context, name string) (*meroxa.Connector, error)
+	GetConnectorByNameOrID(ctx context.Context, nameOrID string) (*meroxa.Connector, error)
 	DeleteConnector(ctx context.Context, nameOrID string) error
 }
 
@@ -58,7 +58,7 @@ func (r *Remove) ValueToConfirm(_ context.Context) (wantInput string) {
 func (r *Remove) Execute(ctx context.Context) error {
 	r.logger.Infof(ctx, "Removing connector %q...", r.args.Name)
 
-	con, err := r.client.GetConnectorByName(ctx, r.args.Name)
+	con, err := r.client.GetConnectorByNameOrID(ctx, r.args.Name)
 	if err != nil {
 		return err
 	}

diff --git a/cmd/meroxa/root/connectors/remove_test.go b/cmd/meroxa/root/connectors/remove_test.go
@@ -73,7 +73,7 @@ func TestRemoveConnectorExecution(t *testing.T) {
 
 	client.
 		EXPECT().
-		GetConnectorByName(ctx, c.Name).
+		GetConnectorByNameOrID(ctx, c.Name).
 		Return(&c, nil)
 
 	client.

diff --git a/cmd/meroxa/root/connectors/update.go b/cmd/meroxa/root/connectors/update.go
@@ -39,7 +39,7 @@ type Update struct {
 	logger log.Logger
 
 	args struct {
-		Name string
+		NameOrID string
 	}
 
 	flags struct {
@@ -70,12 +70,12 @@ func (u *Update) Execute(ctx context.Context) error {
 		return errors.New("requires either --config, --name or --state")
 	}
 
-	u.logger.Infof(ctx, "Updating connector %q...", u.args.Name)
+	u.logger.Infof(ctx, "Updating connector %q...", u.args.NameOrID)
 	var con *meroxa.Connector
 	var err error
 
 	if u.flags.State != "" {
-		con, err = u.client.UpdateConnectorStatus(ctx, u.args.Name, meroxa.Action(u.flags.State))
+		con, err = u.client.UpdateConnectorStatus(ctx, u.args.NameOrID, meroxa.Action(u.flags.State))
 		if err != nil {
 			return err
 		}
@@ -101,13 +101,13 @@ func (u *Update) Execute(ctx context.Context) error {
 			cu.Configuration = config
 		}
 
-		con, err = u.client.UpdateConnector(ctx, u.args.Name, cu)
+		con, err = u.client.UpdateConnector(ctx, u.args.NameOrID, cu)
 		if err != nil {
 			return err
 		}
 	}
 
-	u.logger.Infof(ctx, "Connector %q successfully updated!", u.args.Name)
+	u.logger.Infof(ctx, "Connector %q successfully updated!", u.args.NameOrID)
 	u.logger.JSON(ctx, con)
 	return nil
 }
@@ -129,7 +129,7 @@ func (u *Update) ParseArgs(args []string) error {
 		return errors.New("requires connector name")
 	}
 
-	u.args.Name = args[0]
+	u.args.NameOrID = args[0]
 	return nil
 }
 

diff --git a/cmd/meroxa/root/connectors/update_test.go b/cmd/meroxa/root/connectors/update_test.go
@@ -51,8 +51,8 @@ func TestUpdateConnectorArgs(t *testing.T) {
 			t.Fatalf("expected \"%s\" got \"%s\"", tt.err, err)
 		}
 
-		if tt.name != cc.args.Name {
-			t.Fatalf("expected \"%s\" got \"%s\"", tt.name, cc.args.Name)
+		if tt.name != cc.args.NameOrID {
+			t.Fatalf("expected \"%s\" got \"%s\"", tt.name, cc.args.NameOrID)
 		}
 	}
 }
@@ -120,12 +120,12 @@ func TestUpdateConnectorExecutionWithNewState(t *testing.T) {
 	}
 
 	c := utils.GenerateConnector(0, "")
-	u.args.Name = c.Name
+	u.args.NameOrID = c.Name
 	u.flags.State = "pause"
 
 	client.
 		EXPECT().
-		UpdateConnectorStatus(ctx, u.args.Name, meroxa.Action(u.flags.State)).
+		UpdateConnectorStatus(ctx, u.args.NameOrID, meroxa.Action(u.flags.State)).
 		Return(&c, nil)
 
 	err := u.Execute(ctx)
@@ -137,7 +137,7 @@ func TestUpdateConnectorExecutionWithNewState(t *testing.T) {
 	gotLeveledOutput := logger.LeveledOutput()
 	wantLeveledOutput := fmt.Sprintf(`Updating connector %q...
 Connector %q successfully updated!
-`, u.args.Name, u.args.Name)
+`, u.args.NameOrID, u.args.NameOrID)
 
 	if gotLeveledOutput != wantLeveledOutput {
 		t.Fatalf("expected output:\n%s\ngot:\n%s", wantLeveledOutput, gotLeveledOutput)
@@ -167,7 +167,7 @@ func TestUpdateConnectorExecutionWithNewName(t *testing.T) {
 	}
 
 	c := utils.GenerateConnector(0, "")
-	u.args.Name = c.Name
+	u.args.NameOrID = c.Name
 
 	newName := "new-name"
 	u.flags.Name = newName
@@ -177,7 +177,7 @@ func TestUpdateConnectorExecutionWithNewName(t *testing.T) {
 
 	client.
 		EXPECT().
-		UpdateConnector(ctx, u.args.Name, &cu).
+		UpdateConnector(ctx, u.args.NameOrID, &cu).
 		Return(&c, nil)
 
 	err := u.Execute(ctx)
@@ -189,7 +189,7 @@ func TestUpdateConnectorExecutionWithNewName(t *testing.T) {
 	gotLeveledOutput := logger.LeveledOutput()
 	wantLeveledOutput := fmt.Sprintf(`Updating connector %q...
 Connector %q successfully updated!
-`, u.args.Name, u.args.Name)
+`, u.args.NameOrID, u.args.NameOrID)
 
 	if gotLeveledOutput != wantLeveledOutput {
 		t.Fatalf("expected output:\n%s\ngot:\n%s", wantLeveledOutput, gotLeveledOutput)
@@ -219,7 +219,7 @@ func TestUpdateConnectorExecutionWithNewConfig(t *testing.T) {
 	}
 
 	c := utils.GenerateConnector(0, "")
-	u.args.Name = c.Name
+	u.args.NameOrID = c.Name
 
 	newConfig := "{\"table.name.format\":\"public.copy\"}"
 	cfg := map[string]interface{}{}
@@ -237,7 +237,7 @@ func TestUpdateConnectorExecutionWithNewConfig(t *testing.T) {
 
 	client.
 		EXPECT().
-		UpdateConnector(ctx, u.args.Name, &cu).
+		UpdateConnector(ctx, u.args.NameOrID, &cu).
 		Return(&c, nil)
 
 	err = u.Execute(ctx)
@@ -249,7 +249,7 @@ func TestUpdateConnectorExecutionWithNewConfig(t *testing.T) {
 	gotLeveledOutput := logger.LeveledOutput()
 	wantLeveledOutput := fmt.Sprintf(`Updating connector %q...
 Connector %q successfully updated!
-`, u.args.Name, u.args.Name)
+`, u.args.NameOrID, u.args.NameOrID)
 
 	if gotLeveledOutput != wantLeveledOutput {
 		t.Fatalf("expected output:\n%s\ngot:\n%s", wantLeveledOutput, gotLeveledOutput)

diff --git a/cmd/meroxa/root/resources/describe.go b/cmd/meroxa/root/resources/describe.go
@@ -35,15 +35,15 @@ var (
 )
 
 type describeResourceClient interface {
-	GetResourceByName(ctx context.Context, name string) (*meroxa.Resource, error)
+	GetResourceByNameOrID(ctx context.Context, nameOrID string) (*meroxa.Resource, error)
 }
 
 type Describe struct {
 	client describeResourceClient
 	logger log.Logger
 
 	args struct {
-		Name string
+		NameOrID string
 	}
 }
 
@@ -58,7 +58,7 @@ func (d *Describe) Docs() builder.Docs {
 }
 
 func (d *Describe) Execute(ctx context.Context) error {
-	resource, err := d.client.GetResourceByName(ctx, d.args.Name)
+	resource, err := d.client.GetResourceByNameOrID(ctx, d.args.NameOrID)
 	if err != nil {
 		return err
 	}
@@ -94,6 +94,6 @@ func (d *Describe) ParseArgs(args []string) error {
 		return errors.New("requires resource name")
 	}
 
-	d.args.Name = args[0]
+	d.args.NameOrID = args[0]
 	return nil
 }
diff --git a/cmd/meroxa/root/resources/describe_test.go b/cmd/meroxa/root/resources/describe_test.go
@@ -49,8 +49,8 @@ func TestDescribeResourceArgs(t *testing.T) {
 			t.Fatalf("expected \"%s\" got \"%s\"", tt.err, err)
 		}
 
-		if tt.name != ar.args.Name {
-			t.Fatalf("expected \"%s\" got \"%s\"", tt.name, ar.args.Name)
+		if tt.name != ar.args.NameOrID {
+			t.Fatalf("expected \"%s\" got \"%s\"", tt.name, ar.args.NameOrID)
 		}
 	}
 }
@@ -64,7 +64,7 @@ func TestDescribeResourceExecution(t *testing.T) {
 	r := utils.GenerateResource()
 	client.
 		EXPECT().
-		GetResourceByName(
+		GetResourceByNameOrID(
 			ctx,
 			r.Name,
 		).
@@ -74,7 +74,7 @@ func TestDescribeResourceExecution(t *testing.T) {
 		client: client,
 		logger: logger,
 	}
-	de.args.Name = r.Name
+	de.args.NameOrID = r.Name
 
 	err := de.Execute(ctx)
 	if err != nil {