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 d073922ea..ce99d69e2 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 @@ -521,7 +521,7 @@ public class PipelineYmlSchema implements YamlSchema { switch (value) { case "vault": YBeanType vaultConfig = f.ybean("VaultConfig"); - addProp(vaultConfig, "uri", t_ne_string).isPrimary(true); + addProp(vaultConfig, "url", t_ne_string).isPrimary(true); addProp(vaultConfig, "ca_cert", t_string); addProp(vaultConfig, "path_prefix", t_string); addProp(vaultConfig, "lookup_templates", f.yseq(t_string)); diff --git a/headless-services/concourse-language-server/src/main/resources/desc/VaultConfig/uri.md b/headless-services/concourse-language-server/src/main/resources/desc/VaultConfig/url.md similarity index 100% rename from headless-services/concourse-language-server/src/main/resources/desc/VaultConfig/uri.md rename to headless-services/concourse-language-server/src/main/resources/desc/VaultConfig/url.md 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 c1b04b01d..0aebb45b4 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 @@ -6978,7 +6978,7 @@ public class ConcourseEditorTest { "- name: sts4\n" + " type: vault\n" + " config:\n" + - " uri: some_uri\n" + + " url: some_url\n" + " auth_backend: backend\n" + " auth_max_ttl: 10s\n" + " auth_params: \n" + @@ -7002,7 +7002,7 @@ public class ConcourseEditorTest { editor.assertProblems(); - editor.assertHoverContains("uri", "The URL of the Vault API."); + editor.assertHoverContains("url", "The URL of the Vault API."); editor.assertHoverContains("auth_backend", "Authenticate using an auth backend, e.g. cert or approle."); editor.assertHoverContains("auth_max_ttl", "Maximum duration to elapse before forcing the client to log in again."); editor.assertHoverContains("auth_params", "A key-value map of parameters to pass during authentication."); @@ -7032,7 +7032,7 @@ public class ConcourseEditorTest { ); editor.assertProblems( - "config|'uri' is required" + "config|'url' is required" ); }