@spinnaker/azure 0.3.31 → 0.4.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@spinnaker/azure",
   "license": "Apache-2.0",
-  "version": "0.3.31",
+  "version": "0.4.0",
   "module": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
@@ -13,7 +13,7 @@
     "lib": "npm run build"
   },
   "dependencies": {
-    "@spinnaker/core": "^0.22.2",
+    "@spinnaker/core": "^0.23.0",
     "@uirouter/angularjs": "1.0.26",
     "angular": "1.6.10",
     "angular-ui-bootstrap": "2.5.0",
@@ -35,5 +35,5 @@
     "shx": "0.3.3",
     "typescript": "4.3.5"
   },
-  "gitHead": "587b5a7a5fe2121cd93bed86e5e83795ee401be0"
+  "gitHead": "4d61e53884040e8cae45d29b398c88e3814c6aca"
 }

package/src/pipeline/stages/bake/azureBakeStage.js

@@ -4,6 +4,7 @@ import { module } from 'angular';
 import _ from 'lodash';
 
 import {
+  AccountService,
   AuthenticationService,
   BakeExecutionLabel,
   BakeryReader,
@@ -13,10 +14,16 @@ import {
 } from '@spinnaker/core';
 
 import { AZURE_PIPELINE_STAGES_BAKE_BAKEEXECUTIONDETAILS_CONTROLLER } from './bakeExecutionDetails.controller';
+import { AZURE_IMAGE_IMAGE_READER } from '../../../image/image.reader';
+import { AZURE_SERVERGROUP_CONFIGURE_SERVERGROUPCOMMANDBUILDER_SERVICE } from './../../../serverGroup/configure/serverGroupCommandBuilder.service';
 
 export const AZURE_PIPELINE_STAGES_BAKE_AZUREBAKESTAGE = 'spinnaker.azure.pipeline.stage.bakeStage';
 export const name = AZURE_PIPELINE_STAGES_BAKE_AZUREBAKESTAGE; // for backwards compatibility
-module(AZURE_PIPELINE_STAGES_BAKE_AZUREBAKESTAGE, [AZURE_PIPELINE_STAGES_BAKE_BAKEEXECUTIONDETAILS_CONTROLLER])
+module(AZURE_PIPELINE_STAGES_BAKE_AZUREBAKESTAGE, [
+  AZURE_SERVERGROUP_CONFIGURE_SERVERGROUPCOMMANDBUILDER_SERVICE,
+  AZURE_IMAGE_IMAGE_READER,
+  AZURE_PIPELINE_STAGES_BAKE_BAKEEXECUTIONDETAILS_CONTROLLER,
+])
   .config(function () {
     Registry.pipeline.registerStage({
       provides: 'bake',
@@ -50,8 +57,9 @@ module(AZURE_PIPELINE_STAGES_BAKE_AZUREBAKESTAGE, [AZURE_PIPELINE_STAGES_BAKE_BA
   .controller('azureBakeStageCtrl', [
     '$scope',
     '$q',
+    'azureImageReader',
     '$uibModal',
-    function ($scope, $q, $uibModal) {
+    function ($scope, $q, azureImageReader, $uibModal) {
       $scope.stage.extendedAttributes = $scope.stage.extendedAttributes || {};
       $scope.stage.regions = $scope.stage.regions || [];
 
@@ -65,10 +73,12 @@ module(AZURE_PIPELINE_STAGES_BAKE_AZUREBAKESTAGE, [AZURE_PIPELINE_STAGES_BAKE_BA
 
       function initialize() {
         $q.all([
+          AccountService.getCredentialsKeyedByAccount('azure'),
           BakeryReader.getRegions('azure'),
           BakeryReader.getBaseOsOptions('azure'),
           BakeryReader.getBaseLabelOptions(),
-        ]).then(function ([regions, baseOsOptions, baseLabelOptions]) {
+        ]).then(function ([credentialsKeyedByAccount, regions, baseOsOptions, baseLabelOptions]) {
+          $scope.accounts = Object.keys(credentialsKeyedByAccount);
           $scope.regions = regions;
           if ($scope.regions.length === 1) {
             $scope.stage.region = $scope.regions[0];
@@ -82,32 +92,26 @@ module(AZURE_PIPELINE_STAGES_BAKE_AZUREBAKESTAGE, [AZURE_PIPELINE_STAGES_BAKE_BA
             $scope.stage.regions.push($scope.application.defaultRegions.azure);
           }
           $scope.baseOsOptions = baseOsOptions.baseImages;
-          if ($scope.baseOsOptions.length) {
-            $scope.stage.osType = baseOsOptions.baseImages[0].osType;
-          }
 
           $scope.baseLabelOptions = baseLabelOptions;
+          $scope.osTypeOptions = ['linux', 'windows'];
+          $scope.packageTypeOptions = ['DEB', 'RPM'];
 
-          if (!$scope.stage.baseOs && $scope.baseOsOptions && $scope.baseOsOptions.length) {
-            $scope.stage.baseOs = $scope.baseOsOptions[0].id;
-          }
-
-          if (!$scope.stage.baseLabel && $scope.baseLabelOptions && $scope.baseLabelOptions.length) {
-            $scope.stage.baseLabel = $scope.baseLabelOptions[0];
-          }
           $scope.viewState.roscoMode =
             SETTINGS.feature.roscoMode ||
             (typeof SETTINGS.feature.roscoSelector === 'function' && SETTINGS.feature.roscoSelector($scope.stage));
           $scope.showAdvancedOptions = showAdvanced();
           $scope.viewState.loading = false;
+
+          if ($scope.stage.managedImage != null) {
+            $scope.managedImagesWasChosen = true;
+            setManagedImages();
+          }
+          $scope.defaultImagesWasChosen = $scope.stage.baseOs != null;
+          $scope.customImagesWasChosen = $scope.stage.publisher != null;
         });
       }
 
-      this.baseOsChanged = () => {
-        const selectedOption = _.find($scope.baseOsOptions, { id: $scope.stage.baseOs });
-        $scope.stage.osType = selectedOption.osType;
-      };
-
       function stageUpdated() {
         deleteEmptyProperties();
         // Since the selector computes using stage as an input, it needs to be able to recompute roscoMode on updates
@@ -133,6 +137,33 @@ module(AZURE_PIPELINE_STAGES_BAKE_AZUREBAKESTAGE, [AZURE_PIPELINE_STAGES_BAKE_BA
         });
       }
 
+      function setManagedImages() {
+        azureImageReader
+          .findImages({ provider: 'azure', managedImages: true, account: $scope.stage.account })
+          .then(function (images) {
+            let managedImageOptions = [];
+            for (let i in images) {
+              let image = images[i];
+              let newImage = {
+                id: image.imageName,
+                osType: image.ostype,
+                name: image.imageName,
+              };
+              managedImageOptions.push(newImage);
+            }
+            $scope.managedImageOptions = managedImageOptions;
+          })
+          .catch(() => {});
+      }
+
+      function setRegions() {
+        AccountService.getRegionsForAccount($scope.stage.account)
+          .then(function (regions) {
+            $scope.regions = regions.map((r) => r.name);
+          })
+          .catch(() => {});
+      }
+
       this.addExtendedAttribute = function () {
         if (!$scope.stage.extendedAttributes) {
           $scope.stage.extendedAttributes = {};
@@ -175,6 +206,69 @@ module(AZURE_PIPELINE_STAGES_BAKE_AZUREBAKESTAGE, [AZURE_PIPELINE_STAGES_BAKE_BA
         return $scope.viewState.roscoMode || $scope.stage.varFileName;
       };
 
+      this.showDefaultImages = function () {
+        $scope.managedImagesWasChosen = false;
+        $scope.defaultImagesWasChosen = true;
+        $scope.customImagesWasChosen = false;
+
+        $scope.stage.managedImage = null;
+        $scope.stage.publisher = null;
+        $scope.stage.offer = null;
+        $scope.stage.sku = null;
+        $scope.stage.osType = null;
+        $scope.stage.packageType = null;
+      };
+
+      this.showManagedImages = function () {
+        setManagedImages();
+
+        $scope.managedImagesWasChosen = true;
+        $scope.defaultImagesWasChosen = false;
+        $scope.customImagesWasChosen = false;
+
+        $scope.stage.osType = null;
+        $scope.stage.baseOs = null;
+        $scope.stage.publisher = null;
+        $scope.stage.offer = null;
+        $scope.stage.sku = null;
+        $scope.stage.packageType = null;
+      };
+
+      this.showCustomImages = function () {
+        $scope.managedImagesWasChosen = false;
+        $scope.defaultImagesWasChosen = false;
+        $scope.customImagesWasChosen = true;
+
+        $scope.stage.baseOs = null;
+        $scope.stage.managedImage = null;
+        $scope.stage.osType = null;
+        $scope.stage.packageType = null;
+      };
+
+      this.onChangeAccount = () => {
+        $scope.stage.osType = null;
+        $scope.stage.packageType = null;
+        $scope.stage.managedImage = null;
+
+        if ($scope.stage.account) {
+          setRegions();
+        }
+
+        if ($scope.managedImagesWasChosen) {
+          setManagedImages();
+        }
+      };
+
+      $scope.onChangeManagedImage = () => {
+        $scope.stage.packageType = null;
+        const selectedManagedImage = _.find($scope.managedImageOptions, { id: $scope.stage.managedImage });
+        $scope.stage.osType = selectedManagedImage.osType.toLowerCase();
+      };
+
+      this.onChangeOsType = function (e) {
+        $scope.stage.packageType = null;
+      };
+
       $scope.$watch('stage', stageUpdated, true);
 
       initialize();

package/src/pipeline/stages/bake/bakeStage.html

@@ -3,15 +3,100 @@
     <loading-spinner size="'small'"></loading-spinner>
   </div>
   <div ng-if="!viewState.loading">
+    <stage-config-field label="Account">
+      <account-select-field
+        component="stage"
+        field="account"
+        accounts="accounts"
+        provider="'azure'"
+        on-change="bakeStageCtrl.onChangeAccount()"
+      />
+    </stage-config-field>
+
     <stage-config-field label="Regions">
       <checklist items="regions" model="stage.regions" inline="true" include-select-all-button="true"></checklist>
     </stage-config-field>
+
+    <div class="panel panel-default">
+      <div class="panel-heading">
+        <label class="col-md-3 sm-label-right"></label>
+        <div class="btn-group btn-group-xs" role="group" aria-label="Source Image">
+          <button
+            class="btn btn-default"
+            aria-pressed="true"
+            ng-click="bakeStageCtrl.showDefaultImages()"
+            ng-class="{active: defaultImagesWasChosen}"
+          >
+            Default Images
+          </button>
+          <button
+            class="btn btn-default"
+            aria-pressed="true"
+            ng-click="bakeStageCtrl.showManagedImages()"
+            ng-class="{active: managedImagesWasChosen}"
+          >
+            Managed Images
+          </button>
+          <button
+            class="btn btn-default"
+            aria-pressed="true"
+            ng-click="bakeStageCtrl.showCustomImages()"
+            ng-class="{active: customImagesWasChosen}"
+          >
+            Custom Image
+          </button>
+        </div>
+      </div>
+
+      <div class="panel-body">
+        <stage-config-field label="Base OS" ng-show="defaultImagesWasChosen">
+          <bake-stage-choose-os model="stage.baseOs" base-os-options="baseOsOptions"></bake-stage-choose-os>
+        </stage-config-field>
+
+        <stage-config-field label="Managed Image" ng-show="managedImagesWasChosen">
+          <bake-stage-choose-managed-image
+            model="stage.managedImage"
+            managed-image-options="managedImageOptions"
+            on-change="onChangeManagedImage"
+          ></bake-stage-choose-managed-image>
+        </stage-config-field>
+
+        <stage-config-field label="Publisher" ng-show="customImagesWasChosen">
+          <input type="text" class="form-control input-sm" ng-model="stage.publisher" />
+        </stage-config-field>
+        <stage-config-field label="Offer" ng-show="customImagesWasChosen">
+          <input type="text" class="form-control input-sm" ng-model="stage.offer" />
+        </stage-config-field>
+        <stage-config-field label="SKU" ng-show="customImagesWasChosen">
+          <input type="text" class="form-control input-sm" ng-model="stage.sku" />
+        </stage-config-field>
+
+        <stage-config-field label="OS Type" ng-show="customImagesWasChosen">
+          <label class="radio-inline" ng-repeat="osType in osTypeOptions">
+            <input
+              type="radio"
+              ng-model="stage.osType"
+              ng-value="osType"
+              name="osType"
+              ng-change="bakeStageCtrl.onChangeOsType(value)"
+            />
+            {{osType}}
+          </label>
+        </stage-config-field>
+
+        <stage-config-field label="Package Type" ng-show="stage.osType === 'linux'">
+          <label class="radio-inline" ng-repeat="packageType in packageTypeOptions">
+            <input type="radio" ng-model="stage.packageType" ng-value="packageType" name="packageType" />
+            {{packageType}}
+          </label>
+        </stage-config-field>
+      </div>
+    </div>
+
     <stage-config-field label="Package" help-key="pipeline.config.bake.package">
       <input type="text" class="form-control input-sm" ng-model="stage.package" />
     </stage-config-field>
-    <stage-config-field label="Base OS">
-      <bake-stage-choose-os model="stage.baseOs" base-os-options="baseOsOptions"></bake-stage-choose-os>
-    </stage-config-field>
+
     <stage-config-field label="Base Label">
       <label class="radio-inline" ng-repeat="baseLabel in baseLabelOptions">
         <input type="radio" ng-model="stage.baseLabel" ng-value="baseLabel" />