Cloudaccess examples: Always set resource suffix, reorder vars.

appvia · Oct 25, 2023 · 84314db · 84314db
1 parent 97a88eb
commit 84314db
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/modules/cloudaccess/examples/complete/aws-to-azure.tfvars.sample b/modules/cloudaccess/examples/complete/aws-to-azure.tfvars.sample
@@ -1,13 +1,12 @@
 # Resource suffix is optional, specify this if you need to keep role definitions unique amongst
 # multiple workspaces using the same subscription.
-# e.g. resource_suffix = "-app1-nonprod"
-resource_suffix                 = ""
-wayfinder_identity_aws_role_arn = "arn:aws:iam::123456789012:role/wf-cloudidentity-aws"
-wayfinder_identity_aws_issuer   = "https://oidc.eks.eu-west-2.amazonaws.com/id/ABCDF8D2EF45CE1A6FD96E2781310123"
-wayfinder_identity_aws_subject  = "system:serviceaccount:wayfinder:wayfinder-admin"
+resource_suffix                 = "-app1-nonprod"
 enable_cluster_manager          = true
 enable_dns_zone_manager         = true
 enable_network_manager          = true
 enable_cloud_info               = false
 from_aws                        = true
 from_azure                      = false
+wayfinder_identity_aws_role_arn = "arn:aws:iam::123456789012:role/wf-cloudidentity-aws"
+wayfinder_identity_aws_issuer   = "https://oidc.eks.eu-west-2.amazonaws.com/id/ABCDF8D2EF45CE1A6FD96E2781310123"
+wayfinder_identity_aws_subject  = "system:serviceaccount:wayfinder:wayfinder-admin"
diff --git a/modules/cloudaccess/examples/complete/azure-to-azure.tfvars.sample b/modules/cloudaccess/examples/complete/azure-to-azure.tfvars.sample
@@ -1,10 +1,9 @@
 # Resource suffix is optional, specify this if you need to keep role definitions unique amongst
 # multiple workspaces using the same subscription.
-# e.g. resource_suffix = "-app1-nonprod"
-resource_suffix                       = ""
-wayfinder_identity_azure_principal_id = "87654321-dcba-10fe-abcd-012345678901"
-wayfinder_identity_azure_tenant_id    = "12345678-abcd-ef01-dcba-012345678901"
+resource_suffix                       = "app1-nonprod"
 enable_cluster_manager                = true
 enable_dns_zone_manager               = true
 enable_network_manager                = true
 enable_cloud_info                     = false
+wayfinder_identity_azure_principal_id = "87654321-dcba-10fe-abcd-012345678901"
+wayfinder_identity_azure_tenant_id    = "12345678-abcd-ef01-dcba-012345678901"
diff --git a/modules/cloudaccess/examples/complete/gcp-to-azure.tfvars.sample b/modules/cloudaccess/examples/complete/gcp-to-azure.tfvars.sample
@@ -1,12 +1,11 @@
 # Resource suffix is optional, specify this if you need to keep role definitions unique amongst
 # multiple workspaces using the same subscription.
-# e.g. resource_suffix = "-app1-nonprod"
-resource_suffix                           = ""
-wayfinder_identity_gcp_service_account    = "[email protected]"
-wayfinder_identity_gcp_service_account_id = "123456789"
+resource_suffix                           = "app1-nonprod"
 enable_cluster_manager                    = true
 enable_dns_zone_manager                   = true
 enable_network_manager                    = true
 enable_cloud_info                         = false
 from_azure                                = false
 from_gcp                                  = true
+wayfinder_identity_gcp_service_account    = "[email protected]"
+wayfinder_identity_gcp_service_account_id = "123456789"