Move settings back to a block to avoid adding yet another breaking change (#1666)

Author: tobio

CHANGELOG.md

@@ -32,32 +32,6 @@ resource "elasticstack_fleet_integration" "tcp-o11y" {
 }
 ```
 
-#### `elasticstack_kibana_slo` `settings` block has change to a an attribute. 
-
-As part of migrating this resource to the Terraform plugin framework, the `settings` block has been moved to an attribute. Existing usage of this argument will need to be updated to use an attribute style syntax, for example:
-
-```hcl
-resource "elasticstack_kibana_slo" "test_slo" {
-  ...
-  settings {
-    sync_delay = "5m"
-    frequency  = "5m"
-  }
-}
-```
-
-becomes 
-
-```
-resource "elasticstack_kibana_slo" "test_slo" {
-  ...
-  settings = {  ## Note the addition of the = here. 
-    sync_delay = "5m"
-    frequency  = "5m"
-  }
-}
-```
-
 #### `elasticstack_fleet_integration_policy` input block has changed to a map attribute. 
 
 The `input` block in the `elasticstack_fleet_integration_policy` resource has been restructured into the `inputs` map attribute. 

docs/resources/kibana_slo.md

@@ -249,7 +249,7 @@ resource "elasticstack_kibana_slo" "timeslice_metric" {
 - `kql_custom_indicator` (Block List) (see [below for nested schema](#nestedblock--kql_custom_indicator))
 - `metric_custom_indicator` (Block List) (see [below for nested schema](#nestedblock--metric_custom_indicator))
 - `objective` (Block List) The target objective is the value the SLO needs to meet during the time window. If a timeslices budgeting method is used, we also need to define the timesliceTarget which can be different than the overall SLO target. (see [below for nested schema](#nestedblock--objective))
-- `settings` (Attributes) The default settings should be sufficient for most users, but if needed, these properties can be overwritten. (see [below for nested schema](#nestedatt--settings))
+- `settings` (Block, Optional) The default settings should be sufficient for most users, but if needed, these properties can be overwritten. (see [below for nested schema](#nestedblock--settings))
 - `slo_id` (String) An ID (8 to 48 characters) that contains only letters, numbers, hyphens, and underscores. If omitted, a UUIDv1 will be generated server-side.
 - `space_id` (String) An identifier for the space. If space_id is not provided, the default space is used.
 - `tags` (List of String) The tags for the SLO.
@@ -436,7 +436,7 @@ Optional:
 - `timeslice_window` (String)
 
 
-<a id="nestedatt--settings"></a>
+<a id="nestedblock--settings"></a>
 ### Nested Schema for `settings`
 
 Optional:

internal/kibana/slo/acc_test.go

@@ -82,8 +82,6 @@ func TestAccResourceSlo(t *testing.T) {
 							resource.TestCheckResourceAttr("elasticstack_kibana_slo.test_slo", "objective.0.target", "0.999"),
 							resource.TestCheckResourceAttr("elasticstack_kibana_slo.test_slo", "objective.0.timeslice_target", "0.95"),
 							resource.TestCheckResourceAttr("elasticstack_kibana_slo.test_slo", "objective.0.timeslice_window", "5m"),
-							resource.TestCheckResourceAttr("elasticstack_kibana_slo.test_slo", "settings.sync_delay", "1m"),
-							resource.TestCheckResourceAttr("elasticstack_kibana_slo.test_slo", "settings.frequency", "1m"),
 							resource.TestCheckResourceAttr("elasticstack_kibana_slo.test_slo", "space_id", "default"),
 						),
 					},

internal/kibana/slo/models.go

@@ -213,7 +213,7 @@ func (m *tfModel) populateFromAPI(apiModel *models.Slo) diag.Diagnostics {
 	}
 	m.Objective = []tfObjective{obj}
 
-	if apiModel.Settings != nil {
+	if utils.IsKnown(m.Settings) && apiModel.Settings != nil {
 		attrValues := map[string]attr.Value{
 			"sync_delay":               types.StringPointerValue(apiModel.Settings.SyncDelay),
 			"frequency":                types.StringPointerValue(apiModel.Settings.Frequency),

internal/kibana/slo/schema.go

@@ -82,10 +82,10 @@ func getSchema() schema.Schema {
 				Optional:    true,
 				ElementType: types.StringType,
 			},
-			"settings": schema.SingleNestedAttribute{
+		},
+		Blocks: map[string]schema.Block{
+			"settings": schema.SingleNestedBlock{
 				Description: "The default settings should be sufficient for most users, but if needed, these properties can be overwritten.",
-				Optional:    true,
-				Computed:    true,
 				PlanModifiers: []planmodifier.Object{
 					objectplanmodifier.UseStateForUnknown(),
 				},
@@ -99,8 +99,6 @@ func getSchema() schema.Schema {
 					},
 				},
 			},
-		},
-		Blocks: map[string]schema.Block{
 			"time_window": schema.ListNestedBlock{
 				Description: "Currently support `calendarAligned` and `rolling` time windows. Any duration greater than 1 day can be used: days, weeks, months, quarters, years. Rolling time window requires a duration, e.g. `1w` for one week, and type: `rolling`. SLOs defined with such time window, will only consider the SLI data from the last duration period as a moving window. Calendar aligned time window requires a duration, limited to `1M` for monthly or `1w` for weekly, and type: `calendarAligned`.",
 				Validators:  []validator.List{listvalidator.SizeBetween(1, 1)},

internal/kibana/slo/testdata/TestAccResourceSlo/with-data-view-id=false/apm_availability_indicator/test.tf

@@ -40,7 +40,7 @@ resource "elasticstack_kibana_slo" "test_slo" {
 
   space_id = "default"
 
-  settings = {
+  settings {
     sync_delay = "5m"
     frequency  = "5m"
   }

internal/kibana/slo/testdata/TestAccResourceSlo/with-data-view-id=false/histogram_custom_indicator/test.tf

@@ -53,7 +53,7 @@ resource "elasticstack_kibana_slo" "test_slo" {
 
   space_id = "default"
 
-  settings = {
+  settings {
     sync_delay = "5m"
     frequency  = "5m"
   }

internal/kibana/slo/testdata/TestAccResourceSlo/with-data-view-id=false/kql_custom_indicator/test.tf

@@ -46,7 +46,7 @@ resource "elasticstack_kibana_slo" "test_slo" {
 
   space_id = "default"
 
-  settings = {
+  settings {
     sync_delay = "5m"
     frequency  = "5m"
   }

internal/kibana/slo/testdata/TestAccResourceSlo/with-data-view-id=false/metric_custom_indicator_group_by/test.tf

@@ -71,7 +71,7 @@ resource "elasticstack_kibana_slo" "test_slo" {
 
   space_id = "default"
 
-  settings = {
+  settings {
     sync_delay = "5m"
     frequency  = "5m"
   }

internal/kibana/slo/testdata/TestAccResourceSlo/with-data-view-id=false/metric_custom_indicator_tags/test.tf

@@ -71,7 +71,7 @@ resource "elasticstack_kibana_slo" "test_slo" {
 
   space_id = "default"
 
-  settings = {
+  settings {
     sync_delay = "5m"
     frequency  = "5m"
   }