test(object): lock config: all tests OK on nl-ams

Author: Mia-Cross

scaleway/helpers_object.go

@@ -31,7 +31,7 @@ const (
 
 	maxObjectVersionDeletionWorkers = 8
 
-	objectTestsMainRegion      = "fr-par"
+	objectTestsMainRegion      = "nl-ams"
 	objectTestsSecondaryRegion = "pl-waw"
 
 	errCodeForbidden = "Forbidden"

scaleway/resource_object_bucket_lock_configuration.go

@@ -3,7 +3,6 @@ package scaleway
 import (
 	"context"
 	"fmt"
-	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/s3"
@@ -83,7 +82,17 @@ func resourceObjectLockConfigurationCreate(ctx context.Context, d *schema.Resour
 		return diag.FromErr(err)
 	}
 
-	bucket := expandID(d.Get("bucket").(string))
+	regionalID := expandRegionalID(d.Get("bucket"))
+	bucket := regionalID.ID
+	bucketRegion := regionalID.Region
+
+	if bucketRegion != "" && bucketRegion != region {
+		conn, err = s3ClientForceRegion(d, meta, bucketRegion.String())
+		if err != nil {
+			return diag.FromErr(err)
+		}
+		region = bucketRegion
+	}
 
 	input := &s3.PutObjectLockConfigurationInput{
 		Bucket: aws.String(bucket),
@@ -93,13 +102,7 @@ func resourceObjectLockConfigurationCreate(ctx context.Context, d *schema.Resour
 		},
 	}
 
-	_, err = retryWhenAWSErrCodeEquals(ctx, []string{s3.ErrCodeNoSuchBucket}, &RetryWhenConfig[*s3.PutObjectLockConfigurationOutput]{
-		Timeout:  d.Timeout(schema.TimeoutCreate),
-		Interval: 5 * time.Second,
-		Function: func() (*s3.PutObjectLockConfigurationOutput, error) {
-			return conn.PutObjectLockConfigurationWithContext(ctx, input)
-		},
-	})
+	_, err = conn.PutObjectLockConfigurationWithContext(ctx, input)
 	if err != nil {
 		return diag.FromErr(fmt.Errorf("error creating object bucket (%s) lock configuration: %w", bucket, err))
 	}

scaleway/resource_object_bucket_lock_configuration_test.go

@@ -2,6 +2,7 @@ package scaleway
 
 import (
 	"fmt"
+	"regexp"
 	"testing"
 
 	"github.com/aws/aws-sdk-go/aws"
@@ -137,7 +138,7 @@ func TestAccScalewayObjectBucketLockConfiguration_Update(t *testing.T) {
 						name = %[1]q
 						region = %[2]q
 						tags = {
-							TestName = "TestAccSCW_LockConfig_basic"
+							TestName = "TestAccSCW_LockConfig_update"
 						}
 
 						object_lock_enabled = true
@@ -209,19 +210,103 @@ func TestAccScalewayObjectBucketLockConfiguration_Update(t *testing.T) {
 	})
 }
 
+func TestAccScalewayObjectBucketLockConfiguration_WithBucketName(t *testing.T) {
+	rName := sdkacctest.RandomWithPrefix(LockResourcePrefix)
+	resourceName := lockResourceTestName
+
+	tt := NewTestTools(t)
+	defer tt.Cleanup()
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:          func() { testAccPreCheck(t) },
+		ErrorCheck:        ErrorCheck(t, EndpointsID),
+		ProviderFactories: tt.ProviderFactories,
+		CheckDestroy: resource.ComposeTestCheckFunc(
+			testAccCheckScalewayBucketLockConfigurationDestroy(tt),
+			testAccCheckScalewayObjectBucketDestroy(tt),
+		),
+		Steps: []resource.TestStep{
+			{
+				Config: fmt.Sprintf(`
+					resource "scaleway_object_bucket" "test" {
+						name = %[1]q
+						region = %[2]q
+						tags = {
+							TestName = "TestAccSCW_LockConfig_WithBucketName"
+						}
+
+						object_lock_enabled = true
+					}
+
+					resource "scaleway_object_bucket_acl" "test" {
+						bucket = scaleway_object_bucket.test.id
+						acl = "public-read"
+					}
+
+					resource "scaleway_object_bucket_lock_configuration" "test" {
+						bucket = scaleway_object_bucket.test.name
+						rule {
+							default_retention {
+								mode = "GOVERNANCE"
+								days = 1
+							}
+						}
+					}
+				`, rName, objectTestsMainRegion),
+				ExpectError: regexp.MustCompile("NoSuchBucket: The specified bucket does not exist"),
+			},
+			{
+				Config: fmt.Sprintf(`
+					resource "scaleway_object_bucket" "test" {
+						name = %[1]q
+						region = %[2]q
+						tags = {
+							TestName = "TestAccSCW_LockConfig_WithBucketName"
+						}
+
+						object_lock_enabled = true
+					}
+
+					resource "scaleway_object_bucket_acl" "test" {
+						bucket = scaleway_object_bucket.test.id
+						acl = "public-read"
+					}
+
+					resource "scaleway_object_bucket_lock_configuration" "test" {
+						bucket = scaleway_object_bucket.test.name
+						region = %[2]q
+						rule {
+							default_retention {
+								mode = "GOVERNANCE"
+								days = 1
+							}
+						}
+					}
+				`, rName, objectTestsMainRegion),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckBucketLockConfigurationExists(tt, resourceName),
+					testAccCheckScalewayObjectBucketExistsForceRegion(tt, "scaleway_object_bucket.test", true),
+					resource.TestCheckResourceAttrPair(resourceName, "bucket", "scaleway_object_bucket.test", "name"),
+				),
+			},
+		},
+	})
+}
+
 func testAccCheckScalewayBucketLockConfigurationDestroy(tt *TestTools) resource.TestCheckFunc {
 	return func(s *terraform.State) error {
-		conn, err := newS3ClientFromMeta(tt.Meta)
-		if err != nil {
-			return err
-		}
-
 		for _, rs := range s.RootModule().Resources {
 			if rs.Type != "scaleway_object_bucket_lock_configuration" {
 				continue
 			}
 
-			bucket := expandID(rs.Primary.ID)
+			regionalID := expandRegionalID(rs.Primary.ID)
+			bucketRegion := regionalID.Region
+			bucket := regionalID.ID
+			conn, err := newS3ClientFromMetaForceRegion(tt.Meta, bucketRegion.String())
+			if err != nil {
+				return err
+			}
 
 			input := &s3.GetObjectLockConfigurationInput{
 				Bucket: aws.String(bucket),
@@ -253,11 +338,6 @@ func testAccCheckBucketLockConfigurationExists(tt *TestTools, resourceName strin
 			return fmt.Errorf("resource not found")
 		}
 
-		conn, err := newS3ClientFromMeta(tt.Meta)
-		if err != nil {
-			return err
-		}
-
 		rs, ok := s.RootModule().Resources[resourceName]
 		if !ok {
 			return fmt.Errorf("not found: %s", resourceName)
@@ -267,7 +347,13 @@ func testAccCheckBucketLockConfigurationExists(tt *TestTools, resourceName strin
 			return fmt.Errorf("resource (%s) ID not set", resourceName)
 		}
 
-		bucket := expandID(rs.Primary.ID)
+		regionalID := expandRegionalID(rs.Primary.ID)
+		bucketRegion := regionalID.Region
+		bucket := regionalID.ID
+		conn, err := newS3ClientFromMetaForceRegion(tt.Meta, bucketRegion.String())
+		if err != nil {
+			return err
+		}
 
 		input := &s3.GetObjectLockConfigurationInput{
 			Bucket: aws.String(bucket),