New Resource aws_rds_cluster_activity_stream #22097

jdstuart · 2021-12-07T22:36:29Z

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

Description: This PR adds support for the Amazon Aurora Database Activity Streams.

A lot of credit to @Fedomn that did a bunch of the work in #14243.

Output from acceptance testing:

$ make testacc TESTS=TestAccAWSRDSClusterActivityStream PKG=rds
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/rds/... -v -count 1 -parallel 20 -run='TestAccAWSRDSClusterActivityStream' -timeout 180m
=== RUN   TestAccAWSRDSClusterActivityStream_basic
=== PAUSE TestAccAWSRDSClusterActivityStream_basic
=== RUN   TestAccAWSRDSClusterActivityStream_disappears
=== PAUSE TestAccAWSRDSClusterActivityStream_disappears
=== RUN   TestAccAWSRDSClusterActivityStream_kmsKeyId
=== PAUSE TestAccAWSRDSClusterActivityStream_kmsKeyId
=== RUN   TestAccAWSRDSClusterActivityStream_mode
=== PAUSE TestAccAWSRDSClusterActivityStream_mode
=== RUN   TestAccAWSRDSClusterActivityStream_resourceArn
=== PAUSE TestAccAWSRDSClusterActivityStream_resourceArn
=== CONT  TestAccAWSRDSClusterActivityStream_basic
=== CONT  TestAccAWSRDSClusterActivityStream_mode
=== CONT  TestAccAWSRDSClusterActivityStream_resourceArn
=== CONT  TestAccAWSRDSClusterActivityStream_disappears
=== CONT  TestAccAWSRDSClusterActivityStream_kmsKeyId
--- PASS: TestAccAWSRDSClusterActivityStream_disappears (1677.10s)
--- PASS: TestAccAWSRDSClusterActivityStream_basic (2132.00s)
--- PASS: TestAccAWSRDSClusterActivityStream_kmsKeyId (2573.85s)
--- PASS: TestAccAWSRDSClusterActivityStream_mode (2828.39s)
--- PASS: TestAccAWSRDSClusterActivityStream_resourceArn (3295.58s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/rds	3297.531s

…activity_stream

jdstuart · 2022-02-11T20:44:27Z

I'm having a difficult time debugging the Acceptance test code and I'm not sure why my tests are failing if it's bad code in my test or in the resource I added (or both :( ).

I use Visual Studio Code for development and successfully followed the instructions on Debugging Providers to attach a debugger to the AWS Provider. I manage to run the acceptance tests with make testacc TESTS=... from the CLI, but that doesn't enable me to debug the tests themselves. I can successfully step through the provider code, but I believe the problem is in my tests and not the provider.

Any help or ideas how I can debug the acceptance tests? @DrFaust92 (or anyone)

internal/service/rds/cluster_activity_stream_test.go

DrFaust92 · 2022-02-11T21:20:03Z

internal/service/rds/cluster_activity_stream_test.go

+	}
+}
+
+func testAccCheckAWSRDSClusterActivityStreamAttributes(v *rds.DBCluster) resource.TestCheckFunc {


why is these need if attributes are already checked?

It checks properties returned from AWS and not only attributes stored with the resource. i.e. the ActivityStreamStatus which is expected to be in state Started

DrFaust92 · 2022-02-11T21:20:56Z

internal/service/rds/cluster_activity_stream.go

+		return diag.FromErr(fmt.Errorf("error retrieving RDS cluster: empty response for: %s", d.Id()))
+	}
+
+	if aws.StringValue(resp.ActivityStreamStatus) == rds.ActivityStreamStatusStopped {


I think we should fold this into the find function (also will remove the dupe in acctest destory function)

Do you suggest the FindDBClusterByClusterArn function or do you suggest I create a new find function for the Activity Stream? The Activity Stream isn't really something you can "find" and return. It's a status property on the DB cluster.

DrFaust92 · 2022-02-11T21:22:39Z

internal/service/rds/cluster_activity_stream_test.go

+  kms_key_id   = aws_kms_key.test.key_id
+  mode         = "async"
+
+  depends_on = [aws_rds_cluster_instance.test]


should avoid this and add some retry logic in create if it needs to wait for the instance to be created.

If there's no depends_on it can also cause a race condition when deleting the entire stack. i.e. If AWS is busy destroying either aws_rds_cluster or aws_rds_cluster_activity_stream then the destroy operation of the other will fail stating the cluster is in invalid state to perform the operation.

We can wait at initialization, but to wait at destroy would require changes to the aws_rds_cluster resources too.

DrFaust92 · 2022-02-11T21:23:50Z

@jdstuart can you share errors? i dont run tests on debug so can help you with this unfortunately.

…activity_stream

jdstuart · 2022-02-15T20:56:55Z

When trying to debug the test in VS Code I get the following Debug Output:

Starting: /Users/jstuart/go/bin/dlv dap --check-go-version=false --listen=127.0.0.1:59554 --log-dest=3 from /Users/jstuart/dev_experimental/terraform-provider-aws/terraform-provider-aws/internal/service/rds
DAP server listening at: 127.0.0.1:59554
PASS
Process 35839 has exited with status 0
Detaching
dlv dap (35208) exited with code: 0

The debugger is attached and hit one of the breakpoints but when I continue it will just exit the process and detach.

jdstuart · 2022-02-16T17:45:19Z

@DrFaust92 code is ready again for review.

Results from Acceptance Tests

make testacc TESTS=TestAccAWSRDSClusterActivityStream PKG=rds
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/rds/... -v -count 1 -parallel 20 -run='TestAccAWSRDSClusterActivityStream'  -timeout 180m
=== RUN   TestAccAWSRDSClusterActivityStream_basic
=== PAUSE TestAccAWSRDSClusterActivityStream_basic
=== RUN   TestAccAWSRDSClusterActivityStream_disappears
=== PAUSE TestAccAWSRDSClusterActivityStream_disappears
=== CONT  TestAccAWSRDSClusterActivityStream_basic
=== CONT  TestAccAWSRDSClusterActivityStream_disappears
--- PASS: TestAccAWSRDSClusterActivityStream_basic (1522.06s)
--- PASS: TestAccAWSRDSClusterActivityStream_disappears (1605.99s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/rds	1608.051s

…activity_stream

johnsonaj · 2022-04-06T16:44:49Z

LGTM 🚀

% make testacc TESTS=TestAccAWSRDSClusterActivityStream_ PKG=rds
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go test ./internal/service/rds/... -v -count 1 -parallel 20 -run='TestAccAWSRDSClusterActivityStream_'  -timeout 180m
=== RUN   TestAccAWSRDSClusterActivityStream_basic
=== PAUSE TestAccAWSRDSClusterActivityStream_basic
=== RUN   TestAccAWSRDSClusterActivityStream_disappears
=== PAUSE TestAccAWSRDSClusterActivityStream_disappears
=== CONT  TestAccAWSRDSClusterActivityStream_basic
=== CONT  TestAccAWSRDSClusterActivityStream_disappears
--- PASS: TestAccAWSRDSClusterActivityStream_basic (1515.37s)
--- PASS: TestAccAWSRDSClusterActivityStream_disappears (1613.83s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/rds	1615.716s

johnsonaj · 2022-04-06T16:58:22Z

@jdstuart Thanks for the contribution 🎉 .

github-actions · 2022-04-07T22:37:36Z

This functionality has been released in v4.9.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. Thank you!

github-actions · 2022-05-08T02:32:14Z

I'm going to lock this pull request because it has been closed for 30 days ⏳. This helps our maintainers find and focus on the active issues.
If you have found a problem that seems related to this change, please open a new issue and complete the issue template so we can capture all the details necessary to investigate further.

Fedomn and others added 29 commits May 13, 2021 16:00

Add resource: aws_rds_cluster_activity_stream

3836feb

fix awsproviderlint and terrafmt checked issues

c36565b

rename arn to resource_arn to align with API naming

591bcb3

add ValidateFunc for resource_arn

7b99331

use enums ActivityStreamMode

1277b03

use testAccCheckResourceDisappears instead of custom logic

e7e5347

move all waiter functions and logic to internal rds package

0b456f7

use RandomWithPrefix instead of building a string

20891dd

use TestCheckResourceAttrPair to compare resources used

c612054

fix dangling resources error when resource disappear

8eb244e

remove apply_immediately in arguments

21ce864

upgrade terraform-plugin-sdk to v2

2163bdb

use tfawserr to replace awserr

56be708

fix terrafmt and markdown-lint errors

823e3f2

fix validate-terraform errors

abcadf4

add ErrorCheck and fix doc code block language

4be2a82

add rds cluster activity stream resource

776a061

add rds cluster activity stream resource

fa03d06

update documentation for and register as a resource

3b78253

Merge remote-tracking branch 'hashicorp/main' into f-aws_rds_cluster_…

0569c3a

…activity_stream

fix bug in wait code

b8f7c5b

remove Timing from resource

34d0891

add lookup by DB Cluster ARN

65e70fd

remove debug print statements

b4a60e9

update test to use acctest.ConfigCompose

d8be772

update test to use acctest.ConfigCompose

06a73e0

update acceptance test

a50be24

Merge remote-tracking branch 'hashicorp/main' into f-aws_rds_cluster_…

fbfff0a

…activity_stream

update docs

3188405

github-actions bot added the needs-triage Waiting for first response or review from a maintainer. label Dec 7, 2021

jdstuart added 6 commits February 5, 2022 11:52

remove test and use instead of

13551b9

remove tests and

cea2b8c

remove unused functions

139e5e9

update website documentation. add input variable

91f8a47

made engine_native_audit_fields_included optional

cd36d20

Merge remote-tracking branch 'hashicorp/main' into f-aws_rds_cluster_…

fa5c677

…activity_stream

DrFaust92 suggested changes Feb 11, 2022

View reviewed changes

Merge remote-tracking branch 'hashicorp/main' into f-aws_rds_cluster_…

3a36e79

…activity_stream

fixed acceptance tests

14d11b5

github-actions bot added the sweeper Pertains to changes to or issues with the sweeper. label Feb 15, 2022

fixed acceptance tests

9e3d885

jdstuart added 2 commits February 19, 2022 08:47

Merge remote-tracking branch 'hashicorp/main' into f-aws_rds_cluster_…

b819118

…activity_stream

fix semgrep errors

ad54701

johnsonaj self-requested a review April 5, 2022 18:32

johnsonaj added 4 commits April 5, 2022 13:46

resolve merge conflicts

0aa0d33

r/aws_rds_cluster_activity_stream: add to provider

864d85b

r/aws_rds_cluster_activity_stream: minor changes to finder

af4c2fd

docs: update to include avaiable regions

ca4093e

johnsonaj approved these changes Apr 6, 2022

View reviewed changes

johnsonaj merged commit 44e1ff4 into hashicorp:main Apr 6, 2022

github-actions bot added this to the v4.9.0 milestone Apr 6, 2022

github-actions bot locked as resolved and limited conversation to collaborators May 8, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

New Resource aws_rds_cluster_activity_stream #22097

New Resource aws_rds_cluster_activity_stream #22097

jdstuart commented Dec 7, 2021 •

edited

Loading

jdstuart commented Feb 11, 2022

DrFaust92 Feb 11, 2022

jdstuart Feb 15, 2022

DrFaust92 Feb 11, 2022

jdstuart Feb 13, 2022

DrFaust92 Feb 11, 2022

jdstuart Feb 15, 2022

DrFaust92 commented Feb 11, 2022

jdstuart commented Feb 15, 2022

jdstuart commented Feb 16, 2022

johnsonaj commented Apr 6, 2022

johnsonaj commented Apr 6, 2022

github-actions bot commented Apr 7, 2022

github-actions bot commented May 8, 2022

New Resource aws_rds_cluster_activity_stream #22097

New Resource aws_rds_cluster_activity_stream #22097

Conversation

jdstuart commented Dec 7, 2021 • edited Loading

Community Note

jdstuart commented Feb 11, 2022

DrFaust92 Feb 11, 2022

Choose a reason for hiding this comment

jdstuart Feb 15, 2022

Choose a reason for hiding this comment

DrFaust92 Feb 11, 2022

Choose a reason for hiding this comment

jdstuart Feb 13, 2022

Choose a reason for hiding this comment

DrFaust92 Feb 11, 2022

Choose a reason for hiding this comment

jdstuart Feb 15, 2022

Choose a reason for hiding this comment

DrFaust92 commented Feb 11, 2022

jdstuart commented Feb 15, 2022

jdstuart commented Feb 16, 2022

johnsonaj commented Apr 6, 2022

johnsonaj commented Apr 6, 2022

github-actions bot commented Apr 7, 2022

github-actions bot commented May 8, 2022

jdstuart commented Dec 7, 2021 •

edited

Loading