Replace hardcoded network/subnetwork path with replaced self_link

terraform-google-modules · Jan 4, 2019 · e997e66 · e997e66
1 parent fad997b
commit e997e66
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cluster_regional.tf b/cluster_regional.tf
@@ -26,8 +26,8 @@ resource "google_container_cluster" "primary" {
   region           = "${var.region}"
   additional_zones = ["${coalescelist(compact(var.zones), sort(random_shuffle.available_zones.result))}"]
 
-  network            = "projects/${data.google_compute_network.gke_network.project}/global/networks/${data.google_compute_network.gke_network.name}"
-  subnetwork         = "projects/${data.google_compute_network.gke_network.project}/regions/${var.region}/subnetworks/${data.google_compute_subnetwork.gke_subnetwork.name}"
+  network            = "${replace(data.google_compute_network.gke_network.self_link, "https://www.googleapis.com/compute/v1/", "")}"
+  subnetwork         = "${replace(data.google_compute_subnetwork.gke_subnetwork.self_link, "https://www.googleapis.com/compute/v1/", "")}"
   min_master_version = "${local.kubernetes_version}"
 
   logging_service    = "${var.logging_service}"

diff --git a/cluster_zonal.tf b/cluster_zonal.tf
@@ -26,8 +26,8 @@ resource "google_container_cluster" "zonal_primary" {
   zone             = "${var.zones[0]}"
   additional_zones = ["${slice(var.zones,1,length(var.zones))}"]
 
-  network            = "projects/${data.google_compute_network.gke_network.project}/global/networks/${data.google_compute_network.gke_network.name}"
-  subnetwork         = "projects/${data.google_compute_network.gke_network.project}/regions/${var.region}/subnetworks/${data.google_compute_subnetwork.gke_subnetwork.name}"
+  network            = "${replace(data.google_compute_network.gke_network.self_link, "https://www.googleapis.com/compute/v1/", "")}"
+  subnetwork         = "${replace(data.google_compute_subnetwork.gke_subnetwork.self_link, "https://www.googleapis.com/compute/v1/", "")}"
   min_master_version = "${local.kubernetes_version}"
 
   logging_service    = "${var.logging_service}"