TimestreamInfluxDB DB instance add more updatable arguments #7
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -96,6 +96,57 @@ func TestAccTimestreamInfluxDBDBInstance_disappears(t *testing.T) { | |
| }) | ||
| } | ||
|
|
||
| func TestAccTimestreamInfluxDBDBInstance_dbInstanceType(t *testing.T) { | ||
| ctx := acctest.Context(t) | ||
| if testing.Short() { | ||
| t.Skip("skipping long-running test in short mode") | ||
| } | ||
|
|
||
| var dbInstance1, dbInstance2 timestreaminfluxdb.GetDbInstanceOutput | ||
| rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) | ||
| resourceName := "aws_timestreaminfluxdb_db_instance.test" | ||
|
|
||
| resource.ParallelTest(t, resource.TestCase{ | ||
| PreCheck: func() { | ||
| acctest.PreCheck(ctx, t) | ||
| testAccPreCheck(ctx, t) | ||
| }, | ||
| ErrorCheck: acctest.ErrorCheck(t, names.TimestreamInfluxDBServiceID), | ||
| ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories, | ||
| CheckDestroy: testAccCheckDBInstanceDestroy(ctx), | ||
| Steps: []resource.TestStep{ | ||
| { | ||
| Config: testAccDBInstanceConfig_dbInstanceType(rName, string(awstypes.DbInstanceTypeDbInfluxMedium)), | ||
| Check: resource.ComposeTestCheckFunc( | ||
| testAccCheckDBInstanceExists(ctx, resourceName, &dbInstance1), | ||
| resource.TestCheckResourceAttr(resourceName, "db_instance_type", string(awstypes.DbInstanceTypeDbInfluxMedium)), | ||
| ), | ||
| }, | ||
| { | ||
| ResourceName: resourceName, | ||
| ImportState: true, | ||
| ImportStateVerify: true, | ||
| ImportStateVerifyIgnore: []string{names.AttrBucket, names.AttrUsername, names.AttrPassword, "organization"}, | ||
| }, | ||
| { | ||
| Config: testAccDBInstanceConfig_dbInstanceType(rName, string(awstypes.DbInstanceTypeDbInfluxLarge)), | ||
| Check: resource.ComposeTestCheckFunc( | ||
| testAccCheckDBInstanceExists(ctx, resourceName, &dbInstance2), | ||
| testAccCheckDBInstanceNotRecreated(&dbInstance1, &dbInstance2), | ||
| testAccCheckDBInstanceExists(ctx, resourceName, &dbInstance2), | ||
| resource.TestCheckResourceAttr(resourceName, "db_instance_type", string(awstypes.DbInstanceTypeDbInfluxLarge)), | ||
| ), | ||
| }, | ||
| { | ||
| ResourceName: resourceName, | ||
| ImportState: true, | ||
| ImportStateVerify: true, | ||
| ImportStateVerifyIgnore: []string{names.AttrBucket, names.AttrUsername, names.AttrPassword, "organization"}, | ||
| }, | ||
| }, | ||
| }) | ||
| } | ||
|
|
||
| func TestAccTimestreamInfluxDBDBInstance_logDeliveryConfiguration(t *testing.T) { | ||
| ctx := acctest.Context(t) | ||
| if testing.Short() { | ||
|
|
@@ -140,6 +191,12 @@ func TestAccTimestreamInfluxDBDBInstance_logDeliveryConfiguration(t *testing.T) | |
| resource.TestCheckResourceAttr(resourceName, "log_delivery_configuration.0.s3_configuration.0.enabled", acctest.CtFalse), | ||
| ), | ||
| }, | ||
| { | ||
| ResourceName: resourceName, | ||
| ImportState: true, | ||
| ImportStateVerify: true, | ||
| ImportStateVerifyIgnore: []string{names.AttrBucket, names.AttrUsername, names.AttrPassword, "organization"}, | ||
| }, | ||
| }, | ||
| }) | ||
| } | ||
|
|
@@ -181,13 +238,13 @@ func TestAccTimestreamInfluxDBDBInstance_publiclyAccessible(t *testing.T) { | |
| }) | ||
| } | ||
|
|
||
| func TestAccTimestreamInfluxDBDBInstance_deploymentType(t *testing.T) { | ||
| ctx := acctest.Context(t) | ||
| if testing.Short() { | ||
| t.Skip("skipping long-running test in short mode") | ||
| } | ||
|
|
||
| var dbInstance1, dbInstance2 timestreaminfluxdb.GetDbInstanceOutput | ||
| rName := sdkacctest.RandomWithPrefix(acctest.ResourcePrefix) | ||
| resourceName := "aws_timestreaminfluxdb_db_instance.test" | ||
|
|
||
|
|
@@ -201,9 +258,9 @@ func TestAccTimestreamInfluxDBDBInstance_deploymentTypeMultiAzStandby(t *testing | |
| CheckDestroy: testAccCheckDBInstanceDestroy(ctx), | ||
| Steps: []resource.TestStep{ | ||
| { | ||
| Config: testAccDBInstanceConfig_deploymentType(rName, string(awstypes.DeploymentTypeWithMultiazStandby)), | ||
| Check: resource.ComposeTestCheckFunc( | ||
| testAccCheckDBInstanceExists(ctx, resourceName, &dbInstance1), | ||
| // DB instance will not be publicly accessible and will not have an endpoint. | ||
| // DB instance will have a secondary availability zone. | ||
| resource.TestCheckResourceAttrSet(resourceName, "secondary_availability_zone"), | ||
|
|
@@ -216,6 +273,21 @@ func TestAccTimestreamInfluxDBDBInstance_deploymentTypeMultiAzStandby(t *testing | |
| ImportStateVerify: true, | ||
| ImportStateVerifyIgnore: []string{names.AttrBucket, names.AttrUsername, names.AttrPassword, "organization"}, | ||
| }, | ||
| { | ||
| Config: testAccDBInstanceConfig_deploymentType(rName, string(awstypes.DeploymentTypeSingleAz)), | ||
| Check: resource.ComposeTestCheckFunc( | ||
| testAccCheckDBInstanceExists(ctx, resourceName, &dbInstance2), | ||
| testAccCheckDBInstanceNotRecreated(&dbInstance1, &dbInstance2), | ||
| resource.TestCheckResourceAttr(resourceName, "secondary_availability_zone", ""), | ||
| resource.TestCheckResourceAttr(resourceName, "deployment_type", string(awstypes.DeploymentTypeSingleAz)), | ||
| ), | ||
| }, | ||
| { | ||
| ResourceName: resourceName, | ||
| ImportState: true, | ||
| ImportStateVerify: true, | ||
| ImportStateVerifyIgnore: []string{names.AttrBucket, names.AttrUsername, names.AttrPassword, "organization"}, | ||
| }, | ||
| }, | ||
| }) | ||
| } | ||
|
|
@@ -313,12 +385,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)) | ||
| } | ||
|
|
||
| func testAccDBInstanceConfig_dbInstanceType(rName string, instanceType string) string { | ||
| return acctest.ConfigCompose(testAccDBInstanceConfig_base(rName, 1), fmt.Sprintf(` | ||
| resource "aws_timestreaminfluxdb_db_instance" "test" { | ||
| name = %[1]q | ||
| allocated_storage = 20 | ||
| username = "admin" | ||
| password = "testpassword" | ||
| vpc_subnet_ids = aws_subnet.test[*].id | ||
| vpc_security_group_ids = [aws_security_group.test.id] | ||
| db_instance_type = %[2]q | ||
| port = 8086 | ||
| bucket = "initial" | ||
| organization = "organization" | ||
| } | ||
| `, rName, instanceType)) | ||
| } | ||
|
|
||
| // Configuration with log_delivery_configuration set and enabled. | ||
| func testAccDBInstanceConfig_logDeliveryConfigurationEnabled(rName string, enabled bool) string { | ||
| return acctest.ConfigCompose(testAccDBInstanceConfig_base(rName, 1), fmt.Sprintf(` | ||
|
|
@@ -354,6 +444,7 @@ resource "aws_timestreaminfluxdb_db_instance" "test" { | |
| vpc_security_group_ids = [aws_security_group.test.id] | ||
| db_instance_type = "db.influx.medium" | ||
| publicly_accessible = false | ||
| port = 8086 | ||
| bucket = "initial" | ||
| organization = "organization" | ||
|
|
||
|
|
@@ -407,7 +498,7 @@ resource "aws_timestreaminfluxdb_db_instance" "test" { | |
| `, rName)) | ||
| } | ||
|
|
||
| func testAccDBInstanceConfig_deploymentType(rName string, deploymentType string) string { | ||
| return acctest.ConfigCompose(testAccDBInstanceConfig_base(rName, 2), fmt.Sprintf(` | ||
| resource "aws_timestreaminfluxdb_db_instance" "test" { | ||
| name = %[1]q | ||
|
|
@@ -421,7 +512,7 @@ resource "aws_timestreaminfluxdb_db_instance" "test" { | |
| bucket = "initial" | ||
| organization = "organization" | ||
|
|
||
| deployment_type = %[2]q | ||
| } | ||
| `, rName, deploymentType)) | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ | |
| // SPDX-License-Identifier: MPL-2.0 | ||
|
|
||
| //go:generate go run ../../generate/servicepackage/main.go | ||
| //go:generate go run ../../generate/tags/main.go -KVTValues -ListTags -ServiceTagsMap -UpdateTags -CreateTags | ||
| //go:generate go run ../../generate/tagstests/main.go | ||
| // ONLY generate directives and package declaration! Do not add anything else to this file. | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -21,6 +21,7 @@ resource "aws_timestreaminfluxdb_db_instance" "example" { | |
| db_instance_type = "db.influx.medium" | ||
| username = "admin" | ||
| password = "example-password" | ||
| port = 8086 | ||
| organization = "organization" | ||
| vpc_subnet_ids = [aws_subnet.exampleid] | ||
| vpc_security_group_ids = [aws_security_group.example.id] | ||
|
|
@@ -132,7 +133,8 @@ You can use an S3 bucket to store logs generated by your Timestream for InfluxDB | |
|
|
||
| ```terraform | ||
| resource "aws_s3_bucket" "example" { | ||
| bucket = "example-s3-bucket" | ||
| force_destroy = true | ||
| } | ||
|
|
||
| data "aws_iam_policy_document" "example" { | ||
|
|
@@ -166,7 +168,7 @@ resource "aws_timestreaminfluxdb_db_instance" "example" { | |
|
|
||
| log_delivery_configuration { | ||
| s3_configuration { | ||
| bucket_name = aws_s3_bucket.example.bucket | ||
| enabled = true | ||
| } | ||
| } | ||
|
|
@@ -213,6 +215,7 @@ The following arguments are required: | |
| * `db_instance_type` - (Required) Timestream for InfluxDB DB instance type to run InfluxDB on. Valid options are: `"db.influx.medium"`, `"db.influx.large"`, `"db.influx.xlarge"`, `"db.influx.2xlarge"`, `"db.influx.4xlarge"`, `"db.influx.8xlarge"`, `"db.influx.12xlarge"`, and `"db.influx.16xlarge"`. | ||
| * `name` - (Required) Name that uniquely identifies the DB instance when interacting with the Amazon Timestream for InfluxDB API and CLI commands. This name will also be a prefix included in the endpoint. DB instance names must be unique per customer and per region. The argument must start with a letter, cannot contain consecutive hyphens (`-`) and cannot end with a hyphen. | ||
| * `password` - (Required) Password of the initial admin user created in InfluxDB. This password will allow you to access the InfluxDB UI to perform various administrative tasks and also use the InfluxDB CLI to create an operator token. Along with `bucket`, `username`, and `organization`, this argument will be stored in the secret referred to by the `influx_auth_parameters_secret_arn` attribute. | ||
| * `port` - (Default `8086`) The port on which the instance accepts connections. Valid values: 1024-65535. Cannot be 2375-2376, 7788-7799, 8090, or 51678-51680. | ||
| * `organization` - (Required) Name of the initial organization for the initial admin user in InfluxDB. An InfluxDB organization is a workspace for a group of users. Along with `bucket`, `username`, and `password`, this argument will be stored in the secret referred to by the `influx_auth_parameters_secret_arn` attribute. | ||
| * `username` - (Required) Username of the initial admin user created in InfluxDB. Must start with a letter and can't end with a hyphen or contain two consecutive hyphens. This username will allow you to access the InfluxDB UI to perform various administrative tasks and also use the InfluxDB CLI to create an operator token. Along with `bucket`, `organization`, and `password`, this argument will be stored in the secret referred to by the `influx_auth_parameters_secret_arn` attribute. | ||
| * `vpc_security_group_ids` - (Required) List of VPC security group IDs to associate with the DB instance. | ||
|
|
@@ -238,7 +241,7 @@ The following arguments are optional: | |
| * `bucket_name` - (Required) Name of the S3 bucket to deliver logs to. | ||
| * `enabled` - (Required) Indicates whether log delivery to the S3 bucket is enabled. | ||
|
|
||
| **Note**: The following arguments do updates in-place: `db_parameter_group_identifier`, `log_delivery_configuration`, `port`, `deployment_type`, `db_instance_type`, and `tags`. Changes to any other argument after a DB instance has been deployed will cause destruction and re-creation of the DB instance. Additionally, when `db_parameter_group_identifier` is added to a DB instance or modified, the DB instance will be updated in-place but if `db_parameter_group_identifier` is removed from a DB instance, the DB instance will be destroyed and re-created. | ||
|
|
||
| ## Attribute Reference | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
would it be redundant to add default here as well?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It would be redundant, the port defaults to
8086anyways when creating an instance.