add aksk input

lyu571 · lyu571 · commit 59b084994a26 · 2023-10-19T22:20:05.000+08:00
diff --git a/package.json b/package.json
@@ -195,6 +195,15 @@
         "configuration": {
             "title": "TencentCloud Terraform",
             "properties": {
+                "tcTerraform.terminal": {
+                    "type": "string",
+                    "default": "integrated",
+                    "enum": [
+                        "integrated",
+                        "cloudshell"
+                    ],
+                    "description": "Specifies terminal used to run Terraform commands. Valid settings are `cloudshell` or `integrated`."
+                },
                 "tcTerraform.properties.secretId": {
                     "type": "string",
                     "default": "your_secretid",
@@ -205,15 +214,6 @@
                     "default": "your_secretkey",
                     "description": "Input your Tencent Cloud secret key."
                 },
-                "tcTerraform.terminal": {
-                    "type": "string",
-                    "default": "integrated",
-                    "enum": [
-                        "integrated",
-                        "cloudshell"
-                    ],
-                    "description": "Specifies terminal used to run Terraform commands. Valid settings are `cloudshell` or `integrated`."
-                },
                 "tcTerraform.checkTerraformCmd": {
                     "type": "boolean",
                     "default": "true",
diff --git a/src/commons/customCmdRegister.ts b/src/commons/customCmdRegister.ts
@@ -49,7 +49,7 @@ export function regResourceRelatedCommands() {
         terraformShellManager.getIntegratedShell(TerraformRunner.getInstance()).plan(param);
     });
 
-    commands.registerCommand(cmds.resourceRefresh, function (param: any) {
+    commands.registerCommand(resourceRefresh, function (param: any) {
         tree.refreshTreeData();
     });
 }
diff --git a/src/commons/tencent/user/index.ts b/src/commons/tencent/user/index.ts
@@ -1,13 +1,12 @@
 import { localize } from "vscode-nls-i18n";
 import { ExtensionContext, workspace, ConfigurationTarget, window } from "vscode";
-import { terraformShellManager } from "../../../client/terminal/terraformShellManager";
-import { AbstractClient } from "tencentcloud-sdk-nodejs/tencentcloud/common/abstract_client";
-import { Credential } from "tencentcloud-sdk-nodejs/tencentcloud/common/interface";
 
 import { container } from "../../container";
 import { Context } from "../../context";
 import { tree } from "../treeDataProvider";
 import { getCredentailByInput } from "./auth";
+import { LoginProvider } from "../../../views/login/loginExplorer";
+import { terraformShellManager } from "../../../client/terminal/terraformShellManager";
 
 export namespace user {
     interface UserInfo {
@@ -39,13 +38,11 @@ export namespace user {
             // set in vscode configuration(setting.json)
             config.update('tcTerraform.properties.secretId', accessKey, ConfigurationTarget.Global)
                 .then(() => {
-                    window.showInformationMessage('设置secretId成功');
                 }, (error) => {
                     window.showErrorMessage('设置secretId失败: ' + error);
                 });
             config.update('tcTerraform.properties.secretKey', secretKey, ConfigurationTarget.Global)
                 .then(() => {
-                    window.showInformationMessage('设置secretKey成功');
                 }, (error) => {
                     window.showErrorMessage('设置secretKey失败: ' + error);
                 });
@@ -54,6 +51,9 @@ 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
@@ -36,7 +36,6 @@ export async function getTkeClient(): Promise<TkeClient> {
 }
 
 export async function getCvmClient(region?: string): Promise<CvmClient> {
-    const config = vscode.workspace.getConfiguration();
     const secretIdConfig = utils.getSecretIdFromUI();
     const secretKeyConfig = utils.getSecretKeyFromUI();
     const secretIdEnv = utils.getSecretIdFromEnv();
diff --git a/src/extension.ts b/src/extension.ts
@@ -13,6 +13,7 @@ import { registerView } from './views';
 import { TerraformRunner } from './client/runner/terraformRunner';
 import { TerraformerRunner } from './client/runner/terraformerRunner';
 import { GitUtils } from './utils/gitUtils';
+import { bindExtensionContext } from "./commons";
 import _ from 'lodash';
 
 const TF_MODE: vscode.DocumentFilter = { language: 'terraform', scheme: 'file' };
@@ -21,6 +22,7 @@ const TF_MODE: vscode.DocumentFilter = { language: 'terraform', scheme: 'file' }
 // Your extension is activated the very first time the command is executed
 export async function activate(context: vscode.ExtensionContext) {
     console.log('Congratulations, your extension "TencentCloud Terraform" is now active!');
+    bindExtensionContext(context);
 
     await TerraformRunner.getInstance().checkInstalled();
     await TerraformerRunner.getInstance().checkInstalled();
@@ -36,6 +38,7 @@ export async function activate(context: vscode.ExtensionContext) {
     // });
 
     // context.subscriptions.push(disposableLogin);
+
     // terraform cmd
     context.subscriptions.push(vscode.commands.registerCommand('tcTerraform.init', () => {
         terraformShellManager.getShell().runTerraformCmd(TerraformCommand.Init);
diff --git a/src/test/runTest.ts b/src/test/runTest.ts
diff --git a/src/test/suite/extension.test.ts b/src/test/suite/extension.test.ts
diff --git a/src/test/suite/index.ts b/src/test/suite/index.ts
diff --git a/src/views/help/helpExplorer.ts b/src/views/help/helpExplorer.ts
@@ -1,8 +1,7 @@
 import { ThemeIcon } from "vscode";
 import { localize } from "vscode-nls-i18n";
 
-import { container, tencent, cmds} from "../../commons";
-import { Icons } from "../../utils/icons";
+import { container, tencent, cmds } from "../../commons";
 
 const { tree } = tencent;
 
diff --git a/src/views/index.ts b/src/views/index.ts
@@ -1,8 +1,9 @@
 import { registerHelp } from "./help";
+import { registerLogin } from "./login";
 import { registerResources } from "./resources";
 
 export function registerView() {
     registerHelp();
-
     registerResources();
+    registerLogin();
 }
diff --git a/src/views/login/index.ts b/src/views/login/index.ts
@@ -0,0 +1,8 @@
+import { window } from "vscode";
+
+import { container } from "../../commons/container";
+import { LoginProvider } from "./loginExplorer";
+
+export function registerLogin() {
+    window.registerTreeDataProvider("tcTerraform.loginExplorer", container.get(LoginProvider));
+}
diff --git a/src/views/login/loginExplorer.ts b/src/views/login/loginExplorer.ts
@@ -0,0 +1,55 @@
+import * as vscode from "vscode";
+import { localize } from "vscode-nls-i18n";
+
+import { container, tencent, cmds } from "../../commons";
+import { getSecretIdFromEnv, getSecretKeyFromEnv } from "../../utils/settingUtils";
+
+export class LoginProvider extends tencent.tree.TreeDataProvider {
+    private loggedIn = false;
+
+    constructor() {
+        super();
+        this.loggedIn = false;
+    }
+
+    setLoggedIn(value: boolean) {
+        this.loggedIn = value;
+    }
+
+    isLoggedIn(): boolean {
+        if (getSecretIdFromEnv() && getSecretKeyFromEnv()) {
+            return true;
+        }
+        return false;
+    }
+
+    async getChildren(element?: tencent.tree.TreeItem | undefined): Promise<tencent.tree.TreeItem[]> {
+        if (!element) {
+            if (this.isLoggedIn()) {
+                return [new tencent.tree.TreeItem(localize("TcTerraform.login.success"))];
+            }
+
+            const welcome = [
+                // new tencent.tree.TreeItem(localize("TcTerraform.view.login.welcome"))
+            ];
+
+            // const info = await user.getInfo();
+            // if (info) {
+            //     elements.push(
+            //         new TreeItem(localize("tencent.loginout", info.uin), {
+            //             iconPath: Icons.getIcon("account"),
+            //             command: { command: tencent.command.TENCENT_LOGINOUT, title: "" },
+            //         })
+            //     );
+            // }
+
+            return welcome;
+        }
+        return [];
+    }
+
+}
+
+container.bind(LoginProvider).toSelf().inSingletonScope();
+
+container.bind(tencent.tree.TencentTreeProvider).toService(LoginProvider);

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ export function regResourceRelatedCommands() {`
`49`	`49`	`terraformShellManager.getIntegratedShell(TerraformRunner.getInstance()).plan(param);`
`50`	`50`	`});`
`51`	`51`
`52`		`- commands.registerCommand(cmds.resourceRefresh, function (param: any) {`
	`52`	`+ commands.registerCommand(resourceRefresh, function (param: any) {`
`53`	`53`	`tree.refreshTreeData();`
`54`	`54`	`});`
`55`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@ export async function getTkeClient(): Promise<TkeClient> {`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`export async function getCvmClient(region?: string): Promise<CvmClient> {`
`39`		`- const config = vscode.workspace.getConfiguration();`
`40`	`39`	`const secretIdConfig = utils.getSecretIdFromUI();`
`41`	`40`	`const secretKeyConfig = utils.getSecretKeyFromUI();`
`42`	`41`	`const secretIdEnv = utils.getSecretIdFromEnv();`