Skip to content

Commit 0523c67

Browse files
committed
fix bucket acl
1 parent 60d010c commit 0523c67

6 files changed

+3754
-1570
lines changed

internal/services/object/bucket_acl_test.go

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func TestAccObjectBucketACL_Grantee(t *testing.T) {
7979
testBucketName := sdkacctest.RandomWithPrefix("tf-tests-scw-object-acl-grantee")
8080

8181
ownerID := "105bdce1-64c0-48ab-899d-868455867ecf"
82-
//ownerIDChild := "50ab77d5-56bd-4981-a118-4e0fa5309b59"
82+
ownerIDChild := "50ab77d5-56bd-4981-a118-4e0fa5309b59"
8383
resource.Test(t, resource.TestCase{
8484
PreCheck: func() { acctest.PreCheck(t) },
8585
ProviderFactories: tt.ProviderFactories,
@@ -122,51 +122,51 @@ func TestAccObjectBucketACL_Grantee(t *testing.T) {
122122
resource.TestCheckResourceAttr("scaleway_object_bucket_acl.main", "bucket", testBucketName),
123123
),
124124
},
125-
//{
126-
// Config: fmt.Sprintf(`
127-
// resource "scaleway_object_bucket" "main" {
128-
// name = "%[1]s"
129-
// region = "%[4]s"
130-
// }
131-
//
132-
// resource "scaleway_object_bucket_acl" "main" {
133-
// bucket = scaleway_object_bucket.main.id
134-
// access_control_policy {
135-
// grant {
136-
// grantee {
137-
// id = "%[2]s"
138-
// type = "CanonicalUser"
139-
// }
140-
// permission = "FULL_CONTROL"
141-
// }
142-
//
143-
// grant {
144-
// grantee {
145-
// id = "%[2]s"
146-
// type = "CanonicalUser"
147-
// }
148-
// permission = "WRITE"
149-
// }
150-
//
151-
// grant {
152-
// grantee {
153-
// id = "%[3]s"
154-
// type = "CanonicalUser"
155-
// }
156-
// permission = "FULL_CONTROL"
157-
// }
158-
//
159-
// owner {
160-
// id = "%[2]s"
161-
// }
162-
// }
163-
// }
164-
// `, testBucketName, ownerID, ownerIDChild, objectTestsMainRegion),
165-
// Check: resource.ComposeTestCheckFunc(
166-
// objectchecks.CheckBucketExists(tt, "scaleway_object_bucket.main", true),
167-
// resource.TestCheckResourceAttr("scaleway_object_bucket_acl.main", "bucket", testBucketName),
168-
// ),
169-
//},
125+
{
126+
Config: fmt.Sprintf(`
127+
resource "scaleway_object_bucket" "main" {
128+
name = "%[1]s"
129+
region = "%[4]s"
130+
}
131+
132+
resource "scaleway_object_bucket_acl" "main" {
133+
bucket = scaleway_object_bucket.main.id
134+
access_control_policy {
135+
grant {
136+
grantee {
137+
id = "%[2]s"
138+
type = "CanonicalUser"
139+
}
140+
permission = "FULL_CONTROL"
141+
}
142+
143+
grant {
144+
grantee {
145+
id = "%[2]s"
146+
type = "CanonicalUser"
147+
}
148+
permission = "WRITE"
149+
}
150+
151+
grant {
152+
grantee {
153+
id = "%[3]s"
154+
type = "CanonicalUser"
155+
}
156+
permission = "FULL_CONTROL"
157+
}
158+
159+
owner {
160+
id = "%[2]s"
161+
}
162+
}
163+
}
164+
`, testBucketName, ownerID, ownerIDChild, objectTestsMainRegion),
165+
Check: resource.ComposeTestCheckFunc(
166+
objectchecks.CheckBucketExists(tt, "scaleway_object_bucket.main", true),
167+
resource.TestCheckResourceAttr("scaleway_object_bucket_acl.main", "bucket", testBucketName),
168+
),
169+
},
170170
{
171171
ResourceName: "scaleway_object_bucket_acl.main",
172172
ImportState: true,

0 commit comments

Comments
 (0)