public/terraform-provider-google
0
0
Fork 0
mirror of https://github.com/letic/terraform-provider-google.git synced 2024-07-03 08:42:39 +00:00
Code Issues Projects Releases Wiki Activity

Fix nested object handling in generated code (#1757)

Browse Source 
<!-- This change is generated by MagicModules. -->
/cc @danawillow
This commit is contained in:
The Magician 2018-07-12 17:15:40 -07:00 committed by Dana Hoffman
parent 855bc8fc8d
commit 01a2906518
3 changed files with 122 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
google/resource_compute_autoscaler.go
View File

@ -535,45 +535,44 @@ func expandComputeAutoscalerDescription(v interface{}, d *schema.ResourceData, c
func expandComputeAutoscalerAutoscalingPolicy(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
l := v.([]interface{})
req := make([]interface{}, 0, len(l))
for _, raw := range l {
original := raw.(map[string]interface{})
transformed := make(map[string]interface{})
transformedMinReplicas, err := expandComputeAutoscalerAutoscalingPolicyMinReplicas(original["min_replicas"], d, config)
if err != nil {
return nil, err
}
transformed["minNumReplicas"] = transformedMinReplicas
transformedMaxReplicas, err := expandComputeAutoscalerAutoscalingPolicyMaxReplicas(original["max_replicas"], d, config)
if err != nil {
return nil, err
}
transformed["maxNumReplicas"] = transformedMaxReplicas
transformedCooldownPeriod, err := expandComputeAutoscalerAutoscalingPolicyCooldownPeriod(original["cooldown_period"], d, config)
if err != nil {
return nil, err
}
transformed["coolDownPeriodSec"] = transformedCooldownPeriod
transformedCpuUtilization, err := expandComputeAutoscalerAutoscalingPolicyCpuUtilization(original["cpu_utilization"], d, config)
if err != nil {
return nil, err
}
transformed["cpuUtilization"] = transformedCpuUtilization
transformedMetric, err := expandComputeAutoscalerAutoscalingPolicyMetric(original["metric"], d, config)
if err != nil {
return nil, err
}
transformed["customMetricUtilizations"] = transformedMetric
transformedLoadBalancingUtilization, err := expandComputeAutoscalerAutoscalingPolicyLoadBalancingUtilization(original["load_balancing_utilization"], d, config)
if err != nil {
return nil, err
}
transformed["loadBalancingUtilization"] = transformedLoadBalancingUtilization
req = append(req, transformed)
if len(l) == 0 {
return nil, nil
}
return req, nil
raw := l[0]
original := raw.(map[string]interface{})
transformed := make(map[string]interface{})
transformedMinReplicas, err := expandComputeAutoscalerAutoscalingPolicyMinReplicas(original["min_replicas"], d, config)
if err != nil {
return nil, err
}
transformed["minNumReplicas"] = transformedMinReplicas
transformedMaxReplicas, err := expandComputeAutoscalerAutoscalingPolicyMaxReplicas(original["max_replicas"], d, config)
if err != nil {
return nil, err
}
transformed["maxNumReplicas"] = transformedMaxReplicas
transformedCooldownPeriod, err := expandComputeAutoscalerAutoscalingPolicyCooldownPeriod(original["cooldown_period"], d, config)
if err != nil {
return nil, err
}
transformed["coolDownPeriodSec"] = transformedCooldownPeriod
transformedCpuUtilization, err := expandComputeAutoscalerAutoscalingPolicyCpuUtilization(original["cpu_utilization"], d, config)
if err != nil {
return nil, err
}
transformed["cpuUtilization"] = transformedCpuUtilization
transformedMetric, err := expandComputeAutoscalerAutoscalingPolicyMetric(original["metric"], d, config)
if err != nil {
return nil, err
}
transformed["customMetricUtilizations"] = transformedMetric
transformedLoadBalancingUtilization, err := expandComputeAutoscalerAutoscalingPolicyLoadBalancingUtilization(original["load_balancing_utilization"], d, config)
if err != nil {
return nil, err
}
transformed["loadBalancingUtilization"] = transformedLoadBalancingUtilization
return transformed, nil
}
func expandComputeAutoscalerAutoscalingPolicyMinReplicas(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
@ -590,20 +589,19 @@ func expandComputeAutoscalerAutoscalingPolicyCooldownPeriod(v interface{}, d *sc
func expandComputeAutoscalerAutoscalingPolicyCpuUtilization(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
l := v.([]interface{})
req := make([]interface{}, 0, len(l))
for _, raw := range l {
original := raw.(map[string]interface{})
transformed := make(map[string]interface{})
transformedTarget, err := expandComputeAutoscalerAutoscalingPolicyCpuUtilizationTarget(original["target"], d, config)
if err != nil {
return nil, err
}
transformed["utilizationTarget"] = transformedTarget
req = append(req, transformed)
if len(l) == 0 {
return nil, nil
}
return req, nil
raw := l[0]
original := raw.(map[string]interface{})
transformed := make(map[string]interface{})
transformedTarget, err := expandComputeAutoscalerAutoscalingPolicyCpuUtilizationTarget(original["target"], d, config)
if err != nil {
return nil, err
}
transformed["utilizationTarget"] = transformedTarget
return transformed, nil
}
func expandComputeAutoscalerAutoscalingPolicyCpuUtilizationTarget(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
@ -632,7 +630,6 @@ func expandComputeAutoscalerAutoscalingPolicyMetric(v interface{}, d *schema.Res
return nil, err
}
transformed["utilizationTargetType"] = transformedType
req = append(req, transformed)
}
return req, nil
@ -652,20 +649,19 @@ func expandComputeAutoscalerAutoscalingPolicyMetricType(v interface{}, d *schema
func expandComputeAutoscalerAutoscalingPolicyLoadBalancingUtilization(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
l := v.([]interface{})
req := make([]interface{}, 0, len(l))
for _, raw := range l {
original := raw.(map[string]interface{})
transformed := make(map[string]interface{})
transformedTarget, err := expandComputeAutoscalerAutoscalingPolicyLoadBalancingUtilizationTarget(original["target"], d, config)
if err != nil {
return nil, err
}
transformed["utilizationTarget"] = transformedTarget
req = append(req, transformed)
if len(l) == 0 {
return nil, nil
}
return req, nil
raw := l[0]
original := raw.(map[string]interface{})
transformed := make(map[string]interface{})
transformedTarget, err := expandComputeAutoscalerAutoscalingPolicyLoadBalancingUtilizationTarget(original["target"], d, config)
if err != nil {
return nil, err
}
transformed["utilizationTarget"] = transformedTarget
return transformed, nil
}
func expandComputeAutoscalerAutoscalingPolicyLoadBalancingUtilizationTarget(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {

126
google/resource_compute_region_autoscaler.go
View File

@ -534,45 +534,44 @@ func expandComputeRegionAutoscalerDescription(v interface{}, d *schema.ResourceD
func expandComputeRegionAutoscalerAutoscalingPolicy(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
l := v.([]interface{})
req := make([]interface{}, 0, len(l))
for _, raw := range l {
original := raw.(map[string]interface{})
transformed := make(map[string]interface{})
transformedMinReplicas, err := expandComputeRegionAutoscalerAutoscalingPolicyMinReplicas(original["min_replicas"], d, config)
if err != nil {
return nil, err
}
transformed["minNumReplicas"] = transformedMinReplicas
transformedMaxReplicas, err := expandComputeRegionAutoscalerAutoscalingPolicyMaxReplicas(original["max_replicas"], d, config)
if err != nil {
return nil, err
}
transformed["maxNumReplicas"] = transformedMaxReplicas
transformedCooldownPeriod, err := expandComputeRegionAutoscalerAutoscalingPolicyCooldownPeriod(original["cooldown_period"], d, config)
if err != nil {
return nil, err
}
transformed["coolDownPeriodSec"] = transformedCooldownPeriod
transformedCpuUtilization, err := expandComputeRegionAutoscalerAutoscalingPolicyCpuUtilization(original["cpu_utilization"], d, config)
if err != nil {
return nil, err
}
transformed["cpuUtilization"] = transformedCpuUtilization
transformedMetric, err := expandComputeRegionAutoscalerAutoscalingPolicyMetric(original["metric"], d, config)
if err != nil {
return nil, err
}
transformed["customMetricUtilizations"] = transformedMetric
transformedLoadBalancingUtilization, err := expandComputeRegionAutoscalerAutoscalingPolicyLoadBalancingUtilization(original["load_balancing_utilization"], d, config)
if err != nil {
return nil, err
}
transformed["loadBalancingUtilization"] = transformedLoadBalancingUtilization
req = append(req, transformed)
if len(l) == 0 {
return nil, nil
}
return req, nil
raw := l[0]
original := raw.(map[string]interface{})
transformed := make(map[string]interface{})
transformedMinReplicas, err := expandComputeRegionAutoscalerAutoscalingPolicyMinReplicas(original["min_replicas"], d, config)
if err != nil {
return nil, err
}
transformed["minNumReplicas"] = transformedMinReplicas
transformedMaxReplicas, err := expandComputeRegionAutoscalerAutoscalingPolicyMaxReplicas(original["max_replicas"], d, config)
if err != nil {
return nil, err
}
transformed["maxNumReplicas"] = transformedMaxReplicas
transformedCooldownPeriod, err := expandComputeRegionAutoscalerAutoscalingPolicyCooldownPeriod(original["cooldown_period"], d, config)
if err != nil {
return nil, err
}
transformed["coolDownPeriodSec"] = transformedCooldownPeriod
transformedCpuUtilization, err := expandComputeRegionAutoscalerAutoscalingPolicyCpuUtilization(original["cpu_utilization"], d, config)
if err != nil {
return nil, err
}
transformed["cpuUtilization"] = transformedCpuUtilization
transformedMetric, err := expandComputeRegionAutoscalerAutoscalingPolicyMetric(original["metric"], d, config)
if err != nil {
return nil, err
}
transformed["customMetricUtilizations"] = transformedMetric
transformedLoadBalancingUtilization, err := expandComputeRegionAutoscalerAutoscalingPolicyLoadBalancingUtilization(original["load_balancing_utilization"], d, config)
if err != nil {
return nil, err
}
transformed["loadBalancingUtilization"] = transformedLoadBalancingUtilization
return transformed, nil
}
func expandComputeRegionAutoscalerAutoscalingPolicyMinReplicas(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
@ -589,20 +588,19 @@ func expandComputeRegionAutoscalerAutoscalingPolicyCooldownPeriod(v interface{},
func expandComputeRegionAutoscalerAutoscalingPolicyCpuUtilization(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
l := v.([]interface{})
req := make([]interface{}, 0, len(l))
for _, raw := range l {
original := raw.(map[string]interface{})
transformed := make(map[string]interface{})
transformedTarget, err := expandComputeRegionAutoscalerAutoscalingPolicyCpuUtilizationTarget(original["target"], d, config)
if err != nil {
return nil, err
}
transformed["utilizationTarget"] = transformedTarget
req = append(req, transformed)
if len(l) == 0 {
return nil, nil
}
return req, nil
raw := l[0]
original := raw.(map[string]interface{})
transformed := make(map[string]interface{})
transformedTarget, err := expandComputeRegionAutoscalerAutoscalingPolicyCpuUtilizationTarget(original["target"], d, config)
if err != nil {
return nil, err
}
transformed["utilizationTarget"] = transformedTarget
return transformed, nil
}
func expandComputeRegionAutoscalerAutoscalingPolicyCpuUtilizationTarget(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
@ -631,7 +629,6 @@ func expandComputeRegionAutoscalerAutoscalingPolicyMetric(v interface{}, d *sche
return nil, err
}
transformed["utilizationTargetType"] = transformedType
req = append(req, transformed)
}
return req, nil
@ -651,20 +648,19 @@ func expandComputeRegionAutoscalerAutoscalingPolicyMetricType(v interface{}, d *
func expandComputeRegionAutoscalerAutoscalingPolicyLoadBalancingUtilization(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {
l := v.([]interface{})
req := make([]interface{}, 0, len(l))
for _, raw := range l {
original := raw.(map[string]interface{})
transformed := make(map[string]interface{})
transformedTarget, err := expandComputeRegionAutoscalerAutoscalingPolicyLoadBalancingUtilizationTarget(original["target"], d, config)
if err != nil {
return nil, err
}
transformed["utilizationTarget"] = transformedTarget
req = append(req, transformed)
if len(l) == 0 {
return nil, nil
}
return req, nil
raw := l[0]
original := raw.(map[string]interface{})
transformed := make(map[string]interface{})
transformedTarget, err := expandComputeRegionAutoscalerAutoscalingPolicyLoadBalancingUtilizationTarget(original["target"], d, config)
if err != nil {
return nil, err
}
transformed["utilizationTarget"] = transformedTarget
return transformed, nil
}
func expandComputeRegionAutoscalerAutoscalingPolicyLoadBalancingUtilizationTarget(v interface{}, d *schema.ResourceData, config *Config) (interface{}, error) {

1
google/resource_compute_subnetwork.go
View File

@ -602,7 +602,6 @@ func expandComputeSubnetworkSecondaryIpRange(v interface{}, d *schema.ResourceDa
return nil, err
}
transformed["ipCidrRange"] = transformedIpCidrRange
req = append(req, transformed)
}
return req, nil