@spinnaker/docker 2026.2.2 → 2026.3.0

package/dist/pipeline/stages/bake/dockerBakeStage.d.ts

@@ -1,2 +1,31 @@
-export const DOCKER_PIPELINE_STAGES_BAKE_DOCKERBAKESTAGE: "spinnaker.docker.pipeline.stage.bakeStage";
-export const name: "spinnaker.docker.pipeline.stage.bakeStage";
+import React from 'react';
+import type { IExecutionDetailsSectionProps, IStage, IStageConfigProps } from '@spinnaker/core';
+interface IBaseOsOption {
+    id: string;
+    shortDescription?: string;
+    detailedDescription?: string;
+    isImageFamily?: boolean;
+    displayName?: string;
+}
+interface IDockerBakeStageDefaults {
+    user: string;
+    baseOsOptions: IBaseOsOption[];
+    baseLabelOptions: string[];
+}
+interface IDockerBakeStageConfigState {
+    baseLabelOptions: string[];
+    baseOsOptions: IBaseOsOption[];
+    loadError: boolean;
+    loading: boolean;
+}
+export declare function applyDockerBakeStageDefaults(stage: IStage, defaults: IDockerBakeStageDefaults): IStage;
+export declare class DockerBakeStageConfig extends React.Component<IStageConfigProps, IDockerBakeStageConfigState> {
+    private mounted;
+    state: IDockerBakeStageConfigState;
+    componentDidMount(): void;
+    componentWillUnmount(): void;
+    render(): JSX.Element;
+}
+export declare function DockerBakeExecutionDetails(props: IExecutionDetailsSectionProps): JSX.Element;
+export declare const DOCKER_BAKE_STAGE_CONFIG: any;
+export {};

package/dist/pipeline/trigger/DockerTriggerTemplate.d.ts

@@ -11,7 +11,8 @@ export interface IDockerTriggerTemplateState {
 export declare class DockerTriggerTemplate extends React.Component<ITriggerTemplateComponentProps, IDockerTriggerTemplateState> {
     private queryStream;
     private subscription;
-    static formatLabel(trigger: IDockerTrigger): PromiseLike<string>;
+    private tagRequest;
+    static formatLabel(trigger: IDockerTrigger): Promise<string>;
     constructor(props: ITriggerTemplateComponentProps);
     private handleQuery;
     private lookupTypeChanged;

package/package.json

@@ -5,7 +5,7 @@
     "url": "https://github.com/spinnaker/spinnaker.git"
   },
   "license": "Apache-2.0",
-  "version": "2026.2.2",
+  "version": "2026.3.0",
   "module": "dist/index.js",
   "typings": "dist/index.d.ts",
   "publishConfig": {
@@ -22,12 +22,9 @@
   },
   "dependencies": {
     "@spinnaker/core": "^0.29.1",
-    "@uirouter/angularjs": "1.0.26",
-    "angular": "1.8.3",
     "date-fns": "2.21.1",
     "formik": "1.5.1",
     "lodash": "4.18.1",
-    "ngimport": "0.6.1",
     "react": "16.14.0",
     "react-select": "1.2.1",
     "rxjs": "6.6.7"
@@ -35,12 +32,11 @@
   "devDependencies": {
     "@spinnaker/eslint-plugin": "^3.0.2",
     "@spinnaker/scripts": "^0.4.0",
-    "@types/angular": "1.6.26",
     "@types/lodash": "4.14.64",
     "@types/react": "16.14.10",
     "@types/react-select": "1.3.4",
     "shx": "0.3.3",
     "typescript": "5.0.4"
   },
-  "gitHead": "db086c61529c9421e8c0c2d4a2b8eca88c675ac8"
+  "gitHead": "0f7d75f5d4b42c1675e2ecc69a53f8eb73090eb9"
 }

package/src/docker.module.ts

@@ -1,7 +1,2 @@
-import { module } from 'angular';
-
-import { DOCKER_PIPELINE_STAGES_BAKE_DOCKERBAKESTAGE } from './pipeline/stages/bake/dockerBakeStage';
+import './pipeline/stages/bake/dockerBakeStage';
 import './pipeline/trigger/DockerTrigger';
-
-export const DOCKER_MODULE = 'spinnaker.docker';
-module(DOCKER_MODULE, [DOCKER_PIPELINE_STAGES_BAKE_DOCKERBAKESTAGE]);

package/src/image/DockerChartAndTagSelector.tsx

@@ -71,6 +71,7 @@ export class DockerChartAndTagSelector extends React.Component<
   };
 
   private unmounted = false;
+  private imageRequest: AbortController;
   private images: IDockerImage[];
   private accounts: string[];
 
@@ -109,7 +110,7 @@ export class DockerChartAndTagSelector extends React.Component<
 
   private getAccountMap(images: IDockerImage[]): { [key: string]: string[] } {
     const groupedImages = groupBy(
-      images.filter((image) => image.account),
+      images.filter((image) => image.account && image.repository),
       'account',
     );
     return reduce<IDockerImage[], { [key: string]: string[] }>(
@@ -192,11 +193,12 @@ export class DockerChartAndTagSelector extends React.Component<
   }
 
   public componentWillReceiveProps(nextProps: IDockerChartAndTagSelectorProps) {
+    const requestAccount = this.props.showRegistry ? this.props.account : this.props.registry;
+    const nextRequestAccount = nextProps.showRegistry ? nextProps.account : nextProps.registry;
     if (
-      !this.images ||
-      ['account', 'showRegistry'].some(
-        (key: keyof IDockerChartAndTagSelectorProps) => this.props[key] !== nextProps[key],
-      )
+      (!this.images && !this.imageRequest) ||
+      this.props.showRegistry !== nextProps.showRegistry ||
+      requestAccount !== nextRequestAccount
     ) {
       this.refreshImages(nextProps);
     } else if (
@@ -214,6 +216,7 @@ export class DockerChartAndTagSelector extends React.Component<
 
   componentWillUnmount() {
     this.unmounted = true;
+    this.imageRequest?.abort();
   }
 
   private synchronizeChanges(values: IDockerImageParts, registry: string) {
@@ -315,10 +318,14 @@ export class DockerChartAndTagSelector extends React.Component<
   }
 
   private initializeImages(props: IDockerChartAndTagSelectorProps) {
-    if (this.state.imagesLoading) {
+    if (this.unmounted) {
       return;
     }
 
+    this.imageRequest?.abort();
+    const imageRequest = new AbortController();
+    this.imageRequest = imageRequest;
+
     const { showRegistry, account, registry } = props;
 
     const imageConfig: IFindImageParams = {
@@ -327,8 +334,11 @@ export class DockerChartAndTagSelector extends React.Component<
     };
 
     this.setState({ imagesLoading: true });
-    DockerChartImageReader.findImages(imageConfig)
+    DockerChartImageReader.findImages(imageConfig, imageRequest.signal)
       .then((images: IDockerImage[]) => {
+        if (imageRequest.signal.aborted || this.unmounted) {
+          return;
+        }
         this.images = images;
         this.registryMap = this.getRegistryMap(this.images);
         this.accountMap = this.getAccountMap(this.images);
@@ -337,10 +347,11 @@ export class DockerChartAndTagSelector extends React.Component<
         this.organizationMap = this.getOrganizationMap(this.images);
         this.repositoryMap = this.getRepositoryMap(this.images);
         this.organizations = this.getOrganizationsList(this.accountMap);
-        this.updateThings(props, true);
+        this.updateThings(this.props, true);
       })
       .finally(() => {
-        if (!this.unmounted) {
+        if (!this.unmounted && this.imageRequest === imageRequest) {
+          this.imageRequest = null;
           this.setState({ imagesLoading: false });
         }
       });
@@ -354,9 +365,10 @@ export class DockerChartAndTagSelector extends React.Component<
     this.initializeImages(props);
   }
 
-  private initializeAccounts(props: IDockerChartAndTagSelectorProps) {
-    let { account } = props;
+  private initializeAccounts() {
     AccountService.listAccounts('dockerRegistry').then((allAccounts: IAccount[]) => {
+      const props = this.props;
+      let { account } = props;
       const accounts = allAccounts.map((a: IAccount) => a.name);
       if (this.props.showRegistry && !account) {
         account = accounts[0];
@@ -373,7 +385,7 @@ export class DockerChartAndTagSelector extends React.Component<
 
   public componentDidMount() {
     if (!this.props.deferInitialization && (this.props.registry || this.isNew())) {
-      this.initializeAccounts(this.props);
+      this.initializeAccounts();
     }
   }
 

package/src/image/DockerImageAndTagSelector.spec.tsx

@@ -0,0 +1,159 @@
+import { DockerChartAndTagSelector } from './DockerChartAndTagSelector';
+import { DockerImageAndTagSelector } from './DockerImageAndTagSelector';
+import { DockerChartImageReader, DockerImageReader } from './DockerImageReader';
+import { AccountService } from '@spinnaker/core';
+
+interface IDeferred<T> {
+  promise: Promise<T>;
+  resolve: (value: T) => void;
+}
+
+function deferred<T>(): IDeferred<T> {
+  let resolve: (value: T) => void;
+  const promise = new Promise<T>((promiseResolve) => (resolve = promiseResolve));
+  return { promise, resolve };
+}
+
+describe('Docker image selectors', () => {
+  const props = {
+    specifyTagByRegex: false,
+    imageId: '',
+    organization: '',
+    registry: '',
+    repository: '',
+    tag: '',
+    digest: '',
+    account: '',
+    onChange: () => undefined,
+  };
+
+  it('ignores image records without repositories when grouping account organizations', () => {
+    const images = [
+      { account: 'test', registry: 'registry.example', repository: undefined },
+      { account: 'test', registry: 'registry.example', repository: 'spinnaker/deck', tag: 'latest' },
+    ];
+
+    expect((new DockerImageAndTagSelector(props) as any).getAccountMap(images)).toEqual({ test: ['spinnaker'] });
+    expect((new DockerChartAndTagSelector(props) as any).getAccountMap(images)).toEqual({ test: ['spinnaker'] });
+  });
+
+  it('ignores non-Docker image records when no repositories are present', () => {
+    const images = [
+      { account: 'gce', imageName: 'ubuntu-1804-bionic-v20181003' },
+      { account: 'compute-engine', imageName: 'ubuntu-1804-bionic-v20181003' },
+    ];
+
+    expect((new DockerImageAndTagSelector(props) as any).getAccountMap(images)).toEqual({});
+    expect((new DockerChartAndTagSelector(props) as any).getAccountMap(images)).toEqual({});
+  });
+
+  [
+    { name: 'image', Selector: DockerImageAndTagSelector, Reader: DockerImageReader },
+    { name: 'chart', Selector: DockerChartAndTagSelector, Reader: DockerChartImageReader },
+  ].forEach(({ name, Selector, Reader }) => {
+    it(`aborts replaced and unmounted ${name} loads without applying late state`, async () => {
+      const firstRequest = deferred<any[]>();
+      const secondRequest = deferred<any[]>();
+      const findImages = spyOn(Reader, 'findImages').and.returnValues(firstRequest.promise, secondRequest.promise);
+      const component = new Selector(props);
+      const setState = spyOn(component, 'setState');
+
+      component.refreshImages(props);
+      component.refreshImages({ ...props, account: 'replacement' });
+      const firstSignal = findImages.calls.argsFor(0)[1] as AbortSignal;
+      const secondSignal = findImages.calls.argsFor(1)[1] as AbortSignal;
+
+      expect(firstSignal.aborted).toBe(true);
+      expect(secondSignal.aborted).toBe(false);
+      component.componentWillUnmount();
+      expect(secondSignal.aborted).toBe(true);
+
+      firstRequest.resolve([]);
+      secondRequest.resolve([]);
+      await Promise.all([firstRequest.promise, secondRequest.promise]);
+      await Promise.resolve();
+
+      expect(setState.calls.allArgs()).toEqual([[{ imagesLoading: true }], [{ imagesLoading: true }]]);
+    });
+
+    it(`preserves a pending ${name} load across unrelated prop updates`, async () => {
+      const request = deferred<any[]>();
+      const findImages = spyOn(Reader, 'findImages').and.returnValue(request.promise);
+      const component = new Selector(props);
+      spyOn(component, 'setState');
+      const updateThings = spyOn(component as any, 'updateThings').and.callThrough();
+      const replacementProps = { ...props, repository: 'replacement' };
+
+      component.refreshImages(props);
+      component.componentWillReceiveProps(replacementProps);
+      (component as any).props = replacementProps;
+      const signal = findImages.calls.argsFor(0)[1] as AbortSignal;
+
+      expect(findImages).toHaveBeenCalledTimes(1);
+      expect(signal.aborted).toBe(false);
+
+      updateThings.calls.reset();
+      request.resolve([]);
+      await request.promise;
+      await Promise.resolve();
+
+      expect(updateThings).toHaveBeenCalledOnceWith(replacementProps, true);
+      component.componentWillUnmount();
+    });
+
+    it(`replaces a pending ${name} load when its effective registry account changes`, async () => {
+      const firstRequest = deferred<any[]>();
+      const secondRequest = deferred<any[]>();
+      const findImages = spyOn(Reader, 'findImages').and.returnValues(firstRequest.promise, secondRequest.promise);
+      const initialProps = { ...props, registry: 'initial', showRegistry: false };
+      const replacementProps = { ...initialProps, registry: 'replacement' };
+      const component = new Selector(initialProps);
+      spyOn(component, 'setState');
+
+      component.refreshImages(initialProps);
+      component.componentWillReceiveProps(replacementProps);
+      (component as any).props = replacementProps;
+      const firstSignal = findImages.calls.argsFor(0)[1] as AbortSignal;
+      const secondSignal = findImages.calls.argsFor(1)[1] as AbortSignal;
+
+      expect(findImages.calls.argsFor(1)[0].account).toBe('replacement');
+      expect(firstSignal.aborted).toBe(true);
+      expect(secondSignal.aborted).toBe(false);
+
+      component.componentWillUnmount();
+      firstRequest.resolve([]);
+      secondRequest.resolve([]);
+      await Promise.all([firstRequest.promise, secondRequest.promise]);
+    });
+
+    it(`uses current props when delayed account initialization refreshes ${name} loads`, async () => {
+      const accountsRequest = deferred<any[]>();
+      const firstImageRequest = deferred<any[]>();
+      const secondImageRequest = deferred<any[]>();
+      spyOn(AccountService, 'listAccounts').and.returnValue(accountsRequest.promise);
+      const findImages = spyOn(Reader, 'findImages').and.returnValues(
+        firstImageRequest.promise,
+        secondImageRequest.promise,
+      );
+      const initialProps = { ...props, account: 'initial', showRegistry: true };
+      const replacementProps = { ...initialProps, account: 'replacement' };
+      const component = new Selector(initialProps);
+      spyOn(component, 'setState');
+
+      (component as any).initializeAccounts(initialProps);
+      (component as any).props = replacementProps;
+      component.refreshImages(replacementProps);
+      accountsRequest.resolve([{ name: 'default' }]);
+      await accountsRequest.promise;
+      await Promise.resolve();
+
+      expect(findImages.calls.argsFor(0)[0].account).toBe('replacement');
+      expect(findImages.calls.argsFor(1)[0].account).toBe('replacement');
+
+      component.componentWillUnmount();
+      firstImageRequest.resolve([]);
+      secondImageRequest.resolve([]);
+      await Promise.all([firstImageRequest.promise, secondImageRequest.promise]);
+    });
+  });
+});

package/src/image/DockerImageAndTagSelector.tsx

@@ -71,6 +71,7 @@ export class DockerImageAndTagSelector extends React.Component<
   };
 
   private unmounted = false;
+  private imageRequest: AbortController;
   private images: IDockerImage[];
   private accounts: string[];
 
@@ -109,7 +110,7 @@ export class DockerImageAndTagSelector extends React.Component<
 
   private getAccountMap(images: IDockerImage[]): { [key: string]: string[] } {
     const groupedImages = groupBy(
-      images.filter((image) => image.account),
+      images.filter((image) => image.account && image.repository),
       'account',
     );
     return reduce<IDockerImage[], { [key: string]: string[] }>(
@@ -192,11 +193,12 @@ export class DockerImageAndTagSelector extends React.Component<
   }
 
   public componentWillReceiveProps(nextProps: IDockerImageAndTagSelectorProps) {
+    const requestAccount = this.props.showRegistry ? this.props.account : this.props.registry;
+    const nextRequestAccount = nextProps.showRegistry ? nextProps.account : nextProps.registry;
     if (
-      !this.images ||
-      ['account', 'showRegistry'].some(
-        (key: keyof IDockerImageAndTagSelectorProps) => this.props[key] !== nextProps[key],
-      )
+      (!this.images && !this.imageRequest) ||
+      this.props.showRegistry !== nextProps.showRegistry ||
+      requestAccount !== nextRequestAccount
     ) {
       this.refreshImages(nextProps);
     } else if (
@@ -214,6 +216,7 @@ export class DockerImageAndTagSelector extends React.Component<
 
   componentWillUnmount() {
     this.unmounted = true;
+    this.imageRequest?.abort();
   }
 
   private synchronizeChanges(values: IDockerImageParts, registry: string) {
@@ -315,10 +318,14 @@ export class DockerImageAndTagSelector extends React.Component<
   }
 
   private initializeImages(props: IDockerImageAndTagSelectorProps) {
-    if (this.state.imagesLoading) {
+    if (this.unmounted) {
       return;
     }
 
+    this.imageRequest?.abort();
+    const imageRequest = new AbortController();
+    this.imageRequest = imageRequest;
+
     const { showRegistry, account, registry } = props;
 
     const imageConfig: IFindImageParams = {
@@ -327,8 +334,11 @@ export class DockerImageAndTagSelector extends React.Component<
     };
 
     this.setState({ imagesLoading: true });
-    DockerImageReader.findImages(imageConfig)
+    DockerImageReader.findImages(imageConfig, imageRequest.signal)
       .then((images: IDockerImage[]) => {
+        if (imageRequest.signal.aborted || this.unmounted) {
+          return;
+        }
         this.images = images;
         this.registryMap = this.getRegistryMap(this.images);
         this.accountMap = this.getAccountMap(this.images);
@@ -337,10 +347,11 @@ export class DockerImageAndTagSelector extends React.Component<
         this.organizationMap = this.getOrganizationMap(this.images);
         this.repositoryMap = this.getRepositoryMap(this.images);
         this.organizations = this.getOrganizationsList(this.accountMap);
-        this.updateThings(props, true);
+        this.updateThings(this.props, true);
       })
       .finally(() => {
-        if (!this.unmounted) {
+        if (!this.unmounted && this.imageRequest === imageRequest) {
+          this.imageRequest = null;
           this.setState({ imagesLoading: false });
         }
       });
@@ -354,9 +365,10 @@ export class DockerImageAndTagSelector extends React.Component<
     this.initializeImages(props);
   }
 
-  private initializeAccounts(props: IDockerImageAndTagSelectorProps) {
-    let { account } = props;
+  private initializeAccounts() {
     AccountService.listAccounts('dockerRegistry').then((allAccounts: IAccount[]) => {
+      const props = this.props;
+      let { account } = props;
       const accounts = allAccounts.map((a: IAccount) => a.name);
       if (this.props.showRegistry && !account) {
         account = accounts[0];
@@ -373,7 +385,7 @@ export class DockerImageAndTagSelector extends React.Component<
 
   public componentDidMount() {
     if (!this.props.deferInitialization && (this.props.registry || this.isNew())) {
-      this.initializeAccounts(this.props);
+      this.initializeAccounts();
     }
   }
 

package/src/image/DockerImageReader.spec.ts

@@ -0,0 +1,21 @@
+import { RetryService } from '@spinnaker/core';
+
+import { DockerChartImageReader, DockerImageReader } from './DockerImageReader';
+
+describe('Docker image readers', () => {
+  it('passes owner signals through all image and tag retry sequences', async () => {
+    const retry = spyOn(RetryService, 'buildRetrySequence').and.returnValue(Promise.resolve([]));
+    const signal = new AbortController().signal;
+    const imageParams = { provider: 'dockerRegistry', account: 'registry.example' };
+    const tagParams = { ...imageParams, repository: 'example/service' };
+
+    await Promise.all([
+      DockerImageReader.findImages(imageParams, signal),
+      DockerImageReader.findTags(tagParams, signal),
+      DockerChartImageReader.findImages(imageParams, signal),
+      DockerChartImageReader.findTags(tagParams, signal),
+    ]);
+
+    expect(retry.calls.allArgs().map((args) => args[4])).toEqual([signal, signal, signal, signal]);
+  });
+});

package/src/image/DockerImageReader.ts

@@ -9,7 +9,7 @@ export interface IDockerImage extends IImage {
 }
 
 export class DockerImageReader {
-  public static getImage(imageName: string, region: string, credentials: string): PromiseLike<IDockerImage> {
+  public static getImage(imageName: string, region: string, credentials: string): Promise<IDockerImage> {
     return REST('/images')
       .path(credentials, region, imageName)
       .query({ provider: 'docker' })
@@ -18,23 +18,25 @@ export class DockerImageReader {
       .catch((): IDockerImage => null);
   }
 
-  public static findImages(params: IFindImageParams): PromiseLike<IDockerImage[]> {
+  public static findImages(params: IFindImageParams, signal?: AbortSignal): Promise<IDockerImage[]> {
     return RetryService.buildRetrySequence<IDockerImage[]>(
       () => REST('/images/find').query(params).get(),
       (results: IDockerImage[]) => results.length > 0,
       10,
       1000,
+      signal,
     )
       .then((results: IDockerImage[]) => results)
       .catch((): IDockerImage[] => []);
   }
 
-  public static findTags(params: IFindTagsParams): PromiseLike<string[]> {
+  public static findTags(params: IFindTagsParams, signal?: AbortSignal): Promise<string[]> {
     return RetryService.buildRetrySequence<string[]>(
       () => REST('/images/tags').query(params).get(),
       (results: string[]) => results.length > 0,
       10,
       1000,
+      signal,
     )
       .then((results: string[]) => results)
       .catch((): string[] => []);
@@ -42,7 +44,7 @@ export class DockerImageReader {
 }
 
 export class DockerChartImageReader {
-  public static getImage(imageName: string, region: string, credentials: string): PromiseLike<IDockerImage> {
+  public static getImage(imageName: string, region: string, credentials: string): Promise<IDockerImage> {
     return REST('/charts')
       .path(credentials, region, imageName)
       .query({ provider: 'docker' })
@@ -51,23 +53,25 @@ export class DockerChartImageReader {
       .catch((): IDockerImage => null);
   }
 
-  public static findImages(params: IFindImageParams): PromiseLike<IDockerImage[]> {
+  public static findImages(params: IFindImageParams, signal?: AbortSignal): Promise<IDockerImage[]> {
     return RetryService.buildRetrySequence<IDockerImage[]>(
       () => REST('/charts/find').query(params).get(),
       (results: IDockerImage[]) => results.length > 0,
       10,
       1000,
+      signal,
     )
       .then((results: IDockerImage[]) => results)
       .catch((): IDockerImage[] => []);
   }
 
-  public static findTags(params: IFindTagsParams): PromiseLike<string[]> {
+  public static findTags(params: IFindTagsParams, signal?: AbortSignal): Promise<string[]> {
     return RetryService.buildRetrySequence<string[]>(
       () => REST('/charts/tags').query(params).get(),
       (results: string[]) => results.length > 0,
       10,
       1000,
+      signal,
     )
       .then((results: string[]) => results)
       .catch((): string[] => []);

package/src/index.ts

@@ -1,2 +1,3 @@
+import './docker.module';
+
 export * from './image';
-export * from './docker.module';