Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(cf): Accepting both JSON and YAML in the Deploy Service Configuration stage parameters field #7042

Merged
merged 2 commits into from
May 21, 2019
Merged

feat(cf): Accepting both JSON and YAML in the Deploy Service Configuration stage parameters field #7042

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1092f1
feat(cf): Accepting both JSON and YAML in the Deploy Service Configur…
May 21, 2019
fd03d14
Removed a useless null argument
May 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 19 additions & 23 deletions ...s/cloudfoundry/src/pipeline/stages/deployService/cloudfoundryDeployServiceStage.module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { get, upperFirst } from 'lodash';
import { safeLoad } from 'js-yaml';

import {
ExecutionDetailsTasks,
Expand Down Expand Up @@ -52,30 +53,20 @@ PipelineConfigValidator.registerValidator(
);

PipelineConfigValidator.registerValidator(
'validDeployServiceParameterJson',
'validDeployServiceParameterJsonOrYaml',
new class implements IStageOrTriggerValidator {
private validationMessage(validationConfig: IServiceFieldValidatorConfig): string {
return (
validationConfig.message ||
`<strong>${this.printableFieldLabel(validationConfig)}</strong> should be a valid JSON string.`
);
}

private printableFieldLabel(config: IServiceFieldValidatorConfig): string {
return upperFirst(config.fieldLabel || config.fieldName);
}

private fieldIsValid(stage: IStage | ITrigger, config: IServiceFieldValidatorConfig): boolean {
const serviceInput = get(stage, 'manifest');
const manifestSource: any = get(serviceInput, sourceStruct(serviceInput));
const content: any = get(manifestSource, config.fieldName);

if (!content) {
private isJson(value: string): boolean {
try {
JSON.parse(value);
return true;
} catch (e) {
return false;
}
}

private isYaml(value: string): boolean {
try {
JSON.parse(content);
safeLoad(value);
return true;
} catch (e) {
return false;
Expand All @@ -91,9 +82,14 @@ PipelineConfigValidator.registerValidator(
if (sourceType(manifest, get(stage, 'userProvided')) !== validationConfig.manifestSource) {
return null;
}
const manifestSource: any = get(manifest, sourceStruct(manifest));
const fieldContent: any = get(manifestSource, validationConfig.fieldName);

if (!this.fieldIsValid(stage, validationConfig)) {
return this.validationMessage(validationConfig);
if (fieldContent) {
if (!this.isJson(fieldContent) && !this.isYaml(fieldContent)) {
const fieldLabel = upperFirst(validationConfig.fieldLabel || validationConfig.fieldName);
return validationConfig.message || `<strong>${fieldLabel}</strong> should be a valid JSON or YAML string.`;
}
}
return null;
}
Expand Down Expand Up @@ -150,13 +146,13 @@ Registry.pipeline.registerStage({
preventSave: true,
} as IServiceFieldValidatorConfig,
{
type: 'validDeployServiceParameterJson',
type: 'validDeployServiceParameterJsonOrYaml',
manifestSource: 'direct',
fieldName: 'parameters',
preventSave: true,
} as IServiceFieldValidatorConfig,
{
type: 'validDeployServiceParameterJson',
type: 'validDeployServiceParameterJsonOrYaml',
manifestSource: 'userProvided',
fieldName: 'credentials',
preventSave: true,
Expand Down