From 942d72b3e5abeb60ab208bfa478296cc7196d9b5 Mon Sep 17 00:00:00 2001 From: Graham Davison Date: Fri, 8 Sep 2023 12:13:44 -0700 Subject: [PATCH] Adds bucket name to bucket not found error message --- internal/backend/remote-state/s3/backend_state.go | 2 +- internal/backend/remote-state/s3/client.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/backend/remote-state/s3/backend_state.go b/internal/backend/remote-state/s3/backend_state.go index fb8e780422..bed5f7a803 100644 --- a/internal/backend/remote-state/s3/backend_state.go +++ b/internal/backend/remote-state/s3/backend_state.go @@ -45,7 +45,7 @@ func (b *Backend) Workspaces() ([]string, error) { page, err := pages.NextPage(ctx) if err != nil { if IsA[*s3types.NoSuchBucket](err) { - return nil, fmt.Errorf(errS3NoSuchBucket, err) + return nil, fmt.Errorf(errS3NoSuchBucket, b.bucketName, err) } return nil, err } diff --git a/internal/backend/remote-state/s3/client.go b/internal/backend/remote-state/s3/client.go index 8bdcab79ab..3a3798c249 100644 --- a/internal/backend/remote-state/s3/client.go +++ b/internal/backend/remote-state/s3/client.go @@ -120,7 +120,7 @@ func (c *RemoteClient) get(ctx context.Context) (*remote.Payload, error) { if err != nil { switch { case IsA[*s3types.NoSuchBucket](err): - return nil, fmt.Errorf(errS3NoSuchBucket, err) + return nil, fmt.Errorf(errS3NoSuchBucket, c.bucketName, err) case IsA[*s3types.NotFound](err): return nil, nil } @@ -147,7 +147,7 @@ func (c *RemoteClient) get(ctx context.Context) (*remote.Payload, error) { if err != nil { switch { case IsA[*s3types.NoSuchBucket](err): - return nil, fmt.Errorf(errS3NoSuchBucket, err) + return nil, fmt.Errorf(errS3NoSuchBucket, c.bucketName, err) case IsA[*s3types.NoSuchKey](err): return nil, nil } @@ -459,7 +459,7 @@ to manually verify the remote state and update the Digest value stored in the DynamoDB table to the following value: %x ` -const errS3NoSuchBucket = `S3 bucket does not exist. +const errS3NoSuchBucket = `S3 bucket %q does not exist. The referenced S3 bucket must have been previously created. If the S3 bucket was created within the last minute, please wait for a minute or two and try