Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove retry in read as retry for create/update is already handled in respective methods #12028

Merged
merged 4 commits into from
Oct 22, 2024
Merged

fix: remove retry in read as retry for create/update is already handled in respective methods #12028

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a05a843
remove retry
gurusai-voleti Oct 17, 2024
188e9c5
Merge branch 'GoogleCloudPlatform:main' into rmv_read_retry
gurusai-voleti Oct 18, 2024
d2a35a7
Merge branch 'GoogleCloudPlatform:main' into rmv_read_retry
gurusai-voleti Oct 21, 2024
a5632e8
Merge branch 'GoogleCloudPlatform:main' into rmv_read_retry
gurusai-voleti Oct 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions mmv1/third_party/terraform/services/storage/resource_storage_bucket.go.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -961,18 +961,9 @@ func resourceStorageBucketRead(d *schema.ResourceData, meta interface{}) error {
// Get the bucket and acl
bucket := d.Get("name").(string)

var res *storage.Bucket
// There seems to be some eventual consistency errors in some cases, so we want to check a few times
// to make sure it exists before moving on
err = transport_tpg.Retry(transport_tpg.RetryOptions{
RetryFunc: func() (operr error) {
var retryErr error
res, retryErr = config.NewStorageClient(userAgent).Buckets.Get(bucket).Do()
return retryErr
},
Timeout: d.Timeout(schema.TimeoutRead),
ErrorRetryPredicates: []transport_tpg.RetryErrorPredicateFunc{transport_tpg.IsNotFoundRetryableError("bucket read")},
})
res, err := config.NewStorageClient(userAgent).Buckets.Get(bucket).Do()

if err != nil {
return transport_tpg.HandleNotFoundError(err, d, fmt.Sprintf("Storage Bucket %q", d.Get("name").(string)))
Expand Down