Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Mark some properties as 'required' pipeline yaml schema

Browse Source
This commit is contained in:
Kris De Volder
2017-01-20 16:49:26 -08:00
parent a2d8bba697
commit 9d65aef357
3 changed files with 26 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vscode-extensions/vscode-concourse/src/main/java/org/springframework/ide/vscode/concourse/ConcourseValueParsers.java
View File

@@ -12,9 +12,7 @@ package org.springframework.ide.vscode.concourse;
import java.util.function.Function;
import org.springframework.ide.vscode.commons.util.Assert;
import org.springframework.ide.vscode.commons.util.RegexpParser;
import org.springframework.ide.vscode.commons.util.StringUtil;
import org.springframework.ide.vscode.commons.util.ValueParser;
import org.springframework.ide.vscode.commons.util.text.IDocument;
import org.springframework.ide.vscode.commons.yaml.schema.SchemaContextAware;

26
vscode-extensions/vscode-concourse/src/main/java/org/springframework/ide/vscode/concourse/PipelineYmlSchema.java
View File

@@ -114,7 +114,7 @@ public class PipelineYmlSchema implements YamlSchema {
YType jobName = f.yenum("Job Name",
(parseString, validValues) -> {
return "The '"+parseString+"' resource does not exist. Existing resources: "+validValues;
return "The '"+parseString+"' Job does not exist. Existing jobs: "+validValues;
},
(DynamicSchemaContext dc) -> {
return models.getJobNames(dc.getDocument());
@@ -186,20 +186,20 @@ public class PipelineYmlSchema implements YamlSchema {
});
YBeanType resource = f.ybean("Resource");
addProp(resource, "name", resourceNameDef);
addProp(resource, "type", t_resource_type_name);
addProp(resource, "name", resourceNameDef).isRequired(true);
addProp(resource, "type", t_resource_type_name).isRequired(true);
addProp(resource, "source", resourceSource);
addProp(resource, "check_every", t_duration);
YBeanType job = f.ybean("Job");
addProp(job, "name", jobNameDef);
addProp(job, "name", jobNameDef).isRequired(true);
addProp(job, "plan", f.yseq(step)).isRequired(true);
addProp(job, "serial", t_boolean);
addProp(job, "build_logs_to_retain", t_pos_integer);
addProp(job, "serial_groups", t_strings);
addProp(job, "max_in_flight", t_pos_integer);
addProp(job, "public", t_boolean);
addProp(job, "disable_manual_trigger", t_boolean);
addProp(job, "plan", f.yseq(step));
YBeanType resourceType = f.ybean("ResourceType");
addProp(resourceType, "name", t_ne_string);
@@ -221,8 +221,8 @@ public class PipelineYmlSchema implements YamlSchema {
private void initializeDefaultResourceTypes() {
YBeanType gitSource = f.ybean("GitResourceSource");
addProp(gitSource, "uri", t_string);
addProp(gitSource, "branch", t_string);
addProp(gitSource, "uri", t_string).isRequired(true);
addProp(gitSource, "branch", t_string).isRequired(true);
addProp(gitSource, "private_key", t_string);
addProp(gitSource, "username", t_string);
addProp(gitSource, "password", t_string);
@@ -250,19 +250,21 @@ public class PipelineYmlSchema implements YamlSchema {
return null;
}
private YTypedProperty prop(AbstractType beanType, String name, YType type) {
private YTypedPropertyImpl prop(AbstractType beanType, String name, YType type) {
YTypedPropertyImpl prop = f.yprop(name, type);
prop.setDescriptionProvider(descriptionFor(beanType, name));
return prop;
}
private void addProp(AbstractType superType, AbstractType bean, String name, YType type) {
bean.addProperty(prop(superType, name, type));
private YTypedPropertyImpl addProp(AbstractType superType, AbstractType bean, String name, YType type) {
YTypedPropertyImpl p = prop(superType, name, type);
bean.addProperty(p);
return p;
}
private void addProp(AbstractType bean, String name, YType type) {
addProp(bean, bean, name, type);
private YTypedPropertyImpl addProp(AbstractType bean, String name, YType type) {
return addProp(bean, bean, name, type);
}
public static Renderable descriptionFor(YType owner, String propName) {

19
vscode-extensions/vscode-concourse/src/test/java/org/springframework/ide/vscode/concourse/PipelineYamlEditorTest.java
View File

@@ -343,6 +343,7 @@ public class PipelineYamlEditorTest {
editor = harness.newEditor(
"resources:\n" +
"- name: git\n" +
" type: git\n" +
"jobs:\n" +
"- name: foo\n" +
" serial: true\n" +
@@ -471,6 +472,7 @@ public class PipelineYamlEditorTest {
" type: git\n" +
" source:\n" +
" uri: https://github.com/kdvolder/somestuff\n" +
" branch: master\n" +
"jobs:\n" +
"- name: job1\n" +
" plan:\n" +
@@ -501,16 +503,10 @@ public class PipelineYamlEditorTest {
"resources:\n" +
"- name: sts4\n" +
" type: git\n" +
" source:\n" +
" uri: https://github.com/kdvolder/somestuff\n" +
"- name: utils\n" +
" type: git\n" +
" source:\n" +
" uri: https://github.com/kdvolder/someutils\n" +
"- name: sts4\n" +
" type: git\n" +
" source:\n" +
" uri: https://github.com/kdvolder/extras\n"
" type: git\n"
);
editor.assertProblems(
"sts4|Duplicate resource name",
@@ -527,7 +523,10 @@ public class PipelineYamlEditorTest {
"- name: job-1\n"
);
editor.assertProblems(
"name: job-1|'plan' is required",
"job-1|Duplicate job name",
"name: utils|'plan' is required",
"name: job-1|'plan' is required",
"job-1|Duplicate job name"
);
}
@@ -572,12 +571,14 @@ public class PipelineYamlEditorTest {
"- name: my-repo\n" +
" type: git\n" +
" source:\n" +
" branch: master\n" +
" uri: https://github.com/kdvolder/my-repo\n" +
"resources:\n" +
"- name: your-repo\n" +
" type: git\n" +
" type: git\n" +
" source:\n" +
" branch: master\n" +
" uri: https://github.com/kdvolder/forked-repo\n"
);
@@ -594,7 +595,9 @@ public class PipelineYamlEditorTest {
Editor editor = harness.newEditor(
"resources:\n" +
"- name: git-repo\n" +
" type: git\n" +
"- name: build-artefact\n" +
" type: git\n" +
"jobs:\n" +
"- name: build\n" +
" plan:\n" +
@@ -617,7 +620,9 @@ public class PipelineYamlEditorTest {
Editor editor = harness.newEditor(
"resources:\n" +
"- name: git-repo\n" +
" type: git\n" +
"- name: build-artefact\n" +
" type: git\n" +
"jobs:\n" +
"- name: build\n" +
" plan:\n" +