From 13d900b58f628e0ed296490bf9be0ef10a2b9dc2 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Thu, 21 Dec 2017 16:24:31 -0800 Subject: [PATCH] Fix failing test cases and add missing doc snippets. --- .../ide/vscode/concourse/PipelineYmlSchema.java | 4 +--- .../src/main/resources/desc/ImageResource/params.md | 1 + .../src/main/resources/desc/ImageResource/type.md | 1 + .../src/main/resources/desc/ImageResource/version.md | 1 + .../ide/vscode/concourse/ConcourseEditorTest.java | 3 ++- 5 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 headless-services/concourse-language-server/src/main/resources/desc/ImageResource/params.md create mode 100644 headless-services/concourse-language-server/src/main/resources/desc/ImageResource/type.md create mode 100644 headless-services/concourse-language-server/src/main/resources/desc/ImageResource/version.md diff --git a/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/PipelineYmlSchema.java b/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/PipelineYmlSchema.java index d18518142..728e5ffe2 100644 --- a/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/PipelineYmlSchema.java +++ b/headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/PipelineYmlSchema.java @@ -226,9 +226,7 @@ public class PipelineYmlSchema implements YamlSchema { AbstractType t_image_resource = f.ybean("ImageResource"); { Map resourceProperties = t_resource.getPropertiesMap(); - //Some of the properties in 'image_resource' are just like the ones in regular resource. - // So let's copy them... - t_image_resource.addProperty(resourceProperties.get("type")); + addProp(t_image_resource, "type", t_resource_type_name).isRequired(true); t_image_resource.addProperty(resourceProperties.get("source")); addProp(t_image_resource, "params", t_params); //TODO: make ImageResourceParams dynamic based on resource type. Somewhat like below, but that code isn't exactly diff --git a/headless-services/concourse-language-server/src/main/resources/desc/ImageResource/params.md b/headless-services/concourse-language-server/src/main/resources/desc/ImageResource/params.md new file mode 100644 index 000000000..7cc8b9f37 --- /dev/null +++ b/headless-services/concourse-language-server/src/main/resources/desc/ImageResource/params.md @@ -0,0 +1 @@ +*Optional.* A map of arbitrary configuration to forward to the resource. Refer to the resource type's documentation to see what it supports. \ No newline at end of file diff --git a/headless-services/concourse-language-server/src/main/resources/desc/ImageResource/type.md b/headless-services/concourse-language-server/src/main/resources/desc/ImageResource/type.md new file mode 100644 index 000000000..76eabdbbc --- /dev/null +++ b/headless-services/concourse-language-server/src/main/resources/desc/ImageResource/type.md @@ -0,0 +1 @@ +*Required.* The type of the resource. Usually `docker-image`. \ No newline at end of file diff --git a/headless-services/concourse-language-server/src/main/resources/desc/ImageResource/version.md b/headless-services/concourse-language-server/src/main/resources/desc/ImageResource/version.md new file mode 100644 index 000000000..ef52f9166 --- /dev/null +++ b/headless-services/concourse-language-server/src/main/resources/desc/ImageResource/version.md @@ -0,0 +1 @@ +Optional. A specific version of the resource to fetch. This should be a map with string keys and values. If not specified, the latest version will be fetched. \ No newline at end of file diff --git a/headless-services/concourse-language-server/src/test/java/org/springframework/ide/vscode/concourse/ConcourseEditorTest.java b/headless-services/concourse-language-server/src/test/java/org/springframework/ide/vscode/concourse/ConcourseEditorTest.java index 3c0f89faf..967fdc1a2 100644 --- a/headless-services/concourse-language-server/src/test/java/org/springframework/ide/vscode/concourse/ConcourseEditorTest.java +++ b/headless-services/concourse-language-server/src/test/java/org/springframework/ide/vscode/concourse/ConcourseEditorTest.java @@ -4251,12 +4251,13 @@ public class ConcourseEditorTest { " path: blah\n" + "image_resource:\n" + " type: docker-image\n" + + " params: {}\n" + " source:\n" + " repository: some-docker-image\n" + " version: latest" ); editor.assertHoverContains("type", "type of the resource. Usually `docker-image`."); - editor.assertHoverContains("source", "Configuration for the resource"); + editor.assertHoverContains(" source", "The location of the resource"); editor.assertHoverContains("params", "A map of arbitrary configuration to forward to the resource"); editor.assertHoverContains("version", "A specific version of the resource to fetch"); }