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

Support Aurora point-in-time restore #7031

Merged
merged 14 commits into from
Nov 12, 2020

Conversation

Gufran
Copy link
Contributor

@Gufran Gufran commented Jan 4, 2019

Relates #5286

Changes proposed in this pull request:

Output from acceptance testing:

$ make testacc TEST=./aws TESTARGS="-run=TestAccAWSRDSCluster_PointInTimeRestore"
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -parallel 20 -run=TestAccAWSRDSCluster_PointInTimeRestore -timeout 120m
=== RUN   TestAccAWSRDSCluster_PointInTimeRestore
=== PAUSE TestAccAWSRDSCluster_PointInTimeRestore
=== CONT  TestAccAWSRDSCluster_PointInTimeRestore
--- PASS: TestAccAWSRDSCluster_PointInTimeRestore (354.21s)
PASS
ok      github.com/terraform-providers/terraform-provider-aws/aws       354.267s


@ghost ghost added size/XL Managed by automation to categorize the size of a PR. documentation Introduces or discusses updates to documentation. service/rds Issues and PRs that pertain to the rds service. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. labels Jan 4, 2019
@Gufran
Copy link
Contributor Author

Gufran commented Jan 29, 2019

@tombuildsstuff requesting review please.

@papa99do
Copy link

Any update on this pull request? It would be great if it can be reviewed and included in the next release.

@Gufran
Copy link
Contributor Author

Gufran commented Feb 22, 2019

@papa99do I have no idea if this one is even scheduled for review yet. We are manually building this branch for internal usage until it is merged or there is some feedback.

@ewbankkit
Copy link
Contributor

Cloning Aurora clusters cross-account uses this mechanism.
When this PR is merged we need to investigate the issue mentioned here.

@chadmyers
Copy link

Is there any way to bump this up in priority to get it reviewed and merged? Is there anything I can do to help. Thanks!

@Gufran
Copy link
Contributor Author

Gufran commented Aug 5, 2020

I'm sorry, I'm not sure if there is any way to bump it up or ask the maintainers to pick it up. It also looks like the changeset is no longer valid and I'll probably have to rethink the whole thing, that is if a maintainer is willing to review it.

@chadmyers
Copy link

Dear Mr. Gufran, thank you for your contribution in this pull request. Above I was asking the maintainers if they could prioritize pulling in this pull request. I didn't mean to put more pressure on you to update the PR or anything like that. I was hoping the maintainers would look at this PR soon and I was volunteering to help if the PR needs updated since it has sat for so long.

Thank you, again, for this PR and also thank you to the maintainers for making these providers open source so we can collaborate on things like this!

@anGie44 anGie44 added this to the Roadmap milestone Nov 2, 2020
@anGie44 anGie44 self-assigned this Nov 2, 2020
Copy link
Contributor

@anGie44 anGie44 left a comment

Choose a reason for hiding this comment

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

Hi @Gufran, thank you again for this PR and hope you can continue the work here to get it into a future release of the Provider soon! It's off to a great start, just a couple comments to help get the acceptance test in place and up-to-date with the current state of the provider that supports Terraform 0.12+. You'll need to rebase as well as a couple merge conflicts have emerged over time.

Let me know if you have any follow-up questions or if you are pressed for time, we are also happy to continue the work you have here ! (Please note, we generally provide contributors about a week's time to respond back with next steps)

aws/resource_aws_rds_cluster.go Outdated Show resolved Hide resolved
aws/resource_aws_rds_cluster.go Outdated Show resolved Hide resolved
aws/resource_aws_rds_cluster.go Outdated Show resolved Hide resolved
aws/resource_aws_rds_cluster.go Outdated Show resolved Hide resolved
aws/resource_aws_rds_cluster.go Outdated Show resolved Hide resolved
aws/resource_aws_rds_cluster_test.go Outdated Show resolved Hide resolved
aws/resource_aws_rds_cluster_test.go Show resolved Hide resolved
aws/resource_aws_rds_cluster_test.go Show resolved Hide resolved
aws/resource_aws_rds_cluster_test.go Show resolved Hide resolved
aws/resource_aws_rds_cluster_test.go Outdated Show resolved Hide resolved
@anGie44 anGie44 added the waiting-response Maintainers are waiting on response from community or contributor. label Nov 6, 2020
@Gufran Gufran force-pushed the aurora-pit-restore branch from c011e66 to 0e9be90 Compare November 6, 2020 18:14
@Gufran Gufran requested a review from a team as a code owner November 6, 2020 18:14
@Gufran
Copy link
Contributor Author

Gufran commented Nov 6, 2020

Hi @anGie44, thanks for the review. I've incorporated latest changes into this branch, resolved the conflicts and also addressed the review comments. can you please take a look again? I'm working on the broken lint steps.

make testacc TEST=./aws TESTARGS="-run=TestAccAWSRDSCluster_PointInTimeRestore"
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./aws -v -count 1 -parallel 20 -run=TestAccAWSRDSCluster_PointInTimeRestore -timeout 120m
=== RUN   TestAccAWSRDSCluster_PointInTimeRestore
=== PAUSE TestAccAWSRDSCluster_PointInTimeRestore
=== CONT  TestAccAWSRDSCluster_PointInTimeRestore
--- PASS: TestAccAWSRDSCluster_PointInTimeRestore (398.01s)
PASS
ok      github.com/terraform-providers/terraform-provider-aws/aws       406.464s

@ghost ghost removed the waiting-response Maintainers are waiting on response from community or contributor. label Nov 6, 2020
@anGie44
Copy link
Contributor

anGie44 commented Nov 6, 2020

sure thing @Gufran, thanks for your speedy reply! changes to address previous linting errors look good at the moment 👍

@Gufran
Copy link
Contributor Author

Gufran commented Nov 11, 2020

@anGie44 everything done. can you take a look again please?

@ghost ghost removed the waiting-response Maintainers are waiting on response from community or contributor. label Nov 11, 2020
Co-authored-by: angie pinilla <angelinepinilla@gmail.com>
@anGie44 anGie44 added the waiting-response Maintainers are waiting on response from community or contributor. label Nov 11, 2020
@anGie44 anGie44 modified the milestones: Roadmap, v3.15.0 Nov 11, 2020
@Gufran
Copy link
Contributor Author

Gufran commented Nov 11, 2020

@anGie44 Thank you for your patience and thorough review. I've made the changes, can you take a look once again?

@ghost ghost removed the waiting-response Maintainers are waiting on response from community or contributor. label Nov 11, 2020
Co-authored-by: angie pinilla <angelinepinilla@gmail.com>
@Gufran
Copy link
Contributor Author

Gufran commented Nov 12, 2020

@anGie44 all done.

Copy link
Contributor

@anGie44 anGie44 left a comment

Choose a reason for hiding this comment

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

Thanks for the fantastic work here @Gufran ! 🚀

Output of acceptance tests (commercial):

--- PASS: TestAccAWSRDSClusterInstance_MonitoringRoleArn_RemovedToEnabled (579.64s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraPostgresql (682.82s)
--- PASS: TestAccAWSRDSClusterInstance_generatedName (697.52s)
--- PASS: TestAccAWSRDSClusterInstance_PubliclyAccessible (712.88s)
--- PASS: TestAccAWSRDSClusterInstance_namePrefix (717.19s)
--- PASS: TestAccAWSRDSClusterInstance_CopyTagsToSnapshot (723.80s)
--- PASS: TestAccAWSRDSClusterInstance_disappears (746.74s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraMysql1 (767.86s)
--- PASS: TestAccAWSRDSClusterInstance_isAlreadyBeingDeleted (783.13s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql1 (788.66s)
--- PASS: TestAccAWSRDSClusterInstance_az (796.07s)
--- PASS: TestAccAWSRDSClusterInstance_kmsKey (798.91s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql1_DefaultKeyToCustomKey (810.22s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsEnabled_AuroraMysql2 (878.27s)
--- PASS: TestAccAWSRDSCluster_AvailabilityZones (122.85s)
--- PASS: TestAccAWSRDSCluster_basic (172.80s)
--- PASS: TestAccAWSRDSCluster_missingUserNameCausesError (4.03s)
--- PASS: TestAccAWSRDSCluster_ClusterIdentifierPrefix (122.71s)
--- PASS: TestAccAWSRDSCluster_DbSubnetGroupName (136.82s)
--- PASS: TestAccAWSRDSCluster_BacktrackWindow (180.84s)
--- PASS: TestAccAWSRDSClusterInstance_MonitoringRoleArn_EnabledToRemoved (978.59s)
--- PASS: TestAccAWSRDSClusterInstance_MonitoringRoleArn_EnabledToDisabled (993.53s)
--- PASS: TestAccAWSRDSCluster_generatedName (122.15s)
--- PASS: TestAccAWSRDSClusterEndpoint_tags (1018.87s)
--- PASS: TestAccAWSRDSCluster_Tags (139.97s)
--- PASS: TestAccAWSRDSCluster_takeFinalSnapshot (153.69s)
--- PASS: TestAccAWSRDSCluster_EnabledCloudwatchLogsExports_Postgresql (132.65s)
--- PASS: TestAccAWSRDSCluster_updateIamRoles (135.87s)
--- PASS: TestAccAWSRDSCluster_EnabledCloudwatchLogsExports_MySQL (210.80s)
--- PASS: TestAccAWSRDSCluster_kmsKey (144.68s)
--- PASS: TestAccAWSRDSClusterEndpoint_basic (1125.17s)
--- PASS: TestAccAWSRDSCluster_encrypted (164.16s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql2 (590.55s)
--- PASS: TestAccAWSRDSCluster_iamAuth (152.46s)
--- PASS: TestAccAWSRDSCluster_PointInTimeRestore (388.55s)
--- PASS: TestAccAWSRDSCluster_copyTagsToSnapshot (211.31s)
--- PASS: TestAccAWSRDSCluster_DeletionProtection (161.76s)
--- PASS: TestAccAWSRDSCluster_backupsUpdate (211.05s)
--- PASS: TestAccAWSRDSCluster_EngineMode_ParallelQuery (143.36s)
--- PASS: TestAccAWSRDSClusterInstance_MonitoringInterval (1270.13s)
--- PASS: TestAccAWSRDSCluster_EngineMode_Global (153.41s)
--- PASS: TestAccAWSRDSCluster_EngineMode_Multimaster (157.86s)
--- PASS: TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global (137.26s)
--- PASS: TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global_Add (139.26s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraPostgresql (660.89s)
--- PASS: TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Provisioned (125.73s)
--- PASS: TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global_Update (150.72s)
--- PASS: TestAccAWSRDSCluster_GlobalClusterIdentifier_EngineMode_Global_Remove (166.67s)
--- SKIP: TestAccAWSRDSCluster_SnapshotIdentifier_EngineMode_Serverless (0.00s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraPostgresql_DefaultKeyToCustomKey (676.95s)
--- PASS: TestAccAWSRDSClusterInstance_PerformanceInsightsKmsKeyId_AuroraMysql2_DefaultKeyToCustomKey (736.23s)
--- PASS: TestAccAWSRDSClusterInstance_CACertificateIdentifier (710.77s)
--- PASS: TestAccAWSRDSClusterInstance_basic (1512.95s)
--- PASS: TestAccAWSRDSCluster_Port (251.93s)
--- PASS: TestAccAWSRDSCluster_EngineVersion (436.53s)
--- PASS: TestAccAWSRDSCluster_EngineMode (517.84s)
--- PASS: TestAccAWSRDSCluster_ScalingConfiguration (373.76s)
--- PASS: TestAccAWSRDSCluster_ScalingConfiguration_DefaultMinCapacity (335.35s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_EngineVersion_Different (340.80s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_EngineVersion_Equal (350.62s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_EngineMode_Provisioned (381.29s)
--- PASS: TestValidateTypeStringNullableBoolean (0.00s)
--- PASS: TestValidateTypeStringNullableFloat (0.00s)
--- PASS: TestValidateCloudWatchDashboardName (0.00s)
--- PASS: TestValidateCloudWatchEventRuleName (0.00s)
--- PASS: TestValidateLambdaFunctionName (0.00s)
--- PASS: TestValidateLambdaQualifier (0.00s)
--- PASS: TestValidateLambdaPermissionAction (0.00s)
--- PASS: TestValidateLambdaPermissionEventSourceToken (0.00s)
--- PASS: TestValidateAwsAccountId (0.00s)
--- PASS: TestValidateArn (0.00s)
--- PASS: TestValidateEC2AutomateARN (0.00s)
--- PASS: TestValidatePolicyStatementId (0.00s)
--- PASS: TestValidateCIDRNetworkAddress (0.00s)
--- PASS: TestValidateCIDRBlock (0.00s)
--- PASS: TestValidateIpv4CIDRBlock (0.00s)
--- PASS: TestValidateIpv6CIDRBlock (0.00s)
--- PASS: TestCidrBlocksEqual (0.00s)
--- PASS: TestCanonicalCidrBlock (0.00s)
--- PASS: TestValidateLogMetricFilterName (0.00s)
--- PASS: TestValidateLogMetricTransformationName (0.00s)
--- PASS: TestValidateLogGroupName (0.00s)
--- PASS: TestValidateLogGroupNamePrefix (0.00s)
--- PASS: TestValidateS3BucketLifecycleTimestamp (0.00s)
--- PASS: TestValidateSagemakerName (0.00s)
--- PASS: TestValidateDbEventSubscriptionName (0.00s)
--- PASS: TestValidateIAMPolicyJsonString (0.00s)
--- PASS: TestValidateStringIsJsonOrYaml (0.00s)
--- PASS: TestValidateSQSQueueName (0.00s)
--- PASS: TestValidateSQSFifoQueueName (0.00s)
--- PASS: TestValidateOnceAWeekWindowFormat (0.00s)
--- PASS: TestValidateOnceADayWindowFormat (0.00s)
--- PASS: TestValidateEcsPlacementConstraint (0.00s)
--- PASS: TestValidateEcsPlacementStrategy (0.00s)
--- PASS: TestValidateStepFunctionStateMachineName (0.00s)
--- PASS: TestValidateEmrCustomAmiId (0.00s)
--- PASS: TestValidateDmsEndpointId (0.00s)
--- PASS: TestValidateDmsCertificateId (0.00s)
--- PASS: TestValidateDmsReplicationInstanceId (0.00s)
--- PASS: TestValidateDmsReplicationSubnetGroupId (0.00s)
--- PASS: TestValidateDmsReplicationTaskId (0.00s)
--- PASS: TestValidateAccountAlias (0.00s)
--- PASS: TestValidateIamRoleProfileName (0.00s)
--- PASS: TestValidateIamRoleProfileNamePrefix (0.00s)
--- PASS: TestValidateApiGatewayUsagePlanQuotaSettings (0.00s)
--- PASS: TestValidateDocDBIdentifier (0.00s)
--- PASS: TestValidateElbName (0.00s)
--- PASS: TestValidateElbNamePrefix (0.00s)
--- PASS: TestValidateNeptuneEventSubscriptionName (0.00s)
--- PASS: TestValidateNeptuneEventSubscriptionNamePrefix (0.00s)
--- PASS: TestValidateDbSubnetGroupName (0.00s)
--- PASS: TestValidateNeptuneSubnetGroupName (0.00s)
--- PASS: TestValidateDbSubnetGroupNamePrefix (0.00s)
--- PASS: TestValidateNeptuneSubnetGroupNamePrefix (0.00s)
--- PASS: TestValidateDbOptionGroupName (0.00s)
--- PASS: TestValidateDbOptionGroupNamePrefix (0.00s)
--- PASS: TestValidateDbParamGroupName (0.00s)
--- PASS: TestValidateOpenIdURL (0.00s)
--- PASS: TestValidateAwsKmsName (0.00s)
--- PASS: TestValidateAwsKmsGrantName (0.00s)
--- PASS: TestValidateCognitoIdentityPoolName (0.00s)
--- PASS: TestValidateCognitoProviderDeveloperName (0.00s)
--- PASS: TestValidateCognitoSupportedLoginProviders (0.00s)
--- PASS: TestValidateCognitoIdentityProvidersClientId (0.00s)
--- PASS: TestValidateCognitoIdentityProvidersProviderName (0.00s)
--- PASS: TestValidateCognitoUserPoolEmailVerificationMessage (0.01s)
--- PASS: TestValidateCognitoUserPoolEmailVerificationSubject (0.00s)
--- PASS: TestValidateCognitoUserPoolSmsAuthenticationMessage (0.00s)
--- PASS: TestValidateCognitoUserPoolSmsVerificationMessage (0.00s)
--- PASS: TestValidateWafMetricName (0.00s)
--- PASS: TestValidateAwsSSMName (0.00s)
--- PASS: TestValidateBatchName (0.00s)
--- PASS: TestValidateBatchPrefix (0.00s)
--- PASS: TestValidateCognitoRoleMappingsAmbiguousRoleResolutionAgainstType (0.00s)
--- PASS: TestValidateCognitoRoleMappingsRulesConfiguration (0.00s)
--- PASS: TestValidateSecurityGroupRuleDescription (0.00s)
--- PASS: TestValidateCognitoRoles (0.00s)
--- PASS: TestValidateKmsKey (0.00s)
--- PASS: TestResourceAWSElastiCacheReplicationGroupAuthTokenValidation (0.00s)
--- PASS: TestValidateCognitoUserGroupName (0.00s)
--- PASS: TestValidateCognitoUserPoolId (0.00s)
--- PASS: TestValidateAmazonSideAsn (0.00s)
--- PASS: TestValidate4ByteAsn (0.00s)
--- PASS: TestValidateLaunchTemplateName (0.00s)
--- PASS: TestValidateLaunchTemplateId (0.00s)
--- PASS: TestValidateNeptuneParamGroupName (0.00s)
--- PASS: TestValidateNeptuneParamGroupNamePrefix (0.00s)
--- PASS: TestValidateCloudFrontPublicKeyName (0.00s)
--- PASS: TestValidateCloudFrontPublicKeyNamePrefix (0.00s)
--- PASS: TestValidateDxConnectionBandWidth (0.00s)
--- PASS: TestValidateLbTargetGroupName (0.00s)
--- PASS: TestValidateLbTargetGroupNamePrefix (0.00s)
--- PASS: TestValidateSecretManagerSecretName (0.00s)
--- PASS: TestValidateSecretManagerSecretNamePrefix (0.00s)
--- PASS: TestValidateRoute53ResolverName (0.00s)
--- PASS: TestCloudWatchEventCustomEventBusName (0.00s)
--- PASS: TestValidateServiceDiscoveryNamespaceName (0.00s)
--- PASS: TestValidateUTCTimestamp (0.00s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_EngineMode_ParallelQuery (401.03s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_MasterPassword (370.98s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier (461.46s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_KmsKeyId (381.59s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_DeletionProtection (460.52s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_PreferredBackupWindow (361.30s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_PreferredMaintenanceWindow (350.69s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_MasterUsername (461.39s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_Tags (360.85s)
--- PASS: TestAccAWSRDSCluster_AllowMajorVersionUpgrade (1243.59s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_VpcSecurityGroupIds_Tags (364.50s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_VpcSecurityGroupIds (402.50s)
--- PASS: TestAccAWSRDSCluster_SnapshotIdentifier_EncryptedRestore (381.50s)
--- PASS: TestAccAWSRDSCluster_EnableHttpEndpoint (373.70s)
--- PASS: TestAccAWSRDSCluster_EngineVersionWithPrimaryInstance (1141.53s)
--- PASS: TestAccAWSRDSCluster_ReplicationSourceIdentifier_KmsKeyId (1512.03s)
--- PASS: TestAccAWSRDSCluster_GlobalClusterIdentifier_ReplicationSourceIdentifier (1901.34s)
--- PASS: TestAccAWSRDSCluster_GlobalClusterIdentifier_PrimarySecondaryClusters (1980.75s)
--- FAIL: TestAccAWSRDSCluster_s3Restore (1589.99s) -- known failure reported in https://github.com/hashicorp/terraform-provider-aws/issues/13391

@anGie44 anGie44 merged commit 0738a98 into hashicorp:master Nov 12, 2020
anGie44 added a commit that referenced this pull request Nov 12, 2020
@Gufran Gufran deleted the aurora-pit-restore branch November 12, 2020 17:39
@ghost
Copy link

ghost commented Nov 12, 2020

This has been released in version 3.15.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 Dec 13, 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 as resolved and limited conversation to collaborators Dec 13, 2020
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/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
Development

Successfully merging this pull request may close these issues.

5 participants