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

Fixup schema for image_resource attribute in tasks

Browse Source 
Add 'version' attribute and remove some other that are incorrect.
This commit is contained in:
Kris De Volder
2017-12-21 16:07:14 -08:00
parent 3500616dcd
commit b302a2d30d
3 changed files with 131 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

116
headless-services/concourse-language-server/src/test/java/org/springframework/ide/vscode/concourse/ConcourseEditorTest.java
View File

@@ -4196,6 +4196,122 @@ public class ConcourseEditorTest {
editor.assertHoverContains("path", "The path to a directory to be cached");
}
@Test public void image_resource_completions() throws Exception {
Editor editor = harness.newEditor(LanguageId.CONCOURSE_TASK,
"platform: linux\n" +
"run:\n" +
" path: blah\n" +
"<*>"
);
editor.assertContextualCompletions(PLAIN_COMPLETION,
"imgrs<*>"
, // ==>
"image_resource:\n" +
" type: <*>"
);
editor.setText(
"platform: linux\n" +
"run:\n" +
" path: blah\n" +
"image_resource:\n" +
" type: <*>"
);
editor.assertContextualCompletions("dckr<*>",
"docker-image\n" +
" source:\n" +
" repository: <*>"
);
editor.setText(
"platform: linux\n" +
"run:\n" +
" path: blah\n" +
"image_resource:\n" +
" type: docker-image\n" +
" <*>"
);
editor.assertContextualCompletions(PLAIN_COMPLETION, "<*>"
, // =>
"params:\n" +
" <*>"
, // ----
"source:\n" +
" <*>" //Actually... would expect 'repository' to be filled in by snippet here!
, // ----
"version:\n" +
" <*>"
);
}
@Test public void image_resource_subHovers() throws Exception {
Editor editor = harness.newEditor(LanguageId.CONCOURSE_TASK,
"platform: linux\n" +
"run:\n" +
" path: blah\n" +
"image_resource:\n" +
" type: docker-image\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("params", "A map of arbitrary configuration to forward to the resource");
editor.assertHoverContains("version", "A specific version of the resource to fetch");
}
@Test public void image_resource_version_reconcile() throws Exception {
Editor editor = harness.newEditor(LanguageId.CONCOURSE_TASK,
"platform: linux\n" +
"run:\n" +
" path: blah\n" +
"image_resource:\n" +
" type: docker-image\n" +
" source:\n" +
" repository: some-docker-image\n" +
" version: latest"
);
editor.assertProblems(/*NONE*/);
editor = harness.newEditor(LanguageId.CONCOURSE_TASK,
"platform: linux\n" +
"run:\n" +
" path: blah\n" +
"image_resource:\n" +
" type: docker-image\n" +
" source:\n" +
" repository: some-docker-image\n" +
" version: every"
);
editor.assertProblems(/*NONE*/);
editor = harness.newEditor(LanguageId.CONCOURSE_TASK,
"platform: linux\n" +
"run:\n" +
" path: blah\n" +
"image_resource:\n" +
" type: docker-image\n" +
" source:\n" +
" repository: some-docker-image\n" +
" version:\n"+
" anystring: goes\n"
);
editor.assertProblems(/*NONE*/);
editor = harness.newEditor(LanguageId.CONCOURSE_TASK,
"platform: linux\n" +
"run:\n" +
" path: blah\n" +
"image_resource:\n" +
" type: docker-image\n" +
" source:\n" +
" repository: some-docker-image\n" +
" version: not-a-valid-version"
);
editor.assertProblems("not-a-valid-version|Valid values are: [every, latest]");
}
//////////////////////////////////////////////////////////////////////////////
private void assertContextualCompletions(String conText, String textBefore, String... textAfter) throws Exception {