Skip to content

Commit a88420b

Browse files
committed
fix(cost-centers): remove defensive nil check and use deleteResourceOn404AndSwallow304OtherwiseReturnError helper
1 parent 18f9d54 commit a88420b

2 files changed

Lines changed: 2 additions & 22 deletions

File tree

github/resource_github_enterprise_cost_center.go

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,6 @@ func resourceGithubEnterpriseCostCenterCreate(ctx context.Context, d *schema.Res
6262
return diag.FromErr(err)
6363
}
6464

65-
if cc == nil || cc.ID == "" {
66-
return diag.Errorf("failed to create cost center: missing id in response (unexpected API response; please retry or contact support)")
67-
}
68-
6965
d.SetId(cc.ID)
7066

7167
if err := d.Set("state", cc.GetState()); err != nil {
@@ -85,15 +81,7 @@ func resourceGithubEnterpriseCostCenterRead(ctx context.Context, d *schema.Resou
8581

8682
cc, _, err := client.Enterprise.GetCostCenter(ctx, enterpriseSlug, costCenterID)
8783
if err != nil {
88-
if errIs404(err) {
89-
tflog.Warn(ctx, "Cost center not found, removing from state", map[string]any{
90-
"enterprise_slug": enterpriseSlug,
91-
"cost_center_id": costCenterID,
92-
})
93-
d.SetId("")
94-
return nil
95-
}
96-
return diag.FromErr(err)
84+
return diag.FromErr(deleteResourceOn404AndSwallow304OtherwiseReturnError(err, d, "cost center %s/%s", enterpriseSlug, costCenterID))
9785
}
9886

9987
// If the cost center is archived (deleted), remove from state

github/resource_github_enterprise_cost_center_organizations.go

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -151,15 +151,7 @@ func resourceGithubEnterpriseCostCenterOrganizationsRead(ctx context.Context, d
151151

152152
cc, _, err := client.Enterprise.GetCostCenter(ctx, enterpriseSlug, costCenterID)
153153
if err != nil {
154-
if errIs404(err) {
155-
tflog.Warn(ctx, "Cost center not found, removing from state", map[string]any{
156-
"enterprise_slug": enterpriseSlug,
157-
"cost_center_id": costCenterID,
158-
})
159-
d.SetId("")
160-
return nil
161-
}
162-
return diag.FromErr(err)
154+
return diag.FromErr(deleteResourceOn404AndSwallow304OtherwiseReturnError(err, d, "cost center organizations %s/%s", enterpriseSlug, costCenterID))
163155
}
164156

165157
var organizations []string

0 commit comments

Comments
 (0)