Skip to content

Commit

Permalink
Removed trailing references to kubernetes_dashboard (#4328) (#602)
Browse files Browse the repository at this point in the history
This was removed in GoogleCloudPlatform/magic-modules#2551 as one of the v3 breaking changes. However, a few trailing references remained in the repository. Removing those should bring us back in line and will resolve some broken tests in terraform-validator.

Signed-off-by: Modular Magician <[email protected]>
  • Loading branch information
modular-magician authored Dec 17, 2020
1 parent 5c3cbf4 commit a225f83
Showing 1 changed file with 0 additions and 30 deletions.
30 changes: 0 additions & 30 deletions google/container.go
Original file line number Diff line number Diff line change
Expand Up @@ -835,13 +835,6 @@ func expandContainerClusterAddonsConfig(v interface{}, d TerraformResourceData,
transformed["horizontalPodAutoscaling"] = transformedHorizontalPodAutoscaling
}

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

transformedNetworkPolicyConfig, err := expandContainerClusterAddonsConfigNetworkPolicyConfig(original["network_policy_config"], d, config)
if err != nil {
return nil, err
Expand Down Expand Up @@ -898,29 +891,6 @@ func expandContainerClusterAddonsConfigHorizontalPodAutoscalingDisabled(v interf
return v, nil
}

func expandContainerClusterAddonsConfigKubernetesDashboard(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
l := v.([]interface{})
if len(l) == 0 || l[0] == nil {
return nil, nil
}
raw := l[0]
original := raw.(map[string]interface{})
transformed := make(map[string]interface{})

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

return transformed, nil
}

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

func expandContainerClusterAddonsConfigNetworkPolicyConfig(v interface{}, d TerraformResourceData, config *Config) (interface{}, error) {
l := v.([]interface{})
if len(l) == 0 || l[0] == nil {
Expand Down

0 comments on commit a225f83

Please sign in to comment.