@spinnaker/core 0.0.0-2026.2-2 → 0.0.0-2026.2-3

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": "0.0.0-2026.2-2",
+  "version": "0.0.0-2026.2-3",
   "module": "dist/index.js",
   "typings": "dist/index.d.ts",
   "publishConfig": {
@@ -133,5 +133,5 @@
     "shx": "0.3.3",
     "typescript": "5.0.4"
   },
-  "gitHead": "a4affe721ec80ca8978291e2accce065ea0d227a"
+  "gitHead": "fb7f43aaf1fbaed8f36d9bce0c3c59d8566f6f3e"
 }

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();
+  }
+}