Merge pull request aws-ia#388 from aws-samples/fix-ide-env-try

fix: Add missing try entries in IDE environment variable block
alidonmez · Mar 17, 2023 · bc304d9 · bc304d9
2 parents 21f722f + 1792131
commit bc304d9
Showing 1 changed file with 21 additions and 21 deletions.
diff --git a/terraform/ide.tf b/terraform/ide.tf
@@ -7,37 +7,37 @@ EKS_DEFAULT_MNG_NAME=${try(split(":", module.cluster.eks_cluster_nodegroup_name)
 EKS_DEFAULT_MNG_MIN=${module.cluster.eks_cluster_nodegroup_size_min}
 EKS_DEFAULT_MNG_MAX=${module.cluster.eks_cluster_nodegroup_size_max}
 EKS_DEFAULT_MNG_DESIRED=${module.cluster.eks_cluster_nodegroup_size_desired}
-CARTS_DYNAMODB_TABLENAME=${module.cluster.cart_dynamodb_table_name}
+CARTS_DYNAMODB_TABLENAME=${try(module.cluster.cart_dynamodb_table_name, "")}
 CARTS_IAM_ROLE=${try(module.cluster.cart_iam_role, "")}
-CATALOG_RDS_ENDPOINT=${module.cluster.catalog_rds_endpoint}
-CATALOG_RDS_USERNAME=${module.cluster.catalog_rds_master_username}
-CATALOG_RDS_PASSWORD=${base64encode(module.cluster.catalog_rds_master_password)}
-CATALOG_RDS_DATABASE_NAME=${module.cluster.catalog_rds_database_name}
-CATALOG_RDS_SG_ID=${module.cluster.catalog_rds_sg_id}
-CATALOG_SG_ID=${module.cluster.catalog_sg_id}
-EFS_ID=${module.cluster.efsid}
+CATALOG_RDS_ENDPOINT=${try(module.cluster.catalog_rds_endpoint, "")}
+CATALOG_RDS_USERNAME=${try(module.cluster.catalog_rds_master_username, "")}
+CATALOG_RDS_PASSWORD=${try(base64encode(module.cluster.catalog_rds_master_password), "")}
+CATALOG_RDS_DATABASE_NAME=${try(module.cluster.catalog_rds_database_name, "")}
+CATALOG_RDS_SG_ID=${try(module.cluster.catalog_rds_sg_id, "")}
+CATALOG_SG_ID=${try(module.cluster.catalog_sg_id, "")}
+EFS_ID=${try(module.cluster.efsid, "")}
 EKS_TAINTED_MNG_NAME=${try(split(":", module.cluster.eks_cluster_tainted_nodegroup_name)[1], "")}
-AMP_ENDPOINT=${module.cluster.amp_endpoint}
+AMP_ENDPOINT=${try(module.cluster.amp_endpoint, "")}
 ADOT_IAM_ROLE=${try(module.cluster.adot_iam_role, "")}
-VPC_ID=${module.cluster.vpc_id}
+VPC_ID=${try(module.cluster.vpc_id, "")}
 EKS_CLUSTER_SECURITY_GROUP_ID=${try(module.cluster.eks_cluster_security_group_id, "")}
-PRIMARY_SUBNET_1=${module.cluster.private_subnet_ids[0]}
-PRIMARY_SUBNET_2=${module.cluster.private_subnet_ids[1]}
-PRIMARY_SUBNET_3=${module.cluster.private_subnet_ids[2]}
-SECONDARY_SUBNET_1=${module.cluster.private_subnet_ids[3]}
-SECONDARY_SUBNET_2=${module.cluster.private_subnet_ids[4]}
-SECONDARY_SUBNET_3=${module.cluster.private_subnet_ids[5]}
+PRIMARY_SUBNET_1=${try(module.cluster.private_subnet_ids[0], "")}
+PRIMARY_SUBNET_2=${try(module.cluster.private_subnet_ids[1], "")}
+PRIMARY_SUBNET_3=${try(module.cluster.private_subnet_ids[2], "")}
+SECONDARY_SUBNET_1=${try(module.cluster.private_subnet_ids[3], "")}
+SECONDARY_SUBNET_2=${try(module.cluster.private_subnet_ids[4], "")}
+SECONDARY_SUBNET_3=${try(module.cluster.private_subnet_ids[5], "")}
 MANAGED_NODE_GROUP_IAM_ROLE_ARN=${try(module.cluster.eks_cluster_managed_node_group_iam_role_arns[0], "")}
 AZ1=${module.cluster.azs[0]}
 AZ2=${module.cluster.azs[1]}
 AZ3=${module.cluster.azs[2]}
 ADOT_IAM_ROLE_CI=${try(module.cluster.adot_iam_role_ci, "")}
 OIDC_PROVIDER=${try(module.cluster.oidc_provider, "")}
-VPC_ID=${module.cluster.vpc_id}
-VPC_CIDR=${module.cluster.vpc_cidr}
-VPC_PRIVATE_SUBNET_ID_0=${module.cluster.private_subnet_ids[0]}
-VPC_PRIVATE_SUBNET_ID_1=${module.cluster.private_subnet_ids[1]}
-VPC_PRIVATE_SUBNET_ID_2=${module.cluster.private_subnet_ids[2]}
+VPC_ID=${try(module.cluster.vpc_id, "")}
+VPC_CIDR=${try(module.cluster.vpc_cidr, "")}
+VPC_PRIVATE_SUBNET_ID_0=${try(module.cluster.private_subnet_ids[0], "")}
+VPC_PRIVATE_SUBNET_ID_1=${try(module.cluster.private_subnet_ids[1], "")}
+VPC_PRIVATE_SUBNET_ID_2=${try(module.cluster.private_subnet_ids[2], "")}
 GITOPS_IAM_SSH_KEY_ID=${try(module.cluster.gitops_iam_ssh_key_id, "")}
 GITOPS_IAM_SSH_USER=${try(module.cluster.gitops_ssh_iam_user, "")}
 GITOPS_SSH_SSM_NAME=${try(module.cluster.gitops_ssh_ssm_name, "")}