test(object): bucket: customize region in tests (#2256)

* test(object): bucket: fix nightly tests + split basic test

* test(object): bucket: all tests OK on fr-par

* test(object): bucket: all tests OK on nl-ams

* doc(object): bucket: comment on tags

* feat(object): bucket: dynamically fetch client's default region for tests

* Update docs/data-sources/object_bucket.md

Co-authored-by: Jules Castéran <[email protected]>

* Update docs/resources/object_bucket.md

Co-authored-by: Jules Castéran <[email protected]>

---------

Co-authored-by: Jules Castéran <[email protected]>

Author: Mia-Cross

docs/data-sources/object_bucket.md

@@ -19,7 +19,7 @@ resource "scaleway_object_bucket" "main" {
 }
 
 data "scaleway_object_bucket" "selected" {
-  name = "bucket.test.com"
+  name = scaleway_object_bucket.main.id
 }
 ```
 
@@ -35,9 +35,9 @@ data "scaleway_object_bucket" "selected" {
 
 ## Argument Reference
 
-- `name` - (Required) The bucket name.
+- `name` - (Required) The bucket name, or its terraform's ID (`{region}/{name}`)
 - `object_lock_enabled` - (Optional) Enable object lock on the bucket. Defaults to `false`. Updating this field will force creating a new bucket.
-- `region` - (Defaults to [provider](../index.md#region) `region`) The [region](../guides/regions_and_zones.md#zones) in which the Object Storage exists.
+- `region` - (Defaults to [provider](../index.md#region) `region`) The [region](../guides/regions_and_zones.md#zones) in which the bucket exists.
 - `project_id` - (Defaults to [provider](../index.md#project_id) `project_id`) The ID of the project the bucket is associated with.
 
 

docs/resources/object_bucket.md

@@ -94,7 +94,7 @@ resource "scaleway_object_bucket" "main"{
       }
       
       transition {
-        days          = 0
+        days          = 1
         storage_class = "GLACIER"
       }
   }
@@ -118,6 +118,10 @@ The following arguments are supported:
 
 * `name` - (Required) The name of the bucket.
 * `tags` - (Optional) A list of tags (key / value) for the bucket.
+
+* ~> **Important:** The Scaleway console does not support `key/value` tags yet, so only the tags' values will be displayed.
+Keep in mind that if you make any change to your bucket's tags using the console, it will overwrite them with the format `value/value`.
+
 * `acl` - (Optional)(Deprecated) The canned ACL you want to apply to the bucket.
 * `region` - (Optional) The [region](https://developers.scaleway.com/en/quickstart/#region-definition) in which the bucket should be created.
 * `versioning` - (Optional) A state of [versioning](https://docs.aws.amazon.com/AmazonS3/latest/dev/Versioning.html) (documented below)

scaleway/data_source_object_bucket.go

@@ -30,7 +30,17 @@ func dataSourceScalewayObjectStorageRead(ctx context.Context, d *schema.Resource
 		return diag.FromErr(err)
 	}
 
-	bucket := d.Get("name").(string)
+	regionalID := expandRegionalID(d.Get("name"))
+	bucket := regionalID.ID
+	bucketRegion := regionalID.Region
+
+	if bucketRegion != "" && bucketRegion != region {
+		s3Client, err = s3ClientForceRegion(d, meta, bucketRegion.String())
+		if err != nil {
+			return diag.FromErr(err)
+		}
+		region = bucketRegion
+	}
 
 	input := &s3.HeadBucketInput{
 		Bucket: aws.String(bucket),

scaleway/data_source_object_bucket_policy_test.go

@@ -79,7 +79,7 @@ func TestAccScalewayDataSourceObjectBucketPolicy_Basic(t *testing.T) {
 					}
 				`, bucketName, objectTestsMainRegion),
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckScalewayObjectBucketExistsForceRegion(tt, "scaleway_object_bucket.main"),
+					testAccCheckScalewayObjectBucketExistsForceRegion(tt, "scaleway_object_bucket.main", true),
 					resource.TestCheckResourceAttr("data.scaleway_object_bucket_policy.selected", "bucket", objectTestsMainRegion+"/"+bucketName),
 					resource.TestCheckResourceAttrSet("data.scaleway_object_bucket_policy.selected", "policy"),
 					testAccCheckDataSourcePolicyIsEquivalent("data.scaleway_object_bucket_policy.selected", expectedPolicyText),

scaleway/data_source_object_bucket_test.go

@@ -12,38 +12,80 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestAccScalewayDataSourceObjectStorage_Basic(t *testing.T) {
+func TestAccScalewayDataSourceObjectBucket_Basic(t *testing.T) {
 	tt := NewTestTools(t)
 	defer tt.Cleanup()
 	bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-bucket")
-	// resourceName := "data.scaleway_object_bucket.main"
+	objectBucketTestDefaultRegion, _ := tt.Meta.scwClient.GetDefaultRegion()
+
 	resource.ParallelTest(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t) },
 		ProviderFactories: tt.ProviderFactories,
-		CheckDestroy:      testAccCheckScalewayRdbInstanceDestroy(tt),
+		CheckDestroy:      testAccCheckScalewayObjectBucketDestroy(tt),
 		Steps: []resource.TestStep{
 			{
 				Config: fmt.Sprintf(`
 				resource "scaleway_object_bucket" "base-01" {
 					name = "%s"
+					region = "%s"
 					tags = {
 						foo = "bar"
 					}
 				}
 
-				data "scaleway_object_bucket" "selected" {
+				data "scaleway_object_bucket" "by-id" {
+					name = scaleway_object_bucket.base-01.id
+				}
+				`, bucketName, objectTestsMainRegion),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckScalewayObjectBucketExistsForceRegion(tt, "scaleway_object_bucket.base-01", true),
+					resource.TestCheckResourceAttr("data.scaleway_object_bucket.by-id", "name", bucketName),
+				),
+			},
+			{
+				Config: fmt.Sprintf(`
+				resource "scaleway_object_bucket" "base-01" {
+					name = "%s"
+					region = "%s"
+					tags = {
+						foo = "bar"
+					}
+				}
+
+				data "scaleway_object_bucket" "by-name" {
 					name = scaleway_object_bucket.base-01.name
 				}
-				`, bucketName),
+				`, bucketName, objectBucketTestDefaultRegion),
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttr("data.scaleway_object_bucket.selected", "name", bucketName),
+					testAccCheckScalewayObjectBucketExistsForceRegion(tt, "scaleway_object_bucket.base-01", true),
+					resource.TestCheckResourceAttr("data.scaleway_object_bucket.by-name", "name", bucketName),
 				),
 			},
+			{
+				Config: fmt.Sprintf(`
+				resource "scaleway_object_bucket" "base-01" {
+					name = "%s"
+					region = "%s"
+					tags = {
+						foo = "bar"
+					}
+				}
+
+				data "scaleway_object_bucket" "by-name" {
+					name = scaleway_object_bucket.base-01.name
+				}
+				`, bucketName, objectTestsMainRegion),
+				Check: resource.ComposeTestCheckFunc(
+					testAccCheckScalewayObjectBucketExistsForceRegion(tt, "scaleway_object_bucket.base-01", true),
+					resource.TestCheckResourceAttr("data.scaleway_object_bucket.by-name", "name", bucketName),
+				),
+				ExpectError: regexp.MustCompile("failed getting Object Storage bucket"),
+			},
 		},
 	})
 }
 
-func TestAccScalewayDataSourceObjectStorage_ProjectIDAllowed(t *testing.T) {
+func TestAccScalewayDataSourceObjectBucket_ProjectIDAllowed(t *testing.T) {
 	tt := NewTestTools(t)
 	defer tt.Cleanup()
 	bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-bucket")
@@ -60,7 +102,7 @@ func TestAccScalewayDataSourceObjectStorage_ProjectIDAllowed(t *testing.T) {
 			func(s *terraform.State) error {
 				return terminateFakeSideProject()
 			},
-			testAccCheckScalewayObjectDestroy(tt),
+			testAccCheckScalewayObjectBucketDestroy(tt),
 		),
 		Steps: []resource.TestStep{
 			// Create a bucket from the main provider into the side project and read it from the side provider
@@ -70,17 +112,20 @@ func TestAccScalewayDataSourceObjectStorage_ProjectIDAllowed(t *testing.T) {
 					resource "scaleway_object_bucket" "base" {
 						name = "%[1]s"
 						project_id = "%[2]s"
+						region = "%[3]s"
 					}
 
 					data "scaleway_object_bucket" "selected" {
-						name = scaleway_object_bucket.base.name
+						name = scaleway_object_bucket.base.id
 						provider = side
 					}
 				`,
 					bucketName,
 					project.ID,
+					objectTestsMainRegion,
 				),
 				Check: resource.ComposeTestCheckFunc(
+					testAccCheckScalewayObjectBucketExistsForceRegion(tt, "scaleway_object_bucket.base", false),
 					resource.TestCheckResourceAttr("data.scaleway_object_bucket.selected", "name", bucketName),
 					resource.TestCheckResourceAttr("data.scaleway_object_bucket.selected", "project_id", project.ID),
 				),
@@ -89,7 +134,7 @@ func TestAccScalewayDataSourceObjectStorage_ProjectIDAllowed(t *testing.T) {
 	})
 }
 
-func TestAccScalewayDataSourceObjectStorage_ProjectIDForbidden(t *testing.T) {
+func TestAccScalewayDataSourceObjectBucket_ProjectIDForbidden(t *testing.T) {
 	tt := NewTestTools(t)
 	defer tt.Cleanup()
 	bucketName := sdkacctest.RandomWithPrefix("test-acc-scaleway-object-bucket")
@@ -106,24 +151,27 @@ func TestAccScalewayDataSourceObjectStorage_ProjectIDForbidden(t *testing.T) {
 			func(s *terraform.State) error {
 				return terminateFakeSideProject()
 			},
-			testAccCheckScalewayObjectDestroy(tt),
+			testAccCheckScalewayObjectBucketDestroy(tt),
 		),
 		Steps: []resource.TestStep{
 			// The side provider should not be able to read the bucket from the main project
 			{
 				Config: fmt.Sprintf(`
 					resource "scaleway_object_bucket" "base" {
 						name = "%[1]s"
+						region = "%[3]s"
 					}
 
 					data "scaleway_object_bucket" "selected" {
-						name = scaleway_object_bucket.base.name
+						name = scaleway_object_bucket.base.id
 						provider = side
 					}
 				`,
 					bucketName,
 					project.ID,
+					objectTestsMainRegion,
 				),
+				Check:       testAccCheckScalewayObjectBucketExistsForceRegion(tt, "scaleway_object_bucket.base", false),
 				ExpectError: regexp.MustCompile("failed getting Object Storage bucket"),
 			},
 		},

scaleway/helpers_object.go

@@ -33,6 +33,8 @@ const (
 
 	objectTestsMainRegion      = "nl-ams"
 	objectTestsSecondaryRegion = "pl-waw"
+
+	errCodeForbidden = "Forbidden"
 )
 
 func newS3Client(httpClient *http.Client, region, accessKey, secretKey string) (*s3.S3, error) {

scaleway/resource_object_bucket_policy_test.go

@@ -82,7 +82,7 @@ func TestAccScalewayObjectBucketPolicy_Basic(t *testing.T) {
 			{
 				Config: tfConfig,
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckScalewayObjectBucketExistsForceRegion(tt, "scaleway_object_bucket.bucket"),
+					testAccCheckScalewayObjectBucketExistsForceRegion(tt, "scaleway_object_bucket.bucket", true),
 					resource.TestCheckResourceAttrPair("scaleway_object_bucket_policy.bucket", "region", "scaleway_object_bucket.bucket", "region"),
 					testAccCheckBucketHasPolicy(tt, "scaleway_object_bucket.bucket", expectedPolicyText),
 				),
@@ -168,7 +168,7 @@ func TestAccScalewayObjectBucketPolicy_OtherRegionWithBucketID(t *testing.T) {
 			{
 				Config: tfConfig,
 				Check: resource.ComposeTestCheckFunc(
-					testAccCheckScalewayObjectBucketExistsForceRegion(tt, "scaleway_object_bucket.bucket"),
+					testAccCheckScalewayObjectBucketExistsForceRegion(tt, "scaleway_object_bucket.bucket", true),
 					resource.TestCheckResourceAttrPair("scaleway_object_bucket_policy.bucket", "region", "scaleway_object_bucket.bucket", "region"),
 					testAccCheckBucketHasPolicy(tt, "scaleway_object_bucket.bucket", expectedPolicyText),
 				),