diff --git a/docs/resources/sqlserverflex_instance.md b/docs/resources/sqlserverflex_instance.md index 5e1e519f..aeb3643d 100644 --- a/docs/resources/sqlserverflex_instance.md +++ b/docs/resources/sqlserverflex_instance.md @@ -73,9 +73,12 @@ Read-Only: Optional: -- `edition` (String) - `retention_days` (Number) +Read-Only: + +- `edition` (String) + ### Nested Schema for `storage` diff --git a/stackit/internal/services/sqlserverflex/instance/resource.go b/stackit/internal/services/sqlserverflex/instance/resource.go index 7b6009e0..7c32bba8 100644 --- a/stackit/internal/services/sqlserverflex/instance/resource.go +++ b/stackit/internal/services/sqlserverflex/instance/resource.go @@ -292,7 +292,6 @@ func (r *instanceResource) Schema(_ context.Context, _ resource.SchemaRequest, r }, Attributes: map[string]schema.Attribute{ "edition": schema.StringAttribute{ - Optional: true, Computed: true, PlanModifiers: []planmodifier.String{ stringplanmodifier.RequiresReplace(), @@ -695,9 +694,7 @@ func mapFields(ctx context.Context, resp *sqlserverflex.GetInstanceResponse, mod edition := options.Edition editionValue, ok := (*instance.Options)["edition"] if ok { - // API returns edition in uppercase but validates if it is lowercase - // This is a workaround that should be removed when the API is fixed - edition = types.StringValue(strings.ToLower(editionValue)) + edition = types.StringValue(editionValue) } optionsValues = map[string]attr.Value{ diff --git a/stackit/internal/services/sqlserverflex/sqlserverflex_acc_test.go b/stackit/internal/services/sqlserverflex/sqlserverflex_acc_test.go index c630963e..a727477b 100644 --- a/stackit/internal/services/sqlserverflex/sqlserverflex_acc_test.go +++ b/stackit/internal/services/sqlserverflex/sqlserverflex_acc_test.go @@ -30,7 +30,6 @@ var instanceResource = map[string]string{ "storage_size": "40", "version": "2022", "replicas": "1", - "options_edition": "standard", "options_retention_days": "64", "flavor_id": "4.16-Single", "backup_schedule": "00 6 * * *", @@ -55,7 +54,6 @@ func configResources(backupSchedule string) string { } version = "%s" options = { - edition = "%s" retention_days = %s } backup_schedule = "%s" @@ -70,7 +68,6 @@ func configResources(backupSchedule string) string { instanceResource["storage_class"], instanceResource["storage_size"], instanceResource["version"], - instanceResource["options_edition"], instanceResource["options_retention_days"], backupSchedule, ) @@ -99,7 +96,6 @@ func TestAccSQLServerFlexResource(t *testing.T) { resource.TestCheckResourceAttr("stackit_sqlserverflex_instance.instance", "storage.class", instanceResource["storage_class"]), resource.TestCheckResourceAttr("stackit_sqlserverflex_instance.instance", "storage.size", instanceResource["storage_size"]), resource.TestCheckResourceAttr("stackit_sqlserverflex_instance.instance", "version", instanceResource["version"]), - resource.TestCheckResourceAttr("stackit_sqlserverflex_instance.instance", "options.edition", instanceResource["options_edition"]), resource.TestCheckResourceAttr("stackit_sqlserverflex_instance.instance", "options.retention_days", instanceResource["options_retention_days"]), resource.TestCheckResourceAttr("stackit_sqlserverflex_instance.instance", "backup_schedule", instanceResource["backup_schedule"]), ), @@ -135,7 +131,6 @@ func TestAccSQLServerFlexResource(t *testing.T) { resource.TestCheckResourceAttr("data.stackit_sqlserverflex_instance.instance", "flavor.cpu", instanceResource["flavor_cpu"]), resource.TestCheckResourceAttr("data.stackit_sqlserverflex_instance.instance", "flavor.ram", instanceResource["flavor_ram"]), resource.TestCheckResourceAttr("data.stackit_sqlserverflex_instance.instance", "replicas", instanceResource["replicas"]), - resource.TestCheckResourceAttr("stackit_sqlserverflex_instance.instance", "options.edition", instanceResource["options_edition"]), resource.TestCheckResourceAttr("stackit_sqlserverflex_instance.instance", "options.retention_days", instanceResource["options_retention_days"]), resource.TestCheckResourceAttr("data.stackit_sqlserverflex_instance.instance", "backup_schedule", instanceResource["backup_schedule"]), ), @@ -186,7 +181,6 @@ func TestAccSQLServerFlexResource(t *testing.T) { resource.TestCheckResourceAttr("stackit_sqlserverflex_instance.instance", "storage.class", instanceResource["storage_class"]), resource.TestCheckResourceAttr("stackit_sqlserverflex_instance.instance", "storage.size", instanceResource["storage_size"]), resource.TestCheckResourceAttr("stackit_sqlserverflex_instance.instance", "version", instanceResource["version"]), - resource.TestCheckResourceAttr("stackit_sqlserverflex_instance.instance", "options.edition", instanceResource["options_edition"]), resource.TestCheckResourceAttr("stackit_sqlserverflex_instance.instance", "options.retention_days", instanceResource["options_retention_days"]), resource.TestCheckResourceAttr("stackit_sqlserverflex_instance.instance", "backup_schedule", instanceResource["backup_schedule_updated"]), ),