From 7d026bcc1f39219deca01b245e2d1b32183b16fe Mon Sep 17 00:00:00 2001
From: Hossein Golestani <hosseingolestani@yahoo.com>
Date: Mon, 26 Feb 2024 13:46:12 -0800
Subject: [PATCH] Adding the namespace_labels field to the GKE Hub Scope
 resource (#9972)

* initial commit for scope-level namespace labels

* Add validation exceptions for the  field of the GKEHub Scope and Namespace resources to be of type

* Undoing unnecessary changes

* Fixing the type of Scope namespace_labels field
---
 mmv1/products/gkehub2/Scope.yaml                       |  8 ++++++++
 .../terraform/examples/gkehub_scope_basic.tf.erb       |  5 +++++
 .../services/gkehub2/resource_gke_hub_scope_test.go    | 10 ++++++++++
 3 files changed, 23 insertions(+)

diff --git a/mmv1/products/gkehub2/Scope.yaml b/mmv1/products/gkehub2/Scope.yaml
index 7c12b64c03b4..ff73465a443e 100644
--- a/mmv1/products/gkehub2/Scope.yaml
+++ b/mmv1/products/gkehub2/Scope.yaml
@@ -117,6 +117,14 @@ properties:
           - :READY
           - :DELETING
           - :UPDATING
+  - !ruby/object:Api::Type::KeyValuePairs
+    name: 'namespaceLabels'
+    description: |
+      Scope-level cluster namespace labels. For the member clusters bound
+      to the Scope, these labels are applied to each namespace under the
+      Scope. Scope-level labels take precedence over Namespace-level
+      labels (`namespace_labels` in the Fleet Namespace resource) if they
+      share a key. Keys and values must be Kubernetes-conformant.
   - !ruby/object:Api::Type::KeyValueLabels
     name: 'labels'
     description: |
diff --git a/mmv1/templates/terraform/examples/gkehub_scope_basic.tf.erb b/mmv1/templates/terraform/examples/gkehub_scope_basic.tf.erb
index 107fa956c82d..63efb8be3c78 100644
--- a/mmv1/templates/terraform/examples/gkehub_scope_basic.tf.erb
+++ b/mmv1/templates/terraform/examples/gkehub_scope_basic.tf.erb
@@ -1,5 +1,10 @@
 resource "google_gke_hub_scope" "<%= ctx[:primary_resource_id] %>" {
   scope_id = "<%= ctx[:vars]['resource_name'] %>"
+  namespace_labels = {
+      keyb = "valueb"
+      keya = "valuea"
+      keyc = "valuec" 
+  }
   labels = {
       keyb = "valueb"
       keya = "valuea"
diff --git a/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_scope_test.go b/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_scope_test.go
index 967fe08c4bc2..be00b628a7c6 100644
--- a/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_scope_test.go
+++ b/mmv1/third_party/terraform/services/gkehub2/resource_gke_hub_scope_test.go
@@ -47,6 +47,11 @@ func testAccGKEHub2Scope_gkehubScopeBasicExample_basic(context map[string]interf
 	return acctest.Nprintf(`
 resource "google_gke_hub_scope" "scope" {
   scope_id = "tf-test-scope%{random_suffix}"
+  namespace_labels = {
+    keyb = "valueb"
+    keya = "valuea"
+    keyc = "valuec" 
+  }
   labels = {
     keyb = "valueb"
     keya = "valuea"
@@ -60,6 +65,11 @@ func testAccGKEHub2Scope_gkehubScopeBasicExample_update(context map[string]inter
 	return acctest.Nprintf(`
 resource "google_gke_hub_scope" "scope" {
   scope_id = "tf-test-scope%{random_suffix}"
+  namespace_labels = {
+    updated_keyb = "updated_valueb"
+    updated_keya = "updated_valuea"
+    updated_keyc = "updated_valuec" 
+  }
   labels = {
     updated_keyb = "updated_valueb"
     updated_keya = "updated_valuea"