@spinnaker/google 0.2.13 → 2025.0.0

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@spinnaker/google",
   "license": "Apache-2.0",
-  "version": "0.2.13",
+  "version": "2025.0.0",
   "module": "dist/index.js",
   "typings": "dist/index.d.ts",
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "registry": "https://registry.npmjs.org"
   },
   "scripts": {
     "clean": "shx rm -rf dist",
@@ -16,7 +17,7 @@
     "lib": "npm run build"
   },
   "dependencies": {
-    "@spinnaker/core": "^0.29.0",
+    "@spinnaker/core": "^0.29.1",
     "@uirouter/angularjs": "1.0.26",
     "angular": "1.6.10",
     "angular-ui-bootstrap": "2.5.0",
@@ -40,5 +41,5 @@
     "shx": "0.3.3",
     "typescript": "4.3.5"
   },
-  "gitHead": "082a084908e13888d640e88a5bd6e1571479de14"
+  "gitHead": "5b197da8614979a51dc24b0a6f92e19c3162e874"
 }

package/src/instance/gceInstanceType.service.js

@@ -400,9 +400,16 @@ module(GOOGLE_INSTANCE_GCEINSTANCETYPE_SERVICE, []).factory('gceInstanceTypeServ
     }
 
     function getAvailableTypesForLocations(locationToInstanceTypesMap, selectedLocations) {
-      // This function is only ever called with one location.
-      const [location] = selectedLocations;
-      return locationToInstanceTypesMap[location].instanceTypes;
+      if (!locationToInstanceTypesMap || !selectedLocations || selectedLocations.length === 0) {
+        console.error('Invalid input parameters');
+        return [];
+      }
+
+      const availableTypes = selectedLocations
+        .filter((location) => locationToInstanceTypesMap[location])
+        .flatMap((location) => locationToInstanceTypesMap[location].instanceTypes || []);
+
+      return availableTypes;
     }
 
     const getAvailableTypesForRegions = getAvailableTypesForLocations;

package/src/loadBalancer/configure/common/sessionAffinityNameMaps.ts

@@ -12,6 +12,7 @@ export const sessionAffinityViewToModelMap: IStringMap = {
   'Client IP, port and protocol': 'CLIENT_IP_PORT_PROTO',
   'Header Field': 'HEADER_FIELD',
   'HTTP Cookie': 'HTTP_COOKIE',
+  'Strong Cookie': 'STRONG_COOKIE_AFFINITY',
 };
 
 export const sessionAffinityModelToViewMap = _.invert<IStringMap, IStringMap>(sessionAffinityViewToModelMap);

package/src/serverGroup/configure/serverGroupCommandBuilder.service.js

@@ -104,7 +104,9 @@ angular
           }
         });
         const localSSDDisks = disks.filter((disk) => disk.type === 'local-ssd');
-        const persistentDisks = disks.filter((disk) => disk.type.startsWith('pd-'));
+        const persistentDisks = disks.filter(
+          (disk) => disk.type.startsWith('pd-') || disk.type.startsWith('hyperdisk-'),
+        );
 
         if (persistentDisks.length) {
           command.disks = persistentDisks.concat(localSSDDisks);
@@ -149,7 +151,9 @@ angular
       }
 
       function getPersistentDisks(command) {
-        return (command.disks || []).filter((disk) => disk.type.startsWith('pd-'));
+        return (command.disks || []).filter(
+          (disk) => disk.type.startsWith('pd-') || disk.type.startsWith('hyperdisk-'),
+        );
       }
 
       function calculatePersistentDiskOverriddenStorageDescription(command) {
@@ -285,6 +289,18 @@ angular
         }
       }
 
+      function populateResourceManagerTags(instanceTemplateResourceManagerTags, command) {
+        if (instanceTemplateResourceManagerTags) {
+          Object.assign(command.resourceManagerTags, instanceTemplateResourceManagerTags);
+        }
+      }
+
+      function populatePartnerMetadata(instanceTemplatePartnerMetadata, command) {
+        if (instanceTemplatePartnerMetadata) {
+          Object.assign(command.partnerMetadata, instanceTemplatePartnerMetadata);
+        }
+      }
+
       function populateLabels(instanceTemplateLabels, command) {
         if (instanceTemplateLabels) {
           Object.assign(command.labels, instanceTemplateLabels);
@@ -363,6 +379,8 @@ angular
           instanceMetadata: {},
           tags: [],
           labels: {},
+          resourceManagerTags: {},
+          partnerMetadata: {},
           enableSecureBoot: false,
           enableVtpm: false,
           enableIntegrityMonitoring: false,
@@ -441,6 +459,8 @@ angular
           instanceMetadata: {},
           tags: [],
           labels: {},
+          resourceManagerTags: {},
+          partnerMetadata: {},
           availabilityZones: [],
           enableSecureBoot: serverGroup.enableSecureBoot,
           enableVtpm: serverGroup.enableVtpm,
@@ -501,6 +521,11 @@ angular
             populateTags(serverGroup.launchConfig.instanceTemplate.properties.tags, command);
             populateLabels(serverGroup.instanceTemplateLabels, command);
             populateAuthScopes(serverGroup.launchConfig.instanceTemplate.properties.serviceAccounts, command);
+            populateResourceManagerTags(
+              serverGroup.launchConfig.instanceTemplate.properties.resourceManagerTags,
+              command,
+            );
+            populatePartnerMetadata(serverGroup.launchConfig.instanceTemplate.properties.partnerMetadata, command);
 
             return populateDisksFromExisting(serverGroup.launchConfig.instanceTemplate.properties.disks, command).then(
               function () {
@@ -574,6 +599,12 @@ angular
               extendedCommand.tags = [];
               populateTags(instanceTemplateTags, extendedCommand);
 
+              const resourceManagerTags = extendedCommand.resourceManagerTags;
+              populateResourceManagerTags(resourceManagerTags, extendedCommand);
+
+              const partnerMetadata = extendedCommand.partnerMetadata;
+              populatePartnerMetadata(partnerMetadata, extendedCommand);
+
               return extendedCommand;
             });
           });

package/src/serverGroup/configure/serverGroupConfiguration.service.js

@@ -61,7 +61,7 @@ angular
       gceTagManager,
       gceLoadBalancerSetTransformer,
     ) {
-      const persistentDiskTypes = ['pd-standard', 'pd-ssd'];
+      const persistentDiskTypes = ['pd-standard', 'pd-ssd', 'hyperdisk-balanced'];
       const authScopes = [
         'cloud-platform',
         'userinfo.email',
@@ -234,7 +234,7 @@ angular
         const c = command;
         const result = { dirty: {} };
 
-        const locations = c.regional ? [c.region] : [c.zone];
+        const locations = c.regional ? c.distributionPolicy.zones : [c.zone];
         const { credentialsKeyedByAccount } = c.backingData;
         const { locationToInstanceTypesMap } = credentialsKeyedByAccount[c.credentials];
 

package/src/serverGroup/configure/wizard/advancedSettings/advancedSettings.directive.html

@@ -87,6 +87,24 @@
   </div>
   <map-editor model="vm.command.labels" add-button-label="Add New Label" allow-empty="true"></map-editor>
 </div>
+<div class="form-group">
+  <div class="sm-label-left">
+    <b>Resource Manager Tags</b>
+    <help-field key="gce.serverGroup.resourceManagerTags"></help-field>
+  </div>
+  <map-editor model="vm.command.resourceManagerTags" add-button-label="Add New Tag" allow-empty="false"></map-editor>
+</div>
+<div class="form-group">
+  <div class="sm-label-left">
+    <b>Partner Metadata</b>
+    <help-field key="gce.serverGroup.partnerMetadata"></help-field>
+  </div>
+  <map-object-editor
+    model="vm.command.partnerMetadata"
+    add-button-label="Add New Metadata"
+    allow-empty="false"
+  ></map-object-editor>
+</div>
 <div class="form-group">
   <div class="sm-label-left">
     Shielded VMs

package/src/serverGroup/configure/wizard/advancedSettings/advancedSettingsSelector.directive.spec.js

@@ -18,7 +18,7 @@ describe('Directive: GCE Group Advanced Settings Selector', function () {
       );
       this.gceTagManager = gceTagManager;
       this.scope = $rootScope.$new();
-      this.scope.command = { instanceMetadata: [], tags: [], labels: [], authScopes: [] };
+      this.scope.command = { instanceMetadata: [], tags: [], labels: [], authScopes: [], resourceManagerTags: [] };
       this.elem = angular.element(
         '<gce-server-group-advanced-settings-selector command="command"></gce-server-group-advanced-settings-selector>',
       );

package/src/serverGroup/configure/wizard/advancedSettings/diskConfigurer.component.ts

@@ -84,7 +84,9 @@ class GceDiskConfigurerController implements IComponentController {
   }
 
   private sortDisks(disks: IGceDisk[]): IGceDisk[] {
-    const diskWithoutImage = disks.find((disk) => disk.type.startsWith('pd-') && disk.sourceImage === undefined);
+    const diskWithoutImage = disks.find(
+      (disk) => (disk.type.startsWith('pd-') || disk.type.startsWith('hyperdisk-')) && disk.sourceImage === undefined,
+    );
     return [diskWithoutImage].concat(without(disks, diskWithoutImage));
   }
 
@@ -93,7 +95,9 @@ class GceDiskConfigurerController implements IComponentController {
   }
 
   private getPersistentDisks(): IGceDisk[] {
-    return (this.command.disks || []).filter((disk: IGceDisk) => disk.type.startsWith('pd-'));
+    return (this.command.disks || []).filter(
+      (disk: IGceDisk) => disk.type.startsWith('pd-') || disk.type.startsWith('hyperdisk-'),
+    );
   }
 }