chore(titus/serverGroup): Migrate from $q.all({}) to $q.all([])

spinnaker · Oct 26, 2020 · ab6cc5e · ab6cc5e
1 parent 894caf7
commit ab6cc5e
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/app/scripts/modules/amazon/src/pipeline/stages/bake/awsBakeStage.js b/app/scripts/modules/amazon/src/pipeline/stages/bake/awsBakeStage.js
@@ -65,14 +65,14 @@ module(AMAZON_PIPELINE_STAGES_BAKE_AWSBAKESTAGE, [AMAZON_PIPELINE_STAGES_BAKE_BA
       };
 
       function initialize() {
-        $q.all({
-          regions: BakeryReader.getRegions('aws'),
-          baseOsOptions: BakeryReader.getBaseOsOptions('aws'),
-          baseLabelOptions: BakeryReader.getBaseLabelOptions(),
-          storeTypes: ['ebs', 'docker'],
-        }).then(function (results) {
-          $scope.regions = [...results.regions].sort();
-          $scope.storeTypes = results.storeTypes;
+        $q.all([
+          BakeryReader.getRegions('aws'),
+          BakeryReader.getBaseOsOptions('aws'),
+          BakeryReader.getBaseLabelOptions(),
+          ['ebs', 'docker'],
+        ]).then(function ([regions, baseOsOptions, baseLabelOptions, storeTypes]) {
+          $scope.regions = [...regions].sort();
+          $scope.storeTypes = storeTypes;
           if (!$scope.stage.storeType && $scope.storeTypes && $scope.storeTypes.length) {
             $scope.stage.storeType = $scope.storeTypes[0];
           }
@@ -84,8 +84,8 @@ module(AMAZON_PIPELINE_STAGES_BAKE_AWSBAKESTAGE, [AMAZON_PIPELINE_STAGES_BAKE_BA
           if (!$scope.stage.regions.length && $scope.application.defaultRegions.aws) {
             $scope.stage.regions.push(...Object.keys($scope.application.defaultRegions.aws).sort());
           }
-          $scope.baseOsOptions = results.baseOsOptions.baseImages;
-          $scope.baseLabelOptions = results.baseLabelOptions;
+          $scope.baseOsOptions = baseOsOptions.baseImages;
+          $scope.baseLabelOptions = baseLabelOptions;
 
           if (!$scope.stage.baseOs && $scope.baseOsOptions && $scope.baseOsOptions.length) {
             $scope.stage.baseOs = $scope.baseOsOptions[0].id;