Initial work - adding field to the schema

README.md

@@ -87,6 +87,13 @@ resource "ec_deployment" "example_minimal" {
     hot = {
       autoscaling = {}
     }
+    
+    ml = {
+       autoscaling = {
+          tier_autoscale = true
+       }
+    }
+    
   }
 
   kibana = {

ec/ecresource/deploymentresource/deployment/v2/deployment_create_payload.go

@@ -19,7 +19,6 @@ package v2
 
 import (
 	"context"
-
 	"github.com/elastic/cloud-sdk-go/pkg/api"
 	"github.com/elastic/cloud-sdk-go/pkg/api/deploymentapi/deptemplateapi"
 	"github.com/elastic/cloud-sdk-go/pkg/api/deploymentapi/esremoteclustersapi"
@@ -84,6 +83,9 @@ func (dep DeploymentTF) CreateRequest(ctx context.Context, client *api.API) (*mo
 		return nil, diagsnostics
 	}
 
+	// We don't want this setting to be inferred from deployment template when using TF provider - it should be specified explicitly in resource declaration
+	removeAutoscalingTierOverridesFromTemplate(template)
+
 	baseUpdatePayloads := &models.DeploymentUpdateResources{
 		Apm:                template.DeploymentTemplate.Resources.Apm,
 		Appsearch:          template.DeploymentTemplate.Resources.Appsearch,
@@ -170,6 +172,14 @@ func (dep DeploymentTF) CreateRequest(ctx context.Context, client *api.API) (*mo
 	return &result, diagsnostics
 }
 
+func removeAutoscalingTierOverridesFromTemplate(template *models.DeploymentTemplateInfoV2) {
+	for _, esResource := range template.DeploymentTemplate.Resources.Elasticsearch {
+		for _, topologyElem := range esResource.Plan.ClusterTopology {
+			topologyElem.AutoscalingTierOverride = nil
+		}
+	}
+}
+
 // trafficFilterToModel expands the flattened "traffic_filter" settings to a DeploymentCreateRequest.
 func trafficFilterToModel(ctx context.Context, set types.Set, req *models.DeploymentCreateRequest) diag.Diagnostics {
 	if len(set.Elements()) == 0 || req == nil {

ec/ecresource/deploymentresource/deployment/v2/deployment_update_payload.go

@@ -51,6 +51,9 @@ func (plan DeploymentTF) getBaseUpdatePayloads(ctx context.Context, client *api.
 		return nil, err
 	}
 
+	// Similarly to deployment creation, we don't want this setting to be inferred from deployment template
+	removeAutoscalingTierOverridesFromTemplate(template)
+
 	baseUpdatePayloads := &models.DeploymentUpdateResources{
 		Apm:                template.DeploymentTemplate.Resources.Apm,
 		Appsearch:          template.DeploymentTemplate.Resources.Appsearch,

ec/ecresource/deploymentresource/elasticsearch/v1/elasticsearch_topology_autoscaling.go

@@ -27,6 +27,7 @@ type ElasticsearchTopologyAutoscalingTF struct {
 	MinSizeResource    types.String `tfsdk:"min_size_resource"`
 	MinSize            types.String `tfsdk:"min_size"`
 	PolicyOverrideJson types.String `tfsdk:"policy_override_json"`
+	TierAutoscale      types.Bool   `tfsdk:"tier_autoscale"`
 }
 
 type ElasticsearchTopologyAutoscaling struct {
@@ -35,6 +36,7 @@ type ElasticsearchTopologyAutoscaling struct {
 	MinSizeResource    *string `tfsdk:"min_size_resource"`
 	MinSize            *string `tfsdk:"min_size"`
 	PolicyOverrideJson *string `tfsdk:"policy_override_json"`
+	TierAutoscale      *bool   `tfsdk:"tier_autoscale"`
 }
 
 type ElasticsearchTopologyAutoscalings []ElasticsearchTopologyAutoscaling

ec/ecresource/deploymentresource/elasticsearch/v2/elasticsearch_topology.go

@@ -192,6 +192,10 @@ func readElasticsearchTopologyAutoscaling(topology *models.ElasticsearchClusterT
 		a.PolicyOverrideJson = ec.String(string(b))
 	}
 
+	if topology.AutoscalingTierOverride != nil && *topology.AutoscalingTierOverride == true {
+		a.TierAutoscale = topology.AutoscalingTierOverride
+	}
+
 	return &a, nil
 }
 
@@ -357,6 +361,10 @@ func elasticsearchTopologyAutoscalingPayload(ctx context.Context, autoObj attr.V
 		}
 	}
 
+	if !autoscale.TierAutoscale.IsNull() && !autoscale.TierAutoscale.IsUnknown() {
+		payload.AutoscalingTierOverride = autoscale.TierAutoscale.ValueBoolPointer()
+	}
+
 	return diag
 }
 

ec/ecresource/deploymentresource/elasticsearch/v2/schema.go

@@ -255,6 +255,14 @@ func elasticsearchTopologyAutoscalingSchema(topologyAttributeName string) schema
 					UseTopologyStateForUnknown(topologyAttributeName),
 				},
 			},
+			"tier_autoscale": schema.BoolAttribute{
+				Description: `Whether this specific tier should be auto-scaled, overrides deployment-wide setting`,
+				Computed:    true,
+				Optional:    true,
+				PlanModifiers: []planmodifier.Bool{
+					UseTopologyStateForUnknown(topologyAttributeName),
+				},
+			},
 			"policy_override_json": schema.StringAttribute{
 				Description: "Computed policy overrides set directly via the API or other clients.",
 				Computed:    true,

ec/ecresource/deploymentresource/elasticsearch/v2/topology_plan_modifier.go

@@ -53,6 +53,14 @@ func (m useTopologyState) PlanModifyInt64(ctx context.Context, req planmodifier.
 	}
 }
 
+func (m useTopologyState) PlanModifyBool(ctx context.Context, req planmodifier.BoolRequest, resp *planmodifier.BoolResponse) {
+	useState, diags := m.UseState(ctx, req.ConfigValue, req.Plan, req.State, resp.PlanValue)
+	resp.Diagnostics.Append(diags...)
+	if useState {
+		resp.PlanValue = req.StateValue
+	}
+}
+
 type PlanModifierResponse interface {
 	planmodifier.StringResponse | planmodifier.Int64Response
 }