chore(object): refactor code for bucket resource

Author: remyleone

scaleway/resource_object_bucket_test.go

@@ -6,7 +6,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/aws/awserr"
 	"github.com/aws/aws-sdk-go/service/s3"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
@@ -30,6 +29,7 @@ func TestAccScalewayObjectBucket_Basic(t *testing.T) {
 	testBucketNamePar := testBucketName + "par"
 	testBucketACL := "private"
 	testBucketUpdatedACL := "public-read"
+
 	resource.Test(t, resource.TestCase{
 		PreCheck:          func() { testAccPreCheck(t) },
 		ProviderFactories: tt.ProviderFactories,
@@ -220,7 +220,7 @@ func testAccCheckScalewayObjectBucketExists(tt *TestTools, n string, bucketName
 		}
 
 		_, err = conn.HeadBucketWithContext(tt.ctx, &s3.HeadBucketInput{
-			Bucket: aws.String(bucketName),
+			Bucket: scw.StringPtr(bucketName),
 		})
 
 		if err != nil {
@@ -241,7 +241,7 @@ func testAccCheckScalewayObjectBucketVersioning(tt *TestTools, versioningStatus
 		}
 
 		out, err := conn.GetBucketVersioningWithContext(tt.ctx, &s3.GetBucketVersioningInput{
-			Bucket: aws.String(bucketName),
+			Bucket: scw.StringPtr(bucketName),
 		})
 
 		if err != nil {
@@ -261,3 +261,32 @@ func testAccCheckScalewayObjectBucketVersioning(tt *TestTools, versioningStatus
 		return nil
 	}
 }
+
+func TestAccScalewayObjectBucket_ACL(t *testing.T) {
+	testBucketName := fmt.Sprintf("terraform-test-%d", time.Now().Unix())
+	testBucketACL := "private"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck:     func() { testAccPreCheck(t) },
+		Providers:    testAccProviders,
+		CheckDestroy: testAccCheckScalewayObjectBucketDestroy,
+		Steps: []resource.TestStep{
+			{
+				Config: fmt.Sprintf(`
+					resource "scaleway_object_bucket" "base" {
+						name = "%s"
+						acl = "private"
+					}`, testBucketName),
+				Check: resource.ComposeTestCheckFunc(
+					resource.TestCheckResourceAttr("scaleway_object_bucket.base", "name", testBucketName),
+					resource.TestCheckResourceAttr("scaleway_object_bucket.base", "acl", testBucketACL),
+				),
+			},
+			{
+				ResourceName:      "scaleway_object_bucket.base",
+				ImportState:       true,
+				ImportStateVerify: true,
+			},
+		},
+	})
+}

scaleway/testdata/object-bucket-cors-update.cassette.yaml

@@ -0,0 +1,39 @@
+---
+version: 1
+interactions:
+- request:
+    body: <CreateBucketConfiguration xmlns="http://s3.amazonaws.com/doc/2006-03-01/"><LocationConstraint>fr-par</LocationConstraint></CreateBucketConfiguration>
+    form: {}
+    headers:
+      Authorization:
+      - AWS4-HMAC-SHA256 Credential=SCW8XT5JRAV4B0WQSHPE/20201202/fr-par/s3/aws4_request,
+        SignedHeaders=content-length;host;x-amz-acl;x-amz-content-sha256;x-amz-date,
+        Signature=953a641b35157152c97eaa5617a7dd9cf57cf6567453c5ee7b2c84283b83ba11
+      Content-Length:
+      - "150"
+      User-Agent:
+      - aws-sdk-go/1.34.32 (go1.15.5; darwin; amd64)
+      X-Amz-Acl:
+      - private
+      X-Amz-Content-Sha256:
+      - 2cb57fad7b7168921a4c94426cfcb9ee2953f126430595df844e22d50f029060
+      X-Amz-Date:
+      - 20201202T182450Z
+    url: https://test-acc-scaleway-object-bucket-cors-update.s3.fr-par.scw.cloud/
+    method: PUT
+  response:
+    body: |-
+      <?xml version='1.0' encoding='UTF-8'?>
+      <Error><Code>BucketAlreadyOwnedByYou</Code><Message>Your previous request to create the named bucket succeeded and you already own it.</Message><RequestId>tx3e4e73fd479a4434ae7d9-005fc7dbf3</RequestId><BucketName>test-acc-scaleway-object-bucket-cors-update</BucketName></Error>
+    headers:
+      Content-Type:
+      - application/xml
+      Date:
+      - Wed, 02 Dec 2020 18:24:51 GMT
+      X-Amz-Id-2:
+      - tx3e4e73fd479a4434ae7d9-005fc7dbf3
+      X-Amz-Request-Id:
+      - tx3e4e73fd479a4434ae7d9-005fc7dbf3
+    status: 409 Conflict
+    code: 409
+    duration: ""