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

Minimal support for editing cloud-config

Browse Source
This commit is contained in:
Kris De Volder
2017-08-04 15:48:18 -07:00
parent 66c427f37a
commit 3d1937c9d8
61 changed files with 337 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/BoshEditorTest.java
View File

@@ -148,7 +148,6 @@ public class BoshEditorTest {
editor.assertHoverContains("tags", "Specifies key value pairs to be sent to the CPI for VM tagging");
}
//@Ignore //For now... because not passing yet.
@Test public void reconcileCfManifest() throws Exception {
Editor editor = harness.newEditorFromClasspath("/workspace/cf-deployment-manifest.yml");
cloudConfigProvider.executeCommandWith(() -> {
@@ -254,8 +253,6 @@ public class BoshEditorTest {
editor.assertHoverContains("name", "Full name of a matching stemcell. Either `name` or `os` keys can be specified.");
}
@Test public void releasesBlockCompletions() throws Exception {
harness.getServer().enableSnippets(false);
Editor editor = harness.newEditor(
@@ -1841,4 +1838,61 @@ public class BoshEditorTest {
);
}
@Test public void cloudconfigReconcile() throws Exception {
Editor editor = harness.newEditor(LanguageId.BOSH_CLOUD_CONFIG,
"bogus: bad\n" +
"azs:\n" +
"- name: z1\n" +
" cloud_properties: {availability_zone: us-east-1a}\n" +
"- name: z2\n" +
" cloud_properties: {availability_zone: us-east-1b}\n" +
"\n" +
"vm_types:\n" +
"- name: small\n" +
" cloud_properties:\n" +
" instance_type: t2.micro\n" +
" ephemeral_disk: {size: 3000, type: gp2}\n" +
"- name: medium\n" +
" cloud_properties:\n" +
" instance_type: m3.medium\n" +
" ephemeral_disk: {size: 30000, type: gp2}\n" +
"\n" +
"disk_types:\n" +
"- name: small\n" +
" disk_size: 3000\n" +
" cloud_properties: {type: gp2}\n" +
"- name: large\n" +
" disk_size: 50_000\n" +
" cloud_properties: {type: gp2}\n" +
"\n" +
"networks:\n" +
"- name: private\n" +
" type: manual\n" +
" subnets:\n" +
" - range: 10.10.0.0/24\n" +
" gateway: 10.10.0.1\n" +
" az: z1\n" +
" static: [10.10.0.62]\n" +
" dns: [10.10.0.2]\n" +
" cloud_properties: {subnet: subnet-f2744a86}\n" +
" - range: 10.10.64.0/24\n" +
" gateway: 10.10.64.1\n" +
" az: z2\n" +
" static: [10.10.64.121, 10.10.64.122]\n" +
" dns: [10.10.0.2]\n" +
" cloud_properties: {subnet: subnet-eb8bd3ad}\n" +
"- name: vip\n" +
" type: vip\n" +
"\n" +
"compilation:\n" +
" workers: 5\n" +
" reuse_compilation_vms: true\n" +
" az: z1\n" +
" vm_type: medium\n" +
" network: private\n"
);
editor.assertProblems("bogus|Unknown property");
}
}

8
headless-services/bosh-language-server/src/test/java/org/springframework/ide/vscode/bosh/SchemaBasedSnippetGeneratorTest.java
View File

@@ -13,19 +13,16 @@ package org.springframework.ide.vscode.bosh;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
import org.springframework.ide.vscode.bosh.models.BoshModels;
import org.springframework.ide.vscode.bosh.snippets.SchemaBasedSnippetGenerator;
import org.springframework.ide.vscode.commons.languageserver.util.SnippetBuilder;
import org.springframework.ide.vscode.commons.yaml.ast.YamlAstCache;
import org.springframework.ide.vscode.commons.yaml.reconcile.ASTTypeCache;
import org.springframework.ide.vscode.commons.yaml.schema.DynamicSchemaContext;
import org.springframework.ide.vscode.commons.yaml.schema.YType;
import org.springframework.ide.vscode.commons.yaml.schema.YTypeUtil;
public class SchemaBasedSnippetGeneratorTest {
private ASTTypeCache astTypes = new ASTTypeCache();
private YamlAstCache asts = new YamlAstCache();
private BoshDeploymentManifestSchema schema = new BoshDeploymentManifestSchema(asts, astTypes, (dc) -> null, (dc) -> null, (dc) -> null);
private BoshDeploymentManifestSchema schema = new BoshSchemas(new BoshModels((dc) -> null, (dc) -> null, (dc) -> null)).getDeploymentSchema();
private YTypeUtil typeUtil = schema.getTypeUtil();
private SchemaBasedSnippetGenerator generator = new SchemaBasedSnippetGenerator(typeUtil, SnippetBuilder::new);
@@ -60,7 +57,6 @@ public class SchemaBasedSnippetGeneratorTest {
,
generator.getSnippets(v2Schema).iterator().next().getSnippet()
);
System.out.println();
}
}