Skip to content

Commit be237fb

Browse files
committed
fix --wait issue for service creation
1 parent 1f74c05 commit be237fb

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/openshift/component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ export class Component extends OpenShiftItem {
114114
if (!serviceToLink) return null;
115115

116116
return Promise.resolve()
117-
.then(() => Service.odo.execute(`odo link ${serviceToLink.getName()} --app ${app.getName()} --project ${project.getName()} --component ${context.getName()}`))
117+
.then(() => Service.odo.execute(`odo link ${serviceToLink.getName()} --app ${app.getName()} --project ${project.getName()} --component ${context.getName()} --wait`))
118118
.then(() => `service '${serviceToLink.getName()}' successfully linked with component '${context.getName()}'`)
119119
.catch((err) => Promise.reject(`Failed to link service with error '${err}'`));
120120
}

src/openshift/service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export class Service extends OpenShiftItem {
3434
if (serviceName) {
3535
const project = application.getParent();
3636
return Progress.execCmdWithProgress(`Creating new service '${serviceName}'`,
37-
`odo service create ${serviceTemplateName} --plan ${serviceTemplatePlanName} ${serviceName.trim()} --app ${application.getName()} --project ${project.getName()} --wait`)
37+
`odo service create ${serviceTemplateName} --plan ${serviceTemplatePlanName} ${serviceName.trim()} --app ${application.getName()} --project ${project.getName()}`)
3838
.then(() => Service.explorer.refresh(application))
3939
.then(() => `Service '${serviceName}' successfully created`)
4040
.catch((err) => Promise.reject(`Failed to create service with error '${err}'`));
@@ -59,7 +59,7 @@ export class Service extends OpenShiftItem {
5959
const answer = await vscode.window.showWarningMessage(`Are you sure you want to delete service '${service.getName()}'`, 'Yes', 'Cancel');
6060
if (answer === 'Yes') {
6161
return Promise.resolve()
62-
.then(() => Service.odo.execute(`odo service delete ${service.getName()} -f --project ${project.getName()} --app ${application.getName()} --wait`))
62+
.then(() => Service.odo.execute(`odo service delete ${service.getName()} -f --project ${project.getName()} --app ${application.getName()}`))
6363
.then(() => Service.explorer.refresh(treeItem ? treeItem.getParent() : undefined))
6464
.then(() => `Service '${service.getName()}' successfully deleted`)
6565
.catch((err) => Promise.reject(`Failed to delete service with error '${err}'`));

test/openshift/service.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ suite('Openshift/Service', () => {
5353
expect(result).equals(`Service '${serviceItem.getName()}' successfully created`);
5454
expect(progressStub).calledOnceWith(
5555
`Creating new service '${serviceItem.getName()}'`,
56-
`odo service create ${templateName} --plan ${templatePlan} ${serviceItem.getName()} --app ${appItem.getName()} --project ${projectItem.getName()} --wait`);
56+
`odo service create ${templateName} --plan ${templatePlan} ${serviceItem.getName()} --app ${appItem.getName()} --project ${projectItem.getName()}`);
5757
});
5858

5959
test('returns null with no template selected', async () => {
@@ -105,14 +105,14 @@ suite('Openshift/Service', () => {
105105
const result = await Service.del(serviceItem);
106106

107107
expect(result).equals(`Service '${serviceItem.getName()}' successfully deleted`);
108-
expect(execStub).calledOnceWith(`odo service delete ${serviceItem.getName()} -f --project ${projectItem.getName()} --app ${appItem.getName()} --wait`);
108+
expect(execStub).calledOnceWith(`odo service delete ${serviceItem.getName()} -f --project ${projectItem.getName()} --app ${appItem.getName()}`);
109109
});
110110

111111
test('works without context item', async () => {
112112
const result = await Service.del(null);
113113

114114
expect(result).equals(`Service '${serviceItem.getName()}' successfully deleted`);
115-
expect(execStub).calledOnceWith(`odo service delete ${serviceItem.getName()} -f --project ${projectItem.getName()} --app ${appItem.getName()} --wait`);
115+
expect(execStub).calledOnceWith(`odo service delete ${serviceItem.getName()} -f --project ${projectItem.getName()} --app ${appItem.getName()}`);
116116
});
117117

118118
test('returns null with no application selected', async () => {

0 commit comments

Comments
 (0)