Skip to content

Commit 7c63763

Browse files
modular-magicianmodular-magician
authored
fix linter downsteam (#5027) (#3474)
* fix linter downsteam * newline Signed-off-by: Modular Magician <[email protected]>
1 parent e8a5e02 commit 7c63763

7 files changed

+80
-88
lines changed

‎.changelog/5027.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:none
2+
3+
```

‎google-beta/resource_assured_workloads_workload.go‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -227,14 +227,13 @@ func resourceAssuredWorkloadsWorkloadCreate(d *schema.ResourceData, meta interfa
227227
}
228228
client := NewDCLAssuredWorkloadsClient(config, userAgent, billingProject)
229229
res, err := client.ApplyWorkload(context.Background(), obj, createDirective...)
230-
if err != nil {
231-
if _, ok := err.(dcl.DiffAfterApplyError); ok {
232-
log.Printf("[DEBUG] Diff after apply returned from the DCL: %s", err)
233-
} else {
234-
// The resource didn't actually create
235-
d.SetId("")
236-
return fmt.Errorf("Error creating Workload: %s", err)
237-
}
230+
231+
if _, ok := err.(dcl.DiffAfterApplyError); ok {
232+
log.Printf("[DEBUG] Diff after apply returned from the DCL: %s", err)
233+
} else if err != nil {
234+
// The resource didn't actually create
235+
d.SetId("")
236+
return fmt.Errorf("Error creating Workload: %s", err)
238237
}
239238

240239
log.Printf("[DEBUG] Finished creating Workload %q: %#v", d.Id(), res)
@@ -365,14 +364,13 @@ func resourceAssuredWorkloadsWorkloadUpdate(d *schema.ResourceData, meta interfa
365364
}
366365
client := NewDCLAssuredWorkloadsClient(config, userAgent, billingProject)
367366
res, err := client.ApplyWorkload(context.Background(), obj, directive...)
368-
if err != nil {
369-
if _, ok := err.(dcl.DiffAfterApplyError); ok {
370-
log.Printf("[DEBUG] Diff after apply returned from the DCL: %s", err)
371-
} else {
372-
// The resource didn't actually create
373-
d.SetId("")
374-
return fmt.Errorf("Error updating Workload: %s", err)
375-
}
367+
368+
if _, ok := err.(dcl.DiffAfterApplyError); ok {
369+
log.Printf("[DEBUG] Diff after apply returned from the DCL: %s", err)
370+
} else if err != nil {
371+
// The resource didn't actually create
372+
d.SetId("")
373+
return fmt.Errorf("Error updating Workload: %s", err)
376374
}
377375

378376
log.Printf("[DEBUG] Finished creating Workload %q: %#v", d.Id(), res)

‎google-beta/resource_cloudbuild_worker_pool.go‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -183,14 +183,13 @@ func resourceCloudbuildWorkerPoolCreate(d *schema.ResourceData, meta interface{}
183183
}
184184
client := NewDCLCloudbuildClient(config, userAgent, billingProject)
185185
res, err := client.ApplyWorkerPool(context.Background(), obj, createDirective...)
186-
if err != nil {
187-
if _, ok := err.(dcl.DiffAfterApplyError); ok {
188-
log.Printf("[DEBUG] Diff after apply returned from the DCL: %s", err)
189-
} else {
190-
// The resource didn't actually create
191-
d.SetId("")
192-
return fmt.Errorf("Error creating WorkerPool: %s", err)
193-
}
186+
187+
if _, ok := err.(dcl.DiffAfterApplyError); ok {
188+
log.Printf("[DEBUG] Diff after apply returned from the DCL: %s", err)
189+
} else if err != nil {
190+
// The resource didn't actually create
191+
d.SetId("")
192+
return fmt.Errorf("Error creating WorkerPool: %s", err)
194193
}
195194

196195
log.Printf("[DEBUG] Finished creating WorkerPool %q: %#v", d.Id(), res)
@@ -286,14 +285,13 @@ func resourceCloudbuildWorkerPoolUpdate(d *schema.ResourceData, meta interface{}
286285
}
287286
client := NewDCLCloudbuildClient(config, userAgent, billingProject)
288287
res, err := client.ApplyWorkerPool(context.Background(), obj, directive...)
289-
if err != nil {
290-
if _, ok := err.(dcl.DiffAfterApplyError); ok {
291-
log.Printf("[DEBUG] Diff after apply returned from the DCL: %s", err)
292-
} else {
293-
// The resource didn't actually create
294-
d.SetId("")
295-
return fmt.Errorf("Error updating WorkerPool: %s", err)
296-
}
288+
289+
if _, ok := err.(dcl.DiffAfterApplyError); ok {
290+
log.Printf("[DEBUG] Diff after apply returned from the DCL: %s", err)
291+
} else if err != nil {
292+
// The resource didn't actually create
293+
d.SetId("")
294+
return fmt.Errorf("Error updating WorkerPool: %s", err)
297295
}
298296

299297
log.Printf("[DEBUG] Finished creating WorkerPool %q: %#v", d.Id(), res)

‎google-beta/resource_dataproc_workflow_template.go‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1830,14 +1830,13 @@ func resourceDataprocWorkflowTemplateCreate(d *schema.ResourceData, meta interfa
18301830
}
18311831
client := NewDCLDataprocClient(config, userAgent, billingProject)
18321832
res, err := client.ApplyWorkflowTemplate(context.Background(), obj, createDirective...)
1833-
if err != nil {
1834-
if _, ok := err.(dcl.DiffAfterApplyError); ok {
1835-
log.Printf("[DEBUG] Diff after apply returned from the DCL: %s", err)
1836-
} else {
1837-
// The resource didn't actually create
1838-
d.SetId("")
1839-
return fmt.Errorf("Error creating WorkflowTemplate: %s", err)
1840-
}
1833+
1834+
if _, ok := err.(dcl.DiffAfterApplyError); ok {
1835+
log.Printf("[DEBUG] Diff after apply returned from the DCL: %s", err)
1836+
} else if err != nil {
1837+
// The resource didn't actually create
1838+
d.SetId("")
1839+
return fmt.Errorf("Error creating WorkflowTemplate: %s", err)
18411840
}
18421841

18431842
log.Printf("[DEBUG] Finished creating WorkflowTemplate %q: %#v", d.Id(), res)

‎google-beta/resource_eventarc_trigger.go‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -255,14 +255,13 @@ func resourceEventarcTriggerCreate(d *schema.ResourceData, meta interface{}) err
255255
}
256256
client := NewDCLEventarcClient(config, userAgent, billingProject)
257257
res, err := client.ApplyTrigger(context.Background(), obj, createDirective...)
258-
if err != nil {
259-
if _, ok := err.(dcl.DiffAfterApplyError); ok {
260-
log.Printf("[DEBUG] Diff after apply returned from the DCL: %s", err)
261-
} else {
262-
// The resource didn't actually create
263-
d.SetId("")
264-
return fmt.Errorf("Error creating Trigger: %s", err)
265-
}
258+
259+
if _, ok := err.(dcl.DiffAfterApplyError); ok {
260+
log.Printf("[DEBUG] Diff after apply returned from the DCL: %s", err)
261+
} else if err != nil {
262+
// The resource didn't actually create
263+
d.SetId("")
264+
return fmt.Errorf("Error creating Trigger: %s", err)
266265
}
267266

268267
log.Printf("[DEBUG] Finished creating Trigger %q: %#v", d.Id(), res)
@@ -370,14 +369,13 @@ func resourceEventarcTriggerUpdate(d *schema.ResourceData, meta interface{}) err
370369
}
371370
client := NewDCLEventarcClient(config, userAgent, billingProject)
372371
res, err := client.ApplyTrigger(context.Background(), obj, directive...)
373-
if err != nil {
374-
if _, ok := err.(dcl.DiffAfterApplyError); ok {
375-
log.Printf("[DEBUG] Diff after apply returned from the DCL: %s", err)
376-
} else {
377-
// The resource didn't actually create
378-
d.SetId("")
379-
return fmt.Errorf("Error updating Trigger: %s", err)
380-
}
372+
373+
if _, ok := err.(dcl.DiffAfterApplyError); ok {
374+
log.Printf("[DEBUG] Diff after apply returned from the DCL: %s", err)
375+
} else if err != nil {
376+
// The resource didn't actually create
377+
d.SetId("")
378+
return fmt.Errorf("Error updating Trigger: %s", err)
381379
}
382380

383381
log.Printf("[DEBUG] Finished creating Trigger %q: %#v", d.Id(), res)

‎google-beta/resource_gke_hub_feature.go‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -169,14 +169,13 @@ func resourceGkeHubFeatureCreate(d *schema.ResourceData, meta interface{}) error
169169
}
170170
client := NewDCLGkeHubClient(config, userAgent, billingProject)
171171
res, err := client.ApplyFeature(context.Background(), obj, createDirective...)
172-
if err != nil {
173-
if _, ok := err.(dcl.DiffAfterApplyError); ok {
174-
log.Printf("[DEBUG] Diff after apply returned from the DCL: %s", err)
175-
} else {
176-
// The resource didn't actually create
177-
d.SetId("")
178-
return fmt.Errorf("Error creating Feature: %s", err)
179-
}
172+
173+
if _, ok := err.(dcl.DiffAfterApplyError); ok {
174+
log.Printf("[DEBUG] Diff after apply returned from the DCL: %s", err)
175+
} else if err != nil {
176+
// The resource didn't actually create
177+
d.SetId("")
178+
return fmt.Errorf("Error creating Feature: %s", err)
180179
}
181180

182181
log.Printf("[DEBUG] Finished creating Feature %q: %#v", d.Id(), res)
@@ -276,14 +275,13 @@ func resourceGkeHubFeatureUpdate(d *schema.ResourceData, meta interface{}) error
276275
}
277276
client := NewDCLGkeHubClient(config, userAgent, billingProject)
278277
res, err := client.ApplyFeature(context.Background(), obj, directive...)
279-
if err != nil {
280-
if _, ok := err.(dcl.DiffAfterApplyError); ok {
281-
log.Printf("[DEBUG] Diff after apply returned from the DCL: %s", err)
282-
} else {
283-
// The resource didn't actually create
284-
d.SetId("")
285-
return fmt.Errorf("Error updating Feature: %s", err)
286-
}
278+
279+
if _, ok := err.(dcl.DiffAfterApplyError); ok {
280+
log.Printf("[DEBUG] Diff after apply returned from the DCL: %s", err)
281+
} else if err != nil {
282+
// The resource didn't actually create
283+
d.SetId("")
284+
return fmt.Errorf("Error updating Feature: %s", err)
287285
}
288286

289287
log.Printf("[DEBUG] Finished creating Feature %q: %#v", d.Id(), res)

‎google-beta/resource_gke_hub_feature_membership.go‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -317,14 +317,13 @@ func resourceGkeHubFeatureMembershipCreate(d *schema.ResourceData, meta interfac
317317
}
318318
client := NewDCLGkeHubClient(config, userAgent, billingProject)
319319
res, err := client.ApplyFeatureMembership(context.Background(), obj, createDirective...)
320-
if err != nil {
321-
if _, ok := err.(dcl.DiffAfterApplyError); ok {
322-
log.Printf("[DEBUG] Diff after apply returned from the DCL: %s", err)
323-
} else {
324-
// The resource didn't actually create
325-
d.SetId("")
326-
return fmt.Errorf("Error creating FeatureMembership: %s", err)
327-
}
320+
321+
if _, ok := err.(dcl.DiffAfterApplyError); ok {
322+
log.Printf("[DEBUG] Diff after apply returned from the DCL: %s", err)
323+
} else if err != nil {
324+
// The resource didn't actually create
325+
d.SetId("")
326+
return fmt.Errorf("Error creating FeatureMembership: %s", err)
328327
}
329328

330329
log.Printf("[DEBUG] Finished creating FeatureMembership %q: %#v", d.Id(), res)
@@ -415,14 +414,13 @@ func resourceGkeHubFeatureMembershipUpdate(d *schema.ResourceData, meta interfac
415414
}
416415
client := NewDCLGkeHubClient(config, userAgent, billingProject)
417416
res, err := client.ApplyFeatureMembership(context.Background(), obj, directive...)
418-
if err != nil {
419-
if _, ok := err.(dcl.DiffAfterApplyError); ok {
420-
log.Printf("[DEBUG] Diff after apply returned from the DCL: %s", err)
421-
} else {
422-
// The resource didn't actually create
423-
d.SetId("")
424-
return fmt.Errorf("Error updating FeatureMembership: %s", err)
425-
}
417+
418+
if _, ok := err.(dcl.DiffAfterApplyError); ok {
419+
log.Printf("[DEBUG] Diff after apply returned from the DCL: %s", err)
420+
} else if err != nil {
421+
// The resource didn't actually create
422+
d.SetId("")
423+
return fmt.Errorf("Error updating FeatureMembership: %s", err)
426424
}
427425

428426
log.Printf("[DEBUG] Finished creating FeatureMembership %q: %#v", d.Id(), res)

0 commit comments

Comments
 (0)