@spinnaker/core 2026.1.1 → 2026.1.3

package/package.json

@@ -5,7 +5,7 @@
     "url": "https://github.com/spinnaker/spinnaker.git"
   },
   "license": "Apache-2.0",
-  "version": "2026.1.1",
+  "version": "2026.1.3",
   "module": "dist/index.js",
   "typings": "dist/index.d.ts",
   "publishConfig": {
@@ -128,5 +128,5 @@
     "shx": "0.3.3",
     "typescript": "5.0.4"
   },
-  "gitHead": "f842aaebe413ea1a14ccec06dd6824e07dc7426b"
+  "gitHead": "f185bdabd7b71b84e25c9536cd82ca8775579e3d"
 }

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