From a87615f26aa7b6f90919048c5b58e0b91df8d4d7 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Mon, 9 Aug 2021 14:23:21 -0700 Subject: [PATCH] Add support for GitSource.fetch_tags See: https://github.com/spring-projects/sts4/issues/668 --- .../ide/vscode/concourse/PipelineYmlSchema.java | 1 + .../src/main/resources/desc/GitSource/fetch_tags.md | 1 + .../ide/vscode/concourse/ConcourseEditorTest.java | 12 +++++++++--- 3 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 headless-services/concourse-language-server/src/main/resources/desc/GitSource/fetch_tags.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 7c448404a..d35155953 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 @@ -535,6 +535,7 @@ public class PipelineYmlSchema implements YamlSchema { addProp(source, "ignore_paths", t_strings); addProp(source, "skip_ssl_verification", t_boolean); addProp(source, "tag_filter", t_string); + addProp(source, "fetch_tags", t_boolean); addProp(source, "git_config", t_pair_list); addProp(source, "disable_ci_skip", t_boolean); addProp(source, "commit_verification_keys", t_strings); diff --git a/headless-services/concourse-language-server/src/main/resources/desc/GitSource/fetch_tags.md b/headless-services/concourse-language-server/src/main/resources/desc/GitSource/fetch_tags.md new file mode 100644 index 000000000..db5380694 --- /dev/null +++ b/headless-services/concourse-language-server/src/main/resources/desc/GitSource/fetch_tags.md @@ -0,0 +1 @@ +*Optional*. If `true` the flag `--tags` will be used to fetch all tags in the repository. If `false` no tags 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 cc2baacf1..949da4563 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 @@ -1545,7 +1545,8 @@ public class ConcourseEditorTest { " disable_ci_skip: no_ci_skip\n" + " commit_verification_keys: not-a-list-of-keys\n" + " commit_verification_key_ids: not-a-list-of-ids\n" + - " gpg_keyserver: hkp://somekeyserver.net" + " gpg_keyserver: hkp://somekeyserver.net\n" + + " fetch_tags: is-fetch-tags\n" ); editor.assertProblems( "sts4-out|Unused", @@ -1556,7 +1557,8 @@ public class ConcourseEditorTest { "val|Unknown property", "no_ci_skip|'boolean'", "not-a-list-of-keys|Expecting a 'Sequence'", - "not-a-list-of-ids|Expecting a 'Sequence'" + "not-a-list-of-ids|Expecting a 'Sequence'", + "is-fetch-tags|'boolean'" ); } @@ -1593,6 +1595,8 @@ public class ConcourseEditorTest { , "disable_ci_skip: <*>" , + "fetch_tags: <*>" + , "git_config:\n" + " - <*>" , @@ -1652,7 +1656,8 @@ public class ConcourseEditorTest { " disable_ci_skip: no_ci_skip\n" + " commit_verification_keys: not-a-list-of-keys\n" + " commit_verification_key_ids: not-a-list-of-ids\n" + - " gpg_keyserver: hkp://somekeyserver.net" + " gpg_keyserver: hkp://somekeyserver.net\n" + + " fetch_tags: is-fetch-tags" ); editor.assertHoverContains("uri", "*Required.* The location of the repository."); editor.assertHoverContains("branch", "The branch to track"); @@ -1667,6 +1672,7 @@ public class ConcourseEditorTest { editor.assertHoverContains("disable_ci_skip", "Allows for commits that have been labeled with `[ci skip]`"); editor.assertHoverContains("commit_verification_keys", "Array of GPG public keys"); editor.assertHoverContains("commit_verification_key_ids", "Array of GPG public key ids"); + editor.assertHoverContains("fetch_tags", "fetch all tags in the repository"); } @Test public void gitResourceGetParamsCompletions() throws Exception {