Skip to content

Commit

Permalink
promote schedule-based autoscaling to ga (#4788) (#705)
Browse files Browse the repository at this point in the history 
* schedule-based autoscaling ga

* excluce region/autoscaler scheduling field

Signed-off-by: Modular Magician <magic-modules@google.com>
  • Loading branch information
@modular-magician
modular-magician authored May 17, 2021
1 parent 15434bc commit e8bfb3c
Show file tree
Hide file tree
Showing 2 changed files with 186 additions and 0 deletions.
93 changes: 93 additions & 0 deletions google/compute_autoscaler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ package google
import (
"fmt"
"reflect"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

func GetComputeAutoscalerCaiObject(d TerraformResourceData, config *Config) ([]Asset, error) {
Expand Down Expand Up @@ -149,6 +151,13 @@ func expandComputeAutoscalerAutoscalingPolicy(v interface{}, d TerraformResource
transformed["loadBalancingUtilization"] = transformedLoadBalancingUtilization
}

transformedScalingSchedules, err := expandComputeAutoscalerAutoscalingPolicyScalingSchedules(original["scaling_schedules"], d, config)
if err != nil {
return nil, err
} else if val := reflect.ValueOf(transformedScalingSchedules); val.IsValid() && !isEmptyValue(val) {
transformed["scalingSchedules"] = transformedScalingSchedules
}

return transformed, nil
}

Expand Down Expand Up @@ -337,6 +346,90 @@ func expandComputeAutoscalerAutoscalingPolicyLoadBalancingUtilizationTarget(v in
return v, nil
}

func expandComputeAutoscalerAutoscalingPolicyScalingSchedules(v interface{}, d TerraformResourceData, config *Config) (map[string]interface{}, error) {
if v == nil {
return map[string]interface{}{}, nil
}
m := make(map[string]interface{})
for _, raw := range v.(*schema.Set).List() {
original := raw.(map[string]interface{})
transformed := make(map[string]interface{})

transformedMinRequiredReplicas, err := expandComputeAutoscalerAutoscalingPolicyScalingSchedulesMinRequiredReplicas(original["min_required_replicas"], d, config)
if err != nil {
return nil, err
} else {
transformed["minRequiredReplicas"] = transformedMinRequiredReplicas
}

transformedSchedule, err := expandComputeAutoscalerAutoscalingPolicyScalingSchedulesSchedule(original["schedule"], d, config)
if err != nil {
return nil, err
} else if val := reflect.ValueOf(transformedSchedule); val.IsValid() && !isEmptyValue(val) {
transformed["schedule"] = transformedSchedule
}

transformedTimeZone, err := expandComputeAutoscalerAutoscalingPolicyScalingSchedulesTimeZone(original["time_zone"], d, config)
if err != nil {
return nil, err
} else if val := reflect.ValueOf(transformedTimeZone); val.IsValid() && !isEmptyValue(val) {
transformed["timeZone"] = transformedTimeZone
}

transformedDurationSec, err := expandComputeAutoscalerAutoscalingPolicyScalingSchedulesDurationSec(original["duration_sec"], d, config)
if err != nil {
return nil, err
} else if val := reflect.ValueOf(transformedDurationSec); val.IsValid() && !isEmptyValue(val) {
transformed["durationSec"] = transformedDurationSec
}

transformedDisabled, err := expandComputeAutoscalerAutoscalingPolicyScalingSchedulesDisabled(original["disabled"], d, config)
if err != nil {
return nil, err
} else if val := reflect.ValueOf(transformedDisabled); val.IsValid() && !isEmptyValue(val) {
transformed["disabled"] = transformedDisabled
}

transformedDescription, err := expandComputeAutoscalerAutoscalingPolicyScalingSchedulesDescription(original["description"], d, config)
if err != nil {
return nil, err
} else if val := reflect.ValueOf(transformedDescription); val.IsValid() && !isEmptyValue(val) {
transformed["description"] = transformedDescription
}

transformedName, err := expandString(original["name"], d, config)
if err != nil {
return nil, err
}
m[transformedName] = transformed
}
return m, nil
}

func expandComputeAutoscalerAutoscalingPolicyScalingSchedulesMinRequiredReplicas(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
return v, nil
}

func expandComputeAutoscalerAutoscalingPolicyScalingSchedulesSchedule(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
return v, nil
}

func expandComputeAutoscalerAutoscalingPolicyScalingSchedulesTimeZone(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
return v, nil
}

func expandComputeAutoscalerAutoscalingPolicyScalingSchedulesDurationSec(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
return v, nil
}

func expandComputeAutoscalerAutoscalingPolicyScalingSchedulesDisabled(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
return v, nil
}

func expandComputeAutoscalerAutoscalingPolicyScalingSchedulesDescription(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
return v, nil
}

func expandComputeAutoscalerTarget(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
if v == nil || v.(string) == "" {
return "", nil
Expand Down
93 changes: 93 additions & 0 deletions google/compute_region_autoscaler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ package google
import (
"fmt"
"reflect"

"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
)

func GetComputeRegionAutoscalerCaiObject(d TerraformResourceData, config *Config) ([]Asset, error) {
Expand Down Expand Up @@ -149,6 +151,13 @@ func expandComputeRegionAutoscalerAutoscalingPolicy(v interface{}, d TerraformRe
transformed["loadBalancingUtilization"] = transformedLoadBalancingUtilization
}

transformedScalingSchedules, err := expandComputeRegionAutoscalerAutoscalingPolicyScalingSchedules(original["scaling_schedules"], d, config)
if err != nil {
return nil, err
} else if val := reflect.ValueOf(transformedScalingSchedules); val.IsValid() && !isEmptyValue(val) {
transformed["scalingSchedules"] = transformedScalingSchedules
}

return transformed, nil
}

Expand Down Expand Up @@ -337,6 +346,90 @@ func expandComputeRegionAutoscalerAutoscalingPolicyLoadBalancingUtilizationTarge
return v, nil
}

func expandComputeRegionAutoscalerAutoscalingPolicyScalingSchedules(v interface{}, d TerraformResourceData, config *Config) (map[string]interface{}, error) {
if v == nil {
return map[string]interface{}{}, nil
}
m := make(map[string]interface{})
for _, raw := range v.(*schema.Set).List() {
original := raw.(map[string]interface{})
transformed := make(map[string]interface{})

transformedMinRequiredReplicas, err := expandComputeRegionAutoscalerAutoscalingPolicyScalingSchedulesMinRequiredReplicas(original["min_required_replicas"], d, config)
if err != nil {
return nil, err
} else {
transformed["minRequiredReplicas"] = transformedMinRequiredReplicas
}

transformedSchedule, err := expandComputeRegionAutoscalerAutoscalingPolicyScalingSchedulesSchedule(original["schedule"], d, config)
if err != nil {
return nil, err
} else if val := reflect.ValueOf(transformedSchedule); val.IsValid() && !isEmptyValue(val) {
transformed["schedule"] = transformedSchedule
}

transformedTimeZone, err := expandComputeRegionAutoscalerAutoscalingPolicyScalingSchedulesTimeZone(original["time_zone"], d, config)
if err != nil {
return nil, err
} else if val := reflect.ValueOf(transformedTimeZone); val.IsValid() && !isEmptyValue(val) {
transformed["timeZone"] = transformedTimeZone
}

transformedDurationSec, err := expandComputeRegionAutoscalerAutoscalingPolicyScalingSchedulesDurationSec(original["duration_sec"], d, config)
if err != nil {
return nil, err
} else if val := reflect.ValueOf(transformedDurationSec); val.IsValid() && !isEmptyValue(val) {
transformed["durationSec"] = transformedDurationSec
}

transformedDisabled, err := expandComputeRegionAutoscalerAutoscalingPolicyScalingSchedulesDisabled(original["disabled"], d, config)
if err != nil {
return nil, err
} else if val := reflect.ValueOf(transformedDisabled); val.IsValid() && !isEmptyValue(val) {
transformed["disabled"] = transformedDisabled
}

transformedDescription, err := expandComputeRegionAutoscalerAutoscalingPolicyScalingSchedulesDescription(original["description"], d, config)
if err != nil {
return nil, err
} else if val := reflect.ValueOf(transformedDescription); val.IsValid() && !isEmptyValue(val) {
transformed["description"] = transformedDescription
}

transformedName, err := expandString(original["name"], d, config)
if err != nil {
return nil, err
}
m[transformedName] = transformed
}
return m, nil
}

func expandComputeRegionAutoscalerAutoscalingPolicyScalingSchedulesMinRequiredReplicas(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
return v, nil
}

func expandComputeRegionAutoscalerAutoscalingPolicyScalingSchedulesSchedule(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
return v, nil
}

func expandComputeRegionAutoscalerAutoscalingPolicyScalingSchedulesTimeZone(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
return v, nil
}

func expandComputeRegionAutoscalerAutoscalingPolicyScalingSchedulesDurationSec(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
return v, nil
}

func expandComputeRegionAutoscalerAutoscalingPolicyScalingSchedulesDisabled(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
return v, nil
}

func expandComputeRegionAutoscalerAutoscalingPolicyScalingSchedulesDescription(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
return v, nil
}

func expandComputeRegionAutoscalerTarget(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
return v, nil
}
Expand Down

0 comments on commit e8bfb3c

Please sign in to comment.