diff --git a/.changelog/4738.txt b/.changelog/4738.txt new file mode 100644 index 0000000000..b5063e52d9 --- /dev/null +++ b/.changelog/4738.txt @@ -0,0 +1,4 @@ +```release-note:bug +compute: fixed the failure when `min_required_replicas` is set to 0 on `google_compute_autoscaler ` +compute: fixed the failure when `min_required_replicas` is set to 0 on `google_compute_region_autoscaler` +``` diff --git a/google-beta/resource_compute_autoscaler.go b/google-beta/resource_compute_autoscaler.go index 33b1446fe6..6125eec33c 100644 --- a/google-beta/resource_compute_autoscaler.go +++ b/google-beta/resource_compute_autoscaler.go @@ -1515,7 +1515,7 @@ func expandComputeAutoscalerAutoscalingPolicyScalingSchedules(v interface{}, d T transformedMinRequiredReplicas, err := expandComputeAutoscalerAutoscalingPolicyScalingSchedulesMinRequiredReplicas(original["min_required_replicas"], d, config) if err != nil { return nil, err - } else if val := reflect.ValueOf(transformedMinRequiredReplicas); val.IsValid() && !isEmptyValue(val) { + } else { transformed["minRequiredReplicas"] = transformedMinRequiredReplicas } diff --git a/google-beta/resource_compute_autoscaler_test.go b/google-beta/resource_compute_autoscaler_test.go index 55993e96e2..5ffc82520f 100644 --- a/google-beta/resource_compute_autoscaler_test.go +++ b/google-beta/resource_compute_autoscaler_test.go @@ -383,7 +383,7 @@ resource "google_compute_autoscaler" "foobar" { scaling_schedules { name = "every-weekday-morning" description = "Increase to 2 every weekday at 7AM for 6 hours." - min_required_replicas = 2 + min_required_replicas = 0 schedule = "0 7 * * MON-FRI" time_zone = "America/New_York" duration_sec = 21600 diff --git a/google-beta/resource_compute_region_autoscaler.go b/google-beta/resource_compute_region_autoscaler.go index e6a53357fd..b1520d6d65 100644 --- a/google-beta/resource_compute_region_autoscaler.go +++ b/google-beta/resource_compute_region_autoscaler.go @@ -1511,7 +1511,7 @@ func expandComputeRegionAutoscalerAutoscalingPolicyScalingSchedules(v interface{ transformedMinRequiredReplicas, err := expandComputeRegionAutoscalerAutoscalingPolicyScalingSchedulesMinRequiredReplicas(original["min_required_replicas"], d, config) if err != nil { return nil, err - } else if val := reflect.ValueOf(transformedMinRequiredReplicas); val.IsValid() && !isEmptyValue(val) { + } else { transformed["minRequiredReplicas"] = transformedMinRequiredReplicas } diff --git a/google-beta/resource_compute_region_autoscaler_test.go b/google-beta/resource_compute_region_autoscaler_test.go index 66b26bbad6..06f2846a74 100644 --- a/google-beta/resource_compute_region_autoscaler_test.go +++ b/google-beta/resource_compute_region_autoscaler_test.go @@ -274,7 +274,7 @@ resource "google_compute_region_autoscaler" "foobar" { scaling_schedules { name = "every-weekday-morning" description = "Increase to 2 every weekday at 7AM for 6 hours." - min_required_replicas = 2 + min_required_replicas = 0 schedule = "0 7 * * MON-FRI" time_zone = "America/New_York" duration_sec = 21600 diff --git a/google-beta/resource_dataflow_flex_template_job_test.go b/google-beta/resource_dataflow_flex_template_job_test.go index 0d037482e0..df04d28bb0 100644 --- a/google-beta/resource_dataflow_flex_template_job_test.go +++ b/google-beta/resource_dataflow_flex_template_job_test.go @@ -8,7 +8,7 @@ import ( "github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource" "github.com/hashicorp/terraform-plugin-sdk/v2/terraform" - compute "google.golang.org/api/compute/v1" + "google.golang.org/api/compute/v1" ) func TestAccDataflowFlexTemplateJob_basic(t *testing.T) {