atlasexec: update schema/push output

ariga · Sep 19, 2024 · aff3fbf · aff3fbf
1 parent 5d10c68
commit aff3fbf
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/atlasexec/atlas_schema.go b/atlasexec/atlas_schema.go
@@ -23,6 +23,11 @@ type (
 		Version     string // Version of the schema to push. Defaults to the current timestamp.
 		Description string // Description of the schema changes.
 	}
+	// SchemaPush represents the result of a 'schema push' command.
+	SchemaPush struct {
+		URL  string
+		Link string
+	}
 	// SchemaApplyParams are the parameters for the `schema apply` command.
 	SchemaApplyParams struct {
 		ConfigURL string
@@ -205,7 +210,7 @@ type (
 )
 
 // SchemaPush runs the 'schema push' command.
-func (c *Client) SchemaPush(ctx context.Context, params *SchemaPushParams) (string, error) {
+func (c *Client) SchemaPush(ctx context.Context, params *SchemaPushParams) (*SchemaPush, error) {
 	args := []string{"schema", "push"}
 	// Global flags
 	if params.ConfigURL != "" {
@@ -221,7 +226,7 @@ func (c *Client) SchemaPush(ctx context.Context, params *SchemaPushParams) (stri
 	if params.Context != nil {
 		buf, err := json.Marshal(params.Context)
 		if err != nil {
-			return "", err
+			return nil, err
 		}
 		args = append(args, "--context", string(buf))
 	}
@@ -241,7 +246,7 @@ func (c *Client) SchemaPush(ctx context.Context, params *SchemaPushParams) (stri
 	if params.Repo != "" {
 		args = append(args, params.Repo)
 	}
-	return stringVal(c.runCommand(ctx, args))
+	return firstResult(jsonDecode[SchemaPush](c.runCommand(ctx, args)))
 }
 
 // SchemaApply runs the 'schema apply' command.

diff --git a/atlasexec/atlas_schema_test.go b/atlasexec/atlas_schema_test.go
@@ -576,10 +576,11 @@ func TestSchema_Push(t *testing.T) {
 	for _, tt := range testCases {
 		t.Run(tt.name, func(t *testing.T) {
 			t.Setenv("TEST_ARGS", tt.args)
-			t.Setenv("TEST_STDOUT", `https://gh.atlasgo.cloud/schemas/141733920810`)
+			t.Setenv("TEST_STDOUT", `{"Link":"https://gh.atlasgo.cloud/schemas/141733920810","URL":"atlas://awesome-app?tag=latest"}`)
 			result, err := c.SchemaPush(context.Background(), tt.params)
 			require.NoError(t, err)
-			require.Equal(t, "https://gh.atlasgo.cloud/schemas/141733920810", result)
+			require.Equal(t, "https://gh.atlasgo.cloud/schemas/141733920810", result.Link)
+			require.Equal(t, "atlas://awesome-app?tag=latest", result.URL)
 		})
 	}
 }