Skip to content

Commit edcb1a7

Browse files
ewbankkitewbankkit
committed
r/aws_s3control_bucket_lifecycle_configuration: Switch to 'WithoutTimeout' CRUD handlers (#15090).
Acceptance test output: % make testacc TESTARGS='-run=TestAccS3ControlBucketLifecycleConfiguration_' PKG=s3control ACCTEST_PARALLELISM=3 ==> Checking that code complies with gofmt requirements... TF_ACC=1 go test ./internal/service/s3control/... -v -count 1 -parallel 3 -run=TestAccS3ControlBucketLifecycleConfiguration_ -timeout 180m === RUN TestAccS3ControlBucketLifecycleConfiguration_basic === PAUSE TestAccS3ControlBucketLifecycleConfiguration_basic === RUN TestAccS3ControlBucketLifecycleConfiguration_disappears === PAUSE TestAccS3ControlBucketLifecycleConfiguration_disappears === RUN TestAccS3ControlBucketLifecycleConfiguration_RuleAbortIncompleteMultipartUpload_daysAfterInitiation === PAUSE TestAccS3ControlBucketLifecycleConfiguration_RuleAbortIncompleteMultipartUpload_daysAfterInitiation === RUN TestAccS3ControlBucketLifecycleConfiguration_RuleExpiration_date === PAUSE TestAccS3ControlBucketLifecycleConfiguration_RuleExpiration_date === RUN TestAccS3ControlBucketLifecycleConfiguration_RuleExpiration_days === PAUSE TestAccS3ControlBucketLifecycleConfiguration_RuleExpiration_days === RUN TestAccS3ControlBucketLifecycleConfiguration_RuleExpiration_expiredObjectDeleteMarker acctest.go:71: S3 on Outposts does not error or save it in the API when receiving this parameter --- SKIP: TestAccS3ControlBucketLifecycleConfiguration_RuleExpiration_expiredObjectDeleteMarker (0.00s) === RUN TestAccS3ControlBucketLifecycleConfiguration_RuleFilter_prefix === PAUSE TestAccS3ControlBucketLifecycleConfiguration_RuleFilter_prefix === RUN TestAccS3ControlBucketLifecycleConfiguration_RuleFilter_tags === PAUSE TestAccS3ControlBucketLifecycleConfiguration_RuleFilter_tags === RUN TestAccS3ControlBucketLifecycleConfiguration_Rule_id === PAUSE TestAccS3ControlBucketLifecycleConfiguration_Rule_id === RUN TestAccS3ControlBucketLifecycleConfiguration_Rule_status === PAUSE TestAccS3ControlBucketLifecycleConfiguration_Rule_status === CONT TestAccS3ControlBucketLifecycleConfiguration_basic === CONT TestAccS3ControlBucketLifecycleConfiguration_RuleFilter_prefix === CONT TestAccS3ControlBucketLifecycleConfiguration_Rule_id === CONT TestAccS3ControlBucketLifecycleConfiguration_RuleFilter_prefix acctest.go:1368: skipping since no Outposts found --- SKIP: TestAccS3ControlBucketLifecycleConfiguration_RuleFilter_prefix (4.26s) === CONT TestAccS3ControlBucketLifecycleConfiguration_RuleFilter_tags === CONT TestAccS3ControlBucketLifecycleConfiguration_basic acctest.go:1368: skipping since no Outposts found --- SKIP: TestAccS3ControlBucketLifecycleConfiguration_basic (4.32s) === CONT TestAccS3ControlBucketLifecycleConfiguration_RuleExpiration_date === CONT TestAccS3ControlBucketLifecycleConfiguration_Rule_id acctest.go:1368: skipping since no Outposts found --- SKIP: TestAccS3ControlBucketLifecycleConfiguration_Rule_id (4.38s) === CONT TestAccS3ControlBucketLifecycleConfiguration_RuleExpiration_days === CONT TestAccS3ControlBucketLifecycleConfiguration_RuleFilter_tags acctest.go:1368: skipping since no Outposts found --- SKIP: TestAccS3ControlBucketLifecycleConfiguration_RuleFilter_tags (0.20s) === CONT TestAccS3ControlBucketLifecycleConfiguration_RuleAbortIncompleteMultipartUpload_daysAfterInitiation === CONT TestAccS3ControlBucketLifecycleConfiguration_RuleExpiration_date acctest.go:1368: skipping since no Outposts found --- SKIP: TestAccS3ControlBucketLifecycleConfiguration_RuleExpiration_date (0.18s) === CONT TestAccS3ControlBucketLifecycleConfiguration_disappears === CONT TestAccS3ControlBucketLifecycleConfiguration_RuleExpiration_days acctest.go:1368: skipping since no Outposts found --- SKIP: TestAccS3ControlBucketLifecycleConfiguration_RuleExpiration_days (0.24s) === CONT TestAccS3ControlBucketLifecycleConfiguration_Rule_status === CONT TestAccS3ControlBucketLifecycleConfiguration_RuleAbortIncompleteMultipartUpload_daysAfterInitiation acctest.go:1368: skipping since no Outposts found --- SKIP: TestAccS3ControlBucketLifecycleConfiguration_RuleAbortIncompleteMultipartUpload_daysAfterInitiation (0.19s) === CONT TestAccS3ControlBucketLifecycleConfiguration_disappears acctest.go:1368: skipping since no Outposts found --- SKIP: TestAccS3ControlBucketLifecycleConfiguration_disappears (0.17s) === CONT TestAccS3ControlBucketLifecycleConfiguration_Rule_status acctest.go:1368: skipping since no Outposts found --- SKIP: TestAccS3ControlBucketLifecycleConfiguration_Rule_status (1.39s) PASS ok github.com/hashicorp/terraform-provider-aws/internal/service/s3control 12.331s
1 parent 6f101c4 commit edcb1a7

File tree

5 files changed

+85
-96
lines changed

5 files changed

+85
-96
lines changed

‎internal/provider/provider.go

-1
Original file line numberDiff line numberDiff line change
@@ -2006,7 +2006,6 @@ func New(ctx context.Context) (*schema.Provider, error) {
20062006
"aws_s3_bucket_object": s3.ResourceBucketObject(), // DEPRECATED: use aws_s3_object instead
20072007

20082008
"aws_s3control_bucket": s3control.ResourceBucket(),
2009-
"aws_s3control_bucket_lifecycle_configuration": s3control.ResourceBucketLifecycleConfiguration(),
20102009
"aws_s3control_bucket_policy": s3control.ResourceBucketPolicy(),
20112010
"aws_s3control_multi_region_access_point": s3control.ResourceMultiRegionAccessPoint(),
20122011
"aws_s3control_multi_region_access_point_policy": s3control.ResourceMultiRegionAccessPointPolicy(),

‎internal/service/s3control/bucket_lifecycle_configuration.go

+62-57
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package s3control
22

33
import (
4+
"context"
45
"fmt"
56
"log"
67
"time"
@@ -9,19 +10,26 @@ import (
910
"github.com/aws/aws-sdk-go/aws/arn"
1011
"github.com/aws/aws-sdk-go/service/s3control"
1112
"github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr"
13+
"github.com/hashicorp/terraform-plugin-sdk/v2/diag"
14+
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1215
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
1316
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/validation"
1417
"github.com/hashicorp/terraform-provider-aws/internal/conns"
1518
tftags "github.com/hashicorp/terraform-provider-aws/internal/tags"
19+
"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
1620
"github.com/hashicorp/terraform-provider-aws/internal/verify"
1721
)
1822

19-
func ResourceBucketLifecycleConfiguration() *schema.Resource {
23+
func init() {
24+
_sp.registerSDKResourceFactory("aws_s3control_bucket_lifecycle_configuration", resourceBucketLifecycleConfiguration)
25+
}
26+
27+
func resourceBucketLifecycleConfiguration() *schema.Resource {
2028
return &schema.Resource{
21-
Create: resourceBucketLifecycleConfigurationCreate,
22-
Read: resourceBucketLifecycleConfigurationRead,
23-
Update: resourceBucketLifecycleConfigurationUpdate,
24-
Delete: resourceBucketLifecycleConfigurationDelete,
29+
CreateWithoutTimeout: resourceBucketLifecycleConfigurationCreate,
30+
ReadWithoutTimeout: resourceBucketLifecycleConfigurationRead,
31+
UpdateWithoutTimeout: resourceBucketLifecycleConfigurationUpdate,
32+
DeleteWithoutTimeout: resourceBucketLifecycleConfigurationDelete,
2533

2634
Importer: &schema.ResourceImporter{
2735
State: schema.ImportStatePassthrough,
@@ -117,19 +125,19 @@ func ResourceBucketLifecycleConfiguration() *schema.Resource {
117125
}
118126
}
119127

120-
func resourceBucketLifecycleConfigurationCreate(d *schema.ResourceData, meta interface{}) error {
128+
func resourceBucketLifecycleConfigurationCreate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
121129
conn := meta.(*conns.AWSClient).S3ControlConn()
122130

123131
bucket := d.Get("bucket").(string)
124132

125133
parsedArn, err := arn.Parse(bucket)
126134

127135
if err != nil {
128-
return fmt.Errorf("error parsing S3 Control Bucket ARN (%s): %w", bucket, err)
136+
return diag.FromErr(err)
129137
}
130138

131139
if parsedArn.AccountID == "" {
132-
return fmt.Errorf("error parsing S3 Control Bucket ARN (%s): unknown format", d.Id())
140+
return diag.Errorf("parsing S3 Control Bucket ARN (%s): unknown format", d.Id())
133141
}
134142

135143
input := &s3control.PutBucketLifecycleConfigurationInput{
@@ -140,83 +148,62 @@ func resourceBucketLifecycleConfigurationCreate(d *schema.ResourceData, meta int
140148
},
141149
}
142150

143-
_, err = conn.PutBucketLifecycleConfiguration(input)
151+
_, err = conn.PutBucketLifecycleConfigurationWithContext(ctx, input)
144152

145153
if err != nil {
146-
return fmt.Errorf("error creating S3 Control Lifecycle Configuration (%s): %w", bucket, err)
154+
return diag.Errorf("creating S3 Control Bucket Lifecycle Configuration (%s): %s", bucket, err)
147155
}
148156

149157
d.SetId(bucket)
150158

151-
return resourceBucketLifecycleConfigurationRead(d, meta)
159+
return resourceBucketLifecycleConfigurationRead(ctx, d, meta)
152160
}
153161

154-
func resourceBucketLifecycleConfigurationRead(d *schema.ResourceData, meta interface{}) error {
162+
func resourceBucketLifecycleConfigurationRead(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
155163
conn := meta.(*conns.AWSClient).S3ControlConn()
156164

157165
parsedArn, err := arn.Parse(d.Id())
158166

159167
if err != nil {
160-
return fmt.Errorf("error parsing S3 Control Bucket ARN (%s): %w", d.Id(), err)
168+
return diag.FromErr(err)
161169
}
162170

163171
if parsedArn.AccountID == "" {
164-
return fmt.Errorf("error parsing S3 Control Bucket ARN (%s): unknown format", d.Id())
172+
return diag.Errorf("parsing S3 Control Bucket ARN (%s): unknown format", d.Id())
165173
}
166174

167-
input := &s3control.GetBucketLifecycleConfigurationInput{
168-
AccountId: aws.String(parsedArn.AccountID),
169-
Bucket: aws.String(d.Id()),
170-
}
171-
172-
output, err := conn.GetBucketLifecycleConfiguration(input)
175+
output, err := FindBucketLifecycleConfigurationByTwoPartKey(ctx, conn, parsedArn.AccountID, d.Id())
173176

174-
if !d.IsNewResource() && tfawserr.ErrCodeEquals(err, "NoSuchBucket") {
175-
log.Printf("[WARN] S3 Control Lifecycle Configuration (%s) not found, removing from state", d.Id())
176-
d.SetId("")
177-
return nil
178-
}
179-
180-
if !d.IsNewResource() && tfawserr.ErrCodeEquals(err, "NoSuchLifecycleConfiguration") {
181-
log.Printf("[WARN] S3 Control Lifecycle Configuration (%s) not found, removing from state", d.Id())
182-
d.SetId("")
183-
return nil
184-
}
185-
186-
if !d.IsNewResource() && tfawserr.ErrCodeEquals(err, "NoSuchOutpost") {
187-
log.Printf("[WARN] S3 Control Lifecycle Configuration (%s) not found, removing from state", d.Id())
177+
if !d.IsNewResource() && tfresource.NotFound(err) {
178+
log.Printf("[WARN] S3 Control Bucket Lifecycle Configuration (%s) not found, removing from state", d.Id())
188179
d.SetId("")
189180
return nil
190181
}
191182

192183
if err != nil {
193-
return fmt.Errorf("error reading S3 Control Lifecycle Configuration (%s): %w", d.Id(), err)
194-
}
195-
196-
if output == nil {
197-
return fmt.Errorf("error reading S3 Control Lifecycle Configuration (%s): empty response", d.Id())
184+
return diag.Errorf("reading S3 Control Bucket Lifecycle Configuration (%s): %s", d.Id(), err)
198185
}
199186

200187
d.Set("bucket", d.Id())
201188

202189
if err := d.Set("rule", flattenLifecycleRules(output.Rules)); err != nil {
203-
return fmt.Errorf("error setting rule: %w", err)
190+
return diag.Errorf("setting rule: %s", err)
204191
}
205192

206193
return nil
207194
}
208195

209-
func resourceBucketLifecycleConfigurationUpdate(d *schema.ResourceData, meta interface{}) error {
196+
func resourceBucketLifecycleConfigurationUpdate(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
210197
conn := meta.(*conns.AWSClient).S3ControlConn()
211198

212199
parsedArn, err := arn.Parse(d.Id())
213200

214201
if err != nil {
215-
return fmt.Errorf("error parsing S3 Control Bucket ARN (%s): %w", d.Id(), err)
202+
return diag.FromErr(err)
216203
}
217204

218205
if parsedArn.AccountID == "" {
219-
return fmt.Errorf("error parsing S3 Control Bucket ARN (%s): unknown format", d.Id())
206+
return diag.Errorf("parsing S3 Control Bucket ARN (%s): unknown format", d.Id())
220207
}
221208

222209
input := &s3control.PutBucketLifecycleConfigurationInput{
@@ -227,52 +214,70 @@ func resourceBucketLifecycleConfigurationUpdate(d *schema.ResourceData, meta int
227214
},
228215
}
229216

230-
_, err = conn.PutBucketLifecycleConfiguration(input)
217+
_, err = conn.PutBucketLifecycleConfigurationWithContext(ctx, input)
231218

232219
if err != nil {
233-
return fmt.Errorf("error updating S3 Control Lifecycle Configuration (%s): %w", d.Id(), err)
220+
return diag.Errorf("updating S3 Control Bucket Lifecycle Configuration (%s): %s", d.Id(), err)
234221
}
235222

236-
return resourceBucketLifecycleConfigurationRead(d, meta)
223+
return resourceBucketLifecycleConfigurationRead(ctx, d, meta)
237224
}
238225

239-
func resourceBucketLifecycleConfigurationDelete(d *schema.ResourceData, meta interface{}) error {
226+
func resourceBucketLifecycleConfigurationDelete(ctx context.Context, d *schema.ResourceData, meta interface{}) diag.Diagnostics {
240227
conn := meta.(*conns.AWSClient).S3ControlConn()
241228

242229
parsedArn, err := arn.Parse(d.Id())
243230

244231
if err != nil {
245-
return fmt.Errorf("error parsing S3 Control Bucket ARN (%s): %w", d.Id(), err)
232+
return diag.FromErr(err)
246233
}
247234

248235
if parsedArn.AccountID == "" {
249-
return fmt.Errorf("error parsing S3 Control Bucket ARN (%s): unknown format", d.Id())
236+
return diag.Errorf("parsing S3 Control Bucket ARN (%s): unknown format", d.Id())
250237
}
251238

252239
input := &s3control.DeleteBucketLifecycleConfigurationInput{
253240
AccountId: aws.String(parsedArn.AccountID),
254241
Bucket: aws.String(d.Id()),
255242
}
256243

257-
_, err = conn.DeleteBucketLifecycleConfiguration(input)
244+
_, err = conn.DeleteBucketLifecycleConfigurationWithContext(ctx, input)
258245

259-
if tfawserr.ErrCodeEquals(err, "NoSuchBucket") {
246+
if tfawserr.ErrCodeEquals(err, errCodeNoSuchBucket, errCodeNoSuchLifecycleConfiguration, errCodeNoSuchOutpost) {
260247
return nil
261248
}
262249

263-
if tfawserr.ErrCodeEquals(err, "NoSuchLifecycleConfiguration") {
264-
return nil
250+
if err != nil {
251+
return diag.Errorf("deleting S3 Control Bucket Lifecycle Configuration (%s): %s", d.Id(), err)
265252
}
266253

267-
if tfawserr.ErrCodeEquals(err, "NoSuchOutpost") {
268-
return nil
254+
return nil
255+
}
256+
257+
func FindBucketLifecycleConfigurationByTwoPartKey(ctx context.Context, conn *s3control.S3Control, accountID, bucket string) (*s3control.GetBucketLifecycleConfigurationOutput, error) {
258+
input := &s3control.GetBucketLifecycleConfigurationInput{
259+
AccountId: aws.String(accountID),
260+
Bucket: aws.String(bucket),
261+
}
262+
263+
output, err := conn.GetBucketLifecycleConfigurationWithContext(ctx, input)
264+
265+
if tfawserr.ErrCodeEquals(err, errCodeNoSuchBucket, errCodeNoSuchLifecycleConfiguration, errCodeNoSuchOutpost) {
266+
return nil, &resource.NotFoundError{
267+
LastError: err,
268+
LastRequest: input,
269+
}
269270
}
270271

271272
if err != nil {
272-
return fmt.Errorf("error deleting S3 Control Lifecycle Configuration (%s): %w", d.Id(), err)
273+
return nil, err
273274
}
274275

275-
return nil
276+
if output == nil {
277+
return nil, tfresource.NewEmptyResultError(input)
278+
}
279+
280+
return output, nil
276281
}
277282

278283
func expandAbortIncompleteMultipartUpload(tfList []interface{}) *s3control.AbortIncompleteMultipartUpload {

‎internal/service/s3control/bucket_lifecycle_configuration_test.go

+12-30
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
package s3control_test
22

33
import (
4+
"context"
45
"fmt"
56
"testing"
67
"time"
78

8-
"github.com/aws/aws-sdk-go/aws"
99
"github.com/aws/aws-sdk-go/aws/arn"
1010
"github.com/aws/aws-sdk-go/service/s3control"
11-
"github.com/hashicorp/aws-sdk-go-base/v2/awsv1shim/v2/tfawserr"
1211
sdkacctest "github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
1312
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
1413
"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
1514
"github.com/hashicorp/terraform-provider-aws/internal/acctest"
1615
"github.com/hashicorp/terraform-provider-aws/internal/conns"
1716
tfs3control "github.com/hashicorp/terraform-provider-aws/internal/service/s3control"
17+
"github.com/hashicorp/terraform-provider-aws/internal/tfresource"
1818
)
1919

2020
func TestAccS3ControlBucketLifecycleConfiguration_basic(t *testing.T) {
@@ -428,63 +428,45 @@ func testAccCheckBucketLifecycleConfigurationDestroy(s *terraform.State) error {
428428
parsedArn, err := arn.Parse(rs.Primary.ID)
429429

430430
if err != nil {
431-
return fmt.Errorf("error parsing S3 Control Bucket ARN (%s): %w", rs.Primary.ID, err)
432-
}
433-
434-
input := &s3control.GetBucketLifecycleConfigurationInput{
435-
AccountId: aws.String(parsedArn.AccountID),
436-
Bucket: aws.String(rs.Primary.ID),
437-
}
438-
439-
_, err = conn.GetBucketLifecycleConfiguration(input)
440-
441-
if tfawserr.ErrCodeEquals(err, "NoSuchBucket") {
442-
continue
431+
return err
443432
}
444433

445-
if tfawserr.ErrCodeEquals(err, "NoSuchLifecycleConfiguration") {
446-
continue
447-
}
434+
_, err = tfs3control.FindBucketLifecycleConfigurationByTwoPartKey(context.Background(), conn, parsedArn.AccountID, rs.Primary.ID)
448435

449-
if tfawserr.ErrCodeEquals(err, "NoSuchOutpost") {
436+
if tfresource.NotFound(err) {
450437
continue
451438
}
452439

453440
if err != nil {
454441
return err
455442
}
456443

457-
return fmt.Errorf("S3 Control Bucket Lifecycle Configuration (%s) still exists", rs.Primary.ID)
444+
return fmt.Errorf("S3 Control Bucket Lifecycle Configuration %s still exists", rs.Primary.ID)
458445
}
459446

460447
return nil
461448
}
462449

463-
func testAccCheckBucketLifecycleConfigurationExists(resourceName string) resource.TestCheckFunc {
450+
func testAccCheckBucketLifecycleConfigurationExists(n string) resource.TestCheckFunc {
464451
return func(s *terraform.State) error {
465-
rs, ok := s.RootModule().Resources[resourceName]
452+
rs, ok := s.RootModule().Resources[n]
466453
if !ok {
467-
return fmt.Errorf("not found: %s", resourceName)
454+
return fmt.Errorf("Not found: %s", n)
468455
}
469456

470457
if rs.Primary.ID == "" {
471-
return fmt.Errorf("no resource ID is set")
458+
return fmt.Errorf("No S3 Control Bucket Lifecycle Configuration ID is set")
472459
}
473460

474461
conn := acctest.Provider.Meta().(*conns.AWSClient).S3ControlConn()
475462

476463
parsedArn, err := arn.Parse(rs.Primary.ID)
477464

478465
if err != nil {
479-
return fmt.Errorf("error parsing S3 Control Bucket ARN (%s): %w", rs.Primary.ID, err)
480-
}
481-
482-
input := &s3control.GetBucketLifecycleConfigurationInput{
483-
AccountId: aws.String(parsedArn.AccountID),
484-
Bucket: aws.String(rs.Primary.ID),
466+
return err
485467
}
486468

487-
_, err = conn.GetBucketLifecycleConfiguration(input)
469+
_, err = tfs3control.FindBucketLifecycleConfigurationByTwoPartKey(context.Background(), conn, parsedArn.AccountID, rs.Primary.ID)
488470

489471
return err
490472
}

‎internal/service/s3control/errors.go

+6-4
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,11 @@ package s3control
33
// Error code constants missing from AWS Go SDK:
44
// https://docs.aws.amazon.com/sdk-for-go/api/service/s3control/#pkg-constants
55
const (
6-
errCodeNoSuchAccessPoint = "NoSuchAccessPoint"
7-
errCodeNoSuchAccessPointPolicy = "NoSuchAccessPointPolicy"
8-
errCodeNoSuchAsyncRequest = "NoSuchAsyncRequest"
9-
// errCodeNoSuchConfiguration = "NoSuchConfiguration"
6+
errCodeNoSuchAccessPoint = "NoSuchAccessPoint"
7+
errCodeNoSuchAccessPointPolicy = "NoSuchAccessPointPolicy"
8+
errCodeNoSuchAsyncRequest = "NoSuchAsyncRequest"
9+
errCodeNoSuchBucket = "NoSuchBucket"
10+
errCodeNoSuchLifecycleConfiguration = "NoSuchLifecycleConfiguration"
1011
errCodeNoSuchMultiRegionAccessPoint = "NoSuchMultiRegionAccessPoint"
12+
errCodeNoSuchOutpost = "NoSuchOutpost"
1113
)

‎internal/service/s3control/exports_test.go

+5-4
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ package s3control
22

33
// Exports for use in tests only.
44
var (
5-
ResourceAccessPoint = resourceAccessPoint
6-
ResourceAccessPointPolicy = resourceAccessPointPolicy
7-
ResourceAccountPublicAccessBlock = resourceAccountPublicAccessBlock
8-
ResourceStorageLensConfiguration = resourceStorageLensConfiguration
5+
ResourceAccessPoint = resourceAccessPoint
6+
ResourceAccessPointPolicy = resourceAccessPointPolicy
7+
ResourceAccountPublicAccessBlock = resourceAccountPublicAccessBlock
8+
ResourceBucketLifecycleConfiguration = resourceBucketLifecycleConfiguration
9+
ResourceStorageLensConfiguration = resourceStorageLensConfiguration
910
)

0 commit comments

Comments
 (0)