@spinnaker/ecs 2026.1.1 → 2026.2.0

package/dist/serverGroup/configure/wizard/container/Container.d.ts

@@ -1,4 +1,5 @@
 import * as React from 'react';
+import type { IAccountDetails } from '@spinnaker/core';
 import type { IEcsDockerImage, IEcsServerGroupCommand, IEcsTargetGroupMapping } from '../../serverGroupConfiguration.service';
 export interface IContainerProps {
     command: IEcsServerGroupCommand;
@@ -10,6 +11,8 @@ interface IContainerState {
     computeUnits: number;
     reservedMemory: number;
     dockerImages: IEcsDockerImage[];
+    dockerRegistryAccounts: IAccountDetails[];
+    selectedDockerAccount: string;
     targetGroupsAvailable: string[];
     targetGroupMappings: IEcsTargetGroupMapping[];
 }
@@ -18,6 +21,7 @@ export declare class Container extends React.Component<IContainerProps, IContain
     componentDidMount(): void;
     private getIdToImageMap;
     private getEmptyImageDescription;
+    private updateDockerRegistryAccount;
     private pushTargetGroupMapping;
     private updateContainerMappingImage;
     private updateComputeUnits;

package/dist/serverGroup/configure/wizard/taskDefinition/TaskDefinition.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import type { IAccountDetails } from '@spinnaker/core';
 import type { IEcsContainerMapping, IEcsDockerImage, IEcsServerGroupCommand, IEcsTargetGroupMapping, IEcsTaskDefinitionArtifact } from '../../serverGroupConfiguration.service';
 export interface ITaskDefinitionProps {
     command: IEcsServerGroupCommand;
@@ -11,6 +12,8 @@ interface ITaskDefinitionState {
     containerMappings: IEcsContainerMapping[];
     targetGroupMappings: IEcsTargetGroupMapping[];
     dockerImages: IEcsDockerImage[];
+    dockerRegistryAccounts: IAccountDetails[];
+    selectedDockerAccount: string;
     targetGroupsAvailable: string[];
     loadBalancedContainer: string;
     evaluateTaskDefinitionArtifactExpressions: boolean;
@@ -18,6 +21,7 @@ interface ITaskDefinitionState {
 export declare class TaskDefinition extends React.Component<ITaskDefinitionProps, ITaskDefinitionState> {
     constructor(props: ITaskDefinitionProps);
     componentDidMount(): void;
+    private updateDockerRegistryAccount;
     private getIdToImageMap;
     private getEmptyImageDescription;
     private excludedArtifactTypePatterns;

package/package.json

@@ -5,7 +5,7 @@
     "url": "https://github.com/spinnaker/spinnaker.git"
   },
   "license": "Apache-2.0",
-  "version": "2026.1.1",
+  "version": "2026.2.0",
   "module": "dist/index.js",
   "typings": "dist/index.d.ts",
   "publishConfig": {
@@ -26,7 +26,7 @@
     "@spinnaker/docker": "^0.0.147",
     "@uirouter/angularjs": "1.0.26",
     "@uirouter/react": "1.0.7",
-    "angular": "1.6.10",
+    "angular": "1.8.3",
     "angular-ui-bootstrap": "2.5.0",
     "lodash": "4.18.1",
     "ngimport": "0.6.1",
@@ -47,5 +47,5 @@
     "shx": "0.3.3",
     "typescript": "5.0.4"
   },
-  "gitHead": "f842aaebe413ea1a14ccec06dd6824e07dc7426b"
+  "gitHead": "a9155eb5c4e40b9db5aa9741af28fc2412f7c7d8"
 }

package/src/serverGroup/configure/serverGroupConfiguration.service.ts

@@ -239,13 +239,18 @@ export class EcsServerGroupConfigurationService {
       imageQueries.push(imageQuery);
     }
 
+    // Scope image search to a known account. If no account is available yet the Docker registry
+    // account picker in the wizard will trigger an account-scoped reload once the user selects one.
+    const searchAccount = cmd.imageDescription?.account;
+
     let imagesPromise;
-    if (imageQueries.length) {
+    if (imageQueries.length && searchAccount) {
       imagesPromise = this.$q
         .all(
           imageQueries.map((q) =>
             DockerImageReader.findImages({
               provider: 'dockerRegistry',
+              account: searchAccount,
               count: 50,
               q: q,
             }),

package/src/serverGroup/configure/wizard/container/Container.spec.tsx

@@ -0,0 +1,121 @@
+import { mount } from 'enzyme';
+import React from 'react';
+
+import type { IAccountDetails } from '@spinnaker/core';
+import { AccountService } from '@spinnaker/core';
+import type { IDockerImage } from '@spinnaker/docker';
+import { DockerImageReader } from '@spinnaker/docker';
+
+import type { IEcsDockerImage, IEcsServerGroupCommand } from '../../serverGroupConfiguration.service';
+import { Container } from './Container';
+
+const flushPromises = (): Promise<void> => new Promise((resolve) => setTimeout(resolve, 0));
+
+describe('Container', () => {
+  let command: IEcsServerGroupCommand;
+
+  const configureCommand = (_query: string) => Promise.resolve() as PromiseLike<void>;
+  const notifyAngular = (_key: string, _value: any) => {};
+
+  const dockerAccounts: IAccountDetails[] = [
+    {
+      name: 'my-docker-account',
+      accountId: '1',
+      requiredGroupMembership: [],
+      type: 'dockerRegistry',
+    } as IAccountDetails,
+  ];
+
+  const dockerImages: IDockerImage[] = [
+    { account: 'my-docker-account', registry: 'my-registry', repository: 'my-repo', tag: 'latest' },
+  ];
+
+  beforeEach(() => {
+    command = ({
+      computeUnits: 256,
+      reservedMemory: 512,
+      imageDescription: null as any,
+      targetGroupMappings: [],
+      containerMappings: null as any,
+      targetGroup: '',
+      loadBalancedContainer: '',
+      viewState: { dirty: { targetGroups: [] } } as any,
+      backingData: { filtered: { images: [], targetGroups: [] } } as any,
+    } as any) as IEcsServerGroupCommand;
+
+    spyOn(AccountService, 'listAccounts').and.returnValue(Promise.resolve(dockerAccounts));
+    spyOn(DockerImageReader, 'findImages').and.returnValue(Promise.resolve(dockerImages));
+  });
+
+  describe('updateDockerRegistryAccount', () => {
+    it('calls DockerImageReader.findImages with the selected account', async () => {
+      const wrapper = mount(
+        <Container command={command} notifyAngular={notifyAngular} configureCommand={configureCommand} />,
+      );
+
+      await flushPromises();
+
+      (wrapper.instance() as any).updateDockerRegistryAccount({ value: 'my-docker-account' });
+
+      expect(DockerImageReader.findImages).toHaveBeenCalledWith({
+        provider: 'dockerRegistry',
+        account: 'my-docker-account',
+        count: 50,
+      });
+    });
+
+    it('updates component state and backingData with images returned for the account', async () => {
+      const wrapper = mount(
+        <Container command={command} notifyAngular={notifyAngular} configureCommand={configureCommand} />,
+      );
+
+      (wrapper.instance() as any).updateDockerRegistryAccount({ value: 'my-docker-account' });
+      await flushPromises();
+      wrapper.update();
+
+      expect((wrapper.instance() as Container).state.dockerImages).toEqual(dockerImages as IEcsDockerImage[]);
+      expect(command.backingData.filtered.images).toEqual(dockerImages as IEcsDockerImage[]);
+    });
+
+    it('clears existing images immediately when account changes', () => {
+      command.backingData.filtered.images = dockerImages as IEcsDockerImage[];
+      const wrapper = mount(
+        <Container command={command} notifyAngular={notifyAngular} configureCommand={configureCommand} />,
+      );
+
+      (wrapper.instance() as any).updateDockerRegistryAccount({ value: 'my-docker-account' });
+
+      // State clears synchronously before the findImages promise resolves
+      expect((wrapper.instance() as Container).state.dockerImages).toEqual([]);
+    });
+
+    it('pre-selects the account from imageDescription when command already has one', () => {
+      command.imageDescription = {
+        account: 'my-docker-account',
+        registry: 'my-registry',
+        repository: 'my-repo',
+        tag: 'latest',
+        imageId: 'my-registry/my-repo:latest',
+        message: '',
+        fromTrigger: false,
+        fromContext: false,
+        stageId: '',
+        imageLabelOrSha: '',
+      } as IEcsDockerImage;
+
+      const wrapper = mount(
+        <Container command={command} notifyAngular={notifyAngular} configureCommand={configureCommand} />,
+      );
+
+      expect((wrapper.instance() as Container).state.selectedDockerAccount).toBe('my-docker-account');
+    });
+
+    it('starts with no account selected when imageDescription has no account', () => {
+      const wrapper = mount(
+        <Container command={command} notifyAngular={notifyAngular} configureCommand={configureCommand} />,
+      );
+
+      expect((wrapper.instance() as Container).state.selectedDockerAccount).toBe('');
+    });
+  });
+});

package/src/serverGroup/configure/wizard/container/Container.tsx

@@ -5,7 +5,9 @@ import { Alert } from 'react-bootstrap';
 import type { Option } from 'react-select';
 import { react2angular } from 'react2angular';
 
-import { HelpField, TetheredSelect, withErrorBoundary } from '@spinnaker/core';
+import type { IAccountDetails } from '@spinnaker/core';
+import { AccountService, HelpField, TetheredSelect, withErrorBoundary } from '@spinnaker/core';
+import { DockerImageReader } from '@spinnaker/docker';
 
 import type {
   IEcsDockerImage,
@@ -24,6 +26,8 @@ interface IContainerState {
   computeUnits: number;
   reservedMemory: number;
   dockerImages: IEcsDockerImage[];
+  dockerRegistryAccounts: IAccountDetails[];
+  selectedDockerAccount: string;
   targetGroupsAvailable: string[];
   targetGroupMappings: IEcsTargetGroupMapping[];
 }
@@ -60,6 +64,8 @@ export class Container extends React.Component<IContainerProps, IContainerState>
       computeUnits: cmd.computeUnits,
       reservedMemory: cmd.reservedMemory,
       dockerImages: cmd.backingData && cmd.backingData.filtered ? cmd.backingData.filtered.images : [],
+      dockerRegistryAccounts: [],
+      selectedDockerAccount: cmd.imageDescription?.account ?? '',
       targetGroupMappings: cmd.targetGroupMappings,
       targetGroupsAvailable: cmd.backingData && cmd.backingData.filtered ? cmd.backingData.filtered.targetGroups : [],
     };
@@ -70,6 +76,10 @@ export class Container extends React.Component<IContainerProps, IContainerState>
   }
 
   public componentDidMount() {
+    AccountService.listAccounts('dockerRegistry').then((accounts: IAccountDetails[]) => {
+      this.setState({ dockerRegistryAccounts: accounts });
+    });
+
     this.props.configureCommand('1').then(() => {
       this.setState({
         dockerImages: this.props.command.backingData.filtered.images,
@@ -104,6 +114,16 @@ export class Container extends React.Component<IContainerProps, IContainerState>
     };
   };
 
+  private updateDockerRegistryAccount = (newAccount: Option<string>) => {
+    const account = newAccount.value;
+    this.setState({ selectedDockerAccount: account, dockerImages: [] });
+    DockerImageReader.findImages({ provider: 'dockerRegistry', account, count: 50 }).then((images) => {
+      const ecsImages = images as IEcsDockerImage[];
+      this.props.command.backingData.filtered.images = ecsImages;
+      this.setState({ dockerImages: ecsImages });
+    });
+  };
+
   private pushTargetGroupMapping = () => {
     const targetMaps = this.state.targetGroupMappings;
     targetMaps.push({ containerName: '', targetGroup: '', containerPort: 80 });
@@ -171,6 +191,11 @@ export class Container extends React.Component<IContainerProps, IContainerState>
         ? this.props.command.viewState.dirty.targetGroups
         : [];
 
+    const dockerRegistryAccountOptions = this.state.dockerRegistryAccounts.map((account) => ({
+      label: account.name,
+      value: account.name,
+    }));
+
     const dockerImageOptions = this.state.dockerImages.map(function (image) {
       let msg = '';
       if (image.fromTrigger || image.fromContext) {
@@ -257,6 +282,20 @@ export class Container extends React.Component<IContainerProps, IContainerState>
     return (
       <div className="container-fluid form-horizontal">
         {dirtyTagetGroups.length > 0 ? <div>{dirtyTargetGroupSection}</div> : ''}
+        <div className="form-group">
+          <div className="col-md-3 sm-label-right">
+            <b>Docker Registry Account</b>
+          </div>
+          <div className="col-md-9" data-test-id="ContainerInputs.dockerRegistryAccount">
+            <TetheredSelect
+              placeholder="Select a Docker registry account..."
+              options={dockerRegistryAccountOptions}
+              value={this.state.selectedDockerAccount}
+              onChange={(e: Option) => this.updateDockerRegistryAccount(e as Option<string>)}
+              clearable={false}
+            />
+          </div>
+        </div>
         <div className="form-group">
           <div className="col-md-3 sm-label-right">
             <b>Container Image</b>

package/src/serverGroup/configure/wizard/taskDefinition/TaskDefinition.spec.tsx

@@ -0,0 +1,124 @@
+import { mount } from 'enzyme';
+import React from 'react';
+
+import type { IAccountDetails } from '@spinnaker/core';
+import { AccountService } from '@spinnaker/core';
+import type { IDockerImage } from '@spinnaker/docker';
+import { DockerImageReader } from '@spinnaker/docker';
+
+import type { IEcsDockerImage, IEcsServerGroupCommand } from '../../serverGroupConfiguration.service';
+import { TaskDefinition } from './TaskDefinition';
+
+const flushPromises = (): Promise<void> => new Promise((resolve) => setTimeout(resolve, 0));
+
+describe('TaskDefinition', () => {
+  let command: IEcsServerGroupCommand;
+
+  const configureCommand = (_query: string) => Promise.resolve() as PromiseLike<void>;
+  const notifyAngular = (_key: string, _value: any) => {};
+
+  const dockerAccounts: IAccountDetails[] = [
+    {
+      name: 'my-docker-account',
+      accountId: '1',
+      requiredGroupMembership: [],
+      type: 'dockerRegistry',
+    } as IAccountDetails,
+  ];
+
+  const dockerImages: IDockerImage[] = [
+    { account: 'my-docker-account', registry: 'my-registry', repository: 'my-repo', tag: 'latest' },
+  ];
+
+  beforeEach(() => {
+    command = ({
+      computeUnits: 256,
+      reservedMemory: 512,
+      imageDescription: null as any,
+      targetGroupMappings: [],
+      containerMappings: [] as any,
+      targetGroup: '',
+      loadBalancedContainer: '',
+      taskDefinitionArtifact: {} as any,
+      taskDefinitionArtifactAccount: '',
+      evaluateTaskDefinitionArtifactExpressions: false,
+      useTaskDefinitionArtifact: false,
+      viewState: { dirty: { targetGroups: [] }, pipeline: null as any, currentStage: null as any } as any,
+      backingData: { filtered: { images: [], targetGroups: [] } } as any,
+    } as any) as IEcsServerGroupCommand;
+
+    spyOn(AccountService, 'listAccounts').and.returnValue(Promise.resolve(dockerAccounts));
+    spyOn(DockerImageReader, 'findImages').and.returnValue(Promise.resolve(dockerImages));
+  });
+
+  describe('updateDockerRegistryAccount', () => {
+    it('calls DockerImageReader.findImages with the selected account', async () => {
+      const wrapper = mount(
+        <TaskDefinition command={command} notifyAngular={notifyAngular} configureCommand={configureCommand} />,
+      );
+
+      await flushPromises();
+
+      (wrapper.instance() as any).updateDockerRegistryAccount({ value: 'my-docker-account' });
+
+      expect(DockerImageReader.findImages).toHaveBeenCalledWith({
+        provider: 'dockerRegistry',
+        account: 'my-docker-account',
+        count: 50,
+      });
+    });
+
+    it('updates component state and backingData with images returned for the account', async () => {
+      const wrapper = mount(
+        <TaskDefinition command={command} notifyAngular={notifyAngular} configureCommand={configureCommand} />,
+      );
+
+      (wrapper.instance() as any).updateDockerRegistryAccount({ value: 'my-docker-account' });
+      await flushPromises();
+      wrapper.update();
+
+      expect((wrapper.instance() as TaskDefinition).state.dockerImages).toEqual(dockerImages as IEcsDockerImage[]);
+      expect(command.backingData.filtered.images).toEqual(dockerImages as IEcsDockerImage[]);
+    });
+
+    it('clears existing images immediately when account changes', () => {
+      command.backingData.filtered.images = dockerImages as IEcsDockerImage[];
+      const wrapper = mount(
+        <TaskDefinition command={command} notifyAngular={notifyAngular} configureCommand={configureCommand} />,
+      );
+
+      (wrapper.instance() as any).updateDockerRegistryAccount({ value: 'my-docker-account' });
+
+      expect((wrapper.instance() as TaskDefinition).state.dockerImages).toEqual([]);
+    });
+
+    it('pre-selects the account from imageDescription when command already has one', () => {
+      command.imageDescription = {
+        account: 'my-docker-account',
+        registry: 'my-registry',
+        repository: 'my-repo',
+        tag: 'latest',
+        imageId: 'my-registry/my-repo:latest',
+        message: '',
+        fromTrigger: false,
+        fromContext: false,
+        stageId: '',
+        imageLabelOrSha: '',
+      } as IEcsDockerImage;
+
+      const wrapper = mount(
+        <TaskDefinition command={command} notifyAngular={notifyAngular} configureCommand={configureCommand} />,
+      );
+
+      expect((wrapper.instance() as TaskDefinition).state.selectedDockerAccount).toBe('my-docker-account');
+    });
+
+    it('starts with no account selected when imageDescription has no account', () => {
+      const wrapper = mount(
+        <TaskDefinition command={command} notifyAngular={notifyAngular} configureCommand={configureCommand} />,
+      );
+
+      expect((wrapper.instance() as TaskDefinition).state.selectedDockerAccount).toBe('');
+    });
+  });
+});

package/src/serverGroup/configure/wizard/taskDefinition/TaskDefinition.tsx

@@ -5,8 +5,9 @@ import { Alert } from 'react-bootstrap';
 import type { Option } from 'react-select';
 import { react2angular } from 'react2angular';
 
-import type { IArtifact, IExpectedArtifact } from '@spinnaker/core';
+import type { IAccountDetails, IArtifact, IExpectedArtifact } from '@spinnaker/core';
 import {
+  AccountService,
   ArtifactTypePatterns,
   CheckboxInput,
   HelpField,
@@ -15,6 +16,7 @@ import {
   TetheredSelect,
   withErrorBoundary,
 } from '@spinnaker/core';
+import { DockerImageReader } from '@spinnaker/docker';
 
 import type {
   IEcsContainerMapping,
@@ -36,6 +38,8 @@ interface ITaskDefinitionState {
   containerMappings: IEcsContainerMapping[];
   targetGroupMappings: IEcsTargetGroupMapping[];
   dockerImages: IEcsDockerImage[];
+  dockerRegistryAccounts: IAccountDetails[];
+  selectedDockerAccount: string;
   targetGroupsAvailable: string[];
   loadBalancedContainer: string;
   evaluateTaskDefinitionArtifactExpressions: boolean;
@@ -73,6 +77,8 @@ export class TaskDefinition extends React.Component<ITaskDefinitionProps, ITaskD
       targetGroupMappings: cmd.targetGroupMappings,
       targetGroupsAvailable: cmd.backingData && cmd.backingData.filtered ? cmd.backingData.filtered.targetGroups : [],
       dockerImages: cmd.backingData && cmd.backingData.filtered ? cmd.backingData.filtered.images : [],
+      dockerRegistryAccounts: [],
+      selectedDockerAccount: cmd.imageDescription?.account ?? '',
       loadBalancedContainer: cmd.loadBalancedContainer || defaultContainer,
       taskDefArtifactAccount: cmd.taskDefinitionArtifactAccount,
       evaluateTaskDefinitionArtifactExpressions: cmd.evaluateTaskDefinitionArtifactExpressions,
@@ -81,6 +87,10 @@ export class TaskDefinition extends React.Component<ITaskDefinitionProps, ITaskD
 
   // TODO: Separate docker image component used by both TaskDefinition and Container
   public componentDidMount() {
+    AccountService.listAccounts('dockerRegistry').then((accounts: IAccountDetails[]) => {
+      this.setState({ dockerRegistryAccounts: accounts });
+    });
+
     this.props.configureCommand('1').then(() => {
       this.setState({
         dockerImages: this.props.command.backingData.filtered.images,
@@ -89,6 +99,16 @@ export class TaskDefinition extends React.Component<ITaskDefinitionProps, ITaskD
     });
   }
 
+  private updateDockerRegistryAccount = (newAccount: Option<string>) => {
+    const account = newAccount.value;
+    this.setState({ selectedDockerAccount: account, dockerImages: [] });
+    DockerImageReader.findImages({ provider: 'dockerRegistry', account, count: 50 }).then((images) => {
+      const ecsImages = images as IEcsDockerImage[];
+      this.props.command.backingData.filtered.images = ecsImages;
+      this.setState({ dockerImages: ecsImages });
+    });
+  };
+
   private getIdToImageMap = (): Map<string, IEcsDockerImage> => {
     const imageIdToDescription = new Map<string, IEcsDockerImage>();
     this.props.command.backingData.filtered.images.forEach((e) => {
@@ -224,6 +244,11 @@ export class TaskDefinition extends React.Component<ITaskDefinitionProps, ITaskD
     const updateTargetGroupMappingPort = this.updateTargetGroupMappingPort;
     const updateEvaluateTaskDefArtifactFlag = this.updateEvaluateTaskDefArtifactFlag;
 
+    const dockerRegistryAccountOptions = this.state.dockerRegistryAccounts.map((account) => ({
+      label: account.name,
+      value: account.name,
+    }));
+
     const dockerImageOptions = this.state.dockerImages.map(function (image) {
       let msg = '';
       if (image.fromTrigger || image.fromContext) {
@@ -373,6 +398,21 @@ export class TaskDefinition extends React.Component<ITaskDefinitionProps, ITaskD
           />
         </StageConfigField>
 
+        <div className="form-group">
+          <div className="col-md-3 sm-label-right">
+            <b>Docker Registry Account</b>
+          </div>
+          <div className="col-md-9" data-test-id="Artifacts.dockerRegistryAccount">
+            <TetheredSelect
+              placeholder="Select a Docker registry account..."
+              options={dockerRegistryAccountOptions}
+              value={this.state.selectedDockerAccount}
+              onChange={(e: Option) => this.updateDockerRegistryAccount(e as Option<string>)}
+              clearable={false}
+            />
+          </div>
+        </div>
+
         <div className="form-group">
           <div className="sm-label-left">
             <b>Container Mappings</b>