Add support_physical_cluster_replication field to cluster creation #261
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
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
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 |
|---|---|---|
|
|
@@ -217,9 +217,9 @@ func (r *clusterResource) Schema( | |
| Description: "Storage amount per node in GiB.", | ||
| }, | ||
| "disk_iops": schema.Int64Attribute{ | ||
| Optional: true, | ||
| Computed: true, | ||
| Validators: []validator.Int64{ | ||
| // If supplied this value must be non-zero. 0 is a | ||
| // valid api value indicating the default being | ||
| // returned but it causes a provider inconsistency. | ||
|
|
@@ -232,8 +232,8 @@ func (r *clusterResource) Schema( | |
| Description: "Memory per node in GiB.", | ||
| }, | ||
| "machine_type": schema.StringAttribute{ | ||
| Optional: true, | ||
| Computed: true, | ||
| MarkdownDescription: "Machine type identifier within the given cloud provider, e.g., m6.xlarge, n2-standard-4. This attribute requires a feature flag to be enabled. It is recommended to leave this empty and use `num_virtual_cpus` to control the machine type.", | ||
| }, | ||
| "num_virtual_cpus": schema.Int64Attribute{ | ||
|
|
@@ -257,6 +257,14 @@ func (r *clusterResource) Schema( | |
| stringplanmodifier.UseStateForUnknown(), | ||
| }, | ||
| }, | ||
| "support_physical_cluster_replication": schema.BoolAttribute{ | ||
| Optional: true, | ||
| Computed: true, | ||
| Description: "Specifies whether a cluster should be started using an architecture that supports physical cluster replication.", | ||
|
There was a problem hiding this comment. Do we have any documentation to suggest why a customer wouldn't want this set to true? Otherwise why wouldn't everyone set it to true? @kathancox this is probably more of a docs concern. There was a problem hiding this comment. I guess we should also say it's defaulting to false. |
||
| PlanModifiers: []planmodifier.Bool{ | ||
| boolplanmodifier.UseStateForUnknown(), | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| "regions": schema.ListNestedAttribute{ | ||
|
|
@@ -267,7 +275,7 @@ func (r *clusterResource) Schema( | |
| NestedObject: regionSchema, | ||
| }, | ||
| "state": schema.StringAttribute{ | ||
| Computed: true, | ||
| PlanModifiers: []planmodifier.String{ | ||
| stringplanmodifier.UseStateForUnknown(), | ||
| }, | ||
|
|
@@ -302,32 +310,32 @@ func (r *clusterResource) Schema( | |
| Description: "Set to true to enable delete protection on the cluster. If unset, the server chooses the value on cluster creation, and preserves the value on cluster update.", | ||
| }, | ||
| "backup_config": schema.SingleNestedAttribute{ | ||
| Computed: true, | ||
| Optional: true, | ||
| MarkdownDescription: "The backup settings for a cluster.\n Each cluster has backup settings that determine if backups are enabled, how frequently they are taken, and how long they are retained for. Use this attribute to manage those settings.", | ||
| PlanModifiers: []planmodifier.Object{ | ||
| objectplanmodifier.UseStateForUnknown(), | ||
| }, | ||
| Attributes: map[string]schema.Attribute{ | ||
| "enabled": schema.BoolAttribute{ | ||
| Optional: true, | ||
| Computed: true, | ||
| PlanModifiers: []planmodifier.Bool{ | ||
| boolplanmodifier.UseStateForUnknown(), | ||
| }, | ||
| Description: "Indicates whether backups are enabled. If set to false, no backups will be created.", | ||
| }, | ||
| "retention_days": schema.Int64Attribute{ | ||
| Optional: true, | ||
| Computed: true, | ||
| PlanModifiers: []planmodifier.Int64{ | ||
| int64planmodifier.UseStateForUnknown(), | ||
| }, | ||
| MarkdownDescription: "The number of days to retain backups for. Valid values are [2, 7, 30, 90, 365]. Can only be set once, further changes require opening a support ticket. See [Updating backup retention](../guides/updating-backup-retention) for more information.", | ||
| }, | ||
| "frequency_minutes": schema.Int64Attribute{ | ||
| Optional: true, | ||
| Computed: true, | ||
| PlanModifiers: []planmodifier.Int64{ | ||
| int64planmodifier.UseStateForUnknown(), | ||
| }, | ||
|
|
@@ -556,6 +564,9 @@ func (r *clusterResource) Create( | |
| if cfg.CidrRange.ValueString() != "" { | ||
| dedicated.CidrRange = ptr(cfg.CidrRange.ValueString()) | ||
| } | ||
| if cfg.SupportPhysicalClusterReplication.ValueBool() { | ||
| dedicated.SupportPhysicalClusterReplication = ptr(cfg.SupportPhysicalClusterReplication.ValueBool()) | ||
| } | ||
|
Comment on lines
+567
to
+569
There was a problem hiding this comment. It looks like if someone were to actually set the value to |
||
| } | ||
| clusterSpec.SetDedicated(dedicated) | ||
| } | ||
|
|
@@ -632,7 +643,7 @@ func (r *clusterResource) Create( | |
| backupUpdateRequest.FrequencyMinutes = ptr(int32(planBackupConfig.FrequencyMinutes.ValueInt64())) | ||
| } | ||
|
|
||
| if backupUpdateRequest != (client.UpdateBackupConfigurationSpec{}) { | ||
| traceAPICall("UpdateBackupConfiguration") | ||
| remoteBackupConfig, _, err = r.provider.service.UpdateBackupConfiguration(ctx, clusterObj.Id, &backupUpdateRequest) | ||
| if err != nil { | ||
|
|
@@ -790,6 +801,12 @@ func (r *clusterResource) ModifyPlan( | |
| "isn't allowed. Please explicitly destroy this cluster before changing "+ | ||
| "cidr range.") | ||
| } | ||
| if dedicated := plan.DedicatedConfig; dedicated != nil && dedicated.SupportPhysicalClusterReplication != state.DedicatedConfig.SupportPhysicalClusterReplication { | ||
| resp.Diagnostics.AddError("Cannot update support_physical_cluster_replication", | ||
| "To prevent accidental deletion of data, changing a cluster's "+ | ||
| "support_physical_cluster_replication field isn't allowed. "+ | ||
| "Please explicitly destroy this cluster before changing this field.") | ||
| } | ||
| } | ||
|
|
||
| if req.Plan.Raw.IsNull() { | ||
|
|
@@ -1087,7 +1104,7 @@ func (r *clusterResource) Update( | |
| backupUpdateRequest.FrequencyMinutes = ptr(int32(planBackupConfig.FrequencyMinutes.ValueInt64())) | ||
| } | ||
|
|
||
| if backupUpdateRequest != (client.UpdateBackupConfigurationSpec{}) { | ||
| traceAPICall("UpdateBackupConfiguration") | ||
| remoteBackupConfig, _, err = r.provider.service.UpdateBackupConfiguration(ctx, clusterObj.Id, &backupUpdateRequest) | ||
| if err != nil { | ||
|
|
@@ -1309,6 +1326,10 @@ func loadClusterToTerraformState( | |
| PrivateNetworkVisibility: types.BoolValue(clusterObj.GetNetworkVisibility() == client.NETWORKVISIBILITYTYPE_PRIVATE), | ||
| CidrRange: types.StringValue(clusterObj.CidrRange), | ||
| } | ||
|
|
||
| if plan != nil && plan.DedicatedConfig != nil && IsKnown(plan.DedicatedConfig.SupportPhysicalClusterReplication) { | ||
| state.DedicatedConfig.SupportPhysicalClusterReplication = plan.DedicatedConfig.SupportPhysicalClusterReplication | ||
| } | ||
| } | ||
|
|
||
| var diags diag.Diagnostics | ||
|
|
@@ -1332,12 +1353,11 @@ var backupConfigElementTypes = map[string]attr.Type{ | |
| "retention_days": types.Int64Type, | ||
| } | ||
|
|
||
| func unknownBackupConfig() (basetypes.ObjectValue, diag.Diagnostics) { | ||
| elements := map[string]attr.Value{ | ||
| "enabled": types.BoolUnknown(), | ||
| "frequency_minutes": types.Int64Unknown(), | ||
| "retention_days": types.Int64Unknown(), | ||
| } | ||
| objectValue, diags := types.ObjectValue(backupConfigElementTypes, elements) | ||
| return objectValue, diags | ||
|
|
@@ -1347,9 +1367,9 @@ func clientBackupConfigToProviderBackupConfig( | |
| apiBackupConfig *client.BackupConfiguration, | ||
| ) (basetypes.ObjectValue, diag.Diagnostics) { | ||
| elements := map[string]attr.Value{ | ||
| "enabled": types.BoolValue(apiBackupConfig.GetEnabled()), | ||
| "frequency_minutes": types.Int64Value(int64(apiBackupConfig.GetFrequencyMinutes())), | ||
| "retention_days": types.Int64Value(int64(apiBackupConfig.GetRetentionDays())), | ||
| } | ||
| objectValue, diags := types.ObjectValue(backupConfigElementTypes, elements) | ||
| return objectValue, diags | ||
|
|
@@ -1363,8 +1383,8 @@ func providerBackupConfigToClientBackupConfig(ctx context.Context, providerBacku | |
| } | ||
|
|
||
| backupUpdateRequest := &client.BackupConfiguration{ | ||
| Enabled: planBackupConfig.Enabled.ValueBool(), | ||
| RetentionDays: int32(planBackupConfig.RetentionDays.ValueInt64()), | ||
| FrequencyMinutes: int32(planBackupConfig.FrequencyMinutes.ValueInt64()), | ||
| } | ||
| return backupUpdateRequest, diags | ||
|
|
||
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
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.
Normally when we have optional values, we'll let the server choose the default. computed: true, would normally allow the value in the state to be set by what the server chose. That way from provider version to version we could change the default on the server and it would remain working with our serverside default. However, I suggested we not add the field to the cluster response in that recent PR. I think that is a bit problematic with the current implementation here. I see 2 options: