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

Add new arguments from CreateDbInstance and UpdateDbInstance #40661

Draft
wants to merge 11 commits into
base: main
Choose a base branch
from
Draft

Add new arguments from CreateDbInstance and UpdateDbInstance #40661

wants to merge 11 commits into from
+353 −25

Conversation

trevorbonas
Copy link
Contributor

@trevorbonas trevorbonas commented Dec 20, 2024 •
edited
Loading

Description

  • network_type added as an argument, adding IPv6 support.
  • port added as an argument.
  • deployment_type is now updatable.
    • An update step has been added to TestAccTimestreamInfluxDBDBInstance_deploymentType.
  • db_instance_type is now updatable.
    • The test TestAccTimestreamInfluxDBDBInstance_dbInstanceType has been added with an update step.
  • flex.Expand is no longer used in Update to populate an UpdateDbInstanceInput struct. This is because a ValidationException will occur when a DB instance is updated with configuration values it already uses.
  • In Update, if secondary_availability_zone is left as unknown, it is set to its previous value. secondary_availability_zone can be left as unknown when tags are updated, which causes an error.
  • secondary_availability_zone uses the default value of nil. While unconventional, this prevents an error when updating deployment_type. secondary_availability_zone's value is directly a result of the value of deployment_type.
  • awstypes.StatusDeleted has been added as a pending state in waitDBInstanceDeleted. This is because DB instances are first given the status "DELETED" before becoming unreachable. This status is not consistent. Using this status as a target status leads to flaky tests. Using this status as a pending status means Terraform will wait until the instance is unreachable.
  • An error in the website documentation for creating an instance with S3 log delivery configuration has been fixed.

Relations

N/A.

References

Updated UpdateDbInstanceInput struct documentation.

Output from Acceptance Testing

% make testacc TESTS=TestAccTimestreamInfluxDBDBInstance PKG=timestreaminfluxdb ACCTEST_PARALLELISM=1 ACCTEST_TIMEOUT=1440m
make: Verifying source code with gofmt...
==> Checking that code complies with gofmt requirements...
TF_ACC=1 go1.23.3 test ./internal/service/timestreaminfluxdb/... -v -count 1 -parallel 1 -run='TestAccTimestreamInfluxDBDBInstance'  -timeout 1440m
2025/01/17 23:35:47 Initializing Terraform AWS Provider...
=== RUN   TestAccTimestreamInfluxDBDBInstance_tags
=== PAUSE TestAccTimestreamInfluxDBDBInstance_tags
=== RUN   TestAccTimestreamInfluxDBDBInstance_tags_null
=== PAUSE TestAccTimestreamInfluxDBDBInstance_tags_null
=== RUN   TestAccTimestreamInfluxDBDBInstance_tags_EmptyMap
=== PAUSE TestAccTimestreamInfluxDBDBInstance_tags_EmptyMap
=== RUN   TestAccTimestreamInfluxDBDBInstance_tags_AddOnUpdate
=== PAUSE TestAccTimestreamInfluxDBDBInstance_tags_AddOnUpdate
=== RUN   TestAccTimestreamInfluxDBDBInstance_tags_EmptyTag_OnCreate
=== PAUSE TestAccTimestreamInfluxDBDBInstance_tags_EmptyTag_OnCreate
=== RUN   TestAccTimestreamInfluxDBDBInstance_tags_EmptyTag_OnUpdate_Add
=== PAUSE TestAccTimestreamInfluxDBDBInstance_tags_EmptyTag_OnUpdate_Add
=== RUN   TestAccTimestreamInfluxDBDBInstance_tags_EmptyTag_OnUpdate_Replace
=== PAUSE TestAccTimestreamInfluxDBDBInstance_tags_EmptyTag_OnUpdate_Replace
=== RUN   TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_providerOnly
=== PAUSE TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_providerOnly
=== RUN   TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_nonOverlapping
=== PAUSE TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_nonOverlapping
=== RUN   TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_overlapping
=== PAUSE TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_overlapping
=== RUN   TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_updateToProviderOnly
=== PAUSE TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_updateToProviderOnly
=== RUN   TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_updateToResourceOnly
=== PAUSE TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_updateToResourceOnly
=== RUN   TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_emptyResourceTag
=== PAUSE TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_emptyResourceTag
=== RUN   TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_emptyProviderOnlyTag
=== PAUSE TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_emptyProviderOnlyTag
=== RUN   TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_nullOverlappingResourceTag
=== PAUSE TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_nullOverlappingResourceTag
=== RUN   TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_nullNonOverlappingResourceTag
=== PAUSE TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_nullNonOverlappingResourceTag
=== RUN   TestAccTimestreamInfluxDBDBInstance_tags_ComputedTag_OnCreate
=== PAUSE TestAccTimestreamInfluxDBDBInstance_tags_ComputedTag_OnCreate
=== RUN   TestAccTimestreamInfluxDBDBInstance_tags_ComputedTag_OnUpdate_Add
=== PAUSE TestAccTimestreamInfluxDBDBInstance_tags_ComputedTag_OnUpdate_Add
=== RUN   TestAccTimestreamInfluxDBDBInstance_tags_ComputedTag_OnUpdate_Replace
=== PAUSE TestAccTimestreamInfluxDBDBInstance_tags_ComputedTag_OnUpdate_Replace
=== RUN   TestAccTimestreamInfluxDBDBInstance_tags_IgnoreTags_Overlap_DefaultTag
=== PAUSE TestAccTimestreamInfluxDBDBInstance_tags_IgnoreTags_Overlap_DefaultTag
=== RUN   TestAccTimestreamInfluxDBDBInstance_tags_IgnoreTags_Overlap_ResourceTag
=== PAUSE TestAccTimestreamInfluxDBDBInstance_tags_IgnoreTags_Overlap_ResourceTag
=== RUN   TestAccTimestreamInfluxDBDBInstance_basic
=== PAUSE TestAccTimestreamInfluxDBDBInstance_basic
=== RUN   TestAccTimestreamInfluxDBDBInstance_disappears
=== PAUSE TestAccTimestreamInfluxDBDBInstance_disappears
=== RUN   TestAccTimestreamInfluxDBDBInstance_dbInstanceType
=== PAUSE TestAccTimestreamInfluxDBDBInstance_dbInstanceType
=== RUN   TestAccTimestreamInfluxDBDBInstance_logDeliveryConfiguration
=== PAUSE TestAccTimestreamInfluxDBDBInstance_logDeliveryConfiguration
=== RUN   TestAccTimestreamInfluxDBDBInstance_networkType
=== PAUSE TestAccTimestreamInfluxDBDBInstance_networkType
=== RUN   TestAccTimestreamInfluxDBDBInstance_port
=== PAUSE TestAccTimestreamInfluxDBDBInstance_port
=== RUN   TestAccTimestreamInfluxDBDBInstance_publiclyAccessible
=== PAUSE TestAccTimestreamInfluxDBDBInstance_publiclyAccessible
=== RUN   TestAccTimestreamInfluxDBDBInstance_deploymentType
=== PAUSE TestAccTimestreamInfluxDBDBInstance_deploymentType
=== CONT  TestAccTimestreamInfluxDBDBInstance_tags
--- PASS: TestAccTimestreamInfluxDBDBInstance_tags (1270.66s)
=== CONT  TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_nullNonOverlappingResourceTag
--- PASS: TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_nullNonOverlappingResourceTag (1084.05s)
=== CONT  TestAccTimestreamInfluxDBDBInstance_deploymentType
--- PASS: TestAccTimestreamInfluxDBDBInstance_deploymentType (1350.96s)
=== CONT  TestAccTimestreamInfluxDBDBInstance_publiclyAccessible
--- PASS: TestAccTimestreamInfluxDBDBInstance_publiclyAccessible (1230.57s)
=== CONT  TestAccTimestreamInfluxDBDBInstance_port
--- PASS: TestAccTimestreamInfluxDBDBInstance_port (1236.86s)
=== CONT  TestAccTimestreamInfluxDBDBInstance_networkType
--- PASS: TestAccTimestreamInfluxDBDBInstance_networkType (2513.05s)
=== CONT  TestAccTimestreamInfluxDBDBInstance_logDeliveryConfiguration
--- PASS: TestAccTimestreamInfluxDBDBInstance_logDeliveryConfiguration (1437.57s)
=== CONT  TestAccTimestreamInfluxDBDBInstance_dbInstanceType
--- PASS: TestAccTimestreamInfluxDBDBInstance_dbInstanceType (1396.14s)
=== CONT  TestAccTimestreamInfluxDBDBInstance_disappears
--- PASS: TestAccTimestreamInfluxDBDBInstance_disappears (906.57s)
=== CONT  TestAccTimestreamInfluxDBDBInstance_basic
--- PASS: TestAccTimestreamInfluxDBDBInstance_basic (1056.80s)
=== CONT  TestAccTimestreamInfluxDBDBInstance_tags_IgnoreTags_Overlap_ResourceTag
--- PASS: TestAccTimestreamInfluxDBDBInstance_tags_IgnoreTags_Overlap_ResourceTag (1059.97s)
=== CONT  TestAccTimestreamInfluxDBDBInstance_tags_IgnoreTags_Overlap_DefaultTag
--- PASS: TestAccTimestreamInfluxDBDBInstance_tags_IgnoreTags_Overlap_DefaultTag (1154.99s)
=== CONT  TestAccTimestreamInfluxDBDBInstance_tags_ComputedTag_OnUpdate_Replace
--- PASS: TestAccTimestreamInfluxDBDBInstance_tags_ComputedTag_OnUpdate_Replace (949.01s)
=== CONT  TestAccTimestreamInfluxDBDBInstance_tags_ComputedTag_OnUpdate_Add
--- PASS: TestAccTimestreamInfluxDBDBInstance_tags_ComputedTag_OnUpdate_Add (1210.80s)
=== CONT  TestAccTimestreamInfluxDBDBInstance_tags_ComputedTag_OnCreate
--- PASS: TestAccTimestreamInfluxDBDBInstance_tags_ComputedTag_OnCreate (1155.51s)
=== CONT  TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_nonOverlapping
--- PASS: TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_nonOverlapping (1266.60s)
=== CONT  TestAccTimestreamInfluxDBDBInstance_tags_EmptyTag_OnCreate
--- PASS: TestAccTimestreamInfluxDBDBInstance_tags_EmptyTag_OnCreate (1159.08s)
=== CONT  TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_providerOnly
--- PASS: TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_providerOnly (855.87s)
=== CONT  TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_nullOverlappingResourceTag
--- PASS: TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_nullOverlappingResourceTag (1042.87s)
=== CONT  TestAccTimestreamInfluxDBDBInstance_tags_EmptyTag_OnUpdate_Replace
--- PASS: TestAccTimestreamInfluxDBDBInstance_tags_EmptyTag_OnUpdate_Replace (1147.77s)
=== CONT  TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_emptyProviderOnlyTag
--- PASS: TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_emptyProviderOnlyTag (1098.21s)
=== CONT  TestAccTimestreamInfluxDBDBInstance_tags_EmptyTag_OnUpdate_Add
--- PASS: TestAccTimestreamInfluxDBDBInstance_tags_EmptyTag_OnUpdate_Add (1150.15s)
=== CONT  TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_emptyResourceTag
--- PASS: TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_emptyResourceTag (896.93s)
=== CONT  TestAccTimestreamInfluxDBDBInstance_tags_EmptyMap
--- PASS: TestAccTimestreamInfluxDBDBInstance_tags_EmptyMap (1018.25s)
=== CONT  TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_updateToResourceOnly
--- PASS: TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_updateToResourceOnly (1089.12s)
=== CONT  TestAccTimestreamInfluxDBDBInstance_tags_AddOnUpdate
--- PASS: TestAccTimestreamInfluxDBDBInstance_tags_AddOnUpdate (1108.62s)
=== CONT  TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_updateToProviderOnly
--- PASS: TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_updateToProviderOnly (1191.17s)
=== CONT  TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_overlapping
--- PASS: TestAccTimestreamInfluxDBDBInstance_tags_DefaultTags_overlapping (1201.35s)
=== CONT  TestAccTimestreamInfluxDBDBInstance_tags_null
--- PASS: TestAccTimestreamInfluxDBDBInstance_tags_null (1251.49s)
PASS
ok  	github.com/hashicorp/terraform-provider-aws/internal/service/timestreaminfluxdb	34496.089s

@trevorbonas trevorbonas requested a review from a team as a code owner December 20, 2024 16:29
@github-actions GitHub Actions
Copy link

Community Note

Voting for Prioritization

  • Please vote on this pull request by adding a 👍 reaction to the original post to help the community and maintainers prioritize this pull request.
  • Please see our prioritization guide for information on how we prioritize.
  • Please do not leave "+1" or other comments that do not add relevant new information or questions, they generate extra noise for issue followers and do not help prioritize the request.

For Submitters

  • Review the contribution guide relating to the type of change you are making to ensure all of the necessary steps have been taken.
  • For new resources and data sources, use skaff to generate scaffolding with comments detailing common expectations.
  • Whether or not the branch has been rebased will not impact prioritization, but doing so is always a welcome surprise.

@github-actions github-actions bot added documentation Introduces or discusses updates to documentation. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure. tags Pertains to resource tagging. generators Relates to code generators. service/timestreaminfluxdb Issues and PRs that pertain to the timestreaminfluxdb service. needs-triage Waiting for first response or review from a maintainer. labels Dec 20, 2024
@justinretzolk justinretzolk added enhancement Requests to existing resources that expand the functionality or scope. and removed needs-triage Waiting for first response or review from a maintainer. labels Jan 9, 2025
sasidhar-aws
sasidhar-aws reviewed Jan 16, 2025
View reviewed changes
internal/service/timestreaminfluxdb/db_instance_test.go
@@ -313,12 +387,30 @@ resource "aws_timestreaminfluxdb_db_instance" "test" {
vpc_subnet_ids = aws_subnet.test[*].id
vpc_security_group_ids = [aws_security_group.test.id]
db_instance_type = "db.influx.medium"
port = 8086
bucket = "initial"
organization = "organization"
}
`, rName))
}

Copy link
Contributor

Choose a reason for hiding this comment

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

Testcases to include network_type and port parameters are not available. Please add test case with network_type and port parameters.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

There are now tests for port and network_type. Test output has been updated.

@trevorbonas trevorbonas marked this pull request as draft January 23, 2025 18:02
@trevorbonas
Copy link
Contributor Author

trevorbonas commented Jan 23, 2025 •
edited
Loading

This PR has been converted to a draft since the AWS SDK for Go v2 will receive new features for Timestream for InfluxDB this week, which will be integrated into this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sasidhar-aws sasidhar-aws sasidhar-aws left review comments

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
Labels
documentation Introduces or discusses updates to documentation. enhancement Requests to existing resources that expand the functionality or scope. generators Relates to code generators. service/timestreaminfluxdb Issues and PRs that pertain to the timestreaminfluxdb service. tags Pertains to resource tagging. tests PRs: expanded test coverage. Issues: expanded coverage, enhancements to test infrastructure.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@trevorbonas @sasidhar-aws @justinretzolk