Skip to content

Commit cb18537

Browse files
committed
Fix
1 parent f95e395 commit cb18537

File tree

2 files changed

+0
-44
lines changed

2 files changed

+0
-44
lines changed

scaleway/resource_object_bucket.go

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
"github.com/aws/aws-sdk-go/service/s3"
1010
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
1111
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
12-
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
1312
)
1413

1514
func resourceScalewayObjectBucket() *schema.Resource {
@@ -31,18 +30,6 @@ func resourceScalewayObjectBucket() *schema.Resource {
3130
ForceNew: true,
3231
Description: "The name of the bucket",
3332
},
34-
"acl": {
35-
Type: schema.TypeString,
36-
Optional: true,
37-
Default: "private",
38-
Description: "ACL of the bucket: either 'public-read' or 'private'.",
39-
ValidateFunc: validation.StringInSlice([]string{
40-
s3.ObjectCannedACLPrivate,
41-
s3.ObjectCannedACLPublicRead,
42-
s3.ObjectCannedACLPublicReadWrite,
43-
s3.ObjectCannedACLAuthenticatedRead,
44-
}, false),
45-
},
4633
"tags": {
4734
Type: schema.TypeMap,
4835
Elem: &schema.Schema{
@@ -78,7 +65,6 @@ func resourceScalewayObjectBucket() *schema.Resource {
7865

7966
func resourceScalewayObjectBucketCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
8067
bucketName := d.Get("name").(string)
81-
acl := d.Get("acl").(string)
8268

8369
s3Client, region, err := s3ClientWithRegion(d, meta)
8470
if err != nil {
@@ -87,7 +73,6 @@ func resourceScalewayObjectBucketCreate(ctx context.Context, d *schema.ResourceD
8773

8874
_, err = s3Client.CreateBucketWithContext(ctx, &s3.CreateBucketInput{
8975
Bucket: aws.String(bucketName),
90-
ACL: aws.String(acl),
9176
})
9277
if err != nil {
9378
return diag.FromErr(err)

scaleway/resource_object_bucket_test.go

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -261,32 +261,3 @@ func testAccCheckScalewayObjectBucketVersioning(tt *TestTools, versioningStatus
261261
return nil
262262
}
263263
}
264-
265-
func TestAccScalewayObjectBucket_ACL(t *testing.T) {
266-
testBucketName := fmt.Sprintf("terraform-test-%d", time.Now().Unix())
267-
testBucketACL := "private"
268-
269-
resource.Test(t, resource.TestCase{
270-
PreCheck: func() { testAccPreCheck(t) },
271-
Providers: testAccProviders,
272-
CheckDestroy: testAccCheckScalewayObjectBucketDestroy,
273-
Steps: []resource.TestStep{
274-
{
275-
Config: fmt.Sprintf(`
276-
resource "scaleway_object_bucket" "base" {
277-
name = "%s"
278-
acl = "private"
279-
}`, testBucketName),
280-
Check: resource.ComposeTestCheckFunc(
281-
resource.TestCheckResourceAttr("scaleway_object_bucket.base", "name", testBucketName),
282-
resource.TestCheckResourceAttr("scaleway_object_bucket.base", "acl", testBucketACL),
283-
),
284-
},
285-
{
286-
ResourceName: "scaleway_object_bucket.base",
287-
ImportState: true,
288-
ImportStateVerify: true,
289-
},
290-
},
291-
})
292-
}

0 commit comments

Comments
 (0)