@spinnaker/core 2026.2.3 → 2026.2.4

package/dist/pipeline/config/stages/evaluateVariables/EvaluateVariablesStageConfig.d.ts

@@ -6,5 +6,5 @@ export interface IEvaluatedVariable {
     key: string;
     value: string;
 }
-export declare function validateEvaluateVariablesStage(stage: IStage): any;
+export declare function validateEvaluateVariablesStage(stage: IStage, dashedIdentifiersEnabled?: boolean): any;
 export declare function EvaluateVariablesStageConfig(props: IStageConfigProps): JSX.Element;

package/dist/pipeline/config/stages/evaluateVariables/ExpressionCapabilitiesReader.d.ts

@@ -0,0 +1,8 @@
+export interface IExpressionCapabilities {
+    functions: unknown[];
+    spelEvaluators: unknown[];
+    dashedIdentifiersEnabled: boolean;
+}
+export declare class ExpressionCapabilitiesReader {
+    static getExpressionCapabilities(): PromiseLike<IExpressionCapabilities>;
+}

package/package.json

@@ -5,7 +5,7 @@
     "url": "https://github.com/spinnaker/spinnaker.git"
   },
   "license": "Apache-2.0",
-  "version": "2026.2.3",
+  "version": "2026.2.4",
   "module": "dist/index.js",
   "typings": "dist/index.d.ts",
   "publishConfig": {
@@ -133,5 +133,5 @@
     "shx": "0.3.3",
     "typescript": "5.0.4"
   },
-  "gitHead": "a4e60ac0d767ffea0a41057a8bd9b0df110dfaa4"
+  "gitHead": "f71c76e3c4b7791db81f01212e2487f1b637484c"
 }

package/src/pipeline/config/stages/evaluateVariables/EvaluateVariablesStageConfig.spec.ts

@@ -0,0 +1,70 @@
+import { validateEvaluateVariablesStage } from './EvaluateVariablesStageConfig';
+import type { IStage } from '../../../../domain';
+
+function buildStage(variables: Array<{ key: string; value: string }>): IStage {
+  return ({ variables } as unknown) as IStage;
+}
+
+describe('validateEvaluateVariablesStage', () => {
+  describe('when dashed identifier support is disabled (default)', () => {
+    it('rejects a variable name containing a hyphen', () => {
+      const stage = buildStage([{ key: 'my-container-name', value: '${1}' }]);
+
+      const result = validateEvaluateVariablesStage(stage);
+
+      expect(result.variables[0].key).toEqual(
+        'Error: Variable Name should consist only of letters, numbers, or underscore',
+      );
+    });
+
+    it('accepts a variable name using only letters, numbers, and underscore', () => {
+      const stage = buildStage([{ key: 'my_container_name1', value: '${1}' }]);
+
+      const result = validateEvaluateVariablesStage(stage);
+
+      expect(result.variables).toBeUndefined();
+    });
+  });
+
+  describe('when dashed identifier support is enabled', () => {
+    it('accepts a variable name containing a hyphen', () => {
+      const stage = buildStage([{ key: 'my-container-name', value: '${1}' }]);
+
+      const result = validateEvaluateVariablesStage(stage, true);
+
+      expect(result.variables).toBeUndefined();
+    });
+
+    it('still rejects a variable name starting with a digit', () => {
+      const stage = buildStage([{ key: '1-my-container-name', value: '${1}' }]);
+
+      const result = validateEvaluateVariablesStage(stage, true);
+
+      expect(result.variables[0].key).toEqual(
+        'Error: Variable Name should consist only of letters, numbers, underscore, or hyphen',
+      );
+    });
+
+    it('still rejects a variable name containing a space or other invalid character', () => {
+      const stage = buildStage([{ key: 'my container name', value: '${1}' }]);
+
+      const result = validateEvaluateVariablesStage(stage, true);
+
+      expect(result.variables[0].key).toEqual(
+        'Error: Variable Name should consist only of letters, numbers, underscore, or hyphen',
+      );
+    });
+  });
+
+  it('still enforces the duplicate key validator regardless of dashed identifier support', () => {
+    const stage = buildStage([
+      { key: 'my-name', value: '${1}' },
+      { key: 'my-name', value: '${2}' },
+    ]);
+
+    const result = validateEvaluateVariablesStage(stage, true);
+
+    expect(result.variables[0].key).toEqual("Duplicate key 'my-name'");
+    expect(result.variables[1].key).toEqual("Duplicate key 'my-name'");
+  });
+});

package/src/pipeline/config/stages/evaluateVariables/EvaluateVariablesStageConfig.tsx

@@ -4,6 +4,7 @@ import React from 'react';
 
 import type { IExecutionAndStagePickerProps } from './ExecutionAndStagePicker';
 import { ExecutionAndStagePicker } from './ExecutionAndStagePicker';
+import { ExpressionCapabilitiesReader } from './ExpressionCapabilitiesReader';
 import type { IFormikStageConfigInjectedProps } from '../FormikStageConfig';
 import { FormikStageConfig } from '../FormikStageConfig';
 import type { IStageConfigProps } from '../common';
@@ -31,9 +32,14 @@ export interface IEvaluatedVariable {
   value: string;
 }
 
-const variableNameValidator: IValidator = (val: string, label: string) =>
-  !val.match(/^[a-zA-Z_][a-zA-Z0-9_]*$/) &&
-  errorMessage(`${label} should consist only of letters, numbers, or underscore`);
+const createVariableNameValidator = (dashedIdentifiersEnabled: boolean): IValidator => {
+  const pattern = dashedIdentifiersEnabled ? /^[a-zA-Z_][a-zA-Z0-9_-]*$/ : /^[a-zA-Z_][a-zA-Z0-9_]*$/;
+  const allowedCharacters = dashedIdentifiersEnabled
+    ? 'letters, numbers, underscore, or hyphen'
+    : 'letters, numbers, or underscore';
+  return (val: string, label: string) =>
+    !val.match(pattern) && errorMessage(`${label} should consist only of ${allowedCharacters}`);
+};
 
 const duplicateKeyValidatorFactory = (variables: IEvaluatedVariable[] = []) => {
   const keyCounts = countBy(
@@ -43,9 +49,10 @@ const duplicateKeyValidatorFactory = (variables: IEvaluatedVariable[] = []) => {
   return (key: string) => keyCounts[key] > 1 && `Duplicate key '${key}'`;
 };
 
-export function validateEvaluateVariablesStage(stage: IStage) {
+export function validateEvaluateVariablesStage(stage: IStage, dashedIdentifiersEnabled = false) {
   const formValidator = new FormValidator(stage);
   const duplicateKeyValidator = duplicateKeyValidatorFactory(stage.variables);
+  const variableNameValidator = createVariableNameValidator(dashedIdentifiersEnabled);
   formValidator.field('variables').withValidators(
     formValidator.arrayForEach((item) => {
       item.field('key', 'Variable Name').required().withValidators(variableNameValidator, duplicateKeyValidator);
@@ -75,6 +82,14 @@ function PreviewConfiguration(props: IExecutionAndStagePickerProps) {
 export function EvaluateVariablesStageConfig(props: IStageConfigProps) {
   const { application, stage, pipeline, updateStage } = props;
   const [chosenStage, setChosenStage] = React.useState({} as IStageForSpelPreview);
+  const [dashedIdentifiersEnabled, setDashedIdentifiersEnabled] = React.useState(false);
+
+  React.useEffect(() => {
+    ExpressionCapabilitiesReader.getExpressionCapabilities().then(
+      (capabilities) => setDashedIdentifiersEnabled(capabilities.dashedIdentifiersEnabled),
+      () => setDashedIdentifiersEnabled(false),
+    );
+  }, []);
 
   const helpMessage =
     'Define one or more variables by assigning a **name** _(string)_ and a **value** ' +
@@ -86,7 +101,9 @@ export function EvaluateVariablesStageConfig(props: IStageConfigProps) {
       application={application}
       stage={stage}
       pipeline={pipeline}
-      validate={validateEvaluateVariablesStage}
+      validate={(stageToValidate) =>
+        validateEvaluateVariablesStage(stageToValidate as IStage, dashedIdentifiersEnabled)
+      }
       onChange={updateStage}
       render={(renderProps) => {
         return (

package/src/pipeline/config/stages/evaluateVariables/ExpressionCapabilitiesReader.ts

@@ -0,0 +1,13 @@
+import { REST } from '../../../../api';
+
+export interface IExpressionCapabilities {
+  functions: unknown[];
+  spelEvaluators: unknown[];
+  dashedIdentifiersEnabled: boolean;
+}
+
+export class ExpressionCapabilitiesReader {
+  public static getExpressionCapabilities(): PromiseLike<IExpressionCapabilities> {
+    return REST('/capabilities/expressions').useCache(true).get();
+  }
+}

package/src/pipeline/config/triggers/artifacts/helm-image/HelmImageArtifactEditor.tsx

@@ -1,169 +1,85 @@
 import { cloneDeep } from 'lodash';
 import React from 'react';
-import type { Option } from 'react-select';
 
-import { ArtifactService } from '../ArtifactService';
+import { ArtifactEditor } from '../ArtifactEditor';
 import { ArtifactTypePatterns } from '../../../../../artifact/ArtifactTypes';
 import type { IArtifact, IArtifactEditorProps, IArtifactKindConfig } from '../../../../../domain';
-import { TetheredCreatable, TetheredSelect } from '../../../../../presentation';
+import { singleFieldArtifactEditor } from '../singleFieldArtifactEditor';
 import { StageConfigField } from '../../../stages/common';
-import { Spinner } from '../../../../../widgets/spinners/Spinner';
+import { SpelText } from '../../../../../widgets/spelText/SpelText';
 
 const TYPE = 'helm/image';
 
-interface IHelmImageArtifactEditorState {
-  names: string[];
-  versions: Array<Option<string>>;
-  versionsLoading: boolean;
-  namesLoading: boolean;
-}
-
-class HelmImageEditor extends React.Component<IArtifactEditorProps, IHelmImageArtifactEditorState> {
-  public state: IHelmImageArtifactEditorState = {
-    names: [],
-    versions: [],
-    versionsLoading: true,
-    namesLoading: true,
-  };
-
-  // taken from https://github.com/semver/semver/issues/232
-  private SEMVER = new RegExp(
-    /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(-(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(\.(0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*)?(\+[0-9a-zA-Z-]+(\.[0-9a-zA-Z-]+)*)?$/,
-  );
-
-  constructor(props: IArtifactEditorProps) {
-    super(props);
-    const { artifact } = this.props;
-    if (artifact.type !== TYPE) {
-      const clonedArtifact = cloneDeep(artifact);
-      clonedArtifact.type = TYPE;
-      props.onChange(clonedArtifact);
-    }
-
-    ArtifactService.getArtifactNames(TYPE, this.props.account.name).then(
-      (names) => {
-        this.setState({
-          names,
-          namesLoading: false,
-        });
-      },
-      () => {
-        this.setState({
-          names: [],
-          namesLoading: false,
-          versionsLoading: false,
-          versions: [],
-        });
-      },
-    );
-  }
-
-  public componentDidMount() {
-    const { artifact } = this.props;
-    if (artifact.name) {
-      this.getChartVersionOptions(artifact.name);
-    }
-  }
-
-  public componentDidUpdate(prevProps: IArtifactEditorProps) {
-    if (this.props.account.name !== prevProps.account.name) {
-      ArtifactService.getArtifactNames(TYPE, this.props.account.name).then(
-        (names) => {
-          this.setState({
-            names,
-            namesLoading: false,
-            versions: [],
-          });
-        },
-        () => {
-          this.setState({
-            names: [],
-            namesLoading: false,
-            versions: [],
-          });
-        },
-      );
-    }
+const setNameAndVersionFromReference = (artifact: IArtifact) => {
+  const ref = artifact.reference;
+  if (ref == null) {
+    return artifact;
   }
 
-  public render() {
-    const { artifact } = this.props;
-    const nameOptions = this.state.names.map((name) => ({ value: name, label: name }));
+  const atIndex = ref.indexOf('@');
+  const lastColonIndex = ref.lastIndexOf(':');
 
-    return (
-      <>
-        <StageConfigField label="Name">
-          {!this.state.namesLoading && (
-            <TetheredSelect
-              options={nameOptions}
-              value={artifact.name || ''}
-              onChange={(e: Option) => {
-                this.onChange(e, 'name');
-                this.getChartVersionOptions(e.value.toString());
-              }}
-              clearable={false}
-            />
-          )}
-          {this.state.namesLoading && <Spinner />}
-        </StageConfigField>
-        <StageConfigField label="Version">
-          {!this.state.versionsLoading && (
-            <TetheredCreatable
-              options={this.state.versions}
-              value={artifact.version || ''}
-              onChange={(e: Option) => {
-                this.onChange(e, 'version');
-              }}
-              clearable={false}
-            />
-          )}
-          {this.state.versionsLoading && <Spinner />}
-        </StageConfigField>
-      </>
-    );
-  }
-
-  private onChange = (e: Option, field: keyof IArtifact) => {
-    const clone = cloneDeep(this.props.artifact);
-    (clone[field] as any) = e.value.toString();
-    this.props.onChange(clone);
-  };
-
-  private getChartVersionOptions(chartName: string) {
-    const { artifact, account } = this.props;
-    this.setState({ versionsLoading: true });
-    ArtifactService.getArtifactVersions(TYPE, account.name, chartName).then((versions: string[]) => {
-      // if the version doesn't match SEMVER we assume that it's a regular expression or SpEL expression
-      // and add it to the list of valid versions
-      if (artifact.version && !this.SEMVER.test(artifact.version)) {
-        versions = versions.concat(artifact.version);
-      }
-      this.setState({
-        versions: versions.map((v) => ({ label: v, value: v })),
-        versionsLoading: false,
-      });
-    });
+  if (atIndex >= 0) {
+    const split = ref.split('@');
+    artifact.name = split[0];
+    artifact.version = split[1];
+  } else if (lastColonIndex > 0) {
+    artifact.name = ref.substring(0, lastColonIndex);
+    artifact.version = ref.substring(lastColonIndex + 1);
+  } else {
+    artifact.name = ref;
   }
-}
+  return artifact;
+};
 
 export const HelmImageMatch: IArtifactKindConfig = {
-  label: 'Helm',
+  label: 'Docker Image (OCI)',
   typePattern: ArtifactTypePatterns.HELM_IMAGE,
   type: TYPE,
   isDefault: false,
   isMatch: true,
-  description: 'A helm chart to be deployed',
-  key: 'helm',
-  editCmp: HelmImageEditor,
+  description: 'A Docker image stored in an OCI registry.',
+  key: 'helm-image',
+  editCmp: singleFieldArtifactEditor(
+    'name',
+    TYPE,
+    'Docker image',
+    'gcr.io/project/image',
+    'pipeline.config.expectedArtifact.docker.name',
+  ),
 };
 
 export const HelmImageDefault: IArtifactKindConfig = {
-  label: 'Helm',
+  label: 'Docker Image (OCI)',
   typePattern: ArtifactTypePatterns.HELM_IMAGE,
   type: TYPE,
   isDefault: true,
   isMatch: false,
-  description: 'A helm chart to be deployed',
-  key: 'default.helm',
-  editCmp: HelmImageEditor,
+  description: 'A Docker image stored in an OCI registry.',
+  key: 'default.helm-image',
+  editCmp: class extends ArtifactEditor {
+    constructor(props: IArtifactEditorProps) {
+      super(props, TYPE);
+    }
+
+    private onReferenceChanged = (reference: string) => {
+      const clonedArtifact = cloneDeep(this.props.artifact);
+      clonedArtifact.reference = reference;
+      this.props.onChange(setNameAndVersionFromReference(clonedArtifact));
+    };
+
+    public render() {
+      return (
+        <StageConfigField label="Object path" helpKey="pipeline.config.expectedArtifact.defaultDocker.reference">
+          <SpelText
+            placeholder="gcr.io/project/image@sha256:9efcc2818c9..."
+            value={this.props.artifact.reference}
+            onChange={this.onReferenceChanged}
+            pipeline={this.props.pipeline}
+            docLink={true}
+          />
+        </StageConfigField>
+      );
+    }
+  },
 };