Skip to content

Commit 5080aec

Browse files
authored
Merge pull request #3 from tencentcloudstack/feat/support-login-feature
[20231020]support login,init,plan,apply,destroy process
2 parents 21ec176 + 0b4f4fe commit 5080aec

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+445
-212
lines changed

.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ dist
33
node_modules
44
.vscode-test/
55
*.vsix
6+
terraform.log

package.json

+42-31
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,22 @@
3939
"onCommand:tcTerraform.init",
4040
"onCommand:tcTerraform.plan",
4141
"onCommand:tcTerraform.apply",
42-
"onCommand:tcTerraform.import",
43-
"onCommand:tcTerraform.validate",
4442
"onCommand:tcTerraform.refresh",
4543
"onCommand:tcTerraform.destroy",
46-
"onCommand:tcTerraform.visualize",
47-
"onCommand:tcTerraform.test",
48-
"onCommand:tcTerraform.push",
4944
"onCommand:tcTerraformer.import",
50-
"onCommand:tcTerraformer.plan",
5145
"workspaceContains:**/*.tf",
5246
"onLanguage:terraform"
5347
],
5448
"contributes": {
49+
"menus": {
50+
"view/title": [
51+
{
52+
"command": "tcTerraform.resourcesExplorer.refresh",
53+
"when": "view == tcTerraform.resourcesExplorer.cvm",
54+
"group": "navigation"
55+
}
56+
]
57+
},
5558
"viewsContainers": {
5659
"activitybar": [
5760
{
@@ -65,24 +68,34 @@
6568
"views": {
6669
"tc-terraform-resources": [
6770
{
68-
"id": "tcTerraform.sessionExplorer",
69-
"name": "%TcTerraform.view.session.explorer%",
71+
"id": "tcTerraform.loginExplorer",
72+
"name": "%TcTerraform.view.login%",
7073
"contextualTitle": "Session Explorer",
7174
"visibility": "collapsed"
7275
},
7376
{
7477
"id": "tcTerraform.resourcesExplorer.cvm",
75-
"name": "%TcTerraform.view.resource.explorer.cvm%",
78+
"name": "%TcTerraform.view.resource.cvm%",
7679
"contextualTitle": "Resources Explorer",
7780
"visibility": "collapsed"
7881
},
7982
{
8083
"id": "tcTerraform.helpExplorer",
81-
"name": "%TcTerraform.view.help.explorer%",
84+
"name": "%TcTerraform.view.help%",
8285
"visibility": "collapsed"
8386
}
8487
]
8588
},
89+
"viewsWelcome": [
90+
{
91+
"view": "tcTerraform.loginExplorer",
92+
"contents": "%TcTerraform.view.login.welcome%"
93+
},
94+
{
95+
"view": "tcTerraform.resourcesExplorer.cvm",
96+
"contents": "%TcTerraform.view.login.welcome%"
97+
}
98+
],
8699
"languages": [
87100
{
88101
"id": "terraform",
@@ -101,9 +114,17 @@
101114
"commands": [
102115
{
103116
"command": "tcTerraform.login",
104-
"title": "Login",
117+
"title": "Login: %TcTerraform.view.login.welcome%",
105118
"category": "TencentCloud Terraform"
106119
},
120+
{
121+
"command": "tcTerraform.resourcesExplorer.refresh",
122+
"title": "%TcTerraform.refresh%",
123+
"icon": {
124+
"light": "resources/light/refresh.svg",
125+
"dark": "resources/dark/refresh.svg"
126+
}
127+
},
107128
{
108129
"command": "tcTerraform.init",
109130
"title": "Init",
@@ -178,6 +199,16 @@
178199
],
179200
"description": "Specifies terminal used to run Terraform commands. Valid settings are `cloudshell` or `integrated`."
180201
},
202+
"tcTerraform.properties.secretId": {
203+
"type": "string",
204+
"default": "your_secretid",
205+
"description": "Input your Tencent Cloud secret Id."
206+
},
207+
"tcTerraform.properties.secretKey": {
208+
"type": "string",
209+
"default": "your_secretkey",
210+
"description": "Input your Tencent Cloud secret key."
211+
},
181212
"tcTerraform.checkTerraformCmd": {
182213
"type": "boolean",
183214
"default": "true",
@@ -193,26 +224,6 @@
193224
"default": "true",
194225
"description": "Specifies whether or not TCCLI installed in the PATH."
195226
},
196-
"tcTerraform.secretid.cmd": {
197-
"type": "string",
198-
"default": "tccli configure list | grep 'secretId'",
199-
"description": "Indicates how to get the secretid."
200-
},
201-
"tcTerraform.secretkey.cmd": {
202-
"type": "string",
203-
"default": "tccli configure list | grep 'secretKey'",
204-
"description": "Indicates how to get the secretkey."
205-
},
206-
"tcTerraform.secretid": {
207-
"type": "string",
208-
"default": "your_secretid",
209-
"description": "Input your tencentcloud secret key id."
210-
},
211-
"tcTerraform.secretkey": {
212-
"type": "string",
213-
"default": "your_secretkey",
214-
"description": "Input your tencentcloud secret key."
215-
},
216227
"tcTerraform.test.path": {
217228
"type": "string",
218229
"default": "./",

package.nls.json

+23-12
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,24 @@
11
{
2-
"TcTerraform.title": "TencentCloud Terraofrm",
3-
"TcTerraform.view.session.explorer": "Connect to TencentCloud",
4-
"TcTerraform.view.template.explorer": "Tempaltes Management",
5-
"TcTerraform.view.resource.explorer": "Resources Explorer",
6-
"TcTerraform.view.resource.explorer.cvm": "Import Resouce: CVM",
7-
"TcTerraform.view.resource.explorer.tke": "Import Resouce: TKE",
8-
"TcTerraform.view.help.explorer": "Help",
9-
"TcTerraform.view.help.explorer.provider": "TencentCloud Terraform Provider",
10-
"TcTerraform.view.help.explorer.doc": "Documentation",
11-
"TcTerraform.view.help.explorer.repo": "GitHub Repository",
12-
"TcTerraform.productName": "TcTerraform Toolkit"
13-
}
2+
"TcTerraform.title": "Tencent Cloud Terraform",
3+
"TcTerraform.view.login": "Login Tencent Cloud",
4+
"TcTerraform.view.login.welcome": "Please login the Tencent Cloud. [Sign up](https://cloud.tencent.com/register) for a Tencent Cloud account if you do not have one.\n[Sign in Tencent Cloud](command:tcTerraform.login)",
5+
"TcTerraform.view.codesnippet": "Code Snippets and Examples",
6+
"TcTerraform.view.resource": "Resources Explorer",
7+
"TcTerraform.refresh": "Refresh",
8+
"TcTerraform.refresh.success": "Resources refreshed.",
9+
"TcTerraform.view.resource.cvm": "Resources: CVM",
10+
"TcTerraform.view.resource.tke": "Resources: TKE",
11+
"TcTerraform.view.help": "Help",
12+
"TcTerraform.view.help.provider": "Tencent Cloud Terraform Provider",
13+
"TcTerraform.view.help.doc": "Documentation",
14+
"TcTerraform.view.help.repo": "GitHub Repository",
15+
"TcTerraform.pickup.aksk": "Sign in with [Secret Id/Secret Key]",
16+
"TcTerraform.pickup.oauth": "Sign in with [Tencent Cloud authoritication] (Coming Soon...)",
17+
"TcTerraform.pickup.aksk.placeholder": "Please input your API {0}",
18+
"TcTerraform.pickup.aksk.verify.empty": "{0} can not be empty",
19+
"TcTerraform.welcome": "Welcome to use Tencent Cloud Terraform extension, please wait for the page loading...",
20+
"TcTerraform.msg.aksk.notfound": "Cannot find TENCENTCLOUD_SECRET_ID and TENCENTCLOUD_SECRET_KEY, please sign in first!",
21+
"TcTerraform.logout": "Logout Tencent Cloud ({0})",
22+
"TcTerraform.login": "Login Tencent Cloud...",
23+
"TcTerraform.login.success": "Logged into Tencent Cloud successfully."
24+
}

resources/dark/boolean.svg

+1
Loading

resources/dark/dependency.svg

+1
Loading

resources/dark/document.svg

+1
Loading

resources/dark/edit.svg

+1
Loading

resources/dark/folder.svg

+1
Loading

resources/dark/number.svg

+1
Loading

resources/dark/refresh.svg

+1
Loading

resources/dark/string.svg

+1
Loading

0 commit comments

Comments
 (0)