@spinnaker/core 0.28.0 → 0.29.0

package/dist/notification/selector/types/cdevents/CDEventsNotificationType.d.ts

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

package/dist/notification/selector/types/cdevents/cdevents.notification.d.ts

@@ -0,0 +1,2 @@
+import type { INotificationTypeConfig } from '../../../../domain';
+export declare const cdEventsNotification: INotificationTypeConfig;

package/dist/notification/selector/types/index.d.ts

@@ -5,3 +5,4 @@ export * from './microsoftteams/MicrosoftTeamsNotificationType';
 export * from './pubsub/PubsubNotificationType';
 export * from './slack/SlackNotificationType';
 export * from './sms/SmsNotificationType';
+export * from './cdevents/CDEventsNotificationType';

package/dist/pipeline/config/stages/overrideTimeout/OverrideTimeout.d.ts

@@ -2,7 +2,7 @@
 import type { IStage } from '../../../../domain';
 export interface IOverrideTimeoutConfigProps {
     stageConfig: IStageConfig;
-    stageTimeoutMs: number;
+    stageTimeoutMs: number | any;
     updateStageField: (changes: Partial<IStage>) => void;
 }
 interface IStageConfig {

package/dist/presentation/forms/validation/validators.d.ts

@@ -10,6 +10,8 @@ export declare const Validators: {
     arrayNotEmpty: (message?: string) => IValidator;
     checkBetween: (fieldName: string, min: number, max: number) => IValidator;
     emailValue: (message?: string) => IValidator;
+    cdeventsTypeValue: (message?: string) => IValidator;
+    urlValue: (message?: string) => IValidator;
     isNum: (message?: string) => IValidator;
     isRequired: (message?: string) => IValidator;
     isValidJson: (message?: string) => IValidator;

package/dist/task/task.read.service.d.ts

@@ -2,7 +2,7 @@ import type { Subject } from 'rxjs';
 import type { ITask } from '../domain';
 export declare class TaskReader {
     private static activeStatuses;
-    static getTasks(applicationName: string, statuses?: string[]): PromiseLike<ITask[]>;
+    static getTasks(applicationName: string, statuses?: string[], limitPerPage?: number, page?: number): PromiseLike<ITask[]>;
     static getRunningTasks(applicationName: string): PromiseLike<ITask[]>;
     static getTask(taskId: string): PromiseLike<ITask>;
     static waitUntilTaskMatches(task: ITask, closure: (task: ITask) => boolean, failureClosure?: (task: ITask) => boolean, interval?: number, notifier?: Subject<void>): PromiseLike<ITask>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@spinnaker/core",
   "license": "Apache-2.0",
-  "version": "0.28.0",
+  "version": "0.29.0",
   "module": "dist/index.js",
   "typings": "dist/index.d.ts",
   "publishConfig": {
@@ -123,5 +123,5 @@
     "shx": "0.3.3",
     "typescript": "4.3.5"
   },
-  "gitHead": "20d6ca89f39a5f44a802a1ccaffd669587450d76"
+  "gitHead": "082a084908e13888d640e88a5bd6e1571479de14"
 }

package/src/config/settings.ts

@@ -21,6 +21,7 @@ export interface INotificationSettings {
   pubsub: { enabled: boolean };
   slack: { botName: string; enabled: boolean };
   sms: { enabled: boolean };
+  cdevents: { enabled: boolean };
 }
 
 export interface IFeatures {
@@ -141,6 +142,7 @@ export interface ISpinnakerSettings {
   };
   stashTriggerInfo?: string;
   pollSchedule: number;
+  tasksViewLimitPerPage: number;
   providers?: {
     [key: string]: IProviderSettings; // allows custom providers not typed in here (good for testing too)
   };
@@ -152,6 +154,10 @@ export interface ISpinnakerSettings {
   useClassicFirewallLabels: boolean;
   kubernetesAdHocInfraWritesEnabled: boolean;
   changelogUrl: string;
+  cdevents?: {
+    validUrlPattern: string;
+    validCDEvent: string;
+  };
 }
 
 export const SETTINGS: ISpinnakerSettings = (window as any).spinnakerSettings || {};

package/src/manifest/stage/JobStageExecutionLogs.tsx

@@ -1,4 +1,4 @@
-import { isEmpty, template } from 'lodash';
+import { template } from 'lodash';
 import React from 'react';
 import { from as observableFrom, Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
@@ -52,7 +52,7 @@ export class JobStageExecutionLogs extends React.Component<IJobStageExecutionLog
     const { manifest } = this.state;
     const { externalLink, podNamesProviders, location, account } = this.props;
     // prefer links to external logging platforms
-    if (!isEmpty(manifest) && externalLink) {
+    if (externalLink) {
       return (
         <a target="_blank" href={this.renderExternalLink(externalLink, manifest)}>
           Console Output (External)

package/src/notification/modal/NotificationDetails.tsx

@@ -54,7 +54,10 @@ export class NotificationDetails extends React.Component<INotificationDetailsPro
   }
 
   private renderCustomMessage = (type: string, whenOption: string): React.ReactNode => {
-    if (whenOption !== 'manualJudgment' && ['email', 'slack', 'googlechat', 'microsoftteams'].includes(type)) {
+    if (
+      whenOption !== 'manualJudgment' &&
+      ['email', 'slack', 'googlechat', 'microsoftteams', 'cdevents'].includes(type)
+    ) {
       return (
         <FormikFormField
           name={`message["${whenOption}"].text`}

package/src/notification/notification.types.ts

@@ -6,6 +6,7 @@ import type { INotificationTypeConfig } from '../domain';
 import { Registry } from '../registry';
 
 import { bearyChatNotification } from './selector/types/bearychat/beary.notification';
+import { cdEventsNotification } from './selector/types/cdevents/cdevents.notification';
 import { emailNotification } from './selector/types/email/email.notification';
 import { githubstatusNotification } from './selector/types/githubstatus/githubstatus.notification';
 import { googlechatNotification } from './selector/types/googlechat/googlechat.notification';
@@ -23,6 +24,7 @@ import { smsNotification } from './selector/types/sms/sms.notification';
   pubsubNotification,
   slackNotification,
   smsNotification,
+  cdEventsNotification,
 ].forEach((config: INotificationTypeConfig) => {
   if (SETTINGS.notifications) {
     const notificationSetting: { enabled: boolean; botName?: string } =

package/src/notification/selector/types/cdevents/CDEventsNotificationType.tsx

@@ -0,0 +1,36 @@
+import React from 'react';
+
+import type { INotificationTypeCustomConfig } from '../../../../domain';
+import { FormikFormField, TextInput, Validators } from '../../../../presentation';
+
+export class CDEventsNotificationType extends React.Component<INotificationTypeCustomConfig> {
+  public render() {
+    const { fieldName } = this.props;
+    return (
+      <>
+        <FormikFormField
+          label="Events Broker URL"
+          name={fieldName ? `${fieldName}.address` : 'address'}
+          validate={Validators.skipIfSpel(Validators.urlValue('Please enter a valid URL'))}
+          input={(props) => (
+            <TextInput
+              inputClassName={'form-control input-sm'}
+              {...props}
+              placeholder="Enter an events message broker URL"
+            />
+          )}
+          required={true}
+        />
+        <FormikFormField
+          label="CDEvents Type"
+          name={fieldName ? `${fieldName}.cdEventsType` : 'cdEventsType'}
+          validate={Validators.skipIfSpel(Validators.cdeventsTypeValue('Please enter a valid CDEvents Type'))}
+          input={(props) => (
+            <TextInput inputClassName={'form-control input-sm'} {...props} placeholder="Enter a CDEvents type" />
+          )}
+          required={true}
+        />
+      </>
+    );
+  }
+}

package/src/notification/selector/types/cdevents/cdevents.notification.ts

@@ -0,0 +1,8 @@
+import { CDEventsNotificationType } from './CDEventsNotificationType';
+import type { INotificationTypeConfig } from '../../../../domain';
+
+export const cdEventsNotification: INotificationTypeConfig = {
+  component: CDEventsNotificationType,
+  key: 'cdevents',
+  label: 'CDEvents',
+};

package/src/notification/selector/types/index.ts

@@ -5,3 +5,4 @@ export * from './microsoftteams/MicrosoftTeamsNotificationType';
 export * from './pubsub/PubsubNotificationType';
 export * from './slack/SlackNotificationType';
 export * from './sms/SmsNotificationType';
+export * from './cdevents/CDEventsNotificationType';

package/src/pipeline/config/services/PipelineConfigService.ts

@@ -142,6 +142,9 @@ export class PipelineConfigService {
   private static groupStagesByRequisiteStageRefIds(pipeline: IPipeline) {
     return pipeline.stages.reduce((acc, obj) => {
       const parent = obj['refId'];
+      if (obj['requisiteStageRefIds'] === undefined) {
+        obj['requisiteStageRefIds'] = [];
+      }
       obj.requisiteStageRefIds.forEach((child) => {
         const values = acc.get(child);
         if (values && values.length) {

package/src/pipeline/config/stages/overrideTimeout/OverrideTimeout.tsx

@@ -1,4 +1,4 @@
-import { get } from 'lodash';
+import { get, isNumber } from 'lodash';
 import { Duration } from 'luxon';
 import React from 'react';
 
@@ -10,7 +10,7 @@ const { useEffect, useState } = React;
 
 export interface IOverrideTimeoutConfigProps {
   stageConfig: IStageConfig;
-  stageTimeoutMs: number;
+  stageTimeoutMs: number | any;
   updateStageField: (changes: Partial<IStage>) => void;
 }
 
@@ -41,8 +41,13 @@ export const OverrideTimeout = (props: IOverrideTimeoutConfigProps) => {
   }, [props.stageTimeoutMs]);
 
   const stageChanged = () => {
-    if (props.stageTimeoutMs !== undefined) {
+    if (props.stageTimeoutMs !== undefined && !isExpression) {
       enableTimeout();
+    } else if (props.stageTimeoutMs !== undefined && isExpression) {
+      setOverrideTimeout(true);
+      props.updateStageField({
+        stageTimeoutMs: props.stageTimeoutMs || null,
+      });
     } else {
       clearTimeout();
     }
@@ -74,6 +79,10 @@ export const OverrideTimeout = (props: IOverrideTimeoutConfigProps) => {
   };
 
   const isConfigurable = !!get(props.stageConfig, 'supportsCustomTimeout');
+  const isExpression =
+    props.stageTimeoutMs !== undefined && props.stageTimeoutMs !== null && !isNumber(props.stageTimeoutMs)
+      ? props.stageTimeoutMs.includes('${')
+      : false;
 
   if (isConfigurable) {
     return (
@@ -94,7 +103,7 @@ export const OverrideTimeout = (props: IOverrideTimeoutConfigProps) => {
             </div>
           </div>
         </div>
-        {overrideTimeout && (
+        {overrideTimeout && !isExpression && (
           <div>
             <div className="form-group form-inline">
               <div className="col-md-9 col-md-offset-1 checkbox-padding">
@@ -123,6 +132,17 @@ export const OverrideTimeout = (props: IOverrideTimeoutConfigProps) => {
             </div>
           </div>
         )}
+        {overrideTimeout && isExpression && (
+          <div className="form-group">
+            <div className="col-md-9 col-md-offset-1">
+              <div className="sm-control-field">
+                <span>
+                  Resolved at runtime from expression: <code>{props.stageTimeoutMs}</code>
+                </span>
+              </div>
+            </div>
+          </div>
+        )}
       </>
     );
   } else {

package/src/pipeline/config/stages/wait/waitStage.ts

@@ -8,6 +8,7 @@ Registry.pipeline.registerStage({
   label: 'Wait',
   description: 'Waits a specified period of time',
   key: 'wait',
+  restartable: true,
   component: WaitStageConfig,
   executionDetailsSections: [WaitExecutionDetails, ExecutionDetailsTasks],
   executionLabelComponent: WaitExecutionLabel,

package/src/pipeline/config/validation/PipelineConfigValidator.ts

@@ -54,6 +54,10 @@ export interface ICustomValidator extends IStageOrTriggerValidator, IValidatorCo
   [k: string]: any;
 }
 
+function isNumberOrSpel(valInput: any) {
+  return (isNumber(valInput) && valInput > 0) || (typeof valInput === 'string' && valInput.includes('${'));
+}
+
 export class PipelineConfigValidator {
   private static validators: Map<string, IStageOrTriggerValidator> = new Map();
   private static validationStream: Subject<IPipelineValidationResults> = new Subject();
@@ -151,7 +155,7 @@ export class PipelineConfigValidator {
         );
       }
 
-      if (stage.stageTimeoutMs !== undefined && !(isNumber(stage.stageTimeoutMs) && stage.stageTimeoutMs > 0)) {
+      if (stage.stageTimeoutMs !== undefined && !isNumberOrSpel(stage.stageTimeoutMs)) {
         stageValidations.set(stage, [
           ...(stageValidations.get(stage) || []),
           'Stage is configured to fail after a specific amount of time, but no time is set.',

package/src/presentation/forms/validation/validators.ts

@@ -1,6 +1,7 @@
 import { isNumber } from 'lodash';
-import { robotToHuman } from '../../robotToHumanFilter/robotToHuman.filter';
 
+import { SETTINGS } from '../../../config/settings';
+import { robotToHuman } from '../../robotToHumanFilter/robotToHuman.filter';
 import type { IValidator } from './validation';
 
 const THIS_FIELD = 'This field';
@@ -9,6 +10,12 @@ const VALID_EMAIL_REGEX = new RegExp(
   '^(([^<>()\\[\\]\\\\.,;:\\s@"]+(\\.[^<>()\\[\\]\\\\.,;:\\s@"]+)*)|(".+"))@((\\[[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}\\.[0-9]{1,3}])|(([a-zA-Z\\-0-9]+\\.)+[a-zA-Z]{2,}))$',
 );
 
+const urlPattern = SETTINGS.cdevents?.validUrlPattern ?? '^https?://.+$';
+const VALID_URL = new RegExp(urlPattern);
+
+const cdeventPattern = SETTINGS.cdevents?.validCDEvent ?? '^dev\\.cdevents\\.[^.]+\\.[^.]+$';
+const VALID_CDEVENT_REGEX = new RegExp(cdeventPattern);
+
 const emailValue = (message?: string): IValidator => {
   return function emailValue(val: string, label = THIS_FIELD) {
     message = message || `${label} is not a valid email address.`;
@@ -16,6 +23,20 @@ const emailValue = (message?: string): IValidator => {
   };
 };
 
+const urlValue = (message?: string): IValidator => {
+  return function urlValue(val: string, label = THIS_FIELD) {
+    message = message || `${label} is not a valid URL.`;
+    return val && !VALID_URL.test(val) && message;
+  };
+};
+
+const cdeventsTypeValue = (message?: string): IValidator => {
+  return function cdeventsTypeValue(val: string, label = THIS_FIELD) {
+    message = message || `${label} is not a valid CDEvents Type.`;
+    return val && !VALID_CDEVENT_REGEX.test(val) && message;
+  };
+};
+
 const isRequired = (message?: string): IValidator => {
   return function isRequired(val: any, label = THIS_FIELD) {
     message = message || `${label} is required.`;
@@ -138,6 +159,8 @@ export const Validators = {
   arrayNotEmpty,
   checkBetween,
   emailValue,
+  cdeventsTypeValue,
+  urlValue,
   isNum,
   isRequired,
   isValidJson,

package/src/task/task.dataSource.js

@@ -2,6 +2,7 @@ import * as angular from 'angular';
 
 import { ApplicationDataSourceRegistry } from '../application/service/ApplicationDataSourceRegistry';
 import { CLUSTER_SERVICE } from '../cluster/cluster.service';
+import { SETTINGS } from '../config';
 import { TaskReader } from './task.read.service';
 
 export const CORE_TASK_TASK_DATASOURCE = 'spinnaker.core.task.dataSource';
@@ -14,8 +15,23 @@ angular.module(CORE_TASK_TASK_DATASOURCE, [CLUSTER_SERVICE]).run([
       return $q.when(angular.isArray(tasks) ? tasks : []);
     };
 
-    const loadTasks = (application) => {
-      return TaskReader.getTasks(application.name);
+    const loadPaginatedTasks = async (application, page = 1) => {
+      let limitPerPage = SETTINGS.tasksViewLimitPerPage;
+      const tasks = await TaskReader.getTasks(application.name, [], limitPerPage, page);
+      if (tasks.length === limitPerPage) {
+        return tasks.concat(await loadPaginatedTasks(application, page + 1));
+      } else {
+        return tasks;
+      }
+    };
+
+    const loadTasks = (application, page = 1) => {
+      let limitPerPage = SETTINGS.tasksViewLimitPerPage;
+      if (limitPerPage === undefined) {
+        return TaskReader.getTasks(application.name);
+      } else {
+        return loadPaginatedTasks(application, page);
+      }
     };
 
     const loadRunningTasks = (application) => {

package/src/task/task.read.service.ts

@@ -8,10 +8,19 @@ import { OrchestratedItemTransformer } from '../orchestratedItem/orchestratedIte
 export class TaskReader {
   private static activeStatuses: string[] = ['RUNNING', 'SUSPENDED', 'NOT_STARTED'];
 
-  public static getTasks(applicationName: string, statuses: string[] = []): PromiseLike<ITask[]> {
+  public static getTasks(
+    applicationName: string,
+    statuses: string[] = [],
+    limitPerPage: number = null,
+    page: number = null,
+  ): PromiseLike<ITask[]> {
     return REST('/applications')
       .path(applicationName, 'tasks')
-      .query({ statuses: statuses.join(',') })
+      .query({
+        statuses: statuses.join(','),
+        limit: limitPerPage,
+        page: page,
+      })
       .get()
       .then((tasks: ITask[]) => {
         tasks.forEach((task) => this.setTaskProperties(task));

package/dist/presentation/forms/inputs/NumberConcurrencyInput.d.ts

@@ -1,7 +0,0 @@
-import React from 'react';
-import type { IFormInputProps, OmitControlledInputPropsFrom } from './interface';
-interface INumberInputProps extends IFormInputProps, OmitControlledInputPropsFrom<React.InputHTMLAttributes<any>> {
-    inputClassName?: string;
-}
-export declare function NumberConcurrencyInput(props: INumberInputProps): JSX.Element;
-export {};

package/src/presentation/forms/inputs/NumberConcurrencyInput.tsx

@@ -1,29 +0,0 @@
-import React from 'react';
-
-import { useInternalValidator } from './hooks';
-import type { IFormInputProps, OmitControlledInputPropsFrom } from './interface';
-import { orEmptyString, validationClassName } from './utils';
-import type { IValidator } from '../validation';
-import { composeValidators, Validators } from '../validation';
-
-interface INumberInputProps extends IFormInputProps, OmitControlledInputPropsFrom<React.InputHTMLAttributes<any>> {
-  inputClassName?: string;
-}
-
-const isNumber = (val: any): val is number => typeof val === 'number';
-
-export function NumberConcurrencyInput(props: INumberInputProps) {
-  const { value, validation, inputClassName, ...otherProps } = props;
-
-  const minMaxValidator: IValidator = (val: any, label?: string) => {
-    const minValidator = isNumber(props.min) ? Validators.minValue(props.min) : undefined;
-    const maxValidator = isNumber(props.max) ? Validators.maxValue(props.max) : undefined;
-    const validator = composeValidators([minValidator, maxValidator]);
-    return validator ? validator(val, label) : null;
-  };
-
-  useInternalValidator(validation, minMaxValidator);
-
-  const className = `NumberInput form-control ${orEmptyString(inputClassName)} ${validationClassName(validation)}`;
-  return <input className={className} type="number" value={orEmptyString(value)} {...otherProps} />;
-}