Skip to content

Commit deab69a

Browse files
committed
VaultConfig has url property rather than uri
1 parent 7b795b5 commit deab69a

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

headless-services/concourse-language-server/src/main/java/org/springframework/ide/vscode/concourse/PipelineYmlSchema.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ public PipelineYmlSchema(ConcourseModel models, GithubInfoProvider github) {
521521
switch (value) {
522522
case "vault":
523523
YBeanType vaultConfig = f.ybean("VaultConfig");
524-
addProp(vaultConfig, "uri", t_ne_string).isPrimary(true);
524+
addProp(vaultConfig, "url", t_ne_string).isPrimary(true);
525525
addProp(vaultConfig, "ca_cert", t_string);
526526
addProp(vaultConfig, "path_prefix", t_string);
527527
addProp(vaultConfig, "lookup_templates", f.yseq(t_string));

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -6978,7 +6978,7 @@ void var_source_VaultConfig_Attrs_Hovers() throws Exception {
69786978
"- name: sts4\n" +
69796979
" type: vault\n" +
69806980
" config:\n" +
6981-
" uri: some_uri\n" +
6981+
" url: some_url\n" +
69826982
" auth_backend: backend\n" +
69836983
" auth_max_ttl: 10s\n" +
69846984
" auth_params: \n" +
@@ -7002,7 +7002,7 @@ void var_source_VaultConfig_Attrs_Hovers() throws Exception {
70027002

70037003
editor.assertProblems();
70047004

7005-
editor.assertHoverContains("uri", "The URL of the Vault API.");
7005+
editor.assertHoverContains("url", "The URL of the Vault API.");
70067006
editor.assertHoverContains("auth_backend", "Authenticate using an auth backend, e.g. cert or approle.");
70077007
editor.assertHoverContains("auth_max_ttl", "Maximum duration to elapse before forcing the client to log in again.");
70087008
editor.assertHoverContains("auth_params", "A key-value map of parameters to pass during authentication.");
@@ -7032,7 +7032,7 @@ void var_source_VaultConfig_Attrs_Reconcile() throws Exception {
70327032
);
70337033

70347034
editor.assertProblems(
7035-
"config|'uri' is required"
7035+
"config|'url' is required"
70367036
);
70377037
}
70387038

0 commit comments

Comments
 (0)