@spinnaker/core 2026.0.3 → 2026.1.1

package/src/pipeline/config/triggers/Triggers.tsx

@@ -13,6 +13,7 @@ import { ReactInjector } from '../../../reactShims/react.injector';
 export interface ITriggersProps {
   application: Application;
   pipeline: IPipeline;
+  pipelineConfig?: IPipeline;
   fieldUpdated: () => void;
   updatePipelineConfig: (changes: Partial<IPipeline>) => void;
   revertCount: number;
@@ -54,7 +55,11 @@ export function Triggers(props: ITriggersProps) {
         <NotificationsPageContent {...props} />
       </PageSection>
       <PageSection pageKey="description" label="Metadata" noWrapper={true}>
-        <MetadataPageContent {...props} key={revertCountKLUDGE} />
+        <MetadataPageContent
+          pipeline={props.pipelineConfig || props.pipeline}
+          updatePipelineConfig={props.updatePipelineConfig}
+          key={revertCountKLUDGE}
+        />
       </PageSection>
     </PageNavigator>
   );

package/src/pipeline/config/triggers/index.ts

@@ -13,4 +13,3 @@ import './plugin/plugin.trigger';
 import './pubsub/pubsub.trigger';
 import './travis/travis.trigger';
 import './webhook/webhook.trigger';
-import './wercker/wercker.trigger';

package/src/pipeline/config/triggers/triggers.module.ts

@@ -10,6 +10,7 @@ module(TRIGGERS, []).component(
   react2angular(withErrorBoundary(TriggersWrapper, 'triggers'), [
     'application',
     'pipeline',
+    'pipelineConfig',
     'fieldUpdated',
     'updatePipelineConfig',
     'revertCount',

package/src/pipeline/pipeline.module.ts

@@ -56,7 +56,6 @@ import './config/stages/wait/waitStage';
 import './config/stages/waitForCondition/waitForConditionStage';
 import { CORE_PIPELINE_CONFIG_STAGES_WAITFORPARENTTASKS_WAITFORPARENTTASKS } from './config/stages/waitForParentTasks/waitForParentTasks';
 import { WEBHOOK_STAGE_MODULE } from './config/stages/webhook/webhookStage.module';
-import { WERCKER_STAGE_MODULE } from './config/stages/wercker/werckerStage.module';
 import { PIPELINE_TEMPLATES_V2_STATES_CONFIG } from './config/templates/v2/pipelineTemplateV2.states';
 import { EXECUTION_DETAILS_SECTION_NAV } from './details/executionDetailsSectionNav.component';
 import { STAGE_FAILURE_MESSAGE_COMPONENT } from './details/stageFailureMessage.component';
@@ -87,7 +86,6 @@ module(PIPELINE_MODULE, [
   CORE_PIPELINE_CONFIG_PIPELINECONFIG_MODULE,
   GROUP_STAGE_MODULE,
   TRAVIS_STAGE_MODULE,
-  WERCKER_STAGE_MODULE,
   PRECONFIGUREDJOB_STAGE_MODULE,
   WEBHOOK_STAGE_MODULE,
   UNMATCHED_STAGE_TYPE_STAGE,

package/src/presentation/ReactModal.spec.tsx

@@ -0,0 +1,72 @@
+import React from 'react';
+import ReactDOM from 'react-dom';
+
+import type { IModalComponentProps } from './modal';
+import { ReactModal } from './ReactModal';
+
+const TestModal = (_props: IModalComponentProps): JSX.Element => null;
+
+const getLastRender = (renders: React.ReactElement[]): React.ReactElement =>
+  renders[renders.length - 1] as React.ReactElement;
+
+const flushPromises = (): Promise<void> => Promise.resolve();
+
+describe('ReactModal', () => {
+  it('resolves after the modal exit completes', async () => {
+    const renders: React.ReactElement[] = [];
+    spyOn(ReactDOM, 'render').and.callFake((element) => {
+      renders.push(element as React.ReactElement);
+      return null;
+    });
+    const unmountSpy = spyOn(ReactDOM, 'unmountComponentAtNode').and.returnValue(true);
+
+    let resolvedValue: string | null = null;
+    const promise = ReactModal.show(TestModal);
+    promise.then((value) => {
+      resolvedValue = value as string;
+    });
+
+    const initialModal = getLastRender(renders);
+    const closeModal = (initialModal.props.children as any).props.closeModal as (value?: string) => void;
+    closeModal('gce');
+
+    await flushPromises();
+    expect(resolvedValue).toBeNull();
+
+    const afterCloseModal = getLastRender(renders);
+    afterCloseModal.props.onExited();
+
+    await flushPromises();
+    expect(resolvedValue).toBe('gce');
+    expect(unmountSpy).toHaveBeenCalled();
+  });
+
+  it('rejects after the modal exit completes', async () => {
+    const renders: React.ReactElement[] = [];
+    spyOn(ReactDOM, 'render').and.callFake((element) => {
+      renders.push(element as React.ReactElement);
+      return null;
+    });
+    const unmountSpy = spyOn(ReactDOM, 'unmountComponentAtNode').and.returnValue(true);
+
+    let rejectedValue: string | null = null;
+    const promise = ReactModal.show(TestModal);
+    promise.catch((value) => {
+      rejectedValue = value as string;
+    });
+
+    const initialModal = getLastRender(renders);
+    const dismissModal = (initialModal.props.children as any).props.dismissModal as (value?: string) => void;
+    dismissModal('cancelled');
+
+    await flushPromises();
+    expect(rejectedValue).toBeNull();
+
+    const afterDismissModal = getLastRender(renders);
+    afterDismissModal.props.onExited();
+
+    await flushPromises();
+    expect(rejectedValue).toBe('cancelled');
+    expect(unmountSpy).toHaveBeenCalled();
+  });
+});

package/src/presentation/ReactModal.tsx

@@ -35,12 +35,19 @@ export class ReactModal {
     const modalPromise = new Promise<T>((resolve, reject) => {
       let mountNode = document.createElement('div');
       let show = true;
+      let pendingResult: { handler: (result: any) => void; value: any } | null = null;
 
       function onExited() {
         if (!mountNode) {
           return;
         }
 
+        if (pendingResult) {
+          const { handler, value } = pendingResult;
+          pendingResult = null;
+          handler(value);
+        }
+
         ReactDOM.unmountComponentAtNode(mountNode);
         mountNode = null;
       }
@@ -50,8 +57,11 @@ export class ReactModal {
           return;
         }
 
-        resultHandler(result);
-        // Use react-bootstrap modal lifecycle, i.e. show=false, which triggers onExited
+        if (pendingResult) {
+          return;
+        }
+
+        pendingResult = { handler: resultHandler, value: result };
         show = false;
         render();
       };

package/dist/pipeline/config/stages/wercker/WerckerExecutionLabel.d.ts

@@ -1,7 +0,0 @@
-import React from 'react';
-import type { IExecutionStageSummary } from '../../../../domain';
-export declare class WerckerExecutionLabel extends React.Component<{
-    stage: IExecutionStageSummary;
-}> {
-    render(): JSX.Element;
-}

package/dist/pipeline/config/stages/wercker/modal/addParameter.controller.modal.d.ts

@@ -1,10 +0,0 @@
-import type { IController } from 'angular';
-import type { IModalInstanceService } from 'angular-ui-bootstrap';
-export declare class WerckerStageAddParameter implements IController {
-    private $scope;
-    private $uibModalInstance;
-    static $inject: string[];
-    constructor($scope: ng.IScope, $uibModalInstance: IModalInstanceService);
-    submit(): void;
-}
-export declare const WERCKER_STAGE_ADD_PARAMETER_MODAL_CONTROLLER = "spinnaker.core.pipeline.stage.wercker.modal.addParameter";

package/dist/pipeline/config/stages/wercker/werckerExecutionDetails.controller.d.ts

@@ -1,18 +0,0 @@
-import type { StateParams } from '@uirouter/angularjs';
-import type { IController, IScope } from 'angular';
-import type { ExecutionDetailsSectionService } from '../../../details/executionDetailsSection.service';
-export declare class WerckerExecutionDetailsCtrl implements IController {
-    private $stateParams;
-    private executionDetailsSectionService;
-    private $scope;
-    configSections: string[];
-    detailsSection: string;
-    failureMessage: string;
-    stage: any;
-    static $inject: string[];
-    constructor($stateParams: StateParams, executionDetailsSectionService: ExecutionDetailsSectionService, $scope: IScope);
-    initialized(): void;
-    private getFailureMessage;
-    private initialize;
-}
-export declare const WERCKER_EXECUTION_DETAILS_CONTROLLER = "spinnaker.core.pipeline.stage.wercker.executionDetails.controller";

package/dist/pipeline/config/stages/wercker/werckerStage.d.ts

@@ -1,51 +0,0 @@
-import type { IController, IScope } from 'angular';
-import type { IModalService } from 'angular-ui-bootstrap';
-import type { IParameterDefinitionList } from '../../../../domain';
-export interface IWerckerStageViewState {
-    mastersLoaded: boolean;
-    mastersRefreshing: boolean;
-    appsLoaded: boolean;
-    appsRefreshing: boolean;
-    failureOption?: string;
-    markUnstableAsSuccessful?: boolean;
-    waitForCompletion?: boolean;
-    masterIsParameterized?: boolean;
-    jobIsParameterized?: boolean;
-}
-export interface IParameter {
-    key: string;
-    value: string;
-}
-export declare class WerckerStage implements IController {
-    stage: any;
-    private $uibModal;
-    viewState: IWerckerStageViewState;
-    useDefaultParameters: any;
-    userSuppliedParameters: any;
-    masters: string[];
-    jobs: string[];
-    jobParams: IParameterDefinitionList[];
-    apps: string[];
-    pipelines: string[];
-    filterLimit: number;
-    private filterThreshold;
-    app: string;
-    pipeline: string;
-    job: string;
-    static $inject: string[];
-    constructor(stage: any, $scope: IScope, $uibModal: IModalService);
-    markUnstableChanged(): void;
-    waitForCompletionChanged(): void;
-    refreshMasters(): void;
-    private initializeMasters;
-    refreshApps(): void;
-    private updateAppsList;
-    refreshJobs(): void;
-    private updateJobsList;
-    private updateJob;
-    private updateJobConfig;
-    addParameter(): void;
-    removeParameter(key: string): void;
-    shouldFilter(): boolean;
-}
-export declare const WERCKER_STAGE = "spinnaker.core.pipeline.stage.werckerStage";

package/dist/pipeline/config/stages/wercker/werckerStage.module.d.ts

@@ -1 +0,0 @@
-export declare const WERCKER_STAGE_MODULE = "spinnaker.core.pipeline.stage.wercker";

package/dist/pipeline/config/triggers/wercker/WerckerTrigger.d.ts

@@ -1,13 +0,0 @@
-/// <reference types="react" />
-import type { FormikProps } from 'formik';
-import type { Application } from '../../../../application';
-import type { IBaseBuildTriggerConfigProps } from '../baseBuild/BaseBuildTrigger';
-import type { IWerckerTrigger } from '../../../../domain';
-export interface IWerckerTriggerConfigProps extends IBaseBuildTriggerConfigProps {
-    formik: FormikProps<IWerckerTrigger>;
-    trigger: IWerckerTrigger;
-    application: Application;
-    pipelineId: string;
-    triggerUpdated: (trigger: IWerckerTrigger) => void;
-}
-export declare function WerckerTrigger(werckerTriggerProps: IWerckerTriggerConfigProps): JSX.Element;

package/dist/pipeline/config/triggers/wercker/WerckerTriggerTemplate.d.ts

@@ -1,7 +0,0 @@
-import React from 'react';
-import { BaseBuildTriggerTemplate } from '../baseBuild/BaseBuildTriggerTemplate';
-import type { ITriggerTemplateComponentProps } from '../../../manualExecution/TriggerTemplate';
-export declare class WerckerTriggerTemplate extends React.Component<ITriggerTemplateComponentProps> {
-    static formatLabel: typeof BaseBuildTriggerTemplate.formatLabel;
-    render(): JSX.Element;
-}

package/dist/pipeline/config/triggers/wercker/wercker.trigger.d.ts

@@ -1 +0,0 @@
-export {};

package/src/pipeline/config/stages/wercker/WerckerExecutionLabel.tsx

@@ -1,32 +0,0 @@
-import React from 'react';
-
-import type { IExecutionStageSummary } from '../../../../domain';
-
-export class WerckerExecutionLabel extends React.Component<{ stage: IExecutionStageSummary }> {
-  public render() {
-    const buildInfo = this.props.stage.masterStage.context.buildInfo || {};
-    const testResults = (buildInfo.testResults || []).map((result: any, index: number) => (
-      <div key={index}>
-        {'( '}
-        <span className="tests-pass-count">{result.totalCount - result.failCount - result.skipCount}</span>
-        {' / '}
-        <span className="tests-fail-count">{result.failCount}</span>
-        {result.skipCount > 0 && (
-          <span>
-            <span> / </span>
-            <span className="tests-skip-count">{result.skipCount}</span>
-          </span>
-        )}
-        {' )'}
-      </div>
-    ));
-
-    return (
-      <span className="stage-label">
-        <span>{this.props.stage.name}</span>
-        {buildInfo.number && <div>Build #{buildInfo.number}</div>}
-        {testResults}
-      </span>
-    );
-  }
-}

package/src/pipeline/config/stages/wercker/modal/addParameter.controller.modal.ts

@@ -1,19 +0,0 @@
-import type { IController } from 'angular';
-import { module } from 'angular';
-import type { IModalInstanceService } from 'angular-ui-bootstrap';
-
-export class WerckerStageAddParameter implements IController {
-  public static $inject = ['$scope', '$uibModalInstance'];
-  constructor(private $scope: ng.IScope, private $uibModalInstance: IModalInstanceService) {}
-
-  public submit(): void {
-    this.$uibModalInstance.close(this.$scope.parameter);
-  }
-}
-
-export const WERCKER_STAGE_ADD_PARAMETER_MODAL_CONTROLLER = 'spinnaker.core.pipeline.stage.wercker.modal.addParameter';
-
-module(WERCKER_STAGE_ADD_PARAMETER_MODAL_CONTROLLER, []).controller(
-  'WerckerStageAddParameterCtrl',
-  WerckerStageAddParameter,
-);

package/src/pipeline/config/stages/wercker/modal/addParameter.html

@@ -1,48 +0,0 @@
-<div modal-page>
-  <modal-close dismiss="$dismiss()"></modal-close>
-  <div class="modal-header">
-    <h4 class="modal-title">Add Parameter</h4>
-  </div>
-
-  <form role="form" class="container-fluid" novalidate name="addParameterForm">
-    <div class="modal-body">
-      <div class="form-group row">
-        <div class="col-sm-3 sm-label-right">Key</div>
-        <div class="col-sm-9">
-          <input
-            type="text"
-            class="form-control input-sm"
-            ng-model="parameter.key"
-            placeholder="enter a parameter key"
-            required
-          />
-        </div>
-      </div>
-      <div class="form-group row">
-        <div class="col-sm-3 sm-label-right">Value</div>
-        <div class="col-sm-9">
-          <input
-            type="text"
-            class="form-control input-sm"
-            ng-model="parameter.value"
-            placeholder="enter a parameter value"
-            required
-          />
-        </div>
-      </div>
-    </div>
-
-    <div class="modal-footer">
-      <a href class="btn btn-default" ng-click="$dismiss()">Cancel</a>
-      <button
-        type="submit"
-        class="btn btn-primary"
-        data-purpose="submit"
-        ng-click="ctrl.submit()"
-        ng-disabled="addParameterForm.$invalid"
-      >
-        <span class="far fa-check-circle"></span> Add
-      </button>
-    </div>
-  </form>
-</div>

package/src/pipeline/config/stages/wercker/werckerExecutionDetails.controller.spec.ts

@@ -1,79 +0,0 @@
-import type { IControllerService, IRootScopeService, IScope } from 'angular';
-import { mock } from 'angular';
-
-import {
-  WERCKER_EXECUTION_DETAILS_CONTROLLER,
-  WerckerExecutionDetailsCtrl,
-} from './werckerExecutionDetails.controller';
-
-describe('Wercker Execution Details Controller:', () => {
-  let $scope: IScope, $ctrl: IControllerService;
-
-  beforeEach(mock.module(WERCKER_EXECUTION_DETAILS_CONTROLLER));
-
-  beforeEach(
-    mock.inject(($controller: IControllerService, $rootScope: IRootScopeService) => {
-      $ctrl = $controller;
-      $scope = $rootScope.$new();
-    }),
-  );
-
-  const initializeController = (stage: any): WerckerExecutionDetailsCtrl => {
-    $scope.stage = stage;
-    return $ctrl(WerckerExecutionDetailsCtrl, {
-      $scope,
-      executionDetailsSectionService: {
-        synchronizeSection: (_availableSections: string[], fn: () => any) => fn(),
-      },
-    });
-  };
-
-  describe('getting failure message', () => {
-    it('should count number of failing tests', () => {
-      const stage = {
-        context: {
-          buildInfo: {
-            testResults: [{ failCount: 0 }, { failCount: 3 }, { failCount: 2 }],
-          },
-        },
-      };
-
-      const controller = initializeController(stage);
-
-      expect(controller.failureMessage).toBe('5 tests failed.');
-    });
-
-    it('should fall back to "build failed" message when no failed tests found, but result is "FAILURE"', () => {
-      let stage = {
-        context: {
-          buildInfo: {
-            result: 'FAILURE',
-            testResults: [] as any,
-          },
-        },
-      };
-
-      let controller = initializeController(stage);
-
-      expect(controller.failureMessage).toBe('Build failed.');
-
-      stage = {
-        context: {
-          buildInfo: {
-            result: 'FAILURE',
-            testResults: [{ failCount: 0 }],
-          },
-        },
-      };
-
-      controller = initializeController(stage);
-
-      expect(controller.failureMessage).toBe('Build failed.');
-    });
-
-    it('should set failureMessage to undefined when not failing', function () {
-      const controller = initializeController({});
-      expect(controller.failureMessage).toBeUndefined();
-    });
-  });
-});

package/src/pipeline/config/stages/wercker/werckerExecutionDetails.controller.ts

@@ -1,55 +0,0 @@
-import type { StateParams } from '@uirouter/angularjs';
-import type { IController, IScope } from 'angular';
-import { module } from 'angular';
-
-import type { ExecutionDetailsSectionService } from '../../../details/executionDetailsSection.service';
-import { EXECUTION_DETAILS_SECTION_SERVICE } from '../../../details/executionDetailsSection.service';
-
-export class WerckerExecutionDetailsCtrl implements IController {
-  public configSections = ['werckerConfig', 'taskStatus'];
-  public detailsSection: string;
-  public failureMessage: string;
-  public stage: any;
-
-  public static $inject = ['$stateParams', 'executionDetailsSectionService', '$scope'];
-  constructor(
-    private $stateParams: StateParams,
-    private executionDetailsSectionService: ExecutionDetailsSectionService,
-    private $scope: IScope,
-  ) {
-    this.stage = this.$scope.stage;
-    this.initialize();
-    this.$scope.$on('$stateChangeSuccess', () => this.initialize());
-  }
-
-  public initialized(): void {
-    this.detailsSection = this.$stateParams.details ?? '';
-    this.failureMessage = this.getFailureMessage();
-  }
-
-  private getFailureMessage(): string {
-    let failureMessage = this.stage.failureMessage;
-    const context = this.stage.context || {};
-    const buildInfo = context.buildInfo || {};
-    const testResults: Array<{ failCount: number }> = buildInfo.testResults ?? [];
-    const failingTests = testResults.filter((results) => results.failCount > 0);
-    const failingTestCount = failingTests.reduce((acc, results) => acc + results.failCount, 0);
-    if (buildInfo.result === 'FAILURE') {
-      failureMessage = 'Build failed.';
-    }
-    if (failingTestCount) {
-      failureMessage = `${failingTestCount} test${failingTestCount > 1 ? 's' : ''} failed.`;
-    }
-    return failureMessage;
-  }
-
-  private initialize(): void {
-    this.executionDetailsSectionService.synchronizeSection(this.configSections, () => this.initialized());
-  }
-}
-
-export const WERCKER_EXECUTION_DETAILS_CONTROLLER = 'spinnaker.core.pipeline.stage.wercker.executionDetails.controller';
-module(WERCKER_EXECUTION_DETAILS_CONTROLLER, [EXECUTION_DETAILS_SECTION_SERVICE]).controller(
-  'WerckerExecutionDetailsCtrl',
-  WerckerExecutionDetailsCtrl,
-);

package/src/pipeline/config/stages/wercker/werckerExecutionDetails.html

@@ -1,79 +0,0 @@
-<div ng-controller="WerckerExecutionDetailsCtrl">
-  <execution-details-section-nav sections="configSections"></execution-details-section-nav>
-  <div class="step-section-details" ng-if="detailsSection === 'werckerConfig'">
-    <div class="row">
-      <div class="col-md-{{stage.context.buildInfo.testResults ? 6 : 12}}">
-        <h5>Wercker Stage Configuration</h5>
-        <dl class="dl-narrow dl-horizontal">
-          <dt>Build Service</dt>
-          <dd>{{stage.context.master}}</dd>
-          <dt>Job</dt>
-          <dd>{{stage.context.job}}</dd>
-          <dt>Build</dt>
-          <dd>
-            <span ng-if="!stage.context.buildInfo">{{stage.context.buildNumber}}</span>
-            <a ng-if="stage.context.buildInfo.url" href="{{stage.context.buildInfo.url}}" target="_blank"
-              >#{{stage.context.buildInfo.number}}</a
-            >
-          </dd>
-        </dl>
-      </div>
-      <div class="col-md-6" ng-if="stage.context.buildInfo.testResults">
-        <h5>Test Results</h5>
-        <div class="row" ng-repeat="result in stage.context.buildInfo.testResults">
-          <div class="col-md-6">
-            <p>
-              <a target="_blank" href="{{stage.context.buildInfo.url}}{{result.urlName}}" class="pad-left">
-                {{result.urlName | robotToHuman }}
-              </a>
-            </p>
-          </div>
-          <div class="col-md-6">
-            <p class="test-results">
-              <span class="test-result-section">
-                {{result.totalCount - result.failCount - result.skipCount}} <span class="small fa fa-check"></span>
-              </span>
-              <span class="test-result-section">
-                {{result.failCount}} <span class="small glyphicon glyphicon-remove informational"></span>
-              </span>
-              <span class="test-result-section" ng-if="result.skipCount">
-                {{result.skipCount}} <span class="small glyphicon glyphicon-minus"></span>
-              </span>
-            </p>
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="row" ng-if="stage.context.parameters">
-      <div class="col-md-12">
-        <h5 style="margin-bottom: 0; padding-bottom: 5px">Parameters</h5>
-        <dl>
-          <dt ng-repeat-start="(key, val) in stage.context.parameters">{{key}}</dt>
-          <dd ng-repeat-end>{{val}}</dd>
-        </dl>
-      </div>
-    </div>
-
-    <div class="row" ng-if="stage.context.propertyFileContents">
-      <div class="col-md-12">
-        <h5 style="margin-bottom: 0; padding-bottom: 5px">Property File</h5>
-        <dl>
-          <dt ng-repeat-start="(key, val) in stage.context.propertyFileContents">{{key}}</dt>
-          <dd ng-repeat-end>{{val}}</dd>
-        </dl>
-      </div>
-    </div>
-
-    <stage-failure-message
-      stage="stage"
-      ng-if="stage.isFailed"
-      message="ctrl.getException(stage) || failureMessage"
-    ></stage-failure-message>
-  </div>
-
-  <div class="step-section-details" ng-if="detailsSection === 'taskStatus'">
-    <div class="row">
-      <execution-step-details item="stage"></execution-step-details>
-    </div>
-  </div>
-</div>