Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

r/aws_secretsmanager_secret: Remove rotation_* #31487

Merged
merged 5 commits into from
May 19, 2023
Merged

r/aws_secretsmanager_secret: Remove rotation_* #31487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fc9f514
r/aws_secretsmanager_secret: Remove 'rotation_' attributes.
ewbankkit May 16, 2023
1a5204a
d/aws_secretsmanager_secret: Remove 'rotation_' attributes.
ewbankkit May 16, 2023
f2667de
r/aws_secretsmanager_secret_rotation: Tidy up.
ewbankkit May 17, 2023
7aed124
d/aws_secretsmanager_secret_rotation: Tidy up.
ewbankkit May 17, 2023
b53d8f6
Correct CHANGELOG entry file name.
ewbankkit May 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .changelog/31487.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
```release-note:breaking-change
resource/aws_secretsmanager_secret: The `rotation_enabled`, `rotation_lambda_arn` and `rotation_rules` attributes have been removed
```

```release-note:breaking-change
data-source/aws_secretsmanager_secret: The `rotation_enabled`, `rotation_lambda_arn` and `rotation_rules` attributes have been removed
```
127 changes: 1 addition & 126 deletions internal/service/secretsmanager/secret.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"errors"
"fmt"
"log"
"regexp"
"time"

"github.com/aws/aws-sdk-go/aws"
Expand Down Expand Up @@ -126,52 +125,6 @@ func ResourceSecret() *schema.Resource {
},
},
},
"rotation_enabled": {
Deprecated: "Use the aws_secretsmanager_secret_rotation resource instead",
Type: schema.TypeBool,
Computed: true,
},
"rotation_lambda_arn": {
Deprecated: "Use the aws_secretsmanager_secret_rotation resource instead",
Type: schema.TypeString,
Optional: true,
Computed: true,
},
"rotation_rules": {
Deprecated: "Use the aws_secretsmanager_secret_rotation resource instead",
Type: schema.TypeList,
Computed: true,
Optional: true,
MaxItems: 1,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"automatically_after_days": {
Type: schema.TypeInt,
Optional: true,
ConflictsWith: []string{"rotation_rules.0.schedule_expression"},
ExactlyOneOf: []string{"rotation_rules.0.automatically_after_days", "rotation_rules.0.schedule_expression"},
DiffSuppressFunc: func(k, old, new string, d *schema.ResourceData) bool {
_, exists := d.GetOk("rotation_rules.0.schedule_expression")
return exists
},
DiffSuppressOnRefresh: true,
ValidateFunc: validation.IntBetween(1, 1000),
},
"duration": {
Type: schema.TypeString,
Optional: true,
ValidateFunc: validation.StringMatch(regexp.MustCompile(`[0-9h]+`), ""),
},
"schedule_expression": {
Type: schema.TypeString,
Optional: true,
ConflictsWith: []string{"rotation_rules.0.automatically_after_days"},
ExactlyOneOf: []string{"rotation_rules.0.automatically_after_days", "rotation_rules.0.schedule_expression"},
ValidateFunc: validation.StringMatch(regexp.MustCompile(`[0-9A-Za-z\(\)#\?\*\-\/, ]+`), ""),
},
},
},
},
names.AttrTags: tftags.TagsSchema(),
names.AttrTagsAll: tftags.TagsSchemaComputed(),
},
Expand Down Expand Up @@ -257,33 +210,6 @@ func resourceSecretCreate(ctx context.Context, d *schema.ResourceData, meta inte
}
}

if v, ok := d.GetOk("rotation_lambda_arn"); ok && v.(string) != "" {
input := &secretsmanager.RotateSecretInput{
RotationLambdaARN: aws.String(v.(string)),
RotationRules: expandRotationRules(d.Get("rotation_rules").([]interface{})),
SecretId: aws.String(d.Id()),
}

log.Printf("[DEBUG] Enabling Secrets Manager Secret rotation: %s", input)
err := retry.RetryContext(ctx, 1*time.Minute, func() *retry.RetryError {
_, err := conn.RotateSecretWithContext(ctx, input)
if err != nil {
// AccessDeniedException: Secrets Manager cannot invoke the specified Lambda function.
if tfawserr.ErrCodeEquals(err, "AccessDeniedException") {
return retry.RetryableError(err)
}
return retry.NonRetryableError(err)
}
return nil
})
if tfresource.TimedOut(err) {
_, err = conn.RotateSecretWithContext(ctx, input)
}
if err != nil {
return sdkdiag.AppendErrorf(diags, "enabling Secrets Manager Secret %q rotation: %s", d.Id(), err)
}
}

return append(diags, resourceSecretRead(ctx, d, meta)...)
}

Expand All @@ -295,7 +221,7 @@ func resourceSecretRead(ctx context.Context, d *schema.ResourceData, meta interf
return FindSecretByID(ctx, conn, d.Id())
}, d.IsNewResource())

if !d.IsNewResource() && tfawserr.ErrCodeEquals(err, secretsmanager.ErrCodeResourceNotFoundException) {
if !d.IsNewResource() && tfresource.NotFound(err) {
log.Printf("[WARN] Secrets Manager Secret (%s) not found, removing from state", d.Id())
d.SetId("")
return diags
Expand Down Expand Up @@ -354,18 +280,6 @@ func resourceSecretRead(ctx context.Context, d *schema.ResourceData, meta interf
d.Set("policy", "")
}

d.Set("rotation_enabled", output.RotationEnabled)

if aws.BoolValue(output.RotationEnabled) {
d.Set("rotation_lambda_arn", output.RotationLambdaARN)
if err := d.Set("rotation_rules", flattenRotationRules(output.RotationRules)); err != nil {
return sdkdiag.AppendErrorf(diags, "setting rotation_rules: %s", err)
}
} else {
d.Set("rotation_lambda_arn", "")
d.Set("rotation_rules", []interface{}{})
}

SetTagsOut(ctx, output.Tags)

return diags
Expand Down Expand Up @@ -446,45 +360,6 @@ func resourceSecretUpdate(ctx context.Context, d *schema.ResourceData, meta inte
}
}

if d.HasChanges("rotation_lambda_arn", "rotation_rules") {
if v, ok := d.GetOk("rotation_lambda_arn"); ok && v.(string) != "" {
input := &secretsmanager.RotateSecretInput{
RotationLambdaARN: aws.String(v.(string)),
RotationRules: expandRotationRules(d.Get("rotation_rules").([]interface{})),
SecretId: aws.String(d.Id()),
}

log.Printf("[DEBUG] Enabling Secrets Manager Secret rotation: %s", input)
err := retry.RetryContext(ctx, 1*time.Minute, func() *retry.RetryError {
_, err := conn.RotateSecretWithContext(ctx, input)
if err != nil {
// AccessDeniedException: Secrets Manager cannot invoke the specified Lambda function.
if tfawserr.ErrCodeEquals(err, "AccessDeniedException") {
return retry.RetryableError(err)
}
return retry.NonRetryableError(err)
}
return nil
})
if tfresource.TimedOut(err) {
_, err = conn.RotateSecretWithContext(ctx, input)
}
if err != nil {
return sdkdiag.AppendErrorf(diags, "updating Secrets Manager Secret %q rotation: %s", d.Id(), err)
}
} else {
input := &secretsmanager.CancelRotateSecretInput{
SecretId: aws.String(d.Id()),
}

log.Printf("[DEBUG] Cancelling Secrets Manager Secret rotation: %s", input)
_, err := conn.CancelRotateSecretWithContext(ctx, input)
if err != nil {
return sdkdiag.AppendErrorf(diags, "cancelling Secret Manager Secret %q rotation: %s", d.Id(), err)
}
}
}

return append(diags, resourceSecretRead(ctx, d, meta)...)
}

Expand Down
37 changes: 0 additions & 37 deletions internal/service/secretsmanager/secret_data_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,37 +44,6 @@ func DataSourceSecret() *schema.Resource {
Type: schema.TypeString,
Computed: true,
},
"rotation_enabled": {
Deprecated: "Use the aws_secretsmanager_secret_rotation data source instead",
Type: schema.TypeBool,
Computed: true,
},
"rotation_lambda_arn": {
Deprecated: "Use the aws_secretsmanager_secret_rotation data source instead",
Type: schema.TypeString,
Computed: true,
},
"rotation_rules": {
Deprecated: "Use the aws_secretsmanager_secret_rotation data source instead",
Type: schema.TypeList,
Computed: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"automatically_after_days": {
Type: schema.TypeInt,
Computed: true,
},
"duration": {
Type: schema.TypeString,
Computed: true,
},
"schedule_expression": {
Type: schema.TypeString,
Computed: true,
},
},
},
},
"tags": {
Type: schema.TypeMap,
Computed: true,
Expand Down Expand Up @@ -126,8 +95,6 @@ func dataSourceSecretRead(ctx context.Context, d *schema.ResourceData, meta inte
d.Set("description", output.Description)
d.Set("kms_key_id", output.KmsKeyId)
d.Set("name", output.Name)
d.Set("rotation_enabled", output.RotationEnabled)
d.Set("rotation_lambda_arn", output.RotationLambdaARN)
d.Set("policy", "")

pIn := &secretsmanager.GetResourcePolicyInput{
Expand All @@ -147,10 +114,6 @@ func dataSourceSecretRead(ctx context.Context, d *schema.ResourceData, meta inte
d.Set("policy", policy)
}

if err := d.Set("rotation_rules", flattenRotationRules(output.RotationRules)); err != nil {
return sdkdiag.AppendErrorf(diags, "setting rotation_rules: %s", err)
}

if err := d.Set("tags", KeyValueTags(ctx, output.Tags).IgnoreAWS().IgnoreConfig(ignoreTagsConfig).Map()); err != nil {
return sdkdiag.AppendErrorf(diags, "setting tags: %s", err)
}
Expand Down
3 changes: 0 additions & 3 deletions internal/service/secretsmanager/secret_data_source_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,6 @@ func testAccSecretCheckDataSource(datasourceName, resourceName string) resource.
"kms_key_id",
"name",
"policy",
"rotation_enabled",
"rotation_lambda_arn",
"rotation_rules.#",
"tags.#",
}

Expand Down
Loading