From 39ac9503587bebf394ca0c7d77d53e30f0c72257 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Tue, 10 Aug 2021 13:14:29 -0700 Subject: [PATCH] Add support for `skip_ssl_verification` and `commit_message` to SemverGit See: https://github.com/spring-projects/sts4/issues/655 --- .../ide/vscode/concourse/PipelineYmlSchema.java | 2 ++ .../desc/GitSemverSource/commit_message.md | 1 + .../desc/GitSemverSource/skip_ssl_verification.md | 1 + .../ide/vscode/concourse/ConcourseEditorTest.java | 13 ++++++++++++- 4 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 headless-services/concourse-language-server/src/main/resources/desc/GitSemverSource/commit_message.md create mode 100644 headless-services/concourse-language-server/src/main/resources/desc/GitSemverSource/skip_ssl_verification.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 d35155953..158965385 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 @@ -734,6 +734,8 @@ public class PipelineYmlSchema implements YamlSchema { addProp(git_source, "username", t_ne_string); addProp(git_source, "password", t_ne_string); addProp(git_source, "git_user", t_ne_string); + addProp(git_source, "commit_message", t_ne_string); + addProp(git_source, "skip_ssl_verification", t_boolean); AbstractType s3_source = f.ybean("S3SemverSource"); addProp(s3_source, "bucket", t_ne_string).isPrimary(true); diff --git a/headless-services/concourse-language-server/src/main/resources/desc/GitSemverSource/commit_message.md b/headless-services/concourse-language-server/src/main/resources/desc/GitSemverSource/commit_message.md new file mode 100644 index 000000000..04fbe54a7 --- /dev/null +++ b/headless-services/concourse-language-server/src/main/resources/desc/GitSemverSource/commit_message.md @@ -0,0 +1 @@ +*Optional*. If specified overides the default commit message with the one provided. The user can use `%version%` and `%file%` to get them replaced automatically with the correct values. \ No newline at end of file diff --git a/headless-services/concourse-language-server/src/main/resources/desc/GitSemverSource/skip_ssl_verification.md b/headless-services/concourse-language-server/src/main/resources/desc/GitSemverSource/skip_ssl_verification.md new file mode 100644 index 000000000..a291534b0 --- /dev/null +++ b/headless-services/concourse-language-server/src/main/resources/desc/GitSemverSource/skip_ssl_verification.md @@ -0,0 +1 @@ +*Optional*. Skip SSL verification for git endpoint. Useful for git compatible providers using self-signed SSL certificates. \ 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 949da4563..98f1ecb27 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 @@ -3095,6 +3095,8 @@ public class ConcourseEditorTest { , // ============= " <*>" , // ==> + " commit_message: <*>" + , " git_user: <*>" , " initial_version: <*>" @@ -3103,6 +3105,8 @@ public class ConcourseEditorTest { , " private_key: <*>" , + " skip_ssl_verification: <*>" + , " username: <*>" ); @@ -3123,6 +3127,8 @@ public class ConcourseEditorTest { " branch: version\n" + " file: version\n" + " private_key: {{concourse-repo-private-key}}\n" + + " commit_message: '[skip ci] my commit message'\n" + + " skip_ssl_verification: skip-ssl\n" + " username: jsmith\n" + " password: s3cre$t\n" + " git_user: jsmith@mailhost.com\n" + @@ -3130,6 +3136,7 @@ public class ConcourseEditorTest { ); editor.assertProblems( "version|Unused", + "skip-ssl|'boolean'", "bogus|Unknown property" ); @@ -3142,6 +3149,8 @@ public class ConcourseEditorTest { editor.assertHoverContains("username", "Username for HTTP(S) auth"); editor.assertHoverContains("password", "Password for HTTP(S) auth"); editor.assertHoverContains("git_user", "The git identity to use"); + editor.assertHoverContains("commit_message", "overides the default commit message"); + editor.assertHoverContains("skip_ssl_verification", "Skip SSL verification for git endpoint"); } @Test public void semverResourceSourcePrimaryContentAssist() throws Exception { @@ -3256,15 +3265,17 @@ public class ConcourseEditorTest { " driver: git\n" + " uri: blah\n" + " branch: master\n" + - " file: version-file\n"+ + " file: version-file\n" + " <*>" , ///////////// "<*>" , // ==> + "commit_message: <*>", "git_user: <*>", "initial_version: <*>", "password: <*>", "private_key: <*>", + "skip_ssl_verification: <*>", "username: <*>" ); }