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

RDS DB Cluster Snapshot Tags #10488

Merged
merged 6 commits into from
Nov 2, 2019
Merged

RDS DB Cluster Snapshot Tags #10488

merged 6 commits into from
Nov 2, 2019

Conversation

andyyaldoo
Copy link
Contributor

Community Note

  • Please vote on this pull request by adding a 👍 reaction to the original pull request comment to help the community and maintainers prioritize this request
  • Please do not leave "+1" comments, they generate extra noise for pull request followers and do not help prioritize the request

Closes #8722

Release note for CHANGELOG:

New Attribute: `tags` for resource and and data source `aws_db_cluster_snapshot`

Output from acceptance testing:

❯ AWS_PROFILE=default make testacc TESTARGS='-run=TestAccAWSD\(B\|b\)ClusterSnapshot' TEST=./aws
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAWSD\(B\|b\)ClusterSnapshot -timeout 120m
=== RUN   TestAccAWSDbClusterSnapshotDataSource_DbClusterSnapshotIdentifier
=== PAUSE TestAccAWSDbClusterSnapshotDataSource_DbClusterSnapshotIdentifier
=== RUN   TestAccAWSDbClusterSnapshotDataSource_DbClusterIdentifier
=== PAUSE TestAccAWSDbClusterSnapshotDataSource_DbClusterIdentifier
=== RUN   TestAccAWSDbClusterSnapshotDataSource_MostRecent
=== PAUSE TestAccAWSDbClusterSnapshotDataSource_MostRecent
=== RUN   TestAccAWSDBClusterSnapshot_basic
=== PAUSE TestAccAWSDBClusterSnapshot_basic
=== RUN   TestAccAWSDBClusterSnapshot_Tags
=== PAUSE TestAccAWSDBClusterSnapshot_Tags
=== CONT  TestAccAWSDbClusterSnapshotDataSource_DbClusterSnapshotIdentifier
=== CONT  TestAccAWSDBClusterSnapshot_Tags
=== CONT  TestAccAWSDbClusterSnapshotDataSource_DbClusterIdentifier
=== CONT  TestAccAWSDbClusterSnapshotDataSource_MostRecent
=== CONT  TestAccAWSDBClusterSnapshot_basic
--- PASS: TestAccAWSDBClusterSnapshot_basic (234.24s)
--- PASS: TestAccAWSDbClusterSnapshotDataSource_DbClusterIdentifier (234.51s)
--- PASS: TestAccAWSDbClusterSnapshotDataSource_DbClusterSnapshotIdentifier (235.06s)
--- PASS: TestAccAWSDbClusterSnapshotDataSource_MostRecent (299.73s)
--- PASS: TestAccAWSDBClusterSnapshot_Tags (360.95s)
PASS
ok      github.com/terraform-providers/terraform-provider-aws/aws       361.014s

...

@andyyaldoo
rds-snapshot-tags: Add tests for data source
2637b9d 
Fixes terraform-providers#8722
@andyyaldoo
rds-snapshot-tags: Add tags to data source
fccc920 
Fixes terraform-providers#8722
@andyyaldoo
rds-snapshot-tags: rds-snapshot-tags: Add tests for resource
6188431 
Fixes terraform-providers#8722
@andyyaldoo
rds-snapshot-tags: Add tags to resource
a2a2697 
Fixes terraform-providers#8722
@andyyaldoo
rds-snapshot-tags: Add Update function
77d7434 
Fixes terraform-providers#8722
@ghost ghost added size/L Managed by automation to categorize the size of a PR. service/rds Issues and PRs that pertain to the rds service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. labels Oct 13, 2019
@andyyaldoo
rds-snapshot-tags: Add documentation
7a24dfe 
Fixes terraform-providers#8722
@ghost ghost added the documentation Introduces or discusses updates to documentation. label Oct 14, 2019
@andyyaldoo andyyaldoo marked this pull request as ready for review October 14, 2019 14:01
@andyyaldoo andyyaldoo requested a review from a team October 14, 2019 14:01
@andyyaldoo
Copy link
Contributor Author

@bflad could you take a look?

@bflad bflad added the enhancement Requests to existing resources that expand the functionality or scope. label Nov 1, 2019
bflad
bflad approved these changes Nov 2, 2019
View reviewed changes
Copy link
Contributor

@bflad bflad left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks so much for this, @adharmawan 🚀

--- PASS: TestAccAWSDbClusterSnapshotDataSource_DbClusterIdentifier (169.90s)
--- PASS: TestAccAWSDBClusterSnapshot_Tags (173.11s)
--- PASS: TestAccAWSDbClusterSnapshotDataSource_MostRecent (175.24s)
--- PASS: TestAccAWSDbClusterSnapshotDataSource_DbClusterSnapshotIdentifier (180.41s)
--- PASS: TestAccAWSDBClusterSnapshot_basic (180.61s)

aws/resource_aws_db_cluster_snapshot.go
@@ -167,6 +170,24 @@ func resourceAwsDbClusterSnapshotRead(d *schema.ResourceData, meta interface{})
d.Set("storage_encrypted", snapshot.StorageEncrypted)
d.Set("vpc_id", snapshot.VpcId)

if err := saveTagsRDS(conn, d, aws.StringValue(snapshot.DBClusterSnapshotArn)); err != nil {
log.Printf("[WARN] Failed to save tags for RDS DB Cluster Snapshot (%s): %s", d.Id(), err)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: In the future we will be requiring these to return an error instead of just logging 👍

aws/resource_aws_db_cluster_snapshot.go
if d.HasChange("tags") {
if err := setTagsRDS(conn, d, d.Get("db_cluster_snapshot_arn").(string)); err != nil {
return err
} else {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Since the if condition calls return, the else and nesting are extraneous 👍

@bflad bflad added this to the v2.35.0 milestone Nov 2, 2019
@bflad bflad merged commit 61a0b1b into hashicorp:master Nov 2, 2019
bflad added a commit that referenced this pull request Nov 2, 2019
@bflad
Update CHANGELOG for #10488
8304ab8
@ghost
Copy link

ghost commented Nov 7, 2019

This has been released in version 2.35.0 of the Terraform AWS provider. Please see the Terraform documentation on provider versioning or reach out if you need any assistance upgrading.

For further feature requests or bug reports with this functionality, please create a new GitHub issue following the template for triage. Thanks!

@ghost
Copy link

ghost commented Mar 29, 2020

I'm going to lock this issue because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.

If you feel this issue should be reopened, we encourage creating a new issue linking back to this one for added context. Thanks!

@ghost ghost locked and limited conversation to collaborators Mar 29, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@bflad bflad bflad approved these changes

Assignees
No one assigned
Labels
documentation Introduces or discusses updates to documentation. enhancement Requests to existing resources that expand the functionality or scope. service/rds Issues and PRs that pertain to the rds service. size/L Managed by automation to categorize the size of a PR. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure.
Projects
None yet
Milestone
v2.35.0
Development

Successfully merging this pull request may close these issues.

Add support for RDS cluster snapshot tags
2 participants
@andyyaldoo @bflad