From 8f866fffcfd69402537f70951a2daf370695e4aa Mon Sep 17 00:00:00 2001 From: Stuart Pollock Date: Wed, 13 Mar 2019 09:41:57 -0400 Subject: [PATCH] fix(cf): make Deploy Service pipeline stage work again (#6677) Co-Authored-By: Stu Pollock --- .../deployService/CloudfoundryDeployServiceStageConfig.tsx | 1 + .../deployService/cloudfoundryDeployServiceStage.module.ts | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/scripts/modules/cloudfoundry/src/pipeline/stages/deployService/CloudfoundryDeployServiceStageConfig.tsx b/app/scripts/modules/cloudfoundry/src/pipeline/stages/deployService/CloudfoundryDeployServiceStageConfig.tsx index 8181cac7985..6bb59b46ce7 100644 --- a/app/scripts/modules/cloudfoundry/src/pipeline/stages/deployService/CloudfoundryDeployServiceStageConfig.tsx +++ b/app/scripts/modules/cloudfoundry/src/pipeline/stages/deployService/CloudfoundryDeployServiceStageConfig.tsx @@ -43,6 +43,7 @@ export class CloudfoundryDeployServiceStageConfig extends React.Component< constructor(props: IStageConfigProps) { super(props); + this.props.stage.cloudProvider = 'cloudfoundry'; this.state = { accounts: [], regions: [], diff --git a/app/scripts/modules/cloudfoundry/src/pipeline/stages/deployService/cloudfoundryDeployServiceStage.module.ts b/app/scripts/modules/cloudfoundry/src/pipeline/stages/deployService/cloudfoundryDeployServiceStage.module.ts index 7a3235ce246..984387af7d4 100644 --- a/app/scripts/modules/cloudfoundry/src/pipeline/stages/deployService/cloudfoundryDeployServiceStage.module.ts +++ b/app/scripts/modules/cloudfoundry/src/pipeline/stages/deployService/cloudfoundryDeployServiceStage.module.ts @@ -39,7 +39,8 @@ PipelineConfigValidator.registerValidator( if (sourceType(serviceInput, get(stage, 'userProvided')) !== validationConfig.manifestSource) { return null; } - const content: any = get(serviceInput, validationConfig.fieldName); + const manifestSource: any = get(serviceInput, validationConfig.manifestSource); + const content: any = get(manifestSource, validationConfig.fieldName); const fieldLabel = validationConfig.fieldLabel || upperFirst(validationConfig.fieldName); return content ? null : `${fieldLabel} is a required field for the Deploy Service stage.`; }