Skip to content

Commit bb282a9

Browse files
authored
Merge pull request #253 from julianvmodesto/check-beta-feature-output-config-length
Check null and length of beta feature outputs
2 parents 30a2cd1 + 58dab6c commit bb282a9

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

autogen/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@ locals {
105105
{% if beta_cluster %}
106106
# BETA features
107107
cluster_output_istio_enabled = google_container_cluster.primary.addons_config.0.istio_config.0.disabled
108-
cluster_output_pod_security_policy_enabled = google_container_cluster.primary.pod_security_policy_config.0.enabled
108+
cluster_output_pod_security_policy_enabled = google_container_cluster.primary.pod_security_policy_config != null && length(google_container_cluster.primary.pod_security_policy_config) == 1 ? google_container_cluster.primary.pod_security_policy_config.0.enabled : false
109109
cluster_output_intranode_visbility_enabled = google_container_cluster.primary.enable_intranode_visibility
110-
cluster_output_vertical_pod_autoscaling_enabled = google_container_cluster.primary.vertical_pod_autoscaling.0.enabled
110+
cluster_output_vertical_pod_autoscaling_enabled = google_container_cluster.primary.vertical_pod_autoscaling != null && length(google_container_cluster.primary.vertical_pod_autoscaling) == 1 ? google_container_cluster.primary.vertical_pod_autoscaling.0.enabled : false
111111

112112
# /BETA features
113113
{% endif %}

modules/beta-private-cluster/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ locals {
9494

9595
# BETA features
9696
cluster_output_istio_enabled = google_container_cluster.primary.addons_config.0.istio_config.0.disabled
97-
cluster_output_pod_security_policy_enabled = google_container_cluster.primary.pod_security_policy_config.0.enabled
97+
cluster_output_pod_security_policy_enabled = google_container_cluster.primary.pod_security_policy_config != null && length(google_container_cluster.primary.pod_security_policy_config) == 1 ? google_container_cluster.primary.pod_security_policy_config.0.enabled : false
9898
cluster_output_intranode_visbility_enabled = google_container_cluster.primary.enable_intranode_visibility
99-
cluster_output_vertical_pod_autoscaling_enabled = google_container_cluster.primary.vertical_pod_autoscaling.0.enabled
99+
cluster_output_vertical_pod_autoscaling_enabled = google_container_cluster.primary.vertical_pod_autoscaling != null && length(google_container_cluster.primary.vertical_pod_autoscaling) == 1 ? google_container_cluster.primary.vertical_pod_autoscaling.0.enabled : false
100100

101101
# /BETA features
102102

modules/beta-public-cluster/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ locals {
9494

9595
# BETA features
9696
cluster_output_istio_enabled = google_container_cluster.primary.addons_config.0.istio_config.0.disabled
97-
cluster_output_pod_security_policy_enabled = google_container_cluster.primary.pod_security_policy_config.0.enabled
97+
cluster_output_pod_security_policy_enabled = google_container_cluster.primary.pod_security_policy_config != null && length(google_container_cluster.primary.pod_security_policy_config) == 1 ? google_container_cluster.primary.pod_security_policy_config.0.enabled : false
9898
cluster_output_intranode_visbility_enabled = google_container_cluster.primary.enable_intranode_visibility
99-
cluster_output_vertical_pod_autoscaling_enabled = google_container_cluster.primary.vertical_pod_autoscaling.0.enabled
99+
cluster_output_vertical_pod_autoscaling_enabled = google_container_cluster.primary.vertical_pod_autoscaling != null && length(google_container_cluster.primary.vertical_pod_autoscaling) == 1 ? google_container_cluster.primary.vertical_pod_autoscaling.0.enabled : false
100100

101101
# /BETA features
102102

0 commit comments

Comments
 (0)