@spinnaker/google 2026.0.3 → 2026.1.1

package/src/loadBalancer/configure/network/createLoadBalancer.controller.js

@@ -23,7 +23,17 @@ module(GOOGLE_LOADBALANCER_CONFIGURE_NETWORK_CREATELOADBALANCER_CONTROLLER, [
   'application',
   'loadBalancer',
   'isNew',
-  function ($scope, $uibModalInstance, $state, gceLoadBalancerTransformer, application, loadBalancer, isNew) {
+  'forPipelineConfig',
+  function (
+    $scope,
+    $uibModalInstance,
+    $state,
+    gceLoadBalancerTransformer,
+    application,
+    loadBalancer,
+    isNew,
+    forPipelineConfig,
+  ) {
     const ctrl = this;
 
     $scope.isNew = isNew;
@@ -180,39 +190,45 @@ module(GOOGLE_LOADBALANCER_CONFIGURE_NETWORK_CREATELOADBALANCER_CONTROLLER, [
     this.submit = function () {
       const descriptor = isNew ? 'Create' : 'Update';
 
-      $scope.taskMonitor.submit(function () {
-        const params = {
-          cloudProvider: 'gce',
-          loadBalancerName: $scope.loadBalancer.name,
-        };
-
-        if ($scope.loadBalancer.listeners && $scope.loadBalancer.listeners.length > 0) {
-          const listener = $scope.loadBalancer.listeners[0];
-
-          if (listener.protocol) {
-            params.ipProtocol = listener.protocol;
-          }
-
-          if (listener.portRange) {
-            params.portRange = listener.portRange;
-          }
-
-          if (listener.healthCheck) {
-            params.healthCheck = {
-              port: $scope.loadBalancer.healthCheckPort,
-              requestPath: $scope.loadBalancer.healthCheckPath,
-              timeoutSec: $scope.loadBalancer.healthTimeout,
-              checkIntervalSec: $scope.loadBalancer.healthInterval,
-              healthyThreshold: $scope.loadBalancer.healthyThreshold,
-              unhealthyThreshold: $scope.loadBalancer.unhealthyThreshold,
-            };
-          } else {
-            params.healthCheck = null;
-          }
-
-          params.sessionAffinity = $scope.loadBalancer.sessionAffinity;
+      const params = {
+        cloudProvider: 'gce',
+        loadBalancerName: $scope.loadBalancer.name,
+      };
+
+      if ($scope.loadBalancer.listeners && $scope.loadBalancer.listeners.length > 0) {
+        const listener = $scope.loadBalancer.listeners[0];
+
+        if (listener.protocol) {
+          params.ipProtocol = listener.protocol;
         }
 
+        if (listener.portRange) {
+          params.portRange = listener.portRange;
+        }
+
+        if (listener.healthCheck) {
+          params.healthCheck = {
+            port: $scope.loadBalancer.healthCheckPort,
+            requestPath: $scope.loadBalancer.healthCheckPath,
+            timeoutSec: $scope.loadBalancer.healthTimeout,
+            checkIntervalSec: $scope.loadBalancer.healthInterval,
+            healthyThreshold: $scope.loadBalancer.healthyThreshold,
+            unhealthyThreshold: $scope.loadBalancer.unhealthyThreshold,
+          };
+        } else {
+          params.healthCheck = null;
+        }
+
+        params.sessionAffinity = $scope.loadBalancer.sessionAffinity;
+      }
+
+      if (forPipelineConfig) {
+        const command = Object.assign({}, $scope.loadBalancer, params);
+        $uibModalInstance.close(command);
+        return;
+      }
+
+      $scope.taskMonitor.submit(function () {
         return LoadBalancerWriter.upsertLoadBalancer($scope.loadBalancer, application, descriptor, params);
       });
     };

package/src/loadBalancer/configure/network/createLoadBalancer.controller.spec.js

@@ -24,6 +24,7 @@ describe('Controller: gceCreateLoadBalancerCtrl', function () {
         application: app,
         loadBalancer: null,
         isNew: true,
+        forPipelineConfig: false,
       });
     }),
   );
@@ -79,4 +80,39 @@ describe('Controller: gceCreateLoadBalancerCtrl', function () {
     this.ctrl.setVisibilityHealthCheckTab();
     expect(ModalWizard.includePage.calls.count()).toEqual(2);
   });
+
+  it('closes with a pipeline command instead of submitting', function () {
+    let modalInstance;
+    window.inject(function ($controller, $rootScope) {
+      const $scope = $rootScope.$new();
+      const app = ApplicationModelBuilder.createApplicationForTests('app', {
+        key: 'loadBalancers',
+        lazy: true,
+        defaultData: [],
+      });
+      modalInstance = {
+        close: jasmine.createSpy('close'),
+        dismiss: angular.noop,
+        result: { then: angular.noop },
+      };
+      const ctrl = $controller('gceCreateLoadBalancerCtrl', {
+        $scope,
+        $uibModalInstance: modalInstance,
+        application: app,
+        loadBalancer: null,
+        isNew: true,
+        forPipelineConfig: true,
+      });
+      $scope.taskMonitor = { submit: jasmine.createSpy('submit') };
+      ctrl.updateName();
+      ctrl.submit();
+    });
+
+    expect(modalInstance.close).toHaveBeenCalledWith(
+      jasmine.objectContaining({
+        cloudProvider: 'gce',
+        loadBalancerName: 'app',
+      }),
+    );
+  });
 });

package/src/loadBalancer/configure/ssl/gceCreateSslLoadBalancer.controller.ts

@@ -91,6 +91,7 @@ class SslLoadBalancerCtrl extends CommonGceLoadBalancerCtrl implements IControll
     'loadBalancer',
     'gceCommonLoadBalancerCommandBuilder',
     'isNew',
+    'forPipelineConfig',
     'wizardSubFormValidation',
     '$state',
   ];
@@ -101,6 +102,7 @@ class SslLoadBalancerCtrl extends CommonGceLoadBalancerCtrl implements IControll
     private loadBalancer: SslLoadBalancer,
     private gceCommonLoadBalancerCommandBuilder: GceCommonLoadBalancerCommandBuilder,
     private isNew: boolean,
+    private forPipelineConfig: boolean,
     private wizardSubFormValidation: any,
     $state: StateService,
   ) {
@@ -212,6 +214,12 @@ class SslLoadBalancerCtrl extends CommonGceLoadBalancerCtrl implements IControll
     toSubmitLoadBalancer.cloudProvider = 'gce';
     delete toSubmitLoadBalancer.instances;
 
+    if (this.forPipelineConfig) {
+      Object.assign(toSubmitLoadBalancer, { healthCheck: {} });
+      this.$uibModalInstance.close(toSubmitLoadBalancer);
+      return;
+    }
+
     this.taskMonitor.submit(() =>
       LoadBalancerWriter.upsertLoadBalancer(toSubmitLoadBalancer, this.application, descriptor, {
         healthCheck: {},

package/src/loadBalancer/configure/tcp/gceCreateTcpLoadBalancer.controller.ts

@@ -89,6 +89,7 @@ class TcpLoadBalancerCtrl extends CommonGceLoadBalancerCtrl implements ng.ICompo
     'loadBalancer',
     'gceCommonLoadBalancerCommandBuilder',
     'isNew',
+    'forPipelineConfig',
     'wizardSubFormValidation',
     '$state',
   ];
@@ -99,6 +100,7 @@ class TcpLoadBalancerCtrl extends CommonGceLoadBalancerCtrl implements ng.ICompo
     private loadBalancer: TcpLoadBalancer,
     private gceCommonLoadBalancerCommandBuilder: GceCommonLoadBalancerCommandBuilder,
     private isNew: boolean,
+    private forPipelineConfig: boolean,
     private wizardSubFormValidation: any,
     $state: StateService,
   ) {
@@ -203,6 +205,12 @@ class TcpLoadBalancerCtrl extends CommonGceLoadBalancerCtrl implements ng.ICompo
     toSubmitLoadBalancer.cloudProvider = 'gce';
     delete toSubmitLoadBalancer.instances;
 
+    if (this.forPipelineConfig) {
+      Object.assign(toSubmitLoadBalancer, { healthCheck: {} });
+      this.$uibModalInstance.close(toSubmitLoadBalancer);
+      return;
+    }
+
     this.taskMonitor.submit(() =>
       LoadBalancerWriter.upsertLoadBalancer(toSubmitLoadBalancer, this.application, descriptor, {
         healthCheck: {},

package/src/loadBalancer/details/loadBalancerType/loadBalancerType.component.js

@@ -15,7 +15,9 @@ module(GOOGLE_LOADBALANCER_DETAILS_LOADBALANCERTYPE_LOADBALANCERTYPE_COMPONENT,
     this.$onInit = () => {
       this.type = (function (lb) {
         if (lb.loadBalancerType === 'HTTP') {
-          if (_.isString(lb.certificate)) {
+          const hasCertificate = _.isString(lb.certificate) && !_.isEmpty(lb.certificate);
+          const hasCertificateMap = _.isString(lb.certificateMap) && !_.isEmpty(lb.certificateMap);
+          if (hasCertificate || hasCertificateMap) {
             return 'HTTPS';
           } else {
             return 'HTTP';

package/src/loadBalancer/details/loadBalancerType/loadBalancerType.component.spec.js

@@ -0,0 +1,85 @@
+import { mock } from 'angular';
+
+describe('Component: gceLoadBalancerType', () => {
+  let $componentController;
+
+  beforeEach(mock.module(require('./loadBalancerType.component').name));
+
+  beforeEach(
+    mock.inject((_$componentController_) => {
+      $componentController = _$componentController_;
+    }),
+  );
+
+  function buildController(loadBalancer) {
+    return $componentController(
+      'gceLoadBalancerType',
+      {},
+      {
+        loadBalancer,
+      },
+    );
+  }
+
+  it('detects HTTPS when certificate is present', () => {
+    const ctrl = buildController({
+      loadBalancerType: 'HTTP',
+      certificate: 'legacy-cert',
+      certificateMap: null,
+    });
+
+    ctrl.$onInit();
+
+    expect(ctrl.type).toBe('HTTPS');
+  });
+
+  it('detects HTTPS when certificateMap is present', () => {
+    const ctrl = buildController({
+      loadBalancerType: 'HTTP',
+      certificate: null,
+      certificateMap: 'cm',
+    });
+
+    ctrl.$onInit();
+
+    expect(ctrl.type).toBe('HTTPS');
+  });
+
+  it('detects HTTP when neither certificate field is present', () => {
+    const ctrl = buildController({
+      loadBalancerType: 'HTTP',
+      certificate: null,
+      certificateMap: null,
+    });
+
+    ctrl.$onInit();
+
+    expect(ctrl.type).toBe('HTTP');
+  });
+
+  // Both fields populated simultaneously — the || means either triggers HTTPS.
+  it('detects HTTPS when both certificate and certificateMap are present', () => {
+    const ctrl = buildController({
+      loadBalancerType: 'HTTP',
+      certificate: 'legacy-cert',
+      certificateMap: 'cm',
+    });
+
+    ctrl.$onInit();
+
+    expect(ctrl.type).toBe('HTTPS');
+  });
+
+  // Non-HTTP types pass through the else branch and return verbatim.
+  it('returns loadBalancerType verbatim for non-HTTP types', () => {
+    const ctrl = buildController({
+      loadBalancerType: 'SSL',
+      certificate: null,
+      certificateMap: null,
+    });
+
+    ctrl.$onInit();
+
+    expect(ctrl.type).toBe('SSL');
+  });
+});

package/src/loadBalancer/loadBalancer.setTransformer.ts

@@ -16,6 +16,7 @@ export class GceLoadBalancerSetTransformer {
         port,
         name: loadBalancer.name,
         certificate: loadBalancer.certificate,
+        certificateMap: loadBalancer.certificateMap,
         ipAddress: loadBalancer.ipAddress,
         subnet: loadBalancer.subnet,
       };

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

@@ -152,7 +152,6 @@ angular
               }
             }
 
-            // eslint-disable-next-line no-console
             if (command.autoScalingPolicy) {
               command.enableAutoScaling = true;
             }

package/src/serverGroup/configure/wizard/autoScalingPolicy/autoScalingPolicySelector.component.js

@@ -1,9 +1,6 @@
-/* eslint-disable no-debugger */
-import { IComponentOptions, module } from 'angular';
+import { module } from 'angular';
 import { cloneDeep } from 'lodash';
 
-import { TaskMonitor } from '@spinnaker/core';
-
 import { GOOGLE_AUTOSCALINGPOLICY_COMPONENTS_BASICSETTINGS_BASICSETTINGS_COMPONENT } from '../../../../autoscalingPolicy/components/basicSettings/basicSettings.component';
 import { GOOGLE_AUTOSCALINGPOLICY_COMPONENTS_METRICSETTINGS_METRICSETTINGS_COMPONENT } from '../../../../autoscalingPolicy/components/metricSettings/metricSettings.component';
 import { GOOGLE_AUTOSCALINGPOLICY_COMPONENTS_SCALINGSCHEDULES_SCALINGSCHEDULES_COMPONENT } from '../../../../autoscalingPolicy/components/scalingSchedules/scalingSchedules.component';