support: set aksk and terraform init/plan/apply/destroy cmd

lyu571 · lyu571 · commit 0b4f4fe9bba6 · 2023-10-20T18:47:00.000+08:00
diff --git a/package.json b/package.json
@@ -39,15 +39,9 @@
         "onCommand:tcTerraform.init",
         "onCommand:tcTerraform.plan",
         "onCommand:tcTerraform.apply",
-        "onCommand:tcTerraform.import",
-        "onCommand:tcTerraform.validate",
         "onCommand:tcTerraform.refresh",
         "onCommand:tcTerraform.destroy",
-        "onCommand:tcTerraform.visualize",
-        "onCommand:tcTerraform.test",
-        "onCommand:tcTerraform.push",
         "onCommand:tcTerraformer.import",
-        "onCommand:tcTerraformer.plan",
         "workspaceContains:**/*.tf",
         "onLanguage:terraform"
     ],
@@ -120,7 +114,8 @@
         "commands": [
             {
                 "command": "tcTerraform.login",
-                "title": "%TcTerraform.view.login.welcome%"
+                "title": "Login: %TcTerraform.view.login.welcome%",
+                "category": "TencentCloud Terraform"
             },
             {
                 "command": "tcTerraform.resourcesExplorer.refresh",
diff --git a/src/client/runner/baseRunner.ts b/src/client/runner/baseRunner.ts
@@ -9,7 +9,7 @@ export abstract class BaseRunner {
     public tfExecutor: any;
 
     constructor() {
-        this.init();
+        // this.init();
     }
 
     public abstract init(): void;
diff --git a/src/client/runner/terraformRunner.ts b/src/client/runner/terraformRunner.ts
@@ -29,21 +29,24 @@ export class TerraformRunner extends BaseRunner {
         return TerraformRunner.ins;
     }
 
-    public init(): void {
-        // throw new Error("Method not implemented.");
+    public async init(): Promise<any> {
+        console.debug("[DEBUG]#### TerraformRunner init begin.");
+
+        this.setAKSK();
+
+        terraformShellManager.getShell().runTerraformCmd(TerraformCommand.Init);
+
+        return "init success";
     }
 
     public async executePlan(cwd: string, args: any): Promise<string> {
         console.debug("[DEBUG]#### TerraformRunner executePlan begin.");
 
-        const resAddress = `${args.resource.type}.${args.resource.name}`;
+        // this.setAKSK();
 
-        // reset state
-        await this.resetTFState(resAddress);
+        terraformShellManager.getShell().runTerraformCmd(TerraformCommand.Plan);
 
-        terraformShellManager.getIntegratedShell(TerraformRunner.getInstance()).runTerraformCmd(TerraformCommand.Plan);
-
-        return "";
+        return "plan success";
     }
 
     public async executeShow(cwd: string, args?: any): Promise<string> {
@@ -125,6 +128,12 @@ export class TerraformRunner extends BaseRunner {
         await terraformShellManager.getIntegratedShell(TerraformRunner.getInstance())
             .runTerraformCmd(TerraformCommand.State, ['rm', '-lock=false', resAddress]);
     }
+
+    private setAKSK(runner?: any) {
+        const [ak, sk] = settingUtils.getAKSK();
+        terraformShellManager.getIntegratedShell(runner).runNormalCmd("export TENCENTCLOUD_SECRET_ID=" + ak);
+        terraformShellManager.getIntegratedShell(runner).runNormalCmd("export TENCENTCLOUD_SECRET_KEY=" + sk);
+    }
 }
 
 export function getCheckTerraformCmd(): boolean {
@@ -134,5 +143,3 @@ export function getCheckTerraformCmd(): boolean {
 export function setCheckTerraformCmd(checked: boolean): void {
     vscode.workspace.getConfiguration().update("tcTerraform.checkTerraformCmd", checked);
 }
-
-
diff --git a/src/client/terminal/integratedShell.ts b/src/client/terminal/integratedShell.ts
@@ -129,6 +129,24 @@ export class IntegratedShell extends BaseShell {
         await commands.executeCommand("vscode.open", Uri.file(tfFile), ViewColumn.Active || ViewColumn.One);
     }
 
+    // run terraform init command
+    public async init(params?: any): Promise<void> {
+        console.debug("[DEBUG]#### IntegratedShell init begin. params:[%v]", params);
+
+        await this.runner.checkInstalled();
+        if (this.runner instanceof TerraformRunner) {
+
+            const cwd: string = await selectWorkspaceFolder();
+            if (!cwd) {
+                TelemetryWrapper.sendError(Error("noWorkspaceSelected"));
+                return;
+            }
+
+            const result = await this.runner.init();
+            console.debug("[DEBUG]#### Executed init. result:[%s]", result);
+        }
+    }
+
     // run terraform plan command
     public async plan(params: any): Promise<void> {
         console.debug("[DEBUG]#### IntegratedShell plan begin. params:[%v]", params);
diff --git a/src/client/terminal/terraformShellManager.ts b/src/client/terminal/terraformShellManager.ts
@@ -28,9 +28,9 @@ class TerraformShellManager implements ITerraformShellManager {
 
         TelemetryWrapper.addContextProperty("isCloudShell", isCloudShell.toString());
         if (isCloudShell) {
-            return TerraformShellManager.cloudShell;
+            return this.getCloudShell();
         }
-        return TerraformShellManager.integratedShell;
+        return this.getIntegratedShell();
     }
 
     public getCloudShell(): TencentCloudShell {
@@ -39,14 +39,13 @@ class TerraformShellManager implements ITerraformShellManager {
 
     public getIntegratedShell(runner?: any): IntegratedShell {
         if (!TerraformShellManager.integratedShell) {
+            // default runner is Terraformer
+            TerraformShellManager.integratedShell = new IntegratedShell(TerraformerRunner.getInstance());
+            // specify runner
             if (runner) {
                 TerraformShellManager.integratedShell = new IntegratedShell(runner);
-            } else {
-                // default runner is Terraformer
-                TerraformShellManager.integratedShell = new IntegratedShell(TerraformerRunner.getInstance());
             }
         }
-
         return TerraformShellManager.integratedShell;
     }
 
diff --git a/src/commons/customCmdRegister.ts b/src/commons/customCmdRegister.ts
@@ -45,6 +45,10 @@ export function regResourceRelatedCommands() {
         terraformShellManager.getIntegratedShell(TerraformerRunner.getInstance()).import(param, param.fileName);
     });
 
+    commands.registerCommand("tcTerraform.init", function (param: any) {
+        terraformShellManager.getIntegratedShell(TerraformRunner.getInstance()).init();
+    });
+
     commands.registerCommand("tcTerraform.plan", function (param: any) {
         terraformShellManager.getIntegratedShell(TerraformRunner.getInstance()).plan(param);
     });
diff --git a/src/commons/tencent/user/index.ts b/src/commons/tencent/user/index.ts
@@ -51,9 +51,6 @@ export namespace user {
             process.env.TENCENTCLOUD_SECRET_ID = accessKey;
             process.env.TENCENTCLOUD_SECRET_KEY = secretKey;
 
-            terraformShellManager.getShell().runNormalCmd("export TENCENTCLOUD_SECRET_ID=" + accessKey);
-            terraformShellManager.getShell().runNormalCmd("export TENCENTCLOUD_SECRET_KEY=" + secretKey);
-
             tree.refreshTreeData();
             window.showInformationMessage(localize("TcTerraform.login.success"));
         }
diff --git a/src/connectivity/client.ts b/src/connectivity/client.ts
@@ -4,7 +4,7 @@ import * as vscode from "vscode";
 import { Client as CvmClient } from "tencentcloud-sdk-nodejs-cvm/tencentcloud/services/cvm/v20170312/cvm_client";
 import { Client as TkeClient } from "tencentcloud-sdk-nodejs-tke/tencentcloud/services/tke/v20180525/tke_client";
 import { localize } from "vscode-nls-i18n";
-import * as utils from "../utils/settingUtils";
+import * as settingUtils from "../utils/settingUtils";
 
 const tkeClient = TkeClient;
 const cvmClient = CvmClient;
@@ -36,13 +36,43 @@ export async function getTkeClient(): Promise<TkeClient> {
 }
 
 export async function getCvmClient(region?: string): Promise<CvmClient> {
-    const secretIdConfig = utils.getSecretIdFromUI();
-    const secretKeyConfig = utils.getSecretKeyFromUI();
-    const secretIdEnv = utils.getSecretIdFromEnv();
-    const secretKeyEnv = utils.getSecretKeyFromEnv();
+    // const secretIdConfig = utils.getSecretIdFromUI();
+    // const secretKeyConfig = utils.getSecretKeyFromUI();
+    // const secretIdEnv = utils.getSecretIdFromEnv();
+    // const secretKeyEnv = utils.getSecretKeyFromEnv();
 
-    const secretId = (secretIdEnv === undefined) ? secretIdConfig : secretIdEnv;
-    const secretKey = (secretKeyEnv === undefined) ? secretKeyConfig : secretKeyEnv;
+    // const secretId = (secretIdEnv === undefined) ? secretIdConfig : secretIdEnv;
+    // const secretKey = (secretKeyEnv === undefined) ? secretKeyConfig : secretKeyEnv;
+    const [secretId, secretKey] = settingUtils.getAKSK();
+
+    if (secretId === undefined || secretKey === undefined || secretId === null || secretKey === null) {
+        let msg = localize("TcTerraform.msg.aksk.notfound");
+        vscode.window.showErrorMessage(msg);
+        return null;
+    }
+
+    return new CvmClient({
+        credential: {
+            secretId: secretId,
+            secretKey: secretKey,
+        },
+        // 产品地域
+        region: (process.env.TENCENTCLOUD_REGION === undefined) ?
+            "ap-guangzhou" : process.env.TENCENTCLOUD_REGION,
+        // 可选配置实例
+        profile: {
+            // signMethod: "TC3-HMAC-SHA256", // 签名方法
+            httpProfile: {
+                reqMethod: "POST", // 请求方法
+                // reqTimeout: 60, // 请求超时时间，默认60s
+                endpoint: "cvm.tencentcloudapi.com",
+            },
+        },
+    })
+}
+
+export async function getStsClient(region?: string): Promise<CvmClient> {
+    const [secretId, secretKey] = settingUtils.getAKSK();
 
     if (secretId === undefined || secretKey === undefined || secretId === null || secretKey === null) {
         let msg = localize("TcTerraform.msg.aksk.notfound");
diff --git a/src/extension.ts b/src/extension.ts
@@ -27,29 +27,7 @@ export async function activate(context: vscode.ExtensionContext) {
     await TerraformRunner.getInstance().checkInstalled();
     await TerraformerRunner.getInstance().checkInstalled();
 
-    // let disposableLogin = vscode.commands.registerCommand('tcTerraform.login', async () => {
-    //     // to-do
-    //     // wait for cloudshell and tccli implement ready
-    //     let accessKey = settingUtils.getSecretIdFromUI();
-    //     let secretKey = settingUtils.getSecretKeyFromUI();
-
-    //     terraformShellManager.getShell().runNormalCmd("export TENCENTCLOUD_SECRET_ID=" + accessKey);
-    //     terraformShellManager.getShell().runNormalCmd("export TENCENTCLOUD_SECRET_KEY=" + secretKey);
-    // });
-
-    // context.subscriptions.push(disposableLogin);
-
     // terraform cmd
-    context.subscriptions.push(vscode.commands.registerCommand('tcTerraform.init', () => {
-        terraformShellManager.getShell().runTerraformCmd(TerraformCommand.Init);
-    }));
-
-    // move plan to customCmdRegister
-    // context.subscriptions.push(vscode.commands.registerCommand('tcTerraform.plan', () => {
-    //     await terraformShellManager.getIntegratedShell(TerraformRunner.getInstance()).plan();
-
-    // }));
-
     context.subscriptions.push(vscode.commands.registerCommand('tcTerraform.apply', () => {
         terraformShellManager.getShell().runTerraformCmd(TerraformCommand.Apply);
     }));
diff --git a/src/utils/settingUtils.ts b/src/utils/settingUtils.ts
@@ -35,6 +35,15 @@ export function getSecretKeyFromUI(): string {
     return vscode.workspace.getConfiguration().get("tcTerraform.properties.secretKey");
 }
 
+export function getAKSK(): [string, string] {
+    const secretIdConfig = getSecretIdFromUI();
+    const secretKeyConfig = getSecretKeyFromUI();
+    const secretIdEnv = getSecretIdFromEnv();
+    const secretKeyEnv = getSecretKeyFromEnv();
+
+    return [secretIdEnv ?? secretIdConfig, secretKeyEnv ?? secretKeyConfig];
+}
+
 export function getSecretIdFromEnv(): string {
     return process.env.TENCENTCLOUD_SECRET_ID;
 }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ export abstract class BaseRunner {`
`9`	`9`	`public tfExecutor: any;`
`10`	`10`
`11`	`11`	`constructor() {`
`12`		`- this.init();`
	`12`	`+ // this.init();`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`public abstract init(): void;`
Original file line number	Diff line number	Diff line change
`@@ -28,9 +28,9 @@ class TerraformShellManager implements ITerraformShellManager {`
`28`	`28`
`29`	`29`	`TelemetryWrapper.addContextProperty("isCloudShell", isCloudShell.toString());`
`30`	`30`	`if (isCloudShell) {`
`31`		`- return TerraformShellManager.cloudShell;`
	`31`	`+ return this.getCloudShell();`
`32`	`32`	`}`
`33`		`- return TerraformShellManager.integratedShell;`
	`33`	`+ return this.getIntegratedShell();`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`public getCloudShell(): TencentCloudShell {`
`@@ -39,14 +39,13 @@ class TerraformShellManager implements ITerraformShellManager {`
`39`	`39`
`40`	`40`	`public getIntegratedShell(runner?: any): IntegratedShell {`
`41`	`41`	`if (!TerraformShellManager.integratedShell) {`
	`42`	`+ // default runner is Terraformer`
	`43`	`+ TerraformShellManager.integratedShell = new IntegratedShell(TerraformerRunner.getInstance());`
	`44`	`+ // specify runner`
`42`	`45`	`if (runner) {`
`43`	`46`	`TerraformShellManager.integratedShell = new IntegratedShell(runner);`
`44`		`- } else {`
`45`		`- // default runner is Terraformer`
`46`		`- TerraformShellManager.integratedShell = new IntegratedShell(TerraformerRunner.getInstance());`
`47`	`47`	`}`
`48`	`48`	`}`
`49`		`-`
`50`	`49`	`return TerraformShellManager.integratedShell;`
`51`	`50`	`}`
`52`	`51`
Original file line number	Diff line number	Diff line change
`@@ -51,9 +51,6 @@ export namespace user {`
`51`	`51`	`process.env.TENCENTCLOUD_SECRET_ID = accessKey;`
`52`	`52`	`process.env.TENCENTCLOUD_SECRET_KEY = secretKey;`
`53`	`53`
`54`		`- terraformShellManager.getShell().runNormalCmd("export TENCENTCLOUD_SECRET_ID=" + accessKey);`
`55`		`- terraformShellManager.getShell().runNormalCmd("export TENCENTCLOUD_SECRET_KEY=" + secretKey);`
`56`		`-`
`57`	`54`	`tree.refreshTreeData();`
`58`	`55`	`window.showInformationMessage(localize("TcTerraform.login.success"));`
`59`	`56`	`}`