chore: sync API types from infrastructure (#4448)

* chore: sync API types from infrastructure

* chore: use org slug instead of org id

---------

Co-authored-by: avallete <8771783+avallete@users.noreply.github.com>
Co-authored-by: Qiao Han <qiao@supabase.io>

Author: 3 people

cmd/projects.go

@@ -75,10 +75,10 @@ var (
 				projectName = args[0]
 			}
 			body := api.V1CreateProjectBody{
-				Name:           projectName,
-				OrganizationId: orgId,
-				DbPass:         dbPassword,
-				Region:         cast.Ptr(api.V1CreateProjectBodyRegion(region.Value)),
+				Name:             projectName,
+				OrganizationSlug: orgId,
+				DbPass:           dbPassword,
+				Region:           cast.Ptr(api.V1CreateProjectBodyRegion(region.Value)),
 			}
 			if cmd.Flags().Changed("size") {
 				body.DesiredInstanceSize = (*api.V1CreateProjectBodyDesiredInstanceSize)(&size.Value)

internal/projects/create/create.go

@@ -38,7 +38,7 @@ func Run(ctx context.Context, params api.V1CreateProjectBody, fsys afero.Fs) err
 `
 		table += fmt.Sprintf(
 			"|`%s`|`%s`|`%s`|`%s`|`%s`|\n",
-			resp.JSON201.OrganizationId,
+			resp.JSON201.OrganizationSlug,
 			resp.JSON201.Id,
 			strings.ReplaceAll(resp.JSON201.Name, "|", "\\|"),
 			utils.FormatRegion(resp.JSON201.Region),
@@ -64,11 +64,11 @@ func promptMissingParams(ctx context.Context, body *api.V1CreateProjectBody) err
 	} else {
 		fmt.Fprintln(os.Stderr, printKeyValue("Creating project", body.Name))
 	}
-	if len(body.OrganizationId) == 0 {
-		if body.OrganizationId, err = promptOrgId(ctx); err != nil {
+	if len(body.OrganizationSlug) == 0 {
+		if body.OrganizationSlug, err = promptOrgId(ctx); err != nil {
 			return err
 		}
-		fmt.Fprintln(os.Stderr, printKeyValue("Selected org-id", body.OrganizationId))
+		fmt.Fprintln(os.Stderr, printKeyValue("Selected org-id", body.OrganizationSlug))
 	}
 	if body.Region == nil || len(*body.Region) == 0 {
 		region, err := promptProjectRegion(ctx)

internal/projects/create/create_test.go

@@ -16,10 +16,10 @@ import (
 
 func TestProjectCreateCommand(t *testing.T) {
 	var params = api.V1CreateProjectBody{
-		Name:           "Test Project",
-		OrganizationId: "combined-fuchsia-lion",
-		DbPass:         "redacted",
-		Region:         cast.Ptr(api.V1CreateProjectBodyRegionUsWest1),
+		Name:             "Test Project",
+		OrganizationSlug: "combined-fuchsia-lion",
+		DbPass:           "redacted",
+		Region:           cast.Ptr(api.V1CreateProjectBodyRegionUsWest1),
 	}
 
 	t.Run("creates a new project", func(t *testing.T) {
@@ -36,11 +36,11 @@ func TestProjectCreateCommand(t *testing.T) {
 			JSON(params).
 			Reply(201).
 			JSON(api.V1ProjectResponse{
-				Id:             apitest.RandomProjectRef(),
-				OrganizationId: params.OrganizationId,
-				Name:           params.Name,
-				Region:         string(*params.Region),
-				CreatedAt:      "2022-04-25T02:14:55.906498Z",
+				Id:               apitest.RandomProjectRef(),
+				OrganizationSlug: params.OrganizationSlug,
+				Name:             params.Name,
+				Region:           string(*params.Region),
+				CreatedAt:        "2022-04-25T02:14:55.906498Z",
 			})
 		// Run test
 		assert.NoError(t, Run(context.Background(), params, fsys))

internal/projects/list/list.go

@@ -49,7 +49,7 @@ func Run(ctx context.Context, fsys afero.Fs) error {
 			table += fmt.Sprintf(
 				"|`%s`|`%s`|`%s`|`%s`|`%s`|`%s`|\n",
 				formatBullet(project.Linked),
-				project.OrganizationId,
+				project.OrganizationSlug,
 				project.Id,
 				strings.ReplaceAll(project.Name, "|", "\\|"),
 				utils.FormatRegion(project.Region),

internal/projects/list/list_test.go

@@ -27,11 +27,11 @@ func TestProjectListCommand(t *testing.T) {
 			Reply(200).
 			JSON([]api.V1ProjectResponse{
 				{
-					Id:             apitest.RandomProjectRef(),
-					OrganizationId: "combined-fuchsia-lion",
-					Name:           "Test Project",
-					Region:         "us-west-1",
-					CreatedAt:      "2022-04-25T02:14:55.906498Z",
+					Id:               apitest.RandomProjectRef(),
+					OrganizationSlug: "combined-fuchsia-lion",
+					Name:             "Test Project",
+					Region:           "us-west-1",
+					CreatedAt:        "2022-04-25T02:14:55.906498Z",
 				},
 			})
 		// Run test

internal/utils/flags/project_ref.go

@@ -39,7 +39,7 @@ func PromptProjectRef(ctx context.Context, title string, opts ...tea.ProgramOpti
 	for i, project := range *resp.JSON200 {
 		items[i] = utils.PromptItem{
 			Summary: project.Id,
-			Details: fmt.Sprintf("name: %s, org: %s, region: %s", project.Name, project.OrganizationId, project.Region),
+			Details: fmt.Sprintf("name: %s, org: %s, region: %s", project.Name, project.OrganizationSlug, project.Region),
 		}
 	}
 	choice, err := utils.PromptChoice(ctx, title, items, opts...)

internal/utils/flags/project_ref_test.go

@@ -78,9 +78,9 @@ func TestProjectPrompt(t *testing.T) {
 			Get("/v1/projects").
 			Reply(http.StatusOK).
 			JSON([]api.V1ProjectResponse{{
-				Id:             "test-project",
-				Name:           "My Project",
-				OrganizationId: "test-org",
+				Id:               "test-project",
+				Name:             "My Project",
+				OrganizationSlug: "test-org",
 			}})
 		// Run test
 		err := PromptProjectRef(context.Background(), "", input)