fix(cf): fix deploy service manifest artifact selection (#7059)

spinnaker · May 23, 2019 · b712673 · b712673
1 parent 50f23fc
commit b712673
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...s/cloudfoundry/src/pipeline/stages/deployService/CloudfoundryDeployServiceStageConfig.tsx b/...s/cloudfoundry/src/pipeline/stages/deployService/CloudfoundryDeployServiceStageConfig.tsx
@@ -119,8 +119,8 @@ export class CloudfoundryDeployServiceStageConfig extends React.Component<
   };
 
   public render() {
-    const { pipeline } = this.props;
-    const { credentials, region, userProvided, stage, manifest } = this.props.stage;
+    const { pipeline, stage } = this.props;
+    const { credentials, region, userProvided, manifest } = this.props.stage;
     const { accounts, regions } = this.state;
     const directInput = !manifest || !!manifest.direct;
     let manifestInput;

diff --git a/...s/cloudfoundry/src/pipeline/stages/deployService/cloudfoundryDeployServiceStage.module.ts b/...s/cloudfoundry/src/pipeline/stages/deployService/cloudfoundryDeployServiceStage.module.ts
@@ -21,15 +21,15 @@ interface IServiceFieldValidatorConfig extends IValidatorConfig {
 }
 
 const sourceType = (manifest: ICloudFoundryServiceManifestSource, userProvided: boolean) => {
-  if (manifest.direct) {
+  if (manifest && manifest.direct) {
     return userProvided ? 'userProvided' : 'direct';
   } else {
     return 'artifact';
   }
 };
 
 const sourceStruct = (manifest: ICloudFoundryServiceManifestSource) => {
-  return manifest.direct ? 'direct' : 'artifact';
+  return manifest && manifest.direct ? 'direct' : 'artifact';
 };
 
 PipelineConfigValidator.registerValidator(