From fe449517ea7265e968321d4f171db84765b26400 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Fri, 23 Dec 2016 17:36:03 -0800 Subject: [PATCH] concourse: validation and ca for input-mapping values --- .../ide/vscode/concourse/PipelineYmlSchema.java | 2 +- .../ide/vscode/concourse/PipelineYamlEditorTest.java | 8 ++++++-- .../resources/workspace/pipeline-with-bad-resources.yml | 4 ++++ 3 files changed, 11 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 7045936bc..e32578aa2 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 @@ -128,7 +128,7 @@ public class PipelineYmlSchema implements YamlSchema { prop(taskStep, "privileged", t_boolean); prop(taskStep, "params", t_params); prop(taskStep, "image", t_ne_string); - prop(taskStep, "input_mapping", t_string_params); + prop(taskStep, "input_mapping", f.ymap(t_ne_string, resourceName)); prop(taskStep, "output_mapping", t_string_params); YBeanType aggregateStep = f.ybean("AggregateStep"); diff --git a/vscode-extensions/vscode-concourse/src/test/java/org/springframework/ide/vscode/concourse/PipelineYamlEditorTest.java b/vscode-extensions/vscode-concourse/src/test/java/org/springframework/ide/vscode/concourse/PipelineYamlEditorTest.java index edfae533d..8be2700ee 100644 --- a/vscode-extensions/vscode-concourse/src/test/java/org/springframework/ide/vscode/concourse/PipelineYamlEditorTest.java +++ b/vscode-extensions/vscode-concourse/src/test/java/org/springframework/ide/vscode/concourse/PipelineYamlEditorTest.java @@ -10,7 +10,6 @@ *******************************************************************************/ package org.springframework.ide.vscode.concourse; -import static org.junit.Assert.*; import static org.springframework.ide.vscode.languageserver.testharness.TestAsserts.assertContains; import java.io.InputStream; @@ -20,7 +19,6 @@ import java.util.stream.Collectors; import org.junit.Before; import org.junit.Test; import org.springframework.ide.vscode.commons.util.IOUtil; -import org.springframework.ide.vscode.concourse.ConcourseLanguageServer; import org.springframework.ide.vscode.languageserver.testharness.Editor; import org.springframework.ide.vscode.languageserver.testharness.LanguageServerHarness; @@ -462,15 +460,21 @@ public class PipelineYamlEditorTest { " plan:\n" + " - get: sts4\n" + " - get: bogus-get\n" + + " - task: do-stuff\n" + + " input_mapping:\n" + + " task-input: bogus-input\n" + + " repo: sts4\n" + " - put: bogus-put\n" ); editor.assertProblems( "bogus-get|resource does not exist", + "bogus-input|resource does not exist", "bogus-put|resource does not exist" ); editor.assertProblems( "bogus-get|[sts4]", + "bogus-input|[sts4]", "bogus-put|[sts4]" ); } diff --git a/vscode-extensions/vscode-concourse/src/test/resources/workspace/pipeline-with-bad-resources.yml b/vscode-extensions/vscode-concourse/src/test/resources/workspace/pipeline-with-bad-resources.yml index 6a030ef35..44c8d1607 100644 --- a/vscode-extensions/vscode-concourse/src/test/resources/workspace/pipeline-with-bad-resources.yml +++ b/vscode-extensions/vscode-concourse/src/test/resources/workspace/pipeline-with-bad-resources.yml @@ -15,5 +15,9 @@ jobs: - name: job1 plan: - get: sts4 + - task: do-stuff + input_mapping: + task_input: bogus_input + repo: sts4 - get: bogus-get - put: bogus-put