Skip to content

Commit 41d92fd

Browse files
modular-magicianemilymye
modular-magician
authored and
emilymye
committed
Remove request helper methods. (#1856)
Since we added custom verbs for a lot of resources, we should just use sendRequest directly.
1 parent d01c0cd commit 41d92fd

23 files changed

+66
-82
lines changed

‎google/resource_compute_address.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ func resourceComputeAddressCreate(d *schema.ResourceData, meta interface{}) erro
186186
}
187187

188188
log.Printf("[DEBUG] Creating new Address: %#v", obj)
189-
res, err := Post(config, url, obj)
189+
res, err := sendRequest(config, "POST", url, obj)
190190
if err != nil {
191191
return fmt.Errorf("Error creating Address: %s", err)
192192
}
@@ -270,7 +270,7 @@ func resourceComputeAddressRead(d *schema.ResourceData, meta interface{}) error
270270
return err
271271
}
272272

273-
res, err := Get(config, url)
273+
res, err := sendRequest(config, "GET", url, nil)
274274
if err != nil {
275275
return handleNotFoundError(err, d, fmt.Sprintf("ComputeAddress %q", d.Id()))
276276
}
@@ -388,7 +388,7 @@ func resourceComputeAddressDelete(d *schema.ResourceData, meta interface{}) erro
388388
}
389389

390390
log.Printf("[DEBUG] Deleting Address %q", d.Id())
391-
res, err := Delete(config, url)
391+
res, err := sendRequest(config, "DELETE", url, nil)
392392
if err != nil {
393393
return handleNotFoundError(err, d, "Address")
394394
}

‎google/resource_compute_autoscaler.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ func resourceComputeAutoscalerCreate(d *schema.ResourceData, meta interface{}) e
200200
}
201201

202202
log.Printf("[DEBUG] Creating new Autoscaler: %#v", obj)
203-
res, err := Post(config, url, obj)
203+
res, err := sendRequest(config, "POST", url, obj)
204204
if err != nil {
205205
return fmt.Errorf("Error creating Autoscaler: %s", err)
206206
}
@@ -246,7 +246,7 @@ func resourceComputeAutoscalerRead(d *schema.ResourceData, meta interface{}) err
246246
return err
247247
}
248248

249-
res, err := Get(config, url)
249+
res, err := sendRequest(config, "GET", url, nil)
250250
if err != nil {
251251
return handleNotFoundError(err, d, fmt.Sprintf("ComputeAutoscaler %q", d.Id()))
252252
}
@@ -362,7 +362,7 @@ func resourceComputeAutoscalerDelete(d *schema.ResourceData, meta interface{}) e
362362
}
363363

364364
log.Printf("[DEBUG] Deleting Autoscaler %q", d.Id())
365-
res, err := Delete(config, url)
365+
res, err := sendRequest(config, "DELETE", url, nil)
366366
if err != nil {
367367
return handleNotFoundError(err, d, "Autoscaler")
368368
}

‎google/resource_compute_backend_bucket.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ func resourceComputeBackendBucketCreate(d *schema.ResourceData, meta interface{}
118118
}
119119

120120
log.Printf("[DEBUG] Creating new BackendBucket: %#v", obj)
121-
res, err := Post(config, url, obj)
121+
res, err := sendRequest(config, "POST", url, obj)
122122
if err != nil {
123123
return fmt.Errorf("Error creating BackendBucket: %s", err)
124124
}
@@ -164,7 +164,7 @@ func resourceComputeBackendBucketRead(d *schema.ResourceData, meta interface{})
164164
return err
165165
}
166166

167-
res, err := Get(config, url)
167+
res, err := sendRequest(config, "GET", url, nil)
168168
if err != nil {
169169
return handleNotFoundError(err, d, fmt.Sprintf("ComputeBackendBucket %q", d.Id()))
170170
}
@@ -271,7 +271,7 @@ func resourceComputeBackendBucketDelete(d *schema.ResourceData, meta interface{}
271271
}
272272

273273
log.Printf("[DEBUG] Deleting BackendBucket %q", d.Id())
274-
res, err := Delete(config, url)
274+
res, err := sendRequest(config, "DELETE", url, nil)
275275
if err != nil {
276276
return handleNotFoundError(err, d, "BackendBucket")
277277
}

‎google/resource_compute_disk.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ func resourceComputeDiskCreate(d *schema.ResourceData, meta interface{}) error {
516516
}
517517

518518
log.Printf("[DEBUG] Creating new Disk: %#v", obj)
519-
res, err := Post(config, url, obj)
519+
res, err := sendRequest(config, "POST", url, obj)
520520
if err != nil {
521521
return fmt.Errorf("Error creating Disk: %s", err)
522522
}
@@ -562,7 +562,7 @@ func resourceComputeDiskRead(d *schema.ResourceData, meta interface{}) error {
562562
return err
563563
}
564564

565-
res, err := Get(config, url)
565+
res, err := sendRequest(config, "GET", url, nil)
566566
if err != nil {
567567
return handleNotFoundError(err, d, fmt.Sprintf("ComputeDisk %q", d.Id()))
568568
}
@@ -788,7 +788,7 @@ func resourceComputeDiskDelete(d *schema.ResourceData, meta interface{}) error {
788788
}
789789
}
790790
log.Printf("[DEBUG] Deleting Disk %q", d.Id())
791-
res, err := Delete(config, url)
791+
res, err := sendRequest(config, "DELETE", url, nil)
792792
if err != nil {
793793
return handleNotFoundError(err, d, "Disk")
794794
}

‎google/resource_compute_forwarding_rule.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ func resourceComputeForwardingRuleCreate(d *schema.ResourceData, meta interface{
285285
}
286286

287287
log.Printf("[DEBUG] Creating new ForwardingRule: %#v", obj)
288-
res, err := Post(config, url, obj)
288+
res, err := sendRequest(config, "POST", url, obj)
289289
if err != nil {
290290
return fmt.Errorf("Error creating ForwardingRule: %s", err)
291291
}
@@ -369,7 +369,7 @@ func resourceComputeForwardingRuleRead(d *schema.ResourceData, meta interface{})
369369
return err
370370
}
371371

372-
res, err := Get(config, url)
372+
res, err := sendRequest(config, "GET", url, nil)
373373
if err != nil {
374374
return handleNotFoundError(err, d, fmt.Sprintf("ComputeForwardingRule %q", d.Id()))
375375
}
@@ -544,7 +544,7 @@ func resourceComputeForwardingRuleDelete(d *schema.ResourceData, meta interface{
544544
}
545545

546546
log.Printf("[DEBUG] Deleting ForwardingRule %q", d.Id())
547-
res, err := Delete(config, url)
547+
res, err := sendRequest(config, "DELETE", url, nil)
548548
if err != nil {
549549
return handleNotFoundError(err, d, "ForwardingRule")
550550
}

‎google/resource_compute_global_address.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ func resourceComputeGlobalAddressCreate(d *schema.ResourceData, meta interface{}
131131
}
132132

133133
log.Printf("[DEBUG] Creating new GlobalAddress: %#v", obj)
134-
res, err := Post(config, url, obj)
134+
res, err := sendRequest(config, "POST", url, obj)
135135
if err != nil {
136136
return fmt.Errorf("Error creating GlobalAddress: %s", err)
137137
}
@@ -215,7 +215,7 @@ func resourceComputeGlobalAddressRead(d *schema.ResourceData, meta interface{})
215215
return err
216216
}
217217

218-
res, err := Get(config, url)
218+
res, err := sendRequest(config, "GET", url, nil)
219219
if err != nil {
220220
return handleNotFoundError(err, d, fmt.Sprintf("ComputeGlobalAddress %q", d.Id()))
221221
}
@@ -321,7 +321,7 @@ func resourceComputeGlobalAddressDelete(d *schema.ResourceData, meta interface{}
321321
}
322322

323323
log.Printf("[DEBUG] Deleting GlobalAddress %q", d.Id())
324-
res, err := Delete(config, url)
324+
res, err := sendRequest(config, "DELETE", url, nil)
325325
if err != nil {
326326
return handleNotFoundError(err, d, "GlobalAddress")
327327
}

‎google/resource_compute_http_health_check.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ func resourceComputeHttpHealthCheckCreate(d *schema.ResourceData, meta interface
174174
}
175175

176176
log.Printf("[DEBUG] Creating new HttpHealthCheck: %#v", obj)
177-
res, err := Post(config, url, obj)
177+
res, err := sendRequest(config, "POST", url, obj)
178178
if err != nil {
179179
return fmt.Errorf("Error creating HttpHealthCheck: %s", err)
180180
}
@@ -220,7 +220,7 @@ func resourceComputeHttpHealthCheckRead(d *schema.ResourceData, meta interface{}
220220
return err
221221
}
222222

223-
res, err := Get(config, url)
223+
res, err := sendRequest(config, "GET", url, nil)
224224
if err != nil {
225225
return handleNotFoundError(err, d, fmt.Sprintf("ComputeHttpHealthCheck %q", d.Id()))
226226
}
@@ -372,7 +372,7 @@ func resourceComputeHttpHealthCheckDelete(d *schema.ResourceData, meta interface
372372
}
373373

374374
log.Printf("[DEBUG] Deleting HttpHealthCheck %q", d.Id())
375-
res, err := Delete(config, url)
375+
res, err := sendRequest(config, "DELETE", url, nil)
376376
if err != nil {
377377
return handleNotFoundError(err, d, "HttpHealthCheck")
378378
}

‎google/resource_compute_https_health_check.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ func resourceComputeHttpsHealthCheckCreate(d *schema.ResourceData, meta interfac
174174
}
175175

176176
log.Printf("[DEBUG] Creating new HttpsHealthCheck: %#v", obj)
177-
res, err := Post(config, url, obj)
177+
res, err := sendRequest(config, "POST", url, obj)
178178
if err != nil {
179179
return fmt.Errorf("Error creating HttpsHealthCheck: %s", err)
180180
}
@@ -220,7 +220,7 @@ func resourceComputeHttpsHealthCheckRead(d *schema.ResourceData, meta interface{
220220
return err
221221
}
222222

223-
res, err := Get(config, url)
223+
res, err := sendRequest(config, "GET", url, nil)
224224
if err != nil {
225225
return handleNotFoundError(err, d, fmt.Sprintf("ComputeHttpsHealthCheck %q", d.Id()))
226226
}
@@ -372,7 +372,7 @@ func resourceComputeHttpsHealthCheckDelete(d *schema.ResourceData, meta interfac
372372
}
373373

374374
log.Printf("[DEBUG] Deleting HttpsHealthCheck %q", d.Id())
375-
res, err := Delete(config, url)
375+
res, err := sendRequest(config, "DELETE", url, nil)
376376
if err != nil {
377377
return handleNotFoundError(err, d, "HttpsHealthCheck")
378378
}

‎google/resource_compute_region_autoscaler.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ func resourceComputeRegionAutoscalerCreate(d *schema.ResourceData, meta interfac
199199
}
200200

201201
log.Printf("[DEBUG] Creating new RegionAutoscaler: %#v", obj)
202-
res, err := Post(config, url, obj)
202+
res, err := sendRequest(config, "POST", url, obj)
203203
if err != nil {
204204
return fmt.Errorf("Error creating RegionAutoscaler: %s", err)
205205
}
@@ -245,7 +245,7 @@ func resourceComputeRegionAutoscalerRead(d *schema.ResourceData, meta interface{
245245
return err
246246
}
247247

248-
res, err := Get(config, url)
248+
res, err := sendRequest(config, "GET", url, nil)
249249
if err != nil {
250250
return handleNotFoundError(err, d, fmt.Sprintf("ComputeRegionAutoscaler %q", d.Id()))
251251
}
@@ -361,7 +361,7 @@ func resourceComputeRegionAutoscalerDelete(d *schema.ResourceData, meta interfac
361361
}
362362

363363
log.Printf("[DEBUG] Deleting RegionAutoscaler %q", d.Id())
364-
res, err := Delete(config, url)
364+
res, err := sendRequest(config, "DELETE", url, nil)
365365
if err != nil {
366366
return handleNotFoundError(err, d, "RegionAutoscaler")
367367
}

‎google/resource_compute_region_disk.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ func resourceComputeRegionDiskCreate(d *schema.ResourceData, meta interface{}) e
260260
}
261261

262262
log.Printf("[DEBUG] Creating new RegionDisk: %#v", obj)
263-
res, err := Post(config, url, obj)
263+
res, err := sendRequest(config, "POST", url, obj)
264264
if err != nil {
265265
return fmt.Errorf("Error creating RegionDisk: %s", err)
266266
}
@@ -306,7 +306,7 @@ func resourceComputeRegionDiskRead(d *schema.ResourceData, meta interface{}) err
306306
return err
307307
}
308308

309-
res, err := Get(config, url)
309+
res, err := sendRequest(config, "GET", url, nil)
310310
if err != nil {
311311
return handleNotFoundError(err, d, fmt.Sprintf("ComputeRegionDisk %q", d.Id()))
312312
}
@@ -526,7 +526,7 @@ func resourceComputeRegionDiskDelete(d *schema.ResourceData, meta interface{}) e
526526
}
527527
}
528528
log.Printf("[DEBUG] Deleting RegionDisk %q", d.Id())
529-
res, err := Delete(config, url)
529+
res, err := sendRequest(config, "DELETE", url, nil)
530530
if err != nil {
531531
return handleNotFoundError(err, d, "RegionDisk")
532532
}

‎google/resource_compute_route.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ func resourceComputeRouteCreate(d *schema.ResourceData, meta interface{}) error
199199
}
200200

201201
log.Printf("[DEBUG] Creating new Route: %#v", obj)
202-
res, err := Post(config, url, obj)
202+
res, err := sendRequest(config, "POST", url, obj)
203203
if err != nil {
204204
return fmt.Errorf("Error creating Route: %s", err)
205205
}
@@ -245,7 +245,7 @@ func resourceComputeRouteRead(d *schema.ResourceData, meta interface{}) error {
245245
return err
246246
}
247247

248-
res, err := Get(config, url)
248+
res, err := sendRequest(config, "GET", url, nil)
249249
if err != nil {
250250
return handleNotFoundError(err, d, fmt.Sprintf("ComputeRoute %q", d.Id()))
251251
}
@@ -312,7 +312,7 @@ func resourceComputeRouteDelete(d *schema.ResourceData, meta interface{}) error
312312
}
313313

314314
log.Printf("[DEBUG] Deleting Route %q", d.Id())
315-
res, err := Delete(config, url)
315+
res, err := sendRequest(config, "DELETE", url, nil)
316316
if err != nil {
317317
return handleNotFoundError(err, d, "Route")
318318
}

‎google/resource_compute_router.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ func resourceComputeRouterCreate(d *schema.ResourceData, meta interface{}) error
180180
}
181181

182182
log.Printf("[DEBUG] Creating new Router: %#v", obj)
183-
res, err := Post(config, url, obj)
183+
res, err := sendRequest(config, "POST", url, obj)
184184
if err != nil {
185185
return fmt.Errorf("Error creating Router: %s", err)
186186
}
@@ -226,7 +226,7 @@ func resourceComputeRouterRead(d *schema.ResourceData, meta interface{}) error {
226226
return err
227227
}
228228

229-
res, err := Get(config, url)
229+
res, err := sendRequest(config, "GET", url, nil)
230230
if err != nil {
231231
return handleNotFoundError(err, d, fmt.Sprintf("ComputeRouter %q", d.Id()))
232232
}
@@ -356,7 +356,7 @@ func resourceComputeRouterDelete(d *schema.ResourceData, meta interface{}) error
356356
}
357357

358358
log.Printf("[DEBUG] Deleting Router %q", d.Id())
359-
res, err := Delete(config, url)
359+
res, err := sendRequest(config, "DELETE", url, nil)
360360
if err != nil {
361361
return handleNotFoundError(err, d, "Router")
362362
}

‎google/resource_compute_ssl_policy.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ func resourceComputeSslPolicyCreate(d *schema.ResourceData, meta interface{}) er
171171
}
172172

173173
log.Printf("[DEBUG] Creating new SslPolicy: %#v", obj)
174-
res, err := Post(config, url, obj)
174+
res, err := sendRequest(config, "POST", url, obj)
175175
if err != nil {
176176
return fmt.Errorf("Error creating SslPolicy: %s", err)
177177
}
@@ -217,7 +217,7 @@ func resourceComputeSslPolicyRead(d *schema.ResourceData, meta interface{}) erro
217217
return err
218218
}
219219

220-
res, err := Get(config, url)
220+
res, err := sendRequest(config, "GET", url, nil)
221221
if err != nil {
222222
return handleNotFoundError(err, d, fmt.Sprintf("ComputeSslPolicy %q", d.Id()))
223223
}
@@ -341,7 +341,7 @@ func resourceComputeSslPolicyDelete(d *schema.ResourceData, meta interface{}) er
341341
}
342342

343343
log.Printf("[DEBUG] Deleting SslPolicy %q", d.Id())
344-
res, err := Delete(config, url)
344+
res, err := sendRequest(config, "DELETE", url, nil)
345345
if err != nil {
346346
return handleNotFoundError(err, d, "SslPolicy")
347347
}

‎google/resource_compute_subnetwork.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ func resourceComputeSubnetworkCreate(d *schema.ResourceData, meta interface{}) e
264264
}
265265

266266
log.Printf("[DEBUG] Creating new Subnetwork: %#v", obj)
267-
res, err := Post(config, url, obj)
267+
res, err := sendRequest(config, "POST", url, obj)
268268
if err != nil {
269269
return fmt.Errorf("Error creating Subnetwork: %s", err)
270270
}
@@ -310,7 +310,7 @@ func resourceComputeSubnetworkRead(d *schema.ResourceData, meta interface{}) err
310310
return err
311311
}
312312

313-
res, err := Get(config, url)
313+
res, err := sendRequest(config, "GET", url, nil)
314314
if err != nil {
315315
return handleNotFoundError(err, d, fmt.Sprintf("ComputeSubnetwork %q", d.Id()))
316316
}
@@ -501,7 +501,7 @@ func resourceComputeSubnetworkDelete(d *schema.ResourceData, meta interface{}) e
501501
}
502502

503503
log.Printf("[DEBUG] Deleting Subnetwork %q", d.Id())
504-
res, err := Delete(config, url)
504+
res, err := sendRequest(config, "DELETE", url, nil)
505505
if err != nil {
506506
return handleNotFoundError(err, d, "Subnetwork")
507507
}

0 commit comments

Comments
 (0)