Skip to content

Commit aff506e

Browse files
modular-magicianmodular-magician
authored
Error abort predicates (#8097) (#14850)
* Add error abort predicates * Add error abort predicate * Add additional error abort predicates * Rename function Signed-off-by: Modular Magician <[email protected]>
1 parent 6606a4d commit aff506e

14 files changed

+99
-83
lines changed

‎.changelog/8097.txt

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
filestore: fixed an issue causing 429 errors to be retried
3+
```

‎google/resource_filestore_backup_generated_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func testAccCheckFilestoreBackupDestroyProducer(t *testing.T) func(s *terraform.
119119
Project: billingProject,
120120
RawURL: url,
121121
UserAgent: config.UserAgent,
122-
ErrorRetryPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.IsNotFilestoreQuotaError},
122+
ErrorAbortPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.Is429QuotaError},
123123
})
124124
if err == nil {
125125
return fmt.Errorf("FilestoreBackup still exists at %s", url)

‎google/resource_filestore_instance_generated_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ func testAccCheckFilestoreInstanceDestroyProducer(t *testing.T) func(s *terrafor
164164
Project: billingProject,
165165
RawURL: url,
166166
UserAgent: config.UserAgent,
167-
ErrorRetryPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.IsNotFilestoreQuotaError},
167+
ErrorAbortPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.Is429QuotaError},
168168
})
169169
if err == nil {
170170
return fmt.Errorf("FilestoreInstance still exists at %s", url)

‎google/resource_filestore_snapshot_generated_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ func testAccCheckFilestoreSnapshotDestroyProducer(t *testing.T) func(s *terrafor
167167
Project: billingProject,
168168
RawURL: url,
169169
UserAgent: config.UserAgent,
170-
ErrorRetryPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.IsNotFilestoreQuotaError},
170+
ErrorAbortPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.Is429QuotaError},
171171
})
172172
if err == nil {
173173
return fmt.Errorf("FilestoreSnapshot still exists at %s", url)

‎google/resource_network_services_edge_cache_keyset_generated_test.go

+6-5
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,12 @@ func testAccCheckNetworkServicesEdgeCacheKeysetDestroyProducer(t *testing.T) fun
152152
}
153153

154154
_, err = transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
155-
Config: config,
156-
Method: "GET",
157-
Project: billingProject,
158-
RawURL: url,
159-
UserAgent: config.UserAgent,
155+
Config: config,
156+
Method: "GET",
157+
Project: billingProject,
158+
RawURL: url,
159+
UserAgent: config.UserAgent,
160+
ErrorAbortPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.Is429QuotaError},
160161
})
161162
if err == nil {
162163
return fmt.Errorf("NetworkServicesEdgeCacheKeyset still exists at %s", url)

‎google/services/activedirectory/active_directory_operation.go

+6-5
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,12 @@ func (w *ActiveDirectoryOperationWaiter) QueryOp() (interface{}, error) {
4141
url := fmt.Sprintf("%s%s", w.Config.ActiveDirectoryBasePath, w.CommonOperationWaiter.Op.Name)
4242

4343
return transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
44-
Config: w.Config,
45-
Method: "GET",
46-
Project: w.Project,
47-
RawURL: url,
48-
UserAgent: w.UserAgent,
44+
Config: w.Config,
45+
Method: "GET",
46+
Project: w.Project,
47+
RawURL: url,
48+
UserAgent: w.UserAgent,
49+
ErrorAbortPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.Is429QuotaError},
4950
})
5051
}
5152

‎google/services/activedirectory/resource_active_directory_domain.go

+30-26
Original file line numberDiff line numberDiff line change
@@ -178,13 +178,14 @@ func resourceActiveDirectoryDomainCreate(d *schema.ResourceData, meta interface{
178178
}
179179

180180
res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
181-
Config: config,
182-
Method: "POST",
183-
Project: billingProject,
184-
RawURL: url,
185-
UserAgent: userAgent,
186-
Body: obj,
187-
Timeout: d.Timeout(schema.TimeoutCreate),
181+
Config: config,
182+
Method: "POST",
183+
Project: billingProject,
184+
RawURL: url,
185+
UserAgent: userAgent,
186+
Body: obj,
187+
Timeout: d.Timeout(schema.TimeoutCreate),
188+
ErrorAbortPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.Is429QuotaError},
188189
})
189190
if err != nil {
190191
return fmt.Errorf("Error creating Domain: %s", err)
@@ -252,11 +253,12 @@ func resourceActiveDirectoryDomainRead(d *schema.ResourceData, meta interface{})
252253
}
253254

254255
res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
255-
Config: config,
256-
Method: "GET",
257-
Project: billingProject,
258-
RawURL: url,
259-
UserAgent: userAgent,
256+
Config: config,
257+
Method: "GET",
258+
Project: billingProject,
259+
RawURL: url,
260+
UserAgent: userAgent,
261+
ErrorAbortPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.Is429QuotaError},
260262
})
261263
if err != nil {
262264
return transport_tpg.HandleNotFoundError(err, d, fmt.Sprintf("ActiveDirectoryDomain %q", d.Id()))
@@ -358,13 +360,14 @@ func resourceActiveDirectoryDomainUpdate(d *schema.ResourceData, meta interface{
358360
}
359361

360362
res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
361-
Config: config,
362-
Method: "PATCH",
363-
Project: billingProject,
364-
RawURL: url,
365-
UserAgent: userAgent,
366-
Body: obj,
367-
Timeout: d.Timeout(schema.TimeoutUpdate),
363+
Config: config,
364+
Method: "PATCH",
365+
Project: billingProject,
366+
RawURL: url,
367+
UserAgent: userAgent,
368+
Body: obj,
369+
Timeout: d.Timeout(schema.TimeoutUpdate),
370+
ErrorAbortPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.Is429QuotaError},
368371
})
369372

370373
if err != nil {
@@ -413,13 +416,14 @@ func resourceActiveDirectoryDomainDelete(d *schema.ResourceData, meta interface{
413416
}
414417

415418
res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
416-
Config: config,
417-
Method: "DELETE",
418-
Project: billingProject,
419-
RawURL: url,
420-
UserAgent: userAgent,
421-
Body: obj,
422-
Timeout: d.Timeout(schema.TimeoutDelete),
419+
Config: config,
420+
Method: "DELETE",
421+
Project: billingProject,
422+
RawURL: url,
423+
UserAgent: userAgent,
424+
Body: obj,
425+
Timeout: d.Timeout(schema.TimeoutDelete),
426+
ErrorAbortPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.Is429QuotaError},
423427
})
424428
if err != nil {
425429
return transport_tpg.HandleNotFoundError(err, d, "Domain")

‎google/services/filestore/filestore_operation.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func (w *FilestoreOperationWaiter) QueryOp() (interface{}, error) {
4646
Project: w.Project,
4747
RawURL: url,
4848
UserAgent: w.UserAgent,
49-
ErrorRetryPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.IsNotFilestoreQuotaError},
49+
ErrorAbortPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.Is429QuotaError},
5050
})
5151
}
5252

‎google/services/filestore/resource_filestore_backup.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ func resourceFilestoreBackupCreate(d *schema.ResourceData, meta interface{}) err
202202
UserAgent: userAgent,
203203
Body: obj,
204204
Timeout: d.Timeout(schema.TimeoutCreate),
205-
ErrorRetryPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.IsNotFilestoreQuotaError},
205+
ErrorAbortPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.Is429QuotaError},
206206
})
207207
if err != nil {
208208
return fmt.Errorf("Error creating Backup: %s", err)
@@ -271,7 +271,7 @@ func resourceFilestoreBackupRead(d *schema.ResourceData, meta interface{}) error
271271
Project: billingProject,
272272
RawURL: url,
273273
UserAgent: userAgent,
274-
ErrorRetryPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.IsNotFilestoreQuotaError},
274+
ErrorAbortPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.Is429QuotaError},
275275
})
276276
if err != nil {
277277
return transport_tpg.HandleNotFoundError(err, d, fmt.Sprintf("FilestoreBackup %q", d.Id()))
@@ -399,7 +399,7 @@ func resourceFilestoreBackupUpdate(d *schema.ResourceData, meta interface{}) err
399399
UserAgent: userAgent,
400400
Body: obj,
401401
Timeout: d.Timeout(schema.TimeoutUpdate),
402-
ErrorRetryPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.IsNotFilestoreQuotaError},
402+
ErrorAbortPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.Is429QuotaError},
403403
})
404404

405405
if err != nil {
@@ -462,7 +462,7 @@ func resourceFilestoreBackupDelete(d *schema.ResourceData, meta interface{}) err
462462
UserAgent: userAgent,
463463
Body: obj,
464464
Timeout: d.Timeout(schema.TimeoutDelete),
465-
ErrorRetryPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.IsNotFilestoreQuotaError},
465+
ErrorAbortPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.Is429QuotaError},
466466
})
467467
if err != nil {
468468
return transport_tpg.HandleNotFoundError(err, d, "Backup")

‎google/services/filestore/resource_filestore_instance.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ func resourceFilestoreInstanceCreate(d *schema.ResourceData, meta interface{}) e
354354
UserAgent: userAgent,
355355
Body: obj,
356356
Timeout: d.Timeout(schema.TimeoutCreate),
357-
ErrorRetryPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.IsNotFilestoreQuotaError},
357+
ErrorAbortPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.Is429QuotaError},
358358
})
359359
if err != nil {
360360
return fmt.Errorf("Error creating Instance: %s", err)
@@ -423,7 +423,7 @@ func resourceFilestoreInstanceRead(d *schema.ResourceData, meta interface{}) err
423423
Project: billingProject,
424424
RawURL: url,
425425
UserAgent: userAgent,
426-
ErrorRetryPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.IsNotFilestoreQuotaError},
426+
ErrorAbortPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.Is429QuotaError},
427427
})
428428
if err != nil {
429429
return transport_tpg.HandleNotFoundError(err, d, fmt.Sprintf("FilestoreInstance %q", d.Id()))
@@ -535,7 +535,7 @@ func resourceFilestoreInstanceUpdate(d *schema.ResourceData, meta interface{}) e
535535
UserAgent: userAgent,
536536
Body: obj,
537537
Timeout: d.Timeout(schema.TimeoutUpdate),
538-
ErrorRetryPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.IsNotFilestoreQuotaError},
538+
ErrorAbortPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.Is429QuotaError},
539539
})
540540

541541
if err != nil {
@@ -591,7 +591,7 @@ func resourceFilestoreInstanceDelete(d *schema.ResourceData, meta interface{}) e
591591
UserAgent: userAgent,
592592
Body: obj,
593593
Timeout: d.Timeout(schema.TimeoutDelete),
594-
ErrorRetryPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.IsNotFilestoreQuotaError},
594+
ErrorAbortPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.Is429QuotaError},
595595
})
596596
if err != nil {
597597
return transport_tpg.HandleNotFoundError(err, d, "Instance")

‎google/services/filestore/resource_filestore_snapshot.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ func resourceFilestoreSnapshotCreate(d *schema.ResourceData, meta interface{}) e
165165
UserAgent: userAgent,
166166
Body: obj,
167167
Timeout: d.Timeout(schema.TimeoutCreate),
168-
ErrorRetryPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.IsNotFilestoreQuotaError},
168+
ErrorAbortPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.Is429QuotaError},
169169
})
170170
if err != nil {
171171
return fmt.Errorf("Error creating Snapshot: %s", err)
@@ -234,7 +234,7 @@ func resourceFilestoreSnapshotRead(d *schema.ResourceData, meta interface{}) err
234234
Project: billingProject,
235235
RawURL: url,
236236
UserAgent: userAgent,
237-
ErrorRetryPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.IsNotFilestoreQuotaError},
237+
ErrorAbortPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.Is429QuotaError},
238238
})
239239
if err != nil {
240240
return transport_tpg.HandleNotFoundError(err, d, fmt.Sprintf("FilestoreSnapshot %q", d.Id()))
@@ -334,7 +334,7 @@ func resourceFilestoreSnapshotUpdate(d *schema.ResourceData, meta interface{}) e
334334
UserAgent: userAgent,
335335
Body: obj,
336336
Timeout: d.Timeout(schema.TimeoutUpdate),
337-
ErrorRetryPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.IsNotFilestoreQuotaError},
337+
ErrorAbortPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.Is429QuotaError},
338338
})
339339

340340
if err != nil {
@@ -397,7 +397,7 @@ func resourceFilestoreSnapshotDelete(d *schema.ResourceData, meta interface{}) e
397397
UserAgent: userAgent,
398398
Body: obj,
399399
Timeout: d.Timeout(schema.TimeoutDelete),
400-
ErrorRetryPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.IsNotFilestoreQuotaError},
400+
ErrorAbortPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.Is429QuotaError},
401401
})
402402
if err != nil {
403403
return transport_tpg.HandleNotFoundError(err, d, "Snapshot")

‎google/services/monitoring/resource_monitoring_alert_policy.go

+4
Original file line numberDiff line numberDiff line change
@@ -1009,6 +1009,7 @@ func resourceMonitoringAlertPolicyCreate(d *schema.ResourceData, meta interface{
10091009
Body: obj,
10101010
Timeout: d.Timeout(schema.TimeoutCreate),
10111011
ErrorRetryPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.IsMonitoringConcurrentEditError},
1012+
ErrorAbortPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.Is429QuotaError},
10121013
})
10131014
if err != nil {
10141015
return fmt.Errorf("Error creating AlertPolicy: %s", err)
@@ -1079,6 +1080,7 @@ func resourceMonitoringAlertPolicyRead(d *schema.ResourceData, meta interface{})
10791080
RawURL: url,
10801081
UserAgent: userAgent,
10811082
ErrorRetryPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.IsMonitoringConcurrentEditError},
1083+
ErrorAbortPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.Is429QuotaError},
10821084
})
10831085
if err != nil {
10841086
return transport_tpg.HandleNotFoundError(err, d, fmt.Sprintf("MonitoringAlertPolicy %q", d.Id()))
@@ -1254,6 +1256,7 @@ func resourceMonitoringAlertPolicyUpdate(d *schema.ResourceData, meta interface{
12541256
Body: obj,
12551257
Timeout: d.Timeout(schema.TimeoutUpdate),
12561258
ErrorRetryPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.IsMonitoringConcurrentEditError},
1259+
ErrorAbortPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.Is429QuotaError},
12571260
})
12581261

12591262
if err != nil {
@@ -1309,6 +1312,7 @@ func resourceMonitoringAlertPolicyDelete(d *schema.ResourceData, meta interface{
13091312
Body: obj,
13101313
Timeout: d.Timeout(schema.TimeoutDelete),
13111314
ErrorRetryPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.IsMonitoringConcurrentEditError},
1315+
ErrorAbortPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.Is429QuotaError},
13121316
})
13131317
if err != nil {
13141318
return transport_tpg.HandleNotFoundError(err, d, "AlertPolicy")

‎google/services/networkservices/resource_network_services_edge_cache_keyset.go

+30-26
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,14 @@ func resourceNetworkServicesEdgeCacheKeysetCreate(d *schema.ResourceData, meta i
194194
}
195195

196196
res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
197-
Config: config,
198-
Method: "POST",
199-
Project: billingProject,
200-
RawURL: url,
201-
UserAgent: userAgent,
202-
Body: obj,
203-
Timeout: d.Timeout(schema.TimeoutCreate),
197+
Config: config,
198+
Method: "POST",
199+
Project: billingProject,
200+
RawURL: url,
201+
UserAgent: userAgent,
202+
Body: obj,
203+
Timeout: d.Timeout(schema.TimeoutCreate),
204+
ErrorAbortPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.Is429QuotaError},
204205
})
205206
if err != nil {
206207
return fmt.Errorf("Error creating EdgeCacheKeyset: %s", err)
@@ -254,11 +255,12 @@ func resourceNetworkServicesEdgeCacheKeysetRead(d *schema.ResourceData, meta int
254255
}
255256

256257
res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
257-
Config: config,
258-
Method: "GET",
259-
Project: billingProject,
260-
RawURL: url,
261-
UserAgent: userAgent,
258+
Config: config,
259+
Method: "GET",
260+
Project: billingProject,
261+
RawURL: url,
262+
UserAgent: userAgent,
263+
ErrorAbortPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.Is429QuotaError},
262264
})
263265
if err != nil {
264266
return transport_tpg.HandleNotFoundError(err, d, fmt.Sprintf("NetworkServicesEdgeCacheKeyset %q", d.Id()))
@@ -361,13 +363,14 @@ func resourceNetworkServicesEdgeCacheKeysetUpdate(d *schema.ResourceData, meta i
361363
}
362364

363365
res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
364-
Config: config,
365-
Method: "PATCH",
366-
Project: billingProject,
367-
RawURL: url,
368-
UserAgent: userAgent,
369-
Body: obj,
370-
Timeout: d.Timeout(schema.TimeoutUpdate),
366+
Config: config,
367+
Method: "PATCH",
368+
Project: billingProject,
369+
RawURL: url,
370+
UserAgent: userAgent,
371+
Body: obj,
372+
Timeout: d.Timeout(schema.TimeoutUpdate),
373+
ErrorAbortPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.Is429QuotaError},
371374
})
372375

373376
if err != nil {
@@ -416,13 +419,14 @@ func resourceNetworkServicesEdgeCacheKeysetDelete(d *schema.ResourceData, meta i
416419
}
417420

418421
res, err := transport_tpg.SendRequest(transport_tpg.SendRequestOptions{
419-
Config: config,
420-
Method: "DELETE",
421-
Project: billingProject,
422-
RawURL: url,
423-
UserAgent: userAgent,
424-
Body: obj,
425-
Timeout: d.Timeout(schema.TimeoutDelete),
422+
Config: config,
423+
Method: "DELETE",
424+
Project: billingProject,
425+
RawURL: url,
426+
UserAgent: userAgent,
427+
Body: obj,
428+
Timeout: d.Timeout(schema.TimeoutDelete),
429+
ErrorAbortPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.Is429QuotaError},
426430
})
427431
if err != nil {
428432
return transport_tpg.HandleNotFoundError(err, d, "EdgeCacheKeyset")

0 commit comments

Comments
 (0)