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

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0175e89
Add Port and make DBInstanceType and DeploymentType updatable
trevorbonas Dec 9, 2024
5ec3fb9
Add tests for updatable db_instance_type and deployment_type
trevorbonas Dec 11, 2024
9a2f3b6
Update documentation
trevorbonas Dec 11, 2024
05ddc93
Set secondary_availability_zone to previous value if unknown
trevorbonas Dec 17, 2024
87e603d
Merge branch 'main' of github.com:trevorbonas/terraform-provider-aws …
trevorbonas Dec 17, 2024
4507de5
Add comment for unknown value for SecondaryAvailabilityZone in Update
trevorbonas Dec 18, 2024
83b735e
Add network_type as argument and better handle port
trevorbonas Dec 19, 2024
2b67a59
Use names.AttrPort for "port" in test
trevorbonas Dec 20, 2024
3ae8274
Add tests for port and network_type
trevorbonas Jan 19, 2025
fab078d
Fix linting errors for new tests
trevorbonas Jan 19, 2025
7dedaf7
Fix test name formatting
trevorbonas Jan 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
91 changes: 76 additions & 15 deletions internal/service/timestreaminfluxdb/db_instance.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package timestreaminfluxdb
import (
"context"
"errors"
"math"
"time"

"github.com/YakDriver/regexache"
Expand Down Expand Up @@ -105,11 +106,8 @@ func (r *resourceDBInstance) Schema(ctx context.Context, req resource.SchemaRequ
that each data point persists). A bucket belongs to an organization.`,
},
"db_instance_type": schema.StringAttribute{
CustomType: fwtypes.StringEnumType[awstypes.DbInstanceType](),
Required: true,
PlanModifiers: []planmodifier.String{
stringplanmodifier.RequiresReplace(),
},
CustomType: fwtypes.StringEnumType[awstypes.DbInstanceType](),
Required: true,
Description: `The Timestream for InfluxDB DB instance type to run InfluxDB on.`,
},
"db_parameter_group_identifier": schema.StringAttribute{
Expand Down Expand Up @@ -146,7 +144,6 @@ func (r *resourceDBInstance) Schema(ctx context.Context, req resource.SchemaRequ
Optional: true,
Computed: true,
PlanModifiers: []planmodifier.String{
stringplanmodifier.RequiresReplace(),
stringplanmodifier.UseStateForUnknown(),
},
Description: `Specifies whether the DB instance will be deployed as a standalone instance or
Expand Down Expand Up @@ -187,6 +184,18 @@ func (r *resourceDBInstance) Schema(ctx context.Context, req resource.SchemaRequ
prefix included in the endpoint. DB instance names must be unique per customer
and per region.`,
},
"network_type": schema.StringAttribute{
CustomType: fwtypes.StringEnumType[awstypes.NetworkType](),
Optional: true,
Computed: true,
PlanModifiers: []planmodifier.String{
stringplanmodifier.RequiresReplace(),
stringplanmodifier.UseStateForUnknown(),
},
Description: `Specifies whether the networkType of the Timestream for InfluxDB instance is
IPV4, which can communicate over IPv4 protocol only, or DUAL, which can communicate
over both IPv4 and IPv6 protocols.`,
},
names.AttrTags: tftags.TagsAttribute(),
names.AttrTagsAll: tftags.TagsAttributeComputedOnly(),
"organization": schema.StringAttribute{
Expand Down Expand Up @@ -215,6 +224,18 @@ func (r *resourceDBInstance) Schema(ctx context.Context, req resource.SchemaRequ
also use the InfluxDB CLI to create an operator token. These attributes will be
stored in a Secret created in AWS SecretManager in your account.`,
},
names.AttrPort: schema.Int64Attribute{
Optional: true,
Computed: true,
PlanModifiers: []planmodifier.Int64{
int64planmodifier.UseStateForUnknown(),
},
Validators: []validator.Int64{
int64validator.Between(1024, 65535),
int64validator.NoneOf(2375, 2376, 7788, 7789, 7790, 7791, 7792, 7793, 7794, 7795, 7796, 7797, 7798, 7799, 8090, 51678, 51679, 51680),
},
Description: `The port number on which InfluxDB accepts connections.`,
},
names.AttrPubliclyAccessible: schema.BoolAttribute{
Optional: true,
Computed: true,
Expand All @@ -226,9 +247,7 @@ func (r *resourceDBInstance) Schema(ctx context.Context, req resource.SchemaRequ
},
"secondary_availability_zone": schema.StringAttribute{
Computed: true,
PlanModifiers: []planmodifier.String{
stringplanmodifier.UseStateForUnknown(),
},
Default: nil,
Description: `The Availability Zone in which the standby instance is located when deploying
with a MultiAZ standby instance.`,
},
Expand Down Expand Up @@ -454,15 +473,49 @@ func (r *resourceDBInstance) Update(ctx context.Context, req resource.UpdateRequ
}

if !plan.DBParameterGroupIdentifier.Equal(state.DBParameterGroupIdentifier) ||
!plan.LogDeliveryConfiguration.Equal(state.LogDeliveryConfiguration) {
!plan.LogDeliveryConfiguration.Equal(state.LogDeliveryConfiguration) ||
!plan.DBInstanceType.Equal(state.DBInstanceType) ||
!plan.DeploymentType.Equal(state.DeploymentType) ||
!plan.Port.Equal(state.Port) {
in := timestreaminfluxdb.UpdateDbInstanceInput{
Identifier: plan.ID.ValueStringPointer(),
}

resp.Diagnostics.Append(flex.Expand(ctx, plan, &in)...)
// If any argument is updated with the same value, a ValidationException will occur. Arguments should only
// be updated if they have changed. For this reason, flex.Expand cannot be used for all arguments.
if !plan.DBParameterGroupIdentifier.Equal(state.DBParameterGroupIdentifier) {
in.DbParameterGroupIdentifier = plan.DBParameterGroupIdentifier.ValueStringPointer()
}

if resp.Diagnostics.HasError() {
return
if !plan.LogDeliveryConfiguration.Equal(state.LogDeliveryConfiguration) {
flex.Expand(ctx, plan.LogDeliveryConfiguration, &in.LogDeliveryConfiguration)
}

if !plan.DBInstanceType.Equal(state.DBInstanceType) {
in.DbInstanceType = awstypes.DbInstanceType(plan.DBInstanceType.ValueString())
}

if !plan.DeploymentType.Equal(state.DeploymentType) {
in.DeploymentType = awstypes.DeploymentType(plan.DeploymentType.ValueString())
}

if !plan.Port.Equal(state.Port) {
if plan.Port.ValueInt64() > math.MaxInt32 {
err := errors.New("port was greater than the maximum allowed value for int32")
resp.Diagnostics.AddError(
create.ProblemStandardMessage(names.TimestreamInfluxDB, create.ErrActionUpdating, ResNameDBInstance, plan.ID.String(), err),
err.Error(),
)
return
} else if plan.Port.ValueInt64() < math.MinInt32 {
err := errors.New("port was less than the minimum allowed value for int32")
resp.Diagnostics.AddError(
create.ProblemStandardMessage(names.TimestreamInfluxDB, create.ErrActionUpdating, ResNameDBInstance, plan.ID.String(), err),
err.Error(),
)
return
}
in.Port = aws.Int32(int32(plan.Port.ValueInt64()))
}

_, err := conn.UpdateDbInstance(ctx, &in)
Expand Down Expand Up @@ -494,6 +547,12 @@ func (r *resourceDBInstance) Update(ctx context.Context, req resource.UpdateRequ
plan.SecondaryAvailabilityZone = flex.StringToFrameworkLegacy(ctx, output.SecondaryAvailabilityZone)
}

// Updating tags can leave SecondaryAvailabilityZone unknown, as tags cannot be included in UpdateDbInstanceInput above.
// To get around this, if SecondaryAvailabilityZone is unknown after an update, set it to its previous value.
if plan.SecondaryAvailabilityZone.IsUnknown() {
plan.SecondaryAvailabilityZone = state.SecondaryAvailabilityZone
}

resp.Diagnostics.Append(resp.State.Set(ctx, &plan)...)
}

Expand Down Expand Up @@ -557,7 +616,7 @@ func waitDBInstanceCreated(ctx context.Context, conn *timestreaminfluxdb.Client,

func waitDBInstanceUpdated(ctx context.Context, conn *timestreaminfluxdb.Client, id string, timeout time.Duration) (*timestreaminfluxdb.GetDbInstanceOutput, error) {
stateConf := &retry.StateChangeConf{
Pending: enum.Slice(awstypes.StatusModifying, awstypes.StatusUpdating),
Pending: enum.Slice(awstypes.StatusModifying, awstypes.StatusUpdating, awstypes.StatusUpdatingInstanceType, awstypes.StatusUpdatingDeploymentType),
Target: enum.Slice(awstypes.StatusAvailable),
Refresh: statusDBInstance(ctx, conn, id),
Timeout: timeout,
Expand All @@ -575,7 +634,7 @@ func waitDBInstanceUpdated(ctx context.Context, conn *timestreaminfluxdb.Client,

func waitDBInstanceDeleted(ctx context.Context, conn *timestreaminfluxdb.Client, id string, timeout time.Duration) (*timestreaminfluxdb.GetDbInstanceOutput, error) {
stateConf := &retry.StateChangeConf{
Pending: enum.Slice(awstypes.StatusDeleting),
Pending: enum.Slice(awstypes.StatusDeleting, awstypes.StatusDeleted),
Target: []string{},
Refresh: statusDBInstance(ctx, conn, id),
Timeout: timeout,
Expand Down Expand Up @@ -643,8 +702,10 @@ type resourceDBInstanceData struct {
InfluxAuthParametersSecretARN types.String `tfsdk:"influx_auth_parameters_secret_arn"`
LogDeliveryConfiguration fwtypes.ListNestedObjectValueOf[logDeliveryConfigurationData] `tfsdk:"log_delivery_configuration"`
Name types.String `tfsdk:"name"`
NetworkType fwtypes.StringEnum[awstypes.NetworkType] `tfsdk:"network_type"`
Organization types.String `tfsdk:"organization"`
Password types.String `tfsdk:"password"`
Port types.Int64 `tfsdk:"port"`
PubliclyAccessible types.Bool `tfsdk:"publicly_accessible"`
SecondaryAvailabilityZone types.String `tfsdk:"secondary_availability_zone"`
Tags tftags.Map `tfsdk:"tags"`
Expand Down
Loading
Loading