feat(TPG>=5.6)!: use hub membership location for output (#1824)

terraform-google-modules · Dec 26, 2023 · 13e79af · 13e79af
1 parent 0d7f638
commit 13e79af
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/modules/fleet-membership/main.tf b/modules/fleet-membership/main.tf
@@ -1,5 +1,5 @@
 /**
- * Copyright 2018 Google LLC
+ * Copyright 2018-2023 Google LLC
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,8 @@ locals {
   hub_project_id                   = var.hub_project_id == "" ? var.project_id : var.hub_project_id
   gke_hub_membership_name_complete = var.membership_name != "" ? var.membership_name : "${var.project_id}-${var.location}-${var.cluster_name}"
   gke_hub_membership_name          = trimsuffix(substr(local.gke_hub_membership_name_complete, 0, 63), "-")
+  gke_hub_membership_location      = regex(local.gke_hub_membership_location_re, data.google_container_cluster.primary.fleet[0].membership)[0]
+  gke_hub_membership_location_re   = "//gkehub.googleapis.com/projects/[^/]*/locations/([^/]*)/memberships/[^/]*$"
 }
 
 # Retrieve GKE cluster info

diff --git a/modules/fleet-membership/outputs.tf b/modules/fleet-membership/outputs.tf
@@ -30,7 +30,6 @@ output "project_id" {
 }
 
 output "location" {
-  # TODO: google_gke_hub_membership b/300473592
   description = "The location of the hub membership."
-  value       = "global"
+  value       = var.enable_fleet_registration ? google_gke_hub_membership.primary[0].location : local.gke_hub_membership_location
 }
diff --git a/modules/fleet-membership/versions.tf b/modules/fleet-membership/versions.tf
@@ -20,14 +20,12 @@ terraform {
 
   required_providers {
     google = {
-      source = "hashicorp/google"
-      # Avoid v4.49 and v4.50 for https://github.com/hashicorp/terraform-provider-google/issues/13507
-      version = ">= 4.47.0, != 4.49.0, != 4.50.0, < 6"
+      source  = "hashicorp/google"
+      version = ">= 5.6.0, < 6"
     }
     google-beta = {
-      source = "hashicorp/google-beta"
-      # Avoid v4.49 and v4.50 for https://github.com/hashicorp/terraform-provider-google/issues/13507
-      version = ">= 4.47.0, != 4.49.0, != 4.50.0, < 6"
+      source  = "hashicorp/google-beta"
+      version = ">= 5.6.0, < 6"
     }
   }