Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.10
1.0.11
8 changes: 4 additions & 4 deletions provider/resource_project.go
Original file line number Diff line number Diff line change
Expand Up @@ -369,7 +369,7 @@ func updateDatabasesInProject(ctx context.Context, d *schema.ResourceData, clien
filter := fmt.Sprintf(`project == "%s"`, projectName)
databases, err := client.ListDatabase(ctx, "-", filter)
if err != nil {
return diag.Errorf("failed to list database with error: %v", err)
return diag.Errorf("failed to list database with error: %v", err.Error())
}
existedDBMap := map[string]*v1pb.Database{}
for _, db := range databases {
Expand Down Expand Up @@ -414,14 +414,14 @@ func updateDatabasesInProject(ctx context.Context, d *schema.ResourceData, clien
Requests: batchTransferDatabases,
Parent: "instances/-",
}); err != nil {
return diag.Errorf("failed to assign databases to project %s", projectName)
return diag.Errorf("failed to assign databases to project %s with error: %v", projectName, err.Error())
}
}

for _, database := range updatedDBMap {
if len(database.Labels) > 0 {
if _, err := client.UpdateDatabase(ctx, database, []string{"label"}); err != nil {
return diag.Errorf("failed to update database %s with error: %v", database.Name, err)
return diag.Errorf("failed to update database %s with error: %v", database.Name, err.Error())
}
}
}
Expand All @@ -444,7 +444,7 @@ func updateDatabasesInProject(ctx context.Context, d *schema.ResourceData, clien
Requests: unassignDatabases,
Parent: "instances/-",
}); err != nil {
return diag.Errorf("failed to move databases to default project")
return diag.Errorf("failed to move databases to default project with error: %v", err.Error())
}
}

Expand Down