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

Avoid needless bosh cli execution if target not set

Browse Source
This commit is contained in:
Kris De Volder
2017-08-16 13:24:23 -07:00
parent cbd19a586a
commit 733ca50f3e
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/BoshLanguageServer.java
View File

@@ -24,7 +24,6 @@ import org.springframework.ide.vscode.commons.languageserver.util.Settings;
import org.springframework.ide.vscode.commons.languageserver.util.SimpleLanguageServer;
import org.springframework.ide.vscode.commons.languageserver.util.SimpleTextDocumentService;
import org.springframework.ide.vscode.commons.languageserver.util.SimpleWorkspaceService;
import org.springframework.ide.vscode.commons.util.text.LanguageId;
import org.springframework.ide.vscode.commons.util.text.TextDocument;
import org.springframework.ide.vscode.commons.yaml.ast.YamlAstCache;
import org.springframework.ide.vscode.commons.yaml.completion.SchemaBasedYamlAssistContextProvider;

4
headless-services/bosh-language-server/src/main/java/org/springframework/ide/vscode/bosh/models/BoshCommandBasedModelProvider.java
View File

@@ -86,6 +86,10 @@ public abstract class BoshCommandBasedModelProvider<T> implements DynamicModelPr
}
commandAndArgs.add(command);
String target = config.getTarget();
if (target==null && !StringUtil.hasText(System.getenv("BOSH_ENVIRONMENT"))) {
//See https://www.pivotaltracker.com/story/show/150309966
return null;
}
if (target!=null) {
commandAndArgs.add("-e");
commandAndArgs.add(target);

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

@@ -82,13 +82,13 @@ public class BoshCommandStemcellsProviderTest {
// verify(provider).executeCommand(eq(new ExternalCommand("bosh", "stemcells", "--json")));
// }
@Test public void obeysCliConfigCommand() throws Exception {
@Test public void obeysCliConfigCommandAndTarget() throws Exception {
Map<String, Object> settings = ImmutableMap.of("bosh", ImmutableMap.of("cli",
ImmutableMap.of(
"command", "alternate-command"
"command", "alternate-command",
"target", "some-target"
)
));
cliConfig.handleConfigurationChange(new Settings(settings));
assertEquals(ImmutableList.of(
new StemcellData("bosh-vsphere-esxi-centos-7-go_agent", "3421.11", "centos-7"),
@@ -96,7 +96,7 @@ public class BoshCommandStemcellsProviderTest {
),
provider.getModel(mock(DynamicSchemaContext.class)).getStemcells()
);
verify(provider).executeCommand(eq(new ExternalCommand("alternate-command", "stemcells", "--json")));
verify(provider).executeCommand(eq(new ExternalCommand("alternate-command", "-e", "some-target", "stemcells", "--json")));
}
@Test public void obeysCliConfigTarget() throws Exception {