Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Nov 6, 2017
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...ogle/src/main/groovy/com/netflix/spinnaker/clouddriver/google/model/GoogleInstance.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ import groovy.transform.EqualsAndHashCode
class GoogleInstance {

String name
String id
String gceId
String instanceType
String cpuPlatform
Long launchTime
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...com/netflix/spinnaker/clouddriver/google/provider/agent/GoogleInstanceCachingAgent.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down