Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(cli): catch possible errors when trying to open a url #2961

Merged
merged 2 commits into from
Jun 23, 2023
Merged

fix(cli): catch possible errors when trying to open a url #2961

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b360dd
fix(cli): catch possible errors when trying to open a url
ansgarm Jun 23, 2023
cedf0bf
fix(tests): update convert command unit tests
ansgarm Jun 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions packages/cdktf-cli/src/bin/cmds/helper/terraform-login.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,27 @@ the following file for use by subsequent Terraform commands:

if (tfCloud) {
isLogin = true;
this.openBrowser();
await this.openBrowser();
}

return isLogin;
}

openBrowser() {
async openBrowser() {
console.log(`\nopening webpage using your browser.....\n`);
console.log(chalkColour`If the web browser didn't open the window automatically, you can go to the following url:
{whiteBright ${this.terraformLoginURL}}\n`);
return open.default(this.terraformLoginURL);
try {
await open.default(this.terraformLoginURL, {
allowNonzeroExitCode: true,
wait: true,
});
} catch (e) {
logger.debug(
`Ignored error while trying to open ${this.terraformLoginURL}`,
e
);
}
}

public async askForToken() {
Expand Down
30 changes: 10 additions & 20 deletions packages/cdktf-cli/src/test/cmds/convert.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,9 @@ describe("convert command", () => {
`The following providers are missing schema information and might need manual adjustments to synthesize correctly`
);
expect(result.stdout).toContain(
`import * as NullProvider from "./.gen/providers/null";`
);
expect(result.stdout).toContain(
`new NullProvider.resource.Resource(this, "dummy", {});`
`import { Resource } from "./.gen/providers/null/resource";`
);
expect(result.stdout).toContain(`new Resource(this, "dummy", {});`);
});
}, 30_000);
it("reads provider version from existing cdktf.json", async () => {
Expand All @@ -50,11 +48,9 @@ describe("convert command", () => {
`The following providers are missing schema information and might need manual adjustments to synthesize correctly`
);
expect(result.stdout).toContain(
`import * as NullProvider from "./.gen/providers/null";`
);
expect(result.stdout).toContain(
`new NullProvider.resource.Resource(this, "dummy", {});`
`import { Resource } from "./.gen/providers/null/resource";`
);
expect(result.stdout).toContain(`new Resource(this, "dummy", {});`);
});
}, 30_000);
it("works if no cdktf.json could be found", async () => {
Expand All @@ -69,11 +65,9 @@ describe("convert command", () => {
`The following providers are missing schema information and might need manual adjustments to synthesize correctly`
);
expect(result.stdout).toContain(
`import * as NullProvider from "./.gen/providers/null";`
);
expect(result.stdout).toContain(
`new NullProvider.resource.Resource(this, "dummy", {});`
`import { Resource } from "./.gen/providers/null/resource";`
);
expect(result.stdout).toContain(`new Resource(this, "dummy", {});`);
});
}, 30_000);

Expand Down Expand Up @@ -134,11 +128,9 @@ describe("convert command", () => {
`The following providers are missing schema information and might need manual adjustments to synthesize correctly`
);
expect(result.stdout).toContain(
`import * as kubernetes from "./.gen/providers/kubernetes";`
);
expect(result.stdout).toContain(
`new kubernetes.deployment.Deployment(this, "myapp", {`
`import { Deployment } from "./.gen/providers/kubernetes/deployment";`
);
expect(result.stdout).toContain(`new Deployment(this, "myapp", {`);
expect(result.stdout).toContain(`template: {`);
});
}, 30_000);
Expand Down Expand Up @@ -200,11 +192,9 @@ describe("convert command", () => {
`The following providers are missing schema information and might need manual adjustments to synthesize correctly`
);
expect(result.stdout).toContain(
`import * as kubernetes from "./.gen/providers/kubernetes";`
);
expect(result.stdout).toContain(
`new kubernetes.deployment.Deployment(this, "myapp", {`
`import { Deployment } from "./.gen/providers/kubernetes/deployment";`
);
expect(result.stdout).toContain(`new Deployment(this, "myapp", {`);
expect(result.stdout).toContain(`template: {`);
});
}, 30_000);
Expand Down