update resource schema to match latest api

planetscale · Oct 5, 2024 · 0e8da50 · 0e8da50
1 parent a0184a0
commit 0e8da50
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 29 deletions.
diff --git a/internal/provider/database_resource.go b/internal/provider/database_resource.go
@@ -84,12 +84,11 @@ func databaseResourcefromClient(ctx context.Context, database *planetscale.Datab
 	dataImport, diags := types.ObjectValueFrom(ctx, importResourceAttrTypes, database.DataImport)
 	diags.Append(diags...)
 	return &databaseResourceModel{
-		Organization:                 organization,
-		DataImport:                   dataImport,
-		Id:                           types.StringValue(database.Id),
-		AllowDataBranching:           types.BoolValue(database.AllowDataBranching),
-		AtBackupRestoreBranchesLimit: types.BoolValue(database.AtBackupRestoreBranchesLimit),
-		// AtDevelopmentBranchLimit:          types.BoolValue(database.AtDevelopmentBranchLimit),
+		Organization:                      organization,
+		DataImport:                        dataImport,
+		Id:                                types.StringValue(database.Id),
+		AllowDataBranching:                types.BoolValue(database.AllowDataBranching),
+		AtBackupRestoreBranchesLimit:      types.BoolValue(database.AtBackupRestoreBranchesLimit),
 		AtDevelopmentBranchLimit:          types.BoolValue(false), // at_development_branch_limit removed from API, hardcode to false going forward
 		AutomaticMigrations:               types.BoolPointerValue(database.AutomaticMigrations),
 		BranchesCount:                     types.Float64Value(database.BranchesCount),
@@ -364,11 +363,9 @@ func (r *databaseResource) Create(ctx context.Context, req resource.CreateReques
 	}
 
 	createDbReq := planetscale.CreateDatabaseReq{
-		Name: name.ValueString(),
-		// Plan:        stringValueIfKnown(data.Plan),
+		Name:        name.ValueString(),
 		ClusterSize: data.ClusterSize.ValueString(),
-		// ClusterSize: float64ValueIfKnown(data.ClusterSize),
-		Region: stringValueIfKnown(data.Region),
+		Region:      stringValueIfKnown(data.Region),
 	}
 	res, err := r.client.CreateDatabase(ctx, org.ValueString(), createDbReq)
 	if err != nil {

diff --git a/internal/provider/password_data_source.go b/internal/provider/password_data_source.go
@@ -61,7 +61,6 @@ func (d *passwordDataSource) Read(ctx context.Context, req datasource.ReadReques
 		data.Database.ValueString(),
 		data.Branch.ValueString(),
 		data.Id.ValueString(),
-		// data.ReadOnlyRegionId.ValueStringPointer(),
 	)
 	if err != nil {
 		resp.Diagnostics.AddError("Unable to read database password", err.Error())

diff --git a/internal/provider/password_resource.go b/internal/provider/password_resource.go
@@ -356,7 +356,6 @@ func (r *passwordResource) Read(ctx context.Context, req resource.ReadRequest, r
 		database.ValueString(),
 		branch.ValueString(),
 		id.ValueString(),
-		// nil, // not sure why this would need a region id
 	)
 	if err != nil {
 		if notFoundErr, ok := err.(*planetscale.GetPasswordRes404); ok {

diff --git a/internal/provider/user_data_source.go b/internal/provider/user_data_source.go
@@ -23,19 +23,19 @@ type userDataSource struct {
 }
 
 type userDataSourceModel struct {
-	Id                      *string `tfsdk:"id"`
-	Name                    *string `tfsdk:"name"`
-	AvatarUrl               *string `tfsdk:"avatar_url"`
-	CreatedAt               *string `tfsdk:"created_at"`
-	DefaultOrganizationId   *string `tfsdk:"default_organization_id"`
-	DirectoryManaged        *bool   `tfsdk:"directory_managed"`
-	DisplayName             *string `tfsdk:"display_name"`
-	Email                   *string `tfsdk:"email"`
-	EmailVerified           *bool   `tfsdk:"email_verified"`
-	Managed                 *bool   `tfsdk:"managed"`
-	Sso                     *bool   `tfsdk:"sso"`
-	TwoFactorAuthConfigured *bool   `tfsdk:"two_factor_auth_configured"`
-	UpdatedAt               *string `tfsdk:"updated_at"`
+	Id                      *string                               `tfsdk:"id"`
+	Name                    *string                               `tfsdk:"name"`
+	AvatarUrl               *string                               `tfsdk:"avatar_url"`
+	CreatedAt               *string                               `tfsdk:"created_at"`
+	DefaultOrganization     *planetscale.User_DefaultOrganization `tfsdk:"default_organization"`
+	DirectoryManaged        *bool                                 `tfsdk:"directory_managed"`
+	DisplayName             *string                               `tfsdk:"display_name"`
+	Email                   *string                               `tfsdk:"email"`
+	EmailVerified           *bool                                 `tfsdk:"email_verified"`
+	Managed                 *bool                                 `tfsdk:"managed"`
+	Sso                     *bool                                 `tfsdk:"sso"`
+	TwoFactorAuthConfigured *bool                                 `tfsdk:"two_factor_auth_configured"`
+	UpdatedAt               *string                               `tfsdk:"updated_at"`
 }
 
 func (d *userDataSource) Metadata(ctx context.Context, req datasource.MetadataRequest, resp *datasource.MetadataResponse) {
@@ -66,9 +66,31 @@ Known limitations:
 				Description: "When the user was created.",
 				Computed:    true,
 			},
-			"default_organization_id": schema.StringAttribute{
+			"default_organization": schema.SingleNestedAttribute{
 				Description: "The default organization for the user.",
 				Computed:    true,
+				Attributes: map[string]schema.Attribute{
+					"id": schema.StringAttribute{
+						Description: "The ID of the organization.",
+						Computed:    true,
+					},
+					"name": schema.StringAttribute{
+						Description: "The name of the organization.",
+						Computed:    true,
+					},
+					"created_at": schema.StringAttribute{
+						Description: "When the organization was created.",
+						Computed:    true,
+					},
+					"updated_at": schema.StringAttribute{
+						Description: "When the organization was last updated.",
+						Computed:    true,
+					},
+					"deleted_at": schema.StringAttribute{
+						Description: "When the organization was last deleted.",
+						Computed:    true,
+					},
+				},
 			},
 			"directory_managed": schema.BoolAttribute{
 				Description: "Whether or not the user is managed by a WorkOS directory.",
@@ -137,10 +159,10 @@ func (d *userDataSource) Read(ctx context.Context, req datasource.ReadRequest, r
 		return
 	}
 	state := userDataSourceModel{
-		AvatarUrl: res200.AvatarUrl,
-		CreatedAt: res200.CreatedAt,
-		// DefaultOrganizationId:   res200.DefaultOrganizationId,
+		AvatarUrl:               res200.AvatarUrl,
+		CreatedAt:               res200.CreatedAt,
 		DirectoryManaged:        res200.DirectoryManaged,
+		DefaultOrganization:     &res200.DefaultOrganization,
 		DisplayName:             res200.DisplayName,
 		Email:                   res200.Email,
 		EmailVerified:           res200.EmailVerified,