diff --git a/headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/BoshDeploymentManifestSchema.java b/headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/BoshDeploymentManifestSchema.java index e0f25605b..3fb2f39ad 100644 --- a/headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/BoshDeploymentManifestSchema.java +++ b/headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/BoshDeploymentManifestSchema.java @@ -67,9 +67,11 @@ public class BoshDeploymentManifestSchema implements YamlSchema { YType t_update = t_params; //TODO: https://www.pivotaltracker.com/story/show/148627121 addProp(TOPLEVEL_TYPE, "update", t_update).isRequired(true); + + YType t_instance_group = t_params; //TODO: https://www.pivotaltracker.com/story/show/148627211 + addProp(TOPLEVEL_TYPE, "instance_groups", f.yseq(t_instance_group)).isRequired(true); - YType t_instance_group = t_params; //TODO: https://www.pivotaltracker.com/story/show/148627121 - addProp(TOPLEVEL_TYPE, "instance_groups", f.yseq(t_update)).isRequired(true); + addProp(TOPLEVEL_TYPE, "properties", t_params).isDeprecated("Deprecated in favor of job level properties and links"); } @Override diff --git a/headless-services/bosh-language-server/src/main/resources/desc/BoshDeploymentManifest/properties.md b/headless-services/bosh-language-server/src/main/resources/desc/BoshDeploymentManifest/properties.md new file mode 100644 index 000000000..5859bbb2a --- /dev/null +++ b/headless-services/bosh-language-server/src/main/resources/desc/BoshDeploymentManifest/properties.md @@ -0,0 +1 @@ +*Optional*. Describes global properties. Deprecated in favor of job level properties and links. \ No newline at end of file diff --git a/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/concourse/BoshEditorTest.java b/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/concourse/BoshEditorTest.java index 0aa0a14d2..c314f7069 100644 --- a/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/concourse/BoshEditorTest.java +++ b/headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/concourse/BoshEditorTest.java @@ -75,9 +75,12 @@ public class BoshEditorTest { " persistent_disk_type: medium\n" + " networks:\n" + " - name: default\n" + + "properties:\n" + + " a-property: the-value\n" + "blah: hoooo\n" ); editor.assertProblems( + "properties|Deprecated in favor of job level properties and links", "blah|Unknown property" ); @@ -87,6 +90,7 @@ public class BoshEditorTest { editor.assertHoverContains("stemcells", "The name and version of each stemcell"); editor.assertHoverContains("update", "This specifies instance update properties"); editor.assertHoverContains("instance_groups", "Specifies the mapping between release [jobs](https://bosh.io/docs/terminology.html#job) and instance groups."); + editor.assertHoverContains("properties", 3, "Describes global properties. Deprecated"); }