From 5f86f52d1f7c176ebd79308d40ac56f4158cba16 Mon Sep 17 00:00:00 2001 From: Dana Hoffman Date: Fri, 15 Sep 2017 00:36:29 +0800 Subject: [PATCH] Add DiffSuppressFunc to GKE cluster networks (#419) * fix gke network test * use a state func to store the resource name --- google/resource_container_cluster.go | 9 +++++---- google/self_link_helpers.go | 4 ++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/google/resource_container_cluster.go b/google/resource_container_cluster.go index aa9328cc..2bd36775 100644 --- a/google/resource_container_cluster.go +++ b/google/resource_container_cluster.go @@ -176,10 +176,11 @@ func resourceContainerCluster() *schema.Resource { }, "network": { - Type: schema.TypeString, - Optional: true, - Default: "default", - ForceNew: true, + Type: schema.TypeString, + Optional: true, + Default: "default", + ForceNew: true, + StateFunc: StoreResourceName, }, "subnetwork": { Type: schema.TypeString, diff --git a/google/self_link_helpers.go b/google/self_link_helpers.go index 12956f31..5d0ebd93 100644 --- a/google/self_link_helpers.go +++ b/google/self_link_helpers.go @@ -69,3 +69,7 @@ func GetResourceNameFromSelfLink(link string) string { parts := strings.Split(link, "/") return parts[len(parts)-1] } + +func StoreResourceName(resourceLink interface{}) string { + return GetResourceNameFromSelfLink(resourceLink.(string)) +}