Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

New values process and http for health-check-type

Browse Source
This commit is contained in:
Kris De Volder
2017-04-12 16:56:18 -07:00
parent 20152be6bf
commit a6ac867f7a
4 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
headless-services/manifest-yaml-language-server/src/main/java/org/springframework/ide/vscode/manifest/yaml/ManifestYmlSchema.java
View File

@@ -54,7 +54,7 @@ public class ManifestYmlSchema implements YamlSchema {
Callable<Collection<YValueHint>> servicesProvider = providers.getServicesProvider();
Callable<Collection<YValueHint>> domainsProvider = providers.getDomainsProvider();
YTypeFactory f = new YTypeFactory();
TYPE_UTIL = f.TYPE_UTIL;
@@ -69,7 +69,7 @@ public class ManifestYmlSchema implements YamlSchema {
t_buildpack.addHintProvider(this.buildpackProvider);
// t_buildpack.parseWith(ManifestYmlValueParsers.fromHints(t_buildpack.toString(), buildpackProvider));
}
YAtomicType t_domain = f.yatomic("Domain");
YAtomicType t_domains_string = f.yatomic("Domains");
@@ -79,7 +79,7 @@ public class ManifestYmlSchema implements YamlSchema {
}
YType t_domains = f.yseq(t_domains_string);
YAtomicType t_service_string = f.yatomic("Service");
if (servicesProvider != null) {
t_service_string.addHintProvider(servicesProvider);
@@ -97,7 +97,7 @@ public class ManifestYmlSchema implements YamlSchema {
// "routes" has nested required property "route":
// routes:
// - route: someroute.io
YBeanType route = f.ybean("Route");
YAtomicType t_route_string = f.yatomic("route");
route.addProperty(f.yprop("route", t_route_string).isRequired(true));
@@ -107,7 +107,7 @@ public class ManifestYmlSchema implements YamlSchema {
t_memory.addHints("256M", "512M", "1024M");
t_memory.parseWith(ManifestYmlValueParsers.MEMORY);
YAtomicType t_health_check_type = f.yenum("Health Check Type", "none", "port");
YAtomicType t_health_check_type = f.yenum("Health Check Type", "none", "process", "port", "http");
YAtomicType t_strictly_pos_integer = f.yatomic("Strictly Positive Integer");
t_strictly_pos_integer.parseWith(ManifestYmlValueParsers.integerAtLeast(1));

9
headless-services/manifest-yaml-language-server/src/main/resources/description-by-prop-name/health-check-type.html
View File

@@ -1,9 +0,0 @@
<p>Use the <code>health-check-type</code> attribute to set the <code>health_check_type</code>
flag to either <code>port</code> or <code>none</code>. If you do not provide
a <code>health-check-type</code> attribute, it defaults to <code>port</code>.</p>
<pre>
---
...
health-check-type: none
</pre>

11
headless-services/manifest-yaml-language-server/src/main/resources/description-by-prop-name/health-check-type.md
View File

@@ -1,9 +1,12 @@
Use the `health-check-type` attribute to set the `health_check_type`
flag to either `port` or `none`. If you do not provide a `health-check-type`
attribute, it defaults to `port`.
Use the `health-check-type` attribute to set the `health_check_type` flag to either `port`, `process` or `http`.
If you do not provide a `health-check-type` attribute, it defaults to `port`.
```
---
...
health-check-type: none
health-check-type: port
```
The command line option that overrides this attribute is -u.
The value of `none` is deprecated in favor of `process`

14
headless-services/manifest-yaml-language-server/src/test/java/org/springframework/ide/vscode/manifest/yaml/ManifestYamlEditorTest.java
View File

@@ -407,8 +407,10 @@ public class ManifestYamlEditorTest {
);
assertCompletions("health-check-type: <*>",
"health-check-type: http<*>",
"health-check-type: none<*>",
"health-check-type: port<*>"
"health-check-type: port<*>",
"health-check-type: process<*>"
);
}
@@ -1023,7 +1025,7 @@ public class ManifestYamlEditorTest {
editor.assertProblems("http://springsource.org|is not a valid 'Route'");
Diagnostic problem = editor.assertProblem("http://springsource.org");
assertEquals(DiagnosticSeverity.Error, problem.getSeverity());
editor = harness.newEditor(
"applications:\n" +
"- name: foo\n" +
@@ -1042,7 +1044,7 @@ public class ManifestYamlEditorTest {
problem = editor.assertProblem("springsource.org:kuku");
assertEquals(DiagnosticSeverity.Error, problem.getSeverity());
editor = harness.newEditor(
"applications:\n" +
"- name: foo\n" +
@@ -1072,7 +1074,7 @@ public class ManifestYamlEditorTest {
editor.assertProblems("springsource.org:8765/path|Unable to determine type of route");
Diagnostic problem = editor.assertProblem("springsource.org:8765/path");
assertEquals(DiagnosticSeverity.Error, problem.getSeverity());
editor = harness.newEditor(
"applications:\n" +
"- name: foo\n" +
@@ -1081,7 +1083,7 @@ public class ManifestYamlEditorTest {
editor.assertProblems("66000|Invalid port");
problem = editor.assertProblem("66000");
assertEquals(DiagnosticSeverity.Error, problem.getSeverity());
editor = harness.newEditor(
"applications:\n" +
"- name: foo\n" +
@@ -1105,5 +1107,5 @@ public class ManifestYamlEditorTest {
" - route: host.springsource.org\n");
editor.assertProblems();
}
}