Make SQLServer edition computed (#389)
* Make edition computed * generate docs
This commit is contained in:
parent
04df2f2f89
commit
32b1fc1ef8
3 changed files with 5 additions and 11 deletions
|
|
@ -73,9 +73,12 @@ Read-Only:
|
||||||
|
|
||||||
Optional:
|
Optional:
|
||||||
|
|
||||||
- `edition` (String)
|
|
||||||
- `retention_days` (Number)
|
- `retention_days` (Number)
|
||||||
|
|
||||||
|
Read-Only:
|
||||||
|
|
||||||
|
- `edition` (String)
|
||||||
|
|
||||||
|
|
||||||
<a id="nestedatt--storage"></a>
|
<a id="nestedatt--storage"></a>
|
||||||
### Nested Schema for `storage`
|
### Nested Schema for `storage`
|
||||||
|
|
|
||||||
|
|
@ -292,7 +292,6 @@ func (r *instanceResource) Schema(_ context.Context, _ resource.SchemaRequest, r
|
||||||
},
|
},
|
||||||
Attributes: map[string]schema.Attribute{
|
Attributes: map[string]schema.Attribute{
|
||||||
"edition": schema.StringAttribute{
|
"edition": schema.StringAttribute{
|
||||||
Optional: true,
|
|
||||||
Computed: true,
|
Computed: true,
|
||||||
PlanModifiers: []planmodifier.String{
|
PlanModifiers: []planmodifier.String{
|
||||||
stringplanmodifier.RequiresReplace(),
|
stringplanmodifier.RequiresReplace(),
|
||||||
|
|
@ -695,9 +694,7 @@ func mapFields(ctx context.Context, resp *sqlserverflex.GetInstanceResponse, mod
|
||||||
edition := options.Edition
|
edition := options.Edition
|
||||||
editionValue, ok := (*instance.Options)["edition"]
|
editionValue, ok := (*instance.Options)["edition"]
|
||||||
if ok {
|
if ok {
|
||||||
// API returns edition in uppercase but validates if it is lowercase
|
edition = types.StringValue(editionValue)
|
||||||
// This is a workaround that should be removed when the API is fixed
|
|
||||||
edition = types.StringValue(strings.ToLower(editionValue))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
optionsValues = map[string]attr.Value{
|
optionsValues = map[string]attr.Value{
|
||||||
|
|
|
||||||
|
|
@ -30,7 +30,6 @@ var instanceResource = map[string]string{
|
||||||
"storage_size": "40",
|
"storage_size": "40",
|
||||||
"version": "2022",
|
"version": "2022",
|
||||||
"replicas": "1",
|
"replicas": "1",
|
||||||
"options_edition": "standard",
|
|
||||||
"options_retention_days": "64",
|
"options_retention_days": "64",
|
||||||
"flavor_id": "4.16-Single",
|
"flavor_id": "4.16-Single",
|
||||||
"backup_schedule": "00 6 * * *",
|
"backup_schedule": "00 6 * * *",
|
||||||
|
|
@ -55,7 +54,6 @@ func configResources(backupSchedule string) string {
|
||||||
}
|
}
|
||||||
version = "%s"
|
version = "%s"
|
||||||
options = {
|
options = {
|
||||||
edition = "%s"
|
|
||||||
retention_days = %s
|
retention_days = %s
|
||||||
}
|
}
|
||||||
backup_schedule = "%s"
|
backup_schedule = "%s"
|
||||||
|
|
@ -70,7 +68,6 @@ func configResources(backupSchedule string) string {
|
||||||
instanceResource["storage_class"],
|
instanceResource["storage_class"],
|
||||||
instanceResource["storage_size"],
|
instanceResource["storage_size"],
|
||||||
instanceResource["version"],
|
instanceResource["version"],
|
||||||
instanceResource["options_edition"],
|
|
||||||
instanceResource["options_retention_days"],
|
instanceResource["options_retention_days"],
|
||||||
backupSchedule,
|
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.class", instanceResource["storage_class"]),
|
||||||
resource.TestCheckResourceAttr("stackit_sqlserverflex_instance.instance", "storage.size", instanceResource["storage_size"]),
|
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", "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", "options.retention_days", instanceResource["options_retention_days"]),
|
||||||
resource.TestCheckResourceAttr("stackit_sqlserverflex_instance.instance", "backup_schedule", instanceResource["backup_schedule"]),
|
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.cpu", instanceResource["flavor_cpu"]),
|
||||||
resource.TestCheckResourceAttr("data.stackit_sqlserverflex_instance.instance", "flavor.ram", instanceResource["flavor_ram"]),
|
resource.TestCheckResourceAttr("data.stackit_sqlserverflex_instance.instance", "flavor.ram", instanceResource["flavor_ram"]),
|
||||||
resource.TestCheckResourceAttr("data.stackit_sqlserverflex_instance.instance", "replicas", instanceResource["replicas"]),
|
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("stackit_sqlserverflex_instance.instance", "options.retention_days", instanceResource["options_retention_days"]),
|
||||||
resource.TestCheckResourceAttr("data.stackit_sqlserverflex_instance.instance", "backup_schedule", instanceResource["backup_schedule"]),
|
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.class", instanceResource["storage_class"]),
|
||||||
resource.TestCheckResourceAttr("stackit_sqlserverflex_instance.instance", "storage.size", instanceResource["storage_size"]),
|
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", "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", "options.retention_days", instanceResource["options_retention_days"]),
|
||||||
resource.TestCheckResourceAttr("stackit_sqlserverflex_instance.instance", "backup_schedule", instanceResource["backup_schedule_updated"]),
|
resource.TestCheckResourceAttr("stackit_sqlserverflex_instance.instance", "backup_schedule", instanceResource["backup_schedule_updated"]),
|
||||||
),
|
),
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue