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

Make CA/validation/hovers work for embedded task config

Browse Source
This commit is contained in:
Kris De Volder
2017-01-26 16:42:11 -08:00
parent b9594c1d81
commit 3c3eb58970
2 changed files with 70 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -148,6 +148,43 @@ public class PipelineYmlSchema implements YamlSchema {
YAtomicType resourceTypeNameDef = f.yatomic("ResourceType Name");
resourceTypeNameDef.parseWith(ConcourseValueParsers.resourceTypeNameDef(models));
YType resourceSource = f.contextAware("ResourceSource", (dc) ->
resourceTypes.getSourceType(getResourceTypeTag(models, dc))
);
YBeanType resource = f.ybean("Resource");
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 t_image_resource = f.ybean("ImageResource");
for (YTypedProperty p : resource.getProperties()) {
if (!"name".equals(p.getName())) {
t_image_resource.addProperty(p);
}
}
YAtomicType t_platform = f.yenum("Platform", "windows", "linux", "darwin");
t_platform.parseWith(ValueParsers.NE_STRING); //no errors because in theory platform are just strings.
YType t_name_and_path = f.ybean("NameAndPath" ,
f.yprop("name", t_ne_string).isRequired(true),
f.yprop("path", t_ne_string)
);
YType t_command = f.yany("Command");
//TODO: add structure for command.
task = f.ybean("TaskConfig");
addProp(task, "platform", t_platform).isRequired(true);
addProp(task, "image_resource", t_image_resource);
addProp(task, "image", t_ne_string);
addProp(task, "inputs", f.yseq(t_name_and_path)).isRequired(true);
addProp(task, "outputs", f.yseq(t_name_and_path));
addProp(task, "run", t_command).isRequired(true);
addProp(task, "params", t_string_params);
YBeanType getStep = f.ybean("GetStep");
addProp(getStep, "get", t_resource_name);
addProp(getStep, "resource", t_string);
@@ -170,7 +207,7 @@ public class PipelineYmlSchema implements YamlSchema {
YBeanType taskStep = f.ybean("TaskStep");
addProp(taskStep, "task", t_ne_string);
addProp(taskStep, "file", t_string);
addProp(taskStep, "config", t_any);
addProp(taskStep, "config", task);
addProp(taskStep, "privileged", t_boolean);
addProp(taskStep, "params", t_params);
addProp(taskStep, "image", t_ne_string);
@@ -204,16 +241,6 @@ public class PipelineYmlSchema implements YamlSchema {
addProp(step, subStep, "timeout", t_duration);
}
YType resourceSource = f.contextAware("ResourceSource", (dc) ->
resourceTypes.getSourceType(getResourceTypeTag(models, dc))
);
YBeanType resource = f.ybean("Resource");
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).isRequired(true);
addProp(job, "plan", f.yseq(step)).isRequired(true);
@@ -239,33 +266,6 @@ public class PipelineYmlSchema implements YamlSchema {
addProp(TOPLEVEL_TYPE, "resource_types", f.yseq(resourceType));
addProp(TOPLEVEL_TYPE, "groups", f.yseq(group));
YBeanType t_image_resource = f.ybean("ImageResource");
for (YTypedProperty p : resource.getProperties()) {
if (!"name".equals(p.getName())) {
t_image_resource.addProperty(p);
}
}
YAtomicType t_platform = f.yenum("Platform", "windows", "linux", "darwin");
t_platform.parseWith(ValueParsers.NE_STRING); //no errors because in theory platform are just strings.
YType t_name_and_path = f.ybean("NameAndPath" ,
f.yprop("name", t_ne_string).isRequired(true),
f.yprop("path", t_ne_string)
);
YType t_command = f.yany("Command");
//TODO: add structure for command.
task = f.ybean("TaskConfig");
addProp(task, "platform", t_platform).isRequired(true);
addProp(task, "image_resource", t_image_resource);
addProp(task, "image", t_ne_string);
addProp(task, "inputs", f.yseq(t_name_and_path)).isRequired(true);
addProp(task, "outputs", f.yseq(t_name_and_path));
addProp(task, "run", t_command).isRequired(true);
addProp(task, "params", t_string_params);
initializeDefaultResourceTypes();
}

32
vscode-extensions/vscode-concourse/src/test/java/org/springframework/ide/vscode/concourse/ConcourseEditorTest.java
View File

@@ -1547,6 +1547,38 @@ public class ConcourseEditorTest {
editor.assertHoverContains("platform", "The platform the task should run on");
}
@Test public void reconcileEmbeddedTaskConfig() throws Exception {
Editor editor = harness.newEditor(
"jobs:\n" +
"- name: foo\n" +
" plan:\n" +
" - task: the-task\n" +
" config:\n" +
" platform: a-platform\n" +
" image_resource:\n" +
" name: should-not-be-here\n" +
" type: docker-image\n" +
" source:\n" +
" bogus-source-prop: bad\n" +
" repository: ruby\n" +
" tag: '2.1'\n" +
" image: some-image\n" +
" inputs:\n" +
" - path: path/to/input\n" +
" outputs:\n" +
" - path: path/to/output\n" +
" run:\n" +
" path: my-app/scripts/test\n" +
" params: the-params"
);
editor.assertProblems(
"name|Unknown property",
"bogus-source-prop|Unknown property",
"path: path/to/input|'name' is required",
"path: path/to/output|'name' is required",
"the-params|Expecting a 'Map'"
);
}
//////////////////////////////////////////////////////////////////////////////