From c2798f680c06c2885f548996e69e3a33614a5023 Mon Sep 17 00:00:00 2001
From: Riley Karson <rileykarson@google.com>
Date: Mon, 16 Mar 2020 09:55:24 -0700
Subject: [PATCH] Add mutex, pull extra values from group

---
 products/compute/terraform.yaml                       |  1 +
 templates/terraform/encoders/normalize_group.go.erb   | 11 ++++++++++-
 .../examples/instance_group_named_port_gke.tf.erb     |  8 ++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/products/compute/terraform.yaml b/products/compute/terraform.yaml
index d93cfbad2573..90a0407b6c52 100644
--- a/products/compute/terraform.yaml
+++ b/products/compute/terraform.yaml
@@ -945,6 +945,7 @@ overrides: !ruby/object:Overrides::ResourceOverrides
   InstanceGroupNamedPort: !ruby/object:Overrides::Terraform::ResourceOverride
     id_format: 'projects/{{project}}/zones/{{zone}}/instanceGroups/{{group}}/{{port}}/{{name}}'
     import_format: ['projects/{{project}}/zones/{{zone}}/instanceGroups/{{group}}/{{port}}/{{name}}']
+    mutex: 'projects/{{project}}/zones/{{zone}}/instanceGroups/{{group}}'
     examples:
       - !ruby/object:Provider::Terraform::Examples
         name: "instance_group_named_port_gke"
diff --git a/templates/terraform/encoders/normalize_group.go.erb b/templates/terraform/encoders/normalize_group.go.erb
index 5cda538681ab..ca5104bffb2f 100644
--- a/templates/terraform/encoders/normalize_group.go.erb
+++ b/templates/terraform/encoders/normalize_group.go.erb
@@ -1,2 +1,11 @@
-d.Set("group", GetResourceNameFromSelfLink(d.Get("group").(string)))
+config := meta.(*Config)
+ig, err := ParseInstanceGroupFieldValue(d.Get("group").(string), d, config)
+if err != nil {
+  return nil, err
+}
+
+d.Set("group", ig.Name)
+d.Set("zone", ig.Zone)
+d.Set("project", ig.Project)
+
 return obj, nil
diff --git a/templates/terraform/examples/instance_group_named_port_gke.tf.erb b/templates/terraform/examples/instance_group_named_port_gke.tf.erb
index 65a66528c20f..5e2279017ebd 100644
--- a/templates/terraform/examples/instance_group_named_port_gke.tf.erb
+++ b/templates/terraform/examples/instance_group_named_port_gke.tf.erb
@@ -6,6 +6,14 @@ resource "google_compute_instance_group_named_port" "<%= ctx[:primary_resource_i
   port = 8080
 }
 
+resource "google_compute_instance_group_named_port" "<%= ctx[:primary_resource_id] %>s" {
+  group = google_container_cluster.my_cluster.instance_group_urls[0]
+  zone = "us-central1-a"
+
+  name = "https"
+  port = 4443
+}
+
 resource "google_compute_network" "container_network" {
   name                    = "<%= ctx[:vars]['network_name'] %>"
   auto_create_subnetworks = false