From 3e73814aa9bbbcb9565479901170bcfdba972af1 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Mon, 3 Apr 2017 11:16:51 -0700 Subject: [PATCH] Reconcile: 'image' attribute in a task step should refers to a resource name --- .../ide/vscode/concourse/PipelineYmlSchema.java | 2 +- .../ide/vscode/concourse/ConcourseEditorTest.java | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/vscode-extensions/vscode-concourse/src/main/java/org/springframework/ide/vscode/concourse/PipelineYmlSchema.java b/vscode-extensions/vscode-concourse/src/main/java/org/springframework/ide/vscode/concourse/PipelineYmlSchema.java index 5194844e6..e6b208864 100644 --- a/vscode-extensions/vscode-concourse/src/main/java/org/springframework/ide/vscode/concourse/PipelineYmlSchema.java +++ b/vscode-extensions/vscode-concourse/src/main/java/org/springframework/ide/vscode/concourse/PipelineYmlSchema.java @@ -268,7 +268,7 @@ public class PipelineYmlSchema implements YamlSchema { addProp(taskStep, "config", task); addProp(taskStep, "privileged", t_boolean); addProp(taskStep, "params", t_params); - addProp(taskStep, "image", t_ne_string); + addProp(taskStep, "image", t_resource_name); addProp(taskStep, "input_mapping", f.ymap(t_ne_string, t_resource_name)); addProp(taskStep, "output_mapping", t_string_params); taskStep.requireOneOf("config", "file"); diff --git a/vscode-extensions/vscode-concourse/src/test/java/org/springframework/ide/vscode/concourse/ConcourseEditorTest.java b/vscode-extensions/vscode-concourse/src/test/java/org/springframework/ide/vscode/concourse/ConcourseEditorTest.java index a6c3908e8..cc8f28ac1 100644 --- a/vscode-extensions/vscode-concourse/src/test/java/org/springframework/ide/vscode/concourse/ConcourseEditorTest.java +++ b/vscode-extensions/vscode-concourse/src/test/java/org/springframework/ide/vscode/concourse/ConcourseEditorTest.java @@ -487,6 +487,7 @@ public class ConcourseEditorTest { " - get: sts4\n" + " - get: bogus-get\n" + " - task: do-stuff\n" + + " image: bogus-image\n" + " file: some-file.yml\n" + " input_mapping:\n" + " task-input: bogus-input\n" + @@ -495,12 +496,14 @@ public class ConcourseEditorTest { ); editor.assertProblems( "bogus-get|resource does not exist", + "bogus-image|resource does not exist", "bogus-input|resource does not exist", "bogus-put|resource does not exist" ); editor.assertProblems( "bogus-get|[sts4]", + "bogus-image|[sts4]", "bogus-input|[sts4]", "bogus-put|[sts4]" ); @@ -2568,7 +2571,7 @@ public class ConcourseEditorTest { @Test public void resourceInEmbeddedTaskConfigDeprecated() throws Exception { Editor editor = harness.newEditor( "resources:\n" + - "- name: docker-image\n" + + "- name: my-docker-image\n" + " type: docker-image\n" + " source:\n" + " username: {{docker_hub_username}}\n" + @@ -2578,7 +2581,7 @@ public class ConcourseEditorTest { "- name: build-commons-update-site\n" + " plan:\n" + " - task: hello-world\n" + - " image: docker-image\n" + + " image: my-docker-image\n" + " config:\n" + " image: blah\n" + " image_resource:\n" +