fix(gce) prevents race condition in how credentials are set on command (

#3397)
spinnaker · Mar 16, 2017 · 127d747 · 127d747
1 parent 3d4e5f4
commit 127d747
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/app/scripts/modules/google/serverGroup/configure/serverGroupCommandBuilder.service.js b/app/scripts/modules/google/serverGroup/configure/serverGroupCommandBuilder.service.js
@@ -292,9 +292,8 @@ module.exports = angular.module('spinnaker.gce.serverGroupCommandBuilder.service
         command.interestingHealthProviderNames = ['Google'];
       }
 
-      attemptToSetValidCredentials(application, defaultCredentials, command);
-
-      return $q.when(command);
+      return attemptToSetValidCredentials(application, defaultCredentials, command)
+        .then(() => command);
   }
 
     // Only used to prepare view requiring template selecting