From 534b249cd549c5e8442de8ea9fac0c25ecdeaf77 Mon Sep 17 00:00:00 2001
From: Matt Duftler <duftler@google.com>
Date: Mon, 6 Nov 2017 12:27:41 +0100
Subject: [PATCH] fix(provider/gce): Distinguish instance id from gceId.

---
 .../spinnaker/clouddriver/google/model/GoogleInstance.groovy  | 4 ++--
 .../google/provider/agent/GoogleInstanceCachingAgent.groovy   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/model/GoogleInstance.groovy b/clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/model/GoogleInstance.groovy
index ebf662b4ad6..e94217cf43c 100644
--- a/clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/model/GoogleInstance.groovy
+++ b/clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/model/GoogleInstance.groovy
@@ -40,7 +40,7 @@ import groovy.transform.EqualsAndHashCode
 class GoogleInstance {
 
   String name
-  String id
+  String gceId
   String instanceType
   String cpuPlatform
   Long launchTime
@@ -76,7 +76,7 @@ class GoogleInstance {
     final String cloudProvider = GoogleCloudProvider.ID
 
     String name = GoogleInstance.this.name
-    String id = GoogleInstance.this.id
+    String gceId = GoogleInstance.this.gceId
     String instanceId = GoogleInstance.this.name
     String instanceType = GoogleInstance.this.instanceType
     String cpuPlatform = GoogleInstance.this.cpuPlatform
diff --git a/clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/GoogleInstanceCachingAgent.groovy b/clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/GoogleInstanceCachingAgent.groovy
index 1e8035924cb..fcf4915c8ab 100644
--- a/clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/GoogleInstanceCachingAgent.groovy
+++ b/clouddriver-google/src/main/groovy/com/netflix/spinnaker/clouddriver/google/provider/agent/GoogleInstanceCachingAgent.groovy
@@ -104,7 +104,7 @@ class GoogleInstanceCachingAgent extends AbstractGoogleCachingAgent {
         String instanceName = Utils.getLocalName(instance.name)
         def googleInstance = new GoogleInstance(
             name: instanceName,
-            id: instance.id,
+            gceId: instance.id,
             instanceType: Utils.getLocalName(instance.machineType),
             cpuPlatform: instance.cpuPlatform,
             launchTime: instanceTimestamp,