Skip to content

Commit 40d06c4

Browse files
authored
test(object): fix nightly ACL_Grantee (#2226)
1 parent 0d6c26b commit 40d06c4

File tree

2 files changed

+460
-374
lines changed

2 files changed

+460
-374
lines changed

scaleway/resource_object_bucket_acl_test.go

Lines changed: 41 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -79,29 +79,30 @@ func TestAccScalewayObjectBucketACL_Grantee(t *testing.T) {
7979
resource "scaleway_object_bucket_acl" "main" {
8080
bucket = scaleway_object_bucket.main.name
8181
access_control_policy {
82-
grant {
83-
grantee {
84-
id = "%[2]s"
85-
type = "CanonicalUser"
86-
}
87-
permission = "FULL_CONTROL"
88-
}
82+
grant {
83+
grantee {
84+
id = "%[2]s"
85+
type = "CanonicalUser"
86+
}
87+
permission = "FULL_CONTROL"
88+
}
8989
90-
grant {
91-
grantee {
92-
id = "%[2]s"
93-
type = "CanonicalUser"
94-
}
95-
permission = "WRITE"
96-
}
90+
grant {
91+
grantee {
92+
id = "%[2]s"
93+
type = "CanonicalUser"
94+
}
95+
permission = "WRITE"
96+
}
9797
98-
owner {
99-
id = "%[2]s"
100-
}
98+
owner {
99+
id = "%[2]s"
100+
}
101101
}
102102
}
103103
`, testBucketName, ownerID),
104104
Check: resource.ComposeTestCheckFunc(
105+
testAccCheckScalewayObjectBucketExists(tt, "scaleway_object_bucket.main"),
105106
resource.TestCheckResourceAttr("scaleway_object_bucket_acl.main", "bucket", testBucketName),
106107
),
107108
},
@@ -114,21 +115,38 @@ func TestAccScalewayObjectBucketACL_Grantee(t *testing.T) {
114115
resource "scaleway_object_bucket_acl" "main" {
115116
bucket = scaleway_object_bucket.main.name
116117
access_control_policy {
118+
grant {
119+
grantee {
120+
id = "%[2]s"
121+
type = "CanonicalUser"
122+
}
123+
permission = "FULL_CONTROL"
124+
}
125+
126+
grant {
127+
grantee {
128+
id = "%[2]s"
129+
type = "CanonicalUser"
130+
}
131+
permission = "WRITE"
132+
}
133+
117134
grant {
118135
grantee {
119-
id = "%[3]s"
120-
type = "CanonicalUser"
136+
id = "%[3]s"
137+
type = "CanonicalUser"
121138
}
122139
permission = "FULL_CONTROL"
123140
}
124141
125-
owner {
142+
owner {
126143
id = "%[2]s"
127-
}
144+
}
145+
}
128146
}
129-
}
130-
`, testBucketName, ownerID, ownerIDChild),
147+
`, testBucketName, ownerID, ownerIDChild),
131148
Check: resource.ComposeTestCheckFunc(
149+
testAccCheckScalewayObjectBucketExists(tt, "scaleway_object_bucket.main"),
132150
resource.TestCheckResourceAttr("scaleway_object_bucket_acl.main", "bucket", testBucketName),
133151
),
134152
},

0 commit comments

Comments
 (0)