fix(google): select all zones by default when deploying a regional gc…

…e server group (spinnaker#6751)
christopherthielen · Mar 26, 2019 · ad2e222 · ad2e222
1 parent e5301cf
commit ad2e222
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/scripts/modules/google/src/serverGroup/configure/serverGroupConfiguration.service.js b/app/scripts/modules/google/src/serverGroup/configure/serverGroupConfiguration.service.js
@@ -369,7 +369,7 @@ module.exports = angular
         const regions = command.backingData.credentialsKeyedByAccount[command.credentials].regions;
         if (_.isArray(regions)) {
           filteredData.zones = _.find(regions, { name: command.region }).zones;
-          filteredData.truncatedZones = _.takeRight(filteredData.zones.sort(), 3);
+          filteredData.automaticZones = filteredData.zones.slice().sort();
         } else {
           // TODO(duftler): Remove this once we finish deprecating the old style regions/zones in clouddriver GCE credentials.
           filteredData.zones = regions[command.region];

diff --git a/...scripts/modules/google/src/serverGroup/configure/wizard/zones/zoneSelector.directive.html b/...scripts/modules/google/src/serverGroup/configure/wizard/zones/zoneSelector.directive.html
@@ -19,7 +19,7 @@
       Server group will be available in:
     </p>
     <ul>
-      <li ng-repeat="zone in vm.command.backingData.filtered.truncatedZones">
+      <li ng-repeat="zone in vm.command.backingData.filtered.automaticZones">
         {{zone}}
       </li>
     </ul>

diff --git a/app/scripts/modules/google/src/serverGroup/serverGroup.transformer.js b/app/scripts/modules/google/src/serverGroup/serverGroup.transformer.js
@@ -29,7 +29,7 @@ module.exports = angular
       }
 
       function convertServerGroupCommandToDeployConfiguration(base) {
-        const truncatedZones = base.backingData.filtered.truncatedZones;
+        const automaticZones = base.backingData.filtered.automaticZones;
 
         // use defaults to avoid copying the backingData, which is huge and expensive to copy over
         const command = defaults({ backingData: [], viewState: [] }, base);
@@ -40,7 +40,7 @@ module.exports = angular
         command.disableTraffic = !command.enableTraffic;
         command.cloudProvider = 'gce';
         command.availabilityZones = {};
-        command.availabilityZones[command.region] = base.zone ? [base.zone] : truncatedZones;
+        command.availabilityZones[command.region] = base.zone ? [base.zone] : automaticZones;
         command.account = command.credentials;
         delete command.viewState;
         delete command.backingData;