Merge pull request terraform-google-modules#91 from basisai/fix-substr

Fix issues with `substr` for Service Accounts
dkozlov · Mar 12, 2019 · de467d9 · de467d9
2 parents daea924 + 2ed068f
commit de467d9
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/autogen/sa.tf b/autogen/sa.tf
@@ -24,7 +24,7 @@ locals {
 resource "google_service_account" "cluster_service_account" {
   count        = "${var.service_account == "create" ? 1 : 0}"
   project      = "${var.project_id}"
-  account_id   = "tf-gke-${substr(var.name, 0, 20)}"
+  account_id   = "tf-gke-${substr(var.name, 0, min(20, length(var.name)))}"
   display_name = "Terraform-managed service account for cluster ${var.name}"
 }
 

diff --git a/modules/private-cluster/sa.tf b/modules/private-cluster/sa.tf
@@ -24,7 +24,7 @@ locals {
 resource "google_service_account" "cluster_service_account" {
   count        = "${var.service_account == "create" ? 1 : 0}"
   project      = "${var.project_id}"
-  account_id   = "tf-gke-${substr(var.name, 0, 20)}"
+  account_id   = "tf-gke-${substr(var.name, 0, min(20, length(var.name)))}"
   display_name = "Terraform-managed service account for cluster ${var.name}"
 }
 

diff --git a/sa.tf b/sa.tf
@@ -24,7 +24,7 @@ locals {
 resource "google_service_account" "cluster_service_account" {
   count        = "${var.service_account == "create" ? 1 : 0}"
   project      = "${var.project_id}"
-  account_id   = "tf-gke-${substr(var.name, 0, 20)}"
+  account_id   = "tf-gke-${substr(var.name, 0, min(20, length(var.name)))}"
   display_name = "Terraform-managed service account for cluster ${var.name}"
 }