Merge pull request #147 from fujiwara/fix/s3-region

Fix bucket region configuration issue
fujiwara · Dec 25, 2023 · affdb0d · affdb0d
2 parents 24f9805 + d19f224
commit affdb0d
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/tfstate/remote_s3.go b/tfstate/remote_s3.go
@@ -42,12 +42,20 @@ func readS3(ctx context.Context, bucket, key string, opt s3Option) (io.ReadClose
 	if err != nil {
 		return nil, err
 	}
-	if opt.region == "" {
-		opt.region, err = getBucketRegion(ctx, cfg, bucket)
+	region, err := getBucketRegion(ctx, cfg, bucket)
+	if err != nil {
+		return nil, err
+	}
+	if region != opt.region {
+		// reload config with bucket region
+		cfg, err = config.LoadDefaultConfig(ctx,
+			config.WithRegion(region),
+		)
 		if err != nil {
 			return nil, err
 		}
 	}
+
 	if opt.role_arn != "" {
 		arn, err := arn.Parse(opt.role_arn)
 		if err != nil {