@spinnaker/core 0.15.0 → 0.15.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@spinnaker/core",
   "license": "Apache-2.0",
-  "version": "0.15.0",
+  "version": "0.15.1",
   "module": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
@@ -120,5 +120,5 @@
     "shx": "0.3.3",
     "typescript": "4.3.5"
   },
-  "gitHead": "c4b42b16cee7d8746087e9e1bcc4b00751dd4bc7"
+  "gitHead": "187272ef1933753688fb8f7966e250a27104612a"
 }

package/src/pipeline/config/stages/bakeManifest/helm/BakeHelmConfigForm.spec.tsx

@@ -6,7 +6,8 @@ import { StageConfigField } from '../../../..';
 import { BakeHelmConfigForm } from './BakeHelmConfigForm';
 import { AccountService } from '../../../../../account';
 import { ApplicationModelBuilder } from '../../../../../application';
-import type { IStage } from '../../../../../domain';
+import { ExpectedArtifactService } from '../../../../../artifact';
+import type { IExpectedArtifact, IStage } from '../../../../../domain';
 import { SpinFormik } from '../../../../../presentation';
 import { REACT_MODULE } from '../../../../../reactShims';
 
@@ -84,4 +85,48 @@ describe('<BakeHelmConfigForm />', () => {
 
     expect(component.find(StageConfigField).findWhere((x) => x.text() === helmChartFilePathFieldName).length).toBe(0);
   });
+
+  it('render the helm chart file path if the id of the git artifact is given but the account value does not exist', async () => {
+    const expectedArtifactDisplayName = 'test-artifact';
+    const expectedArtifactId = 'test-artifact-id';
+    const expectedGitArtifact: IExpectedArtifact = {
+      defaultArtifact: {
+        customKind: true,
+        id: 'defaultArtifact-id',
+      },
+      displayName: expectedArtifactDisplayName,
+      id: expectedArtifactId,
+      matchArtifact: {
+        artifactAccount: 'gitrepo',
+        id: expectedArtifactId,
+        reference: 'git repo',
+        type: 'git/repo',
+        version: 'master',
+      },
+      useDefaultArtifact: false,
+      usePriorArtifact: false,
+    };
+    const stage = ({
+      inputArtifacts: [{ id: expectedArtifactId }],
+    } as unknown) as IStage;
+
+    spyOn(ExpectedArtifactService, 'getExpectedArtifactsAvailableToStage').and.returnValue([expectedGitArtifact]);
+
+    const props = getProps();
+
+    const component = mount(
+      <SpinFormik
+        initialValues={stage}
+        onSubmit={() => null}
+        validate={() => null}
+        render={(formik) => <BakeHelmConfigForm {...props} formik={formik} />}
+      />,
+    );
+
+    await new Promise((resolve) => setTimeout(resolve)); // wait one js tick for promise to resolve
+    component.setProps({}); // force a re-render
+
+    expect(component.find('.Select-value-label > span').text().includes(expectedArtifactDisplayName)).toBe(true);
+    expect(component.find(StageConfigField).findWhere((x) => x.text() === helmChartFilePathFieldName).length).toBe(1);
+  });
 });

package/src/pipeline/config/stages/bakeManifest/helm/BakeHelmConfigForm.tsx

@@ -2,7 +2,12 @@ import React from 'react';
 
 import type { IFormikStageConfigInjectedProps } from '../../FormikStageConfig';
 import { AccountService } from '../../../../../account';
-import { ArtifactTypePatterns, excludeAllTypesExcept, StageArtifactSelectorDelegate } from '../../../../../artifact';
+import {
+  ArtifactTypePatterns,
+  excludeAllTypesExcept,
+  ExpectedArtifactService,
+  StageArtifactSelectorDelegate,
+} from '../../../../../artifact';
 import { StageConfigField } from '../../common/stageConfigField/StageConfigField';
 import type { IArtifact, IExpectedArtifact } from '../../../../../domain';
 import { MapEditor } from '../../../../../forms';
@@ -41,6 +46,25 @@ export class BakeHelmConfigForm extends React.Component<IFormikStageConfigInject
         },
       ]);
     }
+
+    // If the Expected Artifact id is provided but the account is not, then attempt to find the artifact from
+    // upstream stages and set the account value.
+    // This is needed because helm chart file path field will need to be rendered if the artifact has a git repo account type
+    const expectedArtifact = this.getInputArtifact(stage, 0);
+    if (expectedArtifact.id && !expectedArtifact.account) {
+      const availableArtifacts = ExpectedArtifactService.getExpectedArtifactsAvailableToStage(
+        stage,
+        this.props.pipeline,
+      );
+      const expectedMatchedArtifact = availableArtifacts.find((a) => a.id === expectedArtifact.id);
+      if (expectedMatchedArtifact && expectedMatchedArtifact.matchArtifact) {
+        this.props.formik.setFieldValue(
+          `inputArtifacts[0].account`,
+          expectedMatchedArtifact.matchArtifact.artifactAccount,
+        );
+      }
+    }
+
     AccountService.getArtifactAccounts().then((artifactAccounts) => {
       this.setState({
         gitRepoArtifactAccountNames: artifactAccounts
@@ -56,9 +80,16 @@ export class BakeHelmConfigForm extends React.Component<IFormikStageConfigInject
     this.props.formik.setFieldValue(`inputArtifacts[${index}].account`, artifact.artifactAccount);
   };
 
-  private onTemplateArtifactSelected = (id: string, index: number) => {
-    this.props.formik.setFieldValue(`inputArtifacts[${index}].id`, id);
+  private onTemplateArtifactSelected = (artifact: IExpectedArtifact, index: number) => {
+    this.props.formik.setFieldValue(`inputArtifacts[${index}].id`, artifact.id);
     this.props.formik.setFieldValue(`inputArtifacts[${index}].artifact`, null);
+    // Set the account to matchArtifact.artifactAccount if it exists.
+    // This account value will be used to determine if the Helm Chart File Path should be displayed.
+    if (artifact.matchArtifact) {
+      this.props.formik.setFieldValue(`inputArtifacts[${index}].account`, artifact.matchArtifact.artifactAccount);
+    } else {
+      this.props.formik.setFieldValue(`inputArtifacts[${index}].account`, null);
+    }
   };
 
   private addInputArtifact = () => {
@@ -119,7 +150,6 @@ export class BakeHelmConfigForm extends React.Component<IFormikStageConfigInject
 
   public render() {
     const stage = this.props.formik.values;
-
     return (
       <>
         <h4>Helm Options</h4>
@@ -150,7 +180,7 @@ export class BakeHelmConfigForm extends React.Component<IFormikStageConfigInject
           onArtifactEdited={(artifact) => {
             this.onTemplateArtifactEdited(artifact, 0);
           }}
-          onExpectedArtifactSelected={(artifact: IExpectedArtifact) => this.onTemplateArtifactSelected(artifact.id, 0)}
+          onExpectedArtifactSelected={(artifact: IExpectedArtifact) => this.onTemplateArtifactSelected(artifact, 0)}
           pipeline={this.props.pipeline}
           stage={stage}
         />
@@ -180,7 +210,7 @@ export class BakeHelmConfigForm extends React.Component<IFormikStageConfigInject
                         this.onTemplateArtifactEdited(artifact, index + 1);
                       }}
                       onExpectedArtifactSelected={(artifact: IExpectedArtifact) =>
-                        this.onTemplateArtifactSelected(artifact.id, index + 1)
+                        this.onTemplateArtifactSelected(artifact, index + 1)
                       }
                       pipeline={this.props.pipeline}
                       stage={stage}