Skip to content

Commit 5a365e2

Browse files
Laure-diLaure-di
committed
fix linter
1 parent 674a0ca commit 5a365e2

File tree

4 files changed

+39
-55
lines changed

4 files changed

+39
-55
lines changed

‎internal/services/object/bucket.go‎

Lines changed: 26 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ func resourceBucketLifecycleUpdate(ctx context.Context, conn *s3.Client, d *sche
351351
return nil
352352
}
353353

354-
var rules []s3Types.LifecycleRule
354+
rules := make([]s3Types.LifecycleRule, 0, len(lifecycleRules))
355355

356356
for i, lifecycleRule := range lifecycleRules {
357357
r := lifecycleRule.(map[string]interface{})
@@ -361,7 +361,7 @@ func resourceBucketLifecycleUpdate(ctx context.Context, conn *s3.Client, d *sche
361361
// Filter
362362
prefix := r["prefix"].(string)
363363
tags := ExpandObjectBucketTags(r["tags"])
364-
ruleHasPrefix := &prefix != nil
364+
ruleHasPrefix := prefix != ""
365365
filter := &s3Types.LifecycleRuleFilter{}
366366

367367
if len(tags) > 1 || (ruleHasPrefix && len(tags) == 1) {
@@ -437,16 +437,6 @@ func resourceBucketLifecycleUpdate(ctx context.Context, conn *s3.Client, d *sche
437437
}
438438
}
439439

440-
// As a lifecycle rule requires 1 or more transition/expiration actions,
441-
// we explicitly pass a default ExpiredObjectDeleteMarker value to be able to create
442-
// the rule while keeping the policy unaffected if the conditions are not met.
443-
//if rule.Expiration == nil && rule.NoncurrentVersionExpiration == nil &&
444-
// rule.Transitions == nil && rule.NoncurrentVersionTransitions == nil &&
445-
// rule.AbortIncompleteMultipartUpload == nil {
446-
// //rule.Expiration = &s3Types.LifecycleExpiration{}
447-
// rule.Transitions = []s3Types.Transition{}
448-
//}
449-
450440
rules = append(rules, rule)
451441
}
452442

@@ -610,8 +600,8 @@ func resourceObjectBucketRead(ctx context.Context, d *schema.ResourceData, m int
610600
}
611601
}
612602
} else {
613-
if lifecycleRule.Filter != nil && lifecycleRule.Filter.Prefix != nil { //nolint:staticcheck
614-
rule["prefix"] = aws.ToString(lifecycleRule.Filter.Prefix) //nolint:staticcheck
603+
if lifecycleRule.Filter != nil && lifecycleRule.Filter.Prefix != nil {
604+
rule["prefix"] = aws.ToString(lifecycleRule.Filter.Prefix)
615605
}
616606
}
617607

@@ -676,7 +666,6 @@ func resourceObjectBucketDelete(ctx context.Context, d *schema.ResourceData, m i
676666
_, err = s3Client.DeleteBucket(ctx, &s3.DeleteBucketInput{
677667
Bucket: scw.StringPtr(bucketName),
678668
})
679-
680669
if err != nil {
681670
var noSuchBucket *s3Types.NoSuchBucket
682671
if errors.As(err, &noSuchBucket) {
@@ -688,10 +677,9 @@ func resourceObjectBucketDelete(ctx context.Context, d *schema.ResourceData, m i
688677
nObjectDeleted, err = emptyBucket(ctx, s3Client, bucketName, true)
689678
if err != nil {
690679
return diag.FromErr(fmt.Errorf("error S3 bucket force_destroy: %s", err))
691-
} else {
692-
log.Printf("[DEBUG] Deleted %d S3 objects", nObjectDeleted)
693680
}
694-
// Try to delete bucket again after deleting objects
681+
log.Printf("[DEBUG] Deleted %d S3 objects", nObjectDeleted)
682+
695683
return resourceObjectBucketDelete(ctx, d, m)
696684
}
697685
}
@@ -723,27 +711,26 @@ func resourceObjectBucketVersioningUpdate(ctx context.Context, s3conn *s3.Client
723711
return nil
724712
}
725713

726-
//
727-
//func resourceObjectBucketVersioningCreate(ctx context.Context, s3conn *s3.Client, d *schema.ResourceData) error {
728-
// v := d.Get("versioning").([]interface{})
729-
// bucketName := d.Get("name").(string)
730-
// vc := expandObjectBucketVersioning(v)
731-
// if vc.Status == "" {
732-
// return nil
733-
// }
734-
// i := &s3.PutBucketVersioningInput{
735-
// Bucket: scw.StringPtr(bucketName),
736-
// VersioningConfiguration: vc,
737-
// }
738-
// tflog.Debug(ctx, fmt.Sprintf("S3 put bucket versioning: %#v", i))
739-
//
740-
// _, err := s3conn.PutBucketVersioning(ctx, i)
741-
// if err != nil {
742-
// return fmt.Errorf("error putting S3 versioning: %s", err)
743-
// }
744-
//
745-
// return nil
746-
//}
714+
func resourceObjectBucketVersioningCreate(ctx context.Context, s3conn *s3.Client, d *schema.ResourceData) error { //nolint:unused
715+
v := d.Get("versioning").([]interface{})
716+
bucketName := d.Get("name").(string)
717+
vc := expandObjectBucketVersioning(v)
718+
if vc.Status == "" {
719+
return nil
720+
}
721+
i := &s3.PutBucketVersioningInput{
722+
Bucket: scw.StringPtr(bucketName),
723+
VersioningConfiguration: vc,
724+
}
725+
tflog.Debug(ctx, fmt.Sprintf("S3 put bucket versioning: %#v", i))
726+
727+
_, err := s3conn.PutBucketVersioning(ctx, i)
728+
if err != nil {
729+
return fmt.Errorf("error putting S3 versioning: %s", err)
730+
}
731+
732+
return nil
733+
}
747734

748735
func resourceS3BucketCorsUpdate(ctx context.Context, s3conn *s3.Client, d *schema.ResourceData) error {
749736
bucketName := d.Get("name").(string)

‎internal/services/object/bucket_lock_configuration_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ func testAccCheckBucketLockConfigurationExists(tt *acctest.TestTools, resourceNa
358358
regionalID := regional.ExpandID(rs.Primary.ID)
359359
bucketRegion := regionalID.Region
360360
bucket := regionalID.ID
361-
conn, err := object.NewS3ClientFromMeta(nil, tt.Meta, bucketRegion.String())
361+
conn, err := object.NewS3ClientFromMeta(ctx, tt.Meta, bucketRegion.String())
362362
if err != nil {
363363
return err
364364
}

‎internal/services/object/errors.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const (
2323
ErrCodeAccessDenied = "AccessDenied"
2424
// ErrCodeBucketNotEmpty bucket is not empty
2525
ErrCodeBucketNotEmpty = "BucketNotEmpty"
26-
//ErrCodeNoSuchBucket bucket not found
26+
// ErrCodeNoSuchBucket bucket not found
2727
ErrCodeNoSuchBucket = "NoSuchBucket"
2828
// ErrCodeNoSuchBucketPolicy policy not found
2929
ErrCodeNoSuchBucketPolicy = "NoSuchBucketPolicy"

‎internal/services/object/helpers_object.go‎

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ func expandObjectBucketVersioning(v []interface{}) *s3Types.VersioningConfigurat
260260
return vc
261261
}
262262

263-
func expandObjectBucketVersioningCreate(v []interface{}) *s3Types.VersioningConfiguration {
263+
func expandObjectBucketVersioningCreate(v []interface{}) *s3Types.VersioningConfiguration { //nolint:unused
264264
vc := &s3Types.VersioningConfiguration{}
265265
if len(v) > 0 {
266266
if c := v[0].(map[string]interface{}); c["enabled"].(bool) {
@@ -273,7 +273,7 @@ func expandObjectBucketVersioningCreate(v []interface{}) *s3Types.VersioningConf
273273
return nil
274274
}
275275

276-
func expandObjectBucketVersioningUpdate(v []interface{}) *s3Types.VersioningConfiguration {
276+
func expandObjectBucketVersioningUpdate(v []interface{}) *s3Types.VersioningConfiguration { //nolint:unused
277277
vc := &s3Types.VersioningConfiguration{}
278278
if len(v) > 0 {
279279
if c := v[0].(map[string]interface{}); c["enabled"].(bool) {
@@ -316,8 +316,8 @@ func flattenBucketCORS(corsResponse interface{}) []interface{} {
316316
}
317317

318318
func expandBucketCORS(ctx context.Context, rawCors []interface{}, bucket string) []s3Types.CORSRule {
319-
if rawCors == nil || len(rawCors) == 0 {
320-
tflog.Warn(ctx, fmt.Sprintf("No CORS configuration provided for bucket: %s", bucket))
319+
if len(rawCors) == 0 {
320+
tflog.Warn(ctx, fmt.Sprintf("No CORS configuration provided for bucket: "+bucket))
321321
return nil
322322
}
323323

@@ -336,13 +336,13 @@ func expandBucketCORS(ctx context.Context, rawCors []interface{}, bucket string)
336336
tflog.Debug(ctx, fmt.Sprintf("Processing CORS key: %s, value: %#v for bucket %s", key, value, bucket))
337337
switch key {
338338
case "allowed_headers":
339-
rule.AllowedHeaders = toStringSlice(value)
339+
rule.AllowedHeaders = toStringSlice(ctx, value)
340340
case "allowed_methods":
341-
rule.AllowedMethods = toStringSlice(value)
341+
rule.AllowedMethods = toStringSlice(ctx, value)
342342
case "allowed_origins":
343-
rule.AllowedOrigins = toStringSlice(value)
343+
rule.AllowedOrigins = toStringSlice(ctx, value)
344344
case "expose_headers":
345-
rule.ExposeHeaders = toStringSlice(value)
345+
rule.ExposeHeaders = toStringSlice(ctx, value)
346346
case "max_age_seconds":
347347
if maxAge, ok := value.(int); ok {
348348
rule.MaxAgeSeconds = scw.Int32Ptr(int32(maxAge))
@@ -361,7 +361,7 @@ func expandBucketCORS(ctx context.Context, rawCors []interface{}, bucket string)
361361
}
362362

363363
// TODO add to sdk-go
364-
func toStringSlice(input interface{}) []string {
364+
func toStringSlice(ctx context.Context, input interface{}) []string {
365365
var result []string
366366
switch v := input.(type) {
367367
case []interface{}:
@@ -373,22 +373,19 @@ func toStringSlice(input interface{}) []string {
373373
case []string:
374374
return v
375375
default:
376-
tflog.Warn(context.Background(), fmt.Sprintf("Unexpected type for toStringSlice: %T", input))
376+
tflog.Warn(ctx, fmt.Sprintf("Unexpected type for toStringSlice: %T", input))
377377
}
378378
return result
379379
}
380380

381-
func deleteS3ObjectVersion(ctx context.Context, conn *s3.Client, bucketName string, key string, versionID string, force bool) error {
381+
func deleteS3ObjectVersion(ctx context.Context, conn *s3.Client, bucketName string, key string, versionID string, _ bool) error {
382382
input := &s3.DeleteObjectInput{
383383
Bucket: scw.StringPtr(bucketName),
384384
Key: scw.StringPtr(key),
385385
}
386386
if versionID != "" {
387387
input.VersionId = scw.StringPtr(versionID)
388388
}
389-
//if force {
390-
// input.BypassGovernanceRetention = scw.BoolPtr(force)
391-
//}
392389

393390
_, err := conn.DeleteObject(ctx, input)
394391
return err

0 commit comments

Comments
 (0)