feat(object): bucket lock configuration takes on bucket's region

docs/resources/object_bucket_acl.md

@@ -20,7 +20,7 @@ resource "scaleway_object_bucket" "some_bucket" {
 }
 
 resource "scaleway_object_bucket_acl" "main" {
-  bucket = scaleway_object_bucket.main.name
+  bucket = scaleway_object_bucket.main.id
   acl = "private"
 }
 ```
@@ -33,7 +33,7 @@ resource "scaleway_object_bucket" "main" {
 }
 
 resource "scaleway_object_bucket_acl" "main" {
-    bucket = scaleway_object_bucket.main.name
+    bucket = scaleway_object_bucket.main.id
     access_control_policy {
       grant {
         grantee {
@@ -62,12 +62,12 @@ resource "scaleway_object_bucket_acl" "main" {
 
 The following arguments are supported:
 
-* `bucket` - (Required) The name of the bucket.
+* `bucket` - (Required) The name of the bucket, or its Terraform ID.
 * `acl` - (Optional) The canned ACL you want to apply to the bucket.
 * `access_control_policy` - (Optional, Conflicts with acl) A configuration block that sets the ACL permissions for an object per grantee documented below.
 * `expected_bucket_owner` - (Optional, Forces new resource) The project ID of the expected bucket owner.
 * `region` - (Optional) The [region](https://developers.scaleway.com/en/quickstart/#region-definition) in which the bucket should be created.
-* `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the bucket is associated with.
+* `project_id` - (Defaults to [provider](../index.md#arguments-reference) `project_id`) The ID of the project the bucket is associated with.
 
 
 ## The ACL

docs/resources/object_bucket_object_lock_configuration.md

@@ -42,7 +42,7 @@ You should [contact Scaleway support](https://console.scaleway.com/support/ticke
 
 The following arguments are supported:
 
-- `bucket` - (Required, Forces new resource) The name of the bucket.
+- `bucket` - (Required, Forces new resource) The name of the bucket, or its Terraform ID.
 
 - `rule` - (Optional) Specifies the Object Lock rule for the specified object.
 
@@ -54,7 +54,7 @@ The following arguments are supported:
 
         - `years` - (Optional) The number of years that you want to specify for the default retention period.
 
-- `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the bucket is associated with.
+- `project_id` - (Defaults to [provider](../index.md#arguments-reference) `project_id`) The ID of the project the bucket is associated with.
 
 ## Attributes Reference
 

scaleway/resource_object_bucket_acl.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"fmt"
 	"strings"
-	"time"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/s3"
@@ -117,11 +116,12 @@ func resourceScalewayObjectBucketACL() *schema.Resource {
 				}, false),
 			},
 			"bucket": {
-				Type:         schema.TypeString,
-				Required:     true,
-				ForceNew:     true,
-				ValidateFunc: validation.StringLenBetween(1, 63),
-				Description:  "The bucket name.",
+				Type:             schema.TypeString,
+				Required:         true,
+				ForceNew:         true,
+				ValidateFunc:     validation.StringLenBetween(1, 63),
+				Description:      "The bucket's name or regional ID.",
+				DiffSuppressFunc: diffSuppressFuncLocality,
 			},
 			"expected_bucket_owner": {
 				Type:         schema.TypeString,
@@ -142,7 +142,18 @@ func resourceBucketACLCreate(ctx context.Context, d *schema.ResourceData, meta i
 		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
+	}
+
 	expectedBucketOwner := d.Get("expected_bucket_owner").(string)
 	acl := d.Get("acl").(string)
 
@@ -162,13 +173,7 @@ func resourceBucketACLCreate(ctx context.Context, d *schema.ResourceData, meta i
 		input.AccessControlPolicy = expandBucketACLAccessControlPolicy(v.([]interface{}))
 	}
 
-	out, err := retryWhenAWSErrCodeEquals(ctx, []string{s3.ErrCodeNoSuchBucket}, &RetryWhenConfig[*s3.PutBucketAclOutput]{
-		Timeout:  d.Timeout(schema.TimeoutCreate),
-		Interval: 5 * time.Second,
-		Function: func() (*s3.PutBucketAclOutput, error) {
-			return conn.PutBucketAclWithContext(ctx, input)
-		},
-	})
+	out, err := conn.PutBucketAclWithContext(ctx, input)
 	if err != nil {
 		return diag.FromErr(fmt.Errorf("error putting Object Storage ACL: %s", err))
 	}

scaleway/resource_object_bucket_acl_test.go

@@ -2,6 +2,7 @@ package scaleway
 
 import (
 	"fmt"
+	"regexp"
 	"testing"
 
 	sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
@@ -11,7 +12,7 @@ import (
 func TestAccScalewayObjectBucketACL_Basic(t *testing.T) {
 	tt := NewTestTools(t)
 	defer tt.Cleanup()
-	testBucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-acl-basic")
+	testBucketName := sdkacctest.RandomWithPrefix("test-acc-scw-object-acl-basic")
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t) },
@@ -22,16 +23,16 @@ func TestAccScalewayObjectBucketACL_Basic(t *testing.T) {
 				Config: fmt.Sprintf(`
 					resource "scaleway_object_bucket" "main" {
 						name = "%s"
-						region = "nl-ams"
+						region = "%s"
 					}
 
 					resource "scaleway_object_bucket_acl" "main" {
-						bucket = scaleway_object_bucket.main.name
+						bucket = scaleway_object_bucket.main.id
 						acl = "private"
-						region = "nl-ams"
 					}
-					`, testBucketName),
+					`, testBucketName, objectTestsMainRegion),
 				Check: resource.ComposeTestCheckFunc(
+					testAccCheckScalewayObjectBucketExistsForceRegion(tt, "scaleway_object_bucket.main", true),
 					resource.TestCheckResourceAttr("scaleway_object_bucket_acl.main", "bucket", testBucketName),
 					resource.TestCheckResourceAttr("scaleway_object_bucket_acl.main", "acl", "private"),
 				),
@@ -40,16 +41,16 @@ func TestAccScalewayObjectBucketACL_Basic(t *testing.T) {
 				Config: fmt.Sprintf(`
 					resource "scaleway_object_bucket" "main" {
 						name = "%s"
-						region = "nl-ams"
+						region = "%s"
 					}
 
 					resource "scaleway_object_bucket_acl" "main" {
-						bucket = scaleway_object_bucket.main.name
+						bucket = scaleway_object_bucket.main.id
 						acl = "public-read"
-						region = "nl-ams"
 					}
-					`, testBucketName),
+					`, testBucketName, objectTestsMainRegion),
 				Check: resource.ComposeTestCheckFunc(
+					testAccCheckScalewayObjectBucketExistsForceRegion(tt, "scaleway_object_bucket.main", true),
 					resource.TestCheckResourceAttr("scaleway_object_bucket_acl.main", "bucket", testBucketName),
 					resource.TestCheckResourceAttr("scaleway_object_bucket_acl.main", "acl", "public-read"),
 				),
@@ -61,7 +62,7 @@ func TestAccScalewayObjectBucketACL_Basic(t *testing.T) {
 func TestAccScalewayObjectBucketACL_Grantee(t *testing.T) {
 	tt := NewTestTools(t)
 	defer tt.Cleanup()
-	testBucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-acl-grantee")
+	testBucketName := sdkacctest.RandomWithPrefix("test-acc-scw-object-acl-grantee")
 
 	ownerID := "105bdce1-64c0-48ab-899d-868455867ecf"
 	ownerIDChild := "50ab77d5-56bd-4981-a118-4e0fa5309b59"
@@ -74,10 +75,11 @@ func TestAccScalewayObjectBucketACL_Grantee(t *testing.T) {
 				Config: fmt.Sprintf(`
 					resource "scaleway_object_bucket" "main" {
 						name = "%[1]s"
+						region = "%[3]s"
 					}
 
 					resource "scaleway_object_bucket_acl" "main" {
-						bucket = scaleway_object_bucket.main.name
+						bucket = scaleway_object_bucket.main.id
 						access_control_policy {
 						  	grant {
 								grantee {
@@ -100,20 +102,21 @@ func TestAccScalewayObjectBucketACL_Grantee(t *testing.T) {
 						  	}
 						}
 					}
-					`, testBucketName, ownerID),
+					`, testBucketName, ownerID, objectTestsMainRegion),
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckScalewayObjectBucketExists(tt, "scaleway_object_bucket.main"),
+					testAccCheckScalewayObjectBucketExistsForceRegion(tt, "scaleway_object_bucket.main", true),
 					resource.TestCheckResourceAttr("scaleway_object_bucket_acl.main", "bucket", testBucketName),
 				),
 			},
 			{
 				Config: fmt.Sprintf(`
 					resource "scaleway_object_bucket" "main" {
 						name = "%[1]s"
+						region = "%[4]s"
 					}
 
 					resource "scaleway_object_bucket_acl" "main" {
-						bucket = scaleway_object_bucket.main.name
+						bucket = scaleway_object_bucket.main.id
 						access_control_policy {
 						  	grant {
 								grantee {
@@ -144,9 +147,9 @@ func TestAccScalewayObjectBucketACL_Grantee(t *testing.T) {
 						  	}
 						}
 					}
-				`, testBucketName, ownerID, ownerIDChild),
+				`, testBucketName, ownerID, ownerIDChild, objectTestsMainRegion),
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckScalewayObjectBucketExists(tt, "scaleway_object_bucket.main"),
+					testAccCheckScalewayObjectBucketExistsForceRegion(tt, "scaleway_object_bucket.main", true),
 					resource.TestCheckResourceAttr("scaleway_object_bucket_acl.main", "bucket", testBucketName),
 				),
 			},
@@ -162,7 +165,7 @@ func TestAccScalewayObjectBucketACL_Grantee(t *testing.T) {
 func TestAccScalewayObjectBucketACL_GranteeWithOwner(t *testing.T) {
 	tt := NewTestTools(t)
 	defer tt.Cleanup()
-	testBucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-acl-grantee-owner")
+	testBucketName := sdkacctest.RandomWithPrefix("test-acc-scw-object-acl-owner")
 	ownerID := "105bdce1-64c0-48ab-899d-868455867ecf"
 	resource.Test(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t) },
@@ -173,10 +176,11 @@ func TestAccScalewayObjectBucketACL_GranteeWithOwner(t *testing.T) {
 				Config: fmt.Sprintf(`
 					resource "scaleway_object_bucket" "main" {
 						name = "%[1]s"
+						region = "%[3]s"
 					}
 
 					resource "scaleway_object_bucket_acl" "main" {
-						bucket = scaleway_object_bucket.main.name
+						bucket = scaleway_object_bucket.main.id
 						expected_bucket_owner = "%[2]s"
 						access_control_policy {
 						  grant {
@@ -200,9 +204,58 @@ func TestAccScalewayObjectBucketACL_GranteeWithOwner(t *testing.T) {
 						  }
 						}
 					}
-					`, testBucketName, ownerID),
+					`, testBucketName, ownerID, objectTestsMainRegion),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckScalewayObjectBucketExistsForceRegion(tt, "scaleway_object_bucket.main", true),
+					resource.TestCheckResourceAttr("scaleway_object_bucket_acl.main", "bucket", testBucketName),
+				),
+			},
+		},
+	})
+}
+
+func TestAccScalewayObjectBucketACL_WithBucketName(t *testing.T) {
+	tt := NewTestTools(t)
+	defer tt.Cleanup()
+	testBucketName := sdkacctest.RandomWithPrefix("test-acc-scw-object-acl-name")
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:          func() { testAccPreCheck(t) },
+		ProviderFactories: tt.ProviderFactories,
+		CheckDestroy:      testAccCheckScalewayObjectBucketDestroy(tt),
+		Steps: []resource.TestStep{
+			{
+				Config: fmt.Sprintf(`
+					resource "scaleway_object_bucket" "main" {
+						name = "%s"
+						region = "%s"
+					}
+
+					resource "scaleway_object_bucket_acl" "main" {
+						bucket = scaleway_object_bucket.main.name
+						acl = "public-read"
+
+					}
+					`, testBucketName, objectTestsMainRegion),
+				ExpectError: regexp.MustCompile("error putting Object Storage ACL: NoSuchBucket: The specified bucket does not exist"),
+			},
+			{
+				Config: fmt.Sprintf(`
+					resource "scaleway_object_bucket" "main" {
+						name = "%s"
+						region = "%s"
+					}
+
+					resource "scaleway_object_bucket_acl" "main" {
+						bucket = scaleway_object_bucket.main.name
+						acl = "public-read"
+						region = "%[2]s"
+					}
+					`, testBucketName, objectTestsMainRegion),
 				Check: resource.ComposeTestCheckFunc(
+					testAccCheckScalewayObjectBucketExistsForceRegion(tt, "scaleway_object_bucket.main", true),
 					resource.TestCheckResourceAttr("scaleway_object_bucket_acl.main", "bucket", testBucketName),
+					resource.TestCheckResourceAttr("scaleway_object_bucket_acl.main", "acl", "public-read"),
 				),
 			},
 		},

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"
@@ -25,11 +24,12 @@ func resourceObjectLockConfiguration() *schema.Resource {
 
 		Schema: map[string]*schema.Schema{
 			"bucket": {
-				Type:         schema.TypeString,
-				Required:     true,
-				ForceNew:     true,
-				ValidateFunc: validation.StringLenBetween(1, 63),
-				Description:  "The bucket name.",
+				Type:             schema.TypeString,
+				Required:         true,
+				ForceNew:         true,
+				ValidateFunc:     validation.StringLenBetween(1, 63),
+				Description:      "The bucket's name or regional ID.",
+				DiffSuppressFunc: diffSuppressFuncLocality,
 			},
 			"rule": {
 				Type:     schema.TypeList,
@@ -82,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),
@@ -92,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))
 	}