Skip to content

Commit 7fd3ffd

Browse files
committed
Update API client methods to handle 202 response for resource provider upserts
- Changed response handling from JSON200 to JSON202 in multiple files to align with updated API specifications. - Adjusted error messages and logging to reflect the new response structure. - Ensured consistency across the codebase for resource provider upsertion processes.
1 parent 371ded4 commit 7fd3ffd

5 files changed

Lines changed: 10 additions & 10 deletions

File tree

cmd/ctrlc/root/sync/salesforce/common/util.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -253,11 +253,11 @@ func UpsertToCtrlplane(ctx context.Context, resources []api.ResourceProviderReso
253253
return fmt.Errorf("failed to upsert resource provider: %w", err)
254254
}
255255

256-
if providerResp.JSON200 == nil {
256+
if providerResp.JSON202 == nil {
257257
return fmt.Errorf("failed to upsert resource provider: %s", providerResp.Body)
258258
}
259259

260-
providerId := providerResp.JSON200.Id
260+
providerId := providerResp.JSON202.Id
261261
log.Info("Upserting resources", "provider", providerName, "count", len(resources))
262262

263263
patchReq := api.SetResourceProviderResourcesJSONRequestBody{

cmd/ctrlc/root/sync/terraform/terraform.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,11 @@ func NewSyncTerraformCmd() *cobra.Command {
6666
return fmt.Errorf("failed to upsert resource provider: %w", err)
6767
}
6868

69-
if resp.JSON200 == nil {
69+
if resp.JSON202 == nil {
7070
return fmt.Errorf("failed to upsert resource provider: %s", resp.Body)
7171
}
7272

73-
providerId := resp.JSON200.Id
73+
providerId := resp.JSON202.Id
7474
fmt.Println("Provider ID:", providerId)
7575
workspaces, err := getWorkspacesInOrg(cmd.Context(), terraformClient, organization)
7676
if err != nil {

internal/api/client.gen.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

internal/api/providers/resource.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ func (r *ResourceItemSpec) getProviderID(ctx Context) (string, error) {
150150
if createResp.StatusCode() != http.StatusOK {
151151
return "", fmt.Errorf("failed to create resource provider: %s", createResp.Status())
152152
}
153-
return createResp.JSON200.Id, nil
153+
return createResp.JSON202.Id, nil
154154
}
155155

156156
func (r *ResourceItemSpec) syncVariables(ctx Context) error {

pkg/resourceprovider/resourceprovider.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@ func New(client *api.ClientWithResponses, workspace string, name string) (*Resou
3333
"status", resp.StatusCode,
3434
"body", string(resp.Body))
3535

36-
if resp.JSON200 == nil {
36+
if resp.JSON202 == nil {
3737
log.Error("Invalid response from upserting resource provider",
3838
"status", resp.StatusCode(),
3939
"body", string(resp.Body))
4040
return nil, fmt.Errorf("failed to upsert resource provider: %s", string(resp.Body))
4141
}
4242

43-
provider := resp.JSON200
43+
provider := resp.JSON202
4444
log.Debug("Successfully created resource provider",
4545
"id", provider.Id,
4646
"name", name)

0 commit comments

Comments
 (0)