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.

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

r/aws_backup_plan: Add support for AdvancedBackupSettings #15341

Merged
merged 1 commit into from
Oct 14, 2020

Conversation

gazoakley
Copy link
Contributor

@gazoakley gazoakley commented Sep 24, 2020

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" or other comments that do not add relevant new information or questions, they generate extra noise for pull request followers and do not help prioritize the request

Closes #15329

Release note for CHANGELOG:

* resource/aws_backup_plan: Add support for AdvancedBackupSettings ([#15341](https://github.com/terraform-providers/terraform-provider-aws/issues/15341))

Output from acceptance testing:

$ make testacc TESTARGS='-run=TestAccAwsBackupPlan_AdvancedBackupSetting'

==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAwsBackupPlan_AdvancedBackupSetting -timeout 120m
=== RUN   TestAccAwsBackupPlan_AdvancedBackupSetting
=== PAUSE TestAccAwsBackupPlan_AdvancedBackupSetting
=== CONT  TestAccAwsBackupPlan_AdvancedBackupSetting
--- PASS: TestAccAwsBackupPlan_AdvancedBackupSetting (30.89s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	32.427s

@gazoakley gazoakley requested a review from a team September 24, 2020 22:23
@ghost ghost added size/XXL Managed by automation to categorize the size of a PR. dependencies Used to indicate dependency changes. service/backup Issues and PRs that pertain to the backup service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. labels Sep 24, 2020
@github-actions github-actions bot added the needs-triage Waiting for first response or review from a maintainer. label Sep 24, 2020
@github-actions
Copy link

Thank you for your contribution! 🚀

Please note that typically Go dependency changes are handled in this repository by Renovate Bot or the maintainers. This is to prevent pull request merge conflicts and further delay reviews of contributions. Remove any changes to the go.mod, go.sum, and vendor/ files and commit them into this pull request.

Additional details:

  • Check open pull requests with the dependencies label to view other dependency updates.
  • If this pull request includes an update the AWS Go SDK (or any other dependency) version, only updates submitted via Renovate Bot will be merged. This pull request will need to remove these changes and will need to be rebased after the existing dependency update via Renovate Bot has been merged for this pull request to be reviewed.
  • If this pull request is for supporting a new AWS service:
    • Ensure the new AWS service changes are following the Contributing Guide section on new services, in particular that the dependency addition and initial provider support are in a separate pull request from other changes (e.g. new resources). Contributions not following this item will not be reviewed until the changes are split.
    • If this pull request is already a separate pull request from the above item, you can ignore this message.

@gazoakley gazoakley force-pushed the f-backup-plan-settings branch from a4ed398 to d4a38de Compare September 24, 2020 22:45
@ghost ghost added the documentation Introduces or discusses updates to documentation. label Sep 24, 2020
@ewbankkit
Copy link
Contributor

@gazoakley Thanks for the contribution.
The latest AWS SDK has been merged including the changes required for this PR.
We have now removed the vendor directory so it will probably be easiest for you to rebase this PR on master, deleting the 8a678461bbf292b93cd568075e35c5da26f35703 commit.

@ewbankkit ewbankkit self-assigned this Oct 2, 2020
@ewbankkit ewbankkit added waiting-response Maintainers are waiting on response from community or contributor. and removed needs-triage Waiting for first response or review from a maintainer. dependencies Used to indicate dependency changes. labels Oct 2, 2020
@gazoakley gazoakley force-pushed the f-backup-plan-settings branch from d4a38de to 726b550 Compare October 2, 2020 21:06
@ghost ghost added size/M Managed by automation to categorize the size of a PR. and removed size/XXL Managed by automation to categorize the size of a PR. labels Oct 2, 2020
@gazoakley gazoakley changed the title resource/aws_backup_plan: Add support for AdvancedBackupSettings r/aws_backup_plan: Add support for AdvancedBackupSettings Oct 2, 2020
@ewbankkit ewbankkit removed the waiting-response Maintainers are waiting on response from community or contributor. label Oct 12, 2020
Copy link
Contributor

@ewbankkit ewbankkit left a comment

Choose a reason for hiding this comment

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

LGTM.

$ make testacc TEST=./aws TESTARGS='-run=TestAccAwsBackupPlan_'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAwsBackupPlan_ -timeout 120m
=== RUN   TestAccAwsBackupPlan_basic
=== PAUSE TestAccAwsBackupPlan_basic
=== RUN   TestAccAwsBackupPlan_withTags
=== PAUSE TestAccAwsBackupPlan_withTags
=== RUN   TestAccAwsBackupPlan_withRules
=== PAUSE TestAccAwsBackupPlan_withRules
=== RUN   TestAccAwsBackupPlan_withLifecycle
=== PAUSE TestAccAwsBackupPlan_withLifecycle
=== RUN   TestAccAwsBackupPlan_withRecoveryPointTags
=== PAUSE TestAccAwsBackupPlan_withRecoveryPointTags
=== RUN   TestAccAwsBackupPlan_Rule_CopyAction_SameRegion
=== PAUSE TestAccAwsBackupPlan_Rule_CopyAction_SameRegion
=== RUN   TestAccAwsBackupPlan_Rule_CopyAction_Multiple
=== PAUSE TestAccAwsBackupPlan_Rule_CopyAction_Multiple
=== RUN   TestAccAwsBackupPlan_Rule_CopyAction_CrossRegion
=== PAUSE TestAccAwsBackupPlan_Rule_CopyAction_CrossRegion
=== RUN   TestAccAwsBackupPlan_AdvancedBackupSetting
=== PAUSE TestAccAwsBackupPlan_AdvancedBackupSetting
=== RUN   TestAccAwsBackupPlan_disappears
=== PAUSE TestAccAwsBackupPlan_disappears
=== CONT  TestAccAwsBackupPlan_basic
=== CONT  TestAccAwsBackupPlan_Rule_CopyAction_Multiple
=== CONT  TestAccAwsBackupPlan_Rule_CopyAction_SameRegion
=== CONT  TestAccAwsBackupPlan_withRecoveryPointTags
=== CONT  TestAccAwsBackupPlan_withLifecycle
=== CONT  TestAccAwsBackupPlan_withRules
=== CONT  TestAccAwsBackupPlan_withTags
=== CONT  TestAccAwsBackupPlan_disappears
=== CONT  TestAccAwsBackupPlan_AdvancedBackupSetting
=== CONT  TestAccAwsBackupPlan_Rule_CopyAction_CrossRegion
=== CONT  TestAccAwsBackupPlan_disappears
    resource_aws_backup_plan_test.go:507: [INFO] Got non-empty plan, as expected
--- PASS: TestAccAwsBackupPlan_disappears (49.82s)
--- PASS: TestAccAwsBackupPlan_AdvancedBackupSetting (58.60s)
--- PASS: TestAccAwsBackupPlan_basic (59.05s)
--- PASS: TestAccAwsBackupPlan_Rule_CopyAction_Multiple (59.18s)
--- PASS: TestAccAwsBackupPlan_Rule_CopyAction_CrossRegion (64.30s)
--- PASS: TestAccAwsBackupPlan_withRules (99.53s)
--- PASS: TestAccAwsBackupPlan_withTags (104.83s)
--- PASS: TestAccAwsBackupPlan_withRecoveryPointTags (105.34s)
--- PASS: TestAccAwsBackupPlan_Rule_CopyAction_SameRegion (105.90s)
--- PASS: TestAccAwsBackupPlan_withLifecycle (119.23s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	119.513s

@breathingdust
Copy link
Member

LGTM 🚀 Thanks @gazoakley

Verified Acceptance Tests in Commercial (us-west-2)

make testacc TEST=./aws TESTARGS='-run=TestAccAwsBackupPlan_'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAwsBackupPlan_ -timeout 120m
=== RUN   TestAccAwsBackupPlan_basic
=== PAUSE TestAccAwsBackupPlan_basic
=== RUN   TestAccAwsBackupPlan_withTags
=== PAUSE TestAccAwsBackupPlan_withTags
=== RUN   TestAccAwsBackupPlan_withRules
=== PAUSE TestAccAwsBackupPlan_withRules
=== RUN   TestAccAwsBackupPlan_withLifecycle
=== PAUSE TestAccAwsBackupPlan_withLifecycle
=== RUN   TestAccAwsBackupPlan_withRecoveryPointTags
=== PAUSE TestAccAwsBackupPlan_withRecoveryPointTags
=== RUN   TestAccAwsBackupPlan_Rule_CopyAction_SameRegion
=== PAUSE TestAccAwsBackupPlan_Rule_CopyAction_SameRegion
=== RUN   TestAccAwsBackupPlan_Rule_CopyAction_Multiple
=== PAUSE TestAccAwsBackupPlan_Rule_CopyAction_Multiple
=== RUN   TestAccAwsBackupPlan_Rule_CopyAction_CrossRegion
=== PAUSE TestAccAwsBackupPlan_Rule_CopyAction_CrossRegion
=== RUN   TestAccAwsBackupPlan_AdvancedBackupSetting
=== PAUSE TestAccAwsBackupPlan_AdvancedBackupSetting
=== RUN   TestAccAwsBackupPlan_disappears
=== PAUSE TestAccAwsBackupPlan_disappears
=== CONT  TestAccAwsBackupPlan_basic
=== CONT  TestAccAwsBackupPlan_Rule_CopyAction_Multiple
=== CONT  TestAccAwsBackupPlan_disappears
=== CONT  TestAccAwsBackupPlan_withRecoveryPointTags
=== CONT  TestAccAwsBackupPlan_withLifecycle
=== CONT  TestAccAwsBackupPlan_Rule_CopyAction_SameRegion
=== CONT  TestAccAwsBackupPlan_AdvancedBackupSetting
=== CONT  TestAccAwsBackupPlan_Rule_CopyAction_CrossRegion
=== CONT  TestAccAwsBackupPlan_withTags
=== CONT  TestAccAwsBackupPlan_withRules
2020/10/14 11:27:41 [INFO] AWS Auth provider used: "SharedCredentialsProvider"
2020/10/14 11:27:42 [INFO] AWS Auth provider used: "SharedCredentialsProvider"
=== CONT  TestAccAwsBackupPlan_disappears
    resource_aws_backup_plan_test.go:507: [INFO] Got non-empty plan, as expected
--- PASS: TestAccAwsBackupPlan_disappears (18.91s)
2020/10/14 11:27:51 [DEBUG] Trying to get account information via sts:GetCallerIdentity
2020/10/14 11:27:51 [INFO] AWS Auth provider used: "SharedCredentialsProvider"
--- PASS: TestAccAwsBackupPlan_Rule_CopyAction_Multiple (21.17s)
--- PASS: TestAccAwsBackupPlan_basic (21.42s)
--- PASS: TestAccAwsBackupPlan_AdvancedBackupSetting (21.90s)
2020/10/14 11:27:56 [DEBUG] Trying to get account information via sts:GetCallerIdentity
--- PASS: TestAccAwsBackupPlan_Rule_CopyAction_CrossRegion (27.78s)
--- PASS: TestAccAwsBackupPlan_withTags (44.39s)
--- PASS: TestAccAwsBackupPlan_withRecoveryPointTags (46.58s)
--- PASS: TestAccAwsBackupPlan_withRules (46.62s)
--- PASS: TestAccAwsBackupPlan_Rule_CopyAction_SameRegion (47.75s)
--- PASS: TestAccAwsBackupPlan_withLifecycle (57.90s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	59.801s

Verified Acceptance Criteria in GovCloud (us-gov-west-1)

make testacc TEST=./aws TESTARGS='-run=TestAccAwsBackupPlan_'
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAwsBackupPlan_ -timeout 120m
=== RUN   TestAccAwsBackupPlan_basic
=== PAUSE TestAccAwsBackupPlan_basic
=== RUN   TestAccAwsBackupPlan_withTags
=== PAUSE TestAccAwsBackupPlan_withTags
=== RUN   TestAccAwsBackupPlan_withRules
=== PAUSE TestAccAwsBackupPlan_withRules
=== RUN   TestAccAwsBackupPlan_withLifecycle
=== PAUSE TestAccAwsBackupPlan_withLifecycle
=== RUN   TestAccAwsBackupPlan_withRecoveryPointTags
=== PAUSE TestAccAwsBackupPlan_withRecoveryPointTags
=== RUN   TestAccAwsBackupPlan_Rule_CopyAction_SameRegion
=== PAUSE TestAccAwsBackupPlan_Rule_CopyAction_SameRegion
=== RUN   TestAccAwsBackupPlan_Rule_CopyAction_Multiple
=== PAUSE TestAccAwsBackupPlan_Rule_CopyAction_Multiple
=== RUN   TestAccAwsBackupPlan_Rule_CopyAction_CrossRegion
=== PAUSE TestAccAwsBackupPlan_Rule_CopyAction_CrossRegion
=== RUN   TestAccAwsBackupPlan_AdvancedBackupSetting
=== PAUSE TestAccAwsBackupPlan_AdvancedBackupSetting
=== RUN   TestAccAwsBackupPlan_disappears
=== PAUSE TestAccAwsBackupPlan_disappears
=== CONT  TestAccAwsBackupPlan_basic
=== CONT  TestAccAwsBackupPlan_Rule_CopyAction_Multiple
=== CONT  TestAccAwsBackupPlan_disappears
=== CONT  TestAccAwsBackupPlan_AdvancedBackupSetting
=== CONT  TestAccAwsBackupPlan_withTags
=== CONT  TestAccAwsBackupPlan_Rule_CopyAction_CrossRegion
=== CONT  TestAccAwsBackupPlan_withLifecycle
=== CONT  TestAccAwsBackupPlan_Rule_CopyAction_SameRegion
=== CONT  TestAccAwsBackupPlan_withRecoveryPointTags
=== CONT  TestAccAwsBackupPlan_withRules
=== CONT  TestAccAwsBackupPlan_disappears
    resource_aws_backup_plan_test.go:507: [INFO] Got non-empty plan, as expected
--- PASS: TestAccAwsBackupPlan_disappears (14.97s)
2020/10/14 11:42:49 [DEBUG] Trying to get account information via sts:GetCallerIdentity
--- PASS: TestAccAwsBackupPlan_basic (18.50s)
--- PASS: TestAccAwsBackupPlan_Rule_CopyAction_Multiple (18.99s)
2020/10/14 11:42:52 [DEBUG] Trying to get account information via sts:GetCallerIdentity
--- PASS: TestAccAwsBackupPlan_AdvancedBackupSetting (19.94s)
2020/10/14 11:42:57 [DEBUG] Deleting Backup Plan: a2fddb7e-9936-403a-a097-b87e9d305090
--- PASS: TestAccAwsBackupPlan_Rule_CopyAction_CrossRegion (25.66s)
2020/10/14 11:43:03 [INFO] AWS Auth provider used: "SharedCredentialsProvider"
--- PASS: TestAccAwsBackupPlan_withRecoveryPointTags (36.72s)
--- PASS: TestAccAwsBackupPlan_withTags (36.78s)
--- PASS: TestAccAwsBackupPlan_Rule_CopyAction_SameRegion (39.74s)
--- PASS: TestAccAwsBackupPlan_withRules (40.84s)
--- PASS: TestAccAwsBackupPlan_withLifecycle (50.30s)
PASS
ok  	github.com/terraform-providers/terraform-provider-aws/aws	52.117s

@breathingdust breathingdust added this to the v3.11.0 milestone Oct 14, 2020
@breathingdust breathingdust merged commit 6ca06e4 into hashicorp:master Oct 14, 2020
@ghost
Copy link

ghost commented Oct 15, 2020

This has been released in version 3.11.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 ghost locked as resolved and limited conversation to collaborators Nov 14, 2020
@ghost
Copy link

ghost commented Nov 14, 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!

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
documentation Introduces or discusses updates to documentation. service/backup Issues and PRs that pertain to the backup service. size/M 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
Development

Successfully merging this pull request may close these issues.

AWS Backup support for VSS snapshots
3 participants