Skip to content

Commit

Permalink
Rename to autoscale
Browse files Browse the repository at this point in the history
  • Loading branch information
gigerdo committed Mar 28, 2024
1 parent 8e10495 commit c23c1fd
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 30 deletions.
26 changes: 13 additions & 13 deletions ec/ecdatasource/deploymenttemplates/model_elasticsearch.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@
package deploymenttemplates

type elasticsearchModel struct {
AutoscalingEnabled *bool `tfsdk:"autoscaling_enabled"`
HotTier *topologyModel `tfsdk:"hot"`
CoordinatingTier *topologyModel `tfsdk:"coordinating"`
MasterTier *topologyModel `tfsdk:"master"`
WarmTier *topologyModel `tfsdk:"warm"`
ColdTier *topologyModel `tfsdk:"cold"`
FrozenTier *topologyModel `tfsdk:"frozen"`
MlTier *topologyModel `tfsdk:"ml"`
Autoscale *bool `tfsdk:"autoscale"`
HotTier *topologyModel `tfsdk:"hot"`
CoordinatingTier *topologyModel `tfsdk:"coordinating"`
MasterTier *topologyModel `tfsdk:"master"`
WarmTier *topologyModel `tfsdk:"warm"`
ColdTier *topologyModel `tfsdk:"cold"`
FrozenTier *topologyModel `tfsdk:"frozen"`
MlTier *topologyModel `tfsdk:"ml"`
}

type topologyModel struct {
Expand All @@ -38,9 +38,9 @@ type topologyModel struct {
}

type autoscalingModel struct {
AutoscalingTierOverride *bool `tfsdk:"autoscaling_tier_override"`
MaxSizeResource *string `tfsdk:"max_size_resource"`
MaxSize *string `tfsdk:"max_size"`
MinSizeResource *string `tfsdk:"min_size_resource"`
MinSize *string `tfsdk:"min_size"`
Autoscale *bool `tfsdk:"autoscale"`
MaxSizeResource *string `tfsdk:"max_size_resource"`
MaxSize *string `tfsdk:"max_size"`
MinSizeResource *string `tfsdk:"min_size_resource"`
MinSize *string `tfsdk:"min_size"`
}
4 changes: 2 additions & 2 deletions ec/ecdatasource/deploymenttemplates/read.go
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ func mapElasticsearch(templateDefinition *models.DeploymentCreateRequest, config
}

es := elasticsearchModel{}
es.AutoscalingEnabled = firstEs.Plan.AutoscalingEnabled
es.Autoscale = firstEs.Plan.AutoscalingEnabled
for _, element := range firstEs.Plan.ClusterTopology {
size := element.Size
id := element.InstanceConfigurationID
Expand Down Expand Up @@ -190,7 +190,7 @@ func getSizeValue(size *models.TopologySize) *int32 {

func mapAutoscaling(element *models.ElasticsearchClusterTopologyElement) autoscalingModel {
model := autoscalingModel{}
model.AutoscalingTierOverride = element.AutoscalingTierOverride
model.Autoscale = element.AutoscalingTierOverride
if element.AutoscalingMin != nil {
model.MinSizeResource = element.AutoscalingMin.Resource
model.MinSize = util.MemoryToStateOptional(element.AutoscalingMin.Value)
Expand Down
26 changes: 13 additions & 13 deletions ec/ecdatasource/deploymenttemplates/read_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -225,14 +225,14 @@ func Test_mapResponseToModel(t *testing.T) {
ID: "id",
Name: "name",
Elasticsearch: &elasticsearchModel{
AutoscalingEnabled: ec.Bool(true),
HotTier: buildTopologyModel("es-hot"),
CoordinatingTier: buildTopologyModel("es-coord"),
MasterTier: buildTopologyModel("es-master"),
WarmTier: buildTopologyModel("es-warm"),
ColdTier: buildTopologyModel("es-cold"),
FrozenTier: buildTopologyModel("es-frozen"),
MlTier: buildTopologyModel("es-ml"),
Autoscale: ec.Bool(true),
HotTier: buildTopologyModel("es-hot"),
CoordinatingTier: buildTopologyModel("es-coord"),
MasterTier: buildTopologyModel("es-master"),
WarmTier: buildTopologyModel("es-warm"),
ColdTier: buildTopologyModel("es-cold"),
FrozenTier: buildTopologyModel("es-frozen"),
MlTier: buildTopologyModel("es-ml"),
},
Kibana: buildStatelessModel("kibana-id"),
EnterpriseSearch: buildStatelessModel("enterprise-search-id"),
Expand Down Expand Up @@ -289,11 +289,11 @@ func buildTopologyModel(instanceConfigurationId string) *topologyModel {
AvailableSizes: []string{"1g", "2g", "4g"},
SizeResource: ec.String("memory"),
Autoscaling: autoscalingModel{
AutoscalingTierOverride: ec.Bool(true),
MaxSizeResource: ec.String("memory"),
MaxSize: ec.String("64g"),
MinSizeResource: ec.String("memory"),
MinSize: ec.String("0g"),
Autoscale: ec.Bool(true),
MaxSizeResource: ec.String("memory"),
MaxSize: ec.String("64g"),
MinSizeResource: ec.String("memory"),
MinSize: ec.String("0g"),
},
}
}
Expand Down
4 changes: 2 additions & 2 deletions ec/ecdatasource/deploymenttemplates/schema.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func elasticsearchSchema() schema.SingleNestedAttribute {
Description: "Defines the default configuration for Elasticsearch.",
Computed: true,
Attributes: map[string]schema.Attribute{
"autoscaling_enabled": schema.BoolAttribute{
"autoscale": schema.BoolAttribute{
Computed: true,
},
"hot": topologySchema(),
Expand Down Expand Up @@ -134,7 +134,7 @@ func autoscalingSchema() schema.SingleNestedAttribute {
return schema.SingleNestedAttribute{
Computed: true,
Attributes: map[string]schema.Attribute{
"autoscaling_tier_override": schema.BoolAttribute{
"autoscale": schema.BoolAttribute{
Computed: true,
},
"max_size_resource": schema.StringAttribute{
Expand Down

0 comments on commit c23c1fd

Please sign in to comment.