fix(provider/gce): Distinguish instance id from gceId. (#2084)

spinnaker · Nov 6, 2017 · 0758444 · 0758444
1 parent 7f332b2
commit 0758444
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...ogle/src/main/groovy/com/netflix/spinnaker/clouddriver/google/model/GoogleInstance.groovy b/...ogle/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/...com/netflix/spinnaker/clouddriver/google/provider/agent/GoogleInstanceCachingAgent.groovy b/...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,