Skip to content

Commit 1966866

Browse files
Merge Development to main for release (#404)
1 parent 36975d8 commit 1966866

11 files changed

Lines changed: 2405 additions & 18 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
- name: windows-specific
5555
shell: pwsh
5656
if: matrix.platform == 'win32'
57-
run: choco install openssl.light --version=1.1.1 && choco install cmake --global && npm install --global cmake-js node-gyp && echo CMAKE_JS_LIB - $CMAKE_JS_LIB
57+
run: choco install openssl.light --version=1.1.1 && choco install cmake --global && npm install --global cmake-js node-gyp && echo CMAKE_JS_LIB - $CMAKE_JS_LIB
5858
- name: mac-specific
5959
shell: bash
6060
if: matrix.platform == 'darwin'

package-lock.json

Lines changed: 1315 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "vscode-couchbase",
33
"displayName": "Couchbase",
44
"description": "",
5-
"version": "2.0.4",
5+
"version": "2.0.5",
66
"engines": {
77
"vscode": "^1.63.1"
88
},
@@ -91,6 +91,8 @@
9191
"webpack-cli": "^5.1.4"
9292
},
9393
"dependencies": {
94+
"@aws-sdk/client-dynamodb": "^3.602.0",
95+
"@aws-sdk/credential-providers": "^3.600.0",
9496
"@chatscope/chat-ui-kit-styles": "^1.4.0",
9597
"@fortawesome/fontawesome-svg-core": "^6.5.1",
9698
"@fortawesome/free-solid-svg-icons": "^6.5.1",
@@ -569,6 +571,11 @@
569571
"title": "MongoDB Migrate",
570572
"category": "Couchbase"
571573
},
574+
{
575+
"command": "vscode-couchbase.tools.dynamodbMigrate",
576+
"title": "DynamoDB Migrate",
577+
"category": "Couchbase"
578+
},
572579
{
573580
"command": "vscode-couchbase.tools.dataImport",
574581
"title": "Data Import",
@@ -898,6 +905,10 @@
898905
"command": "vscode-couchbase.tools.mdbMigrate",
899906
"when": "false"
900907
},
908+
{
909+
"command": "vscode-couchbase.tools.dynamodbMigrate",
910+
"when": "false"
911+
},
901912
{
902913
"command": "vscode-couchbase.tools.dataImport",
903914
"when": "false"
@@ -1078,19 +1089,23 @@
10781089
"vscode-couchbase.toolsMenu": [
10791090
{
10801091
"command": "vscode-couchbase.tools.dataExport",
1081-
"group": "navigation"
1092+
"group": "secondary"
10821093
},
10831094
{
10841095
"command": "vscode-couchbase.tools.mdbMigrate",
1085-
"group": "navigation"
1096+
"group": "tertiary"
1097+
},
1098+
{
1099+
"command": "vscode-couchbase.tools.dynamodbMigrate",
1100+
"group": "tertiary"
10861101
},
10871102
{
10881103
"command": "vscode-couchbase.tools.dataImport",
1089-
"group": "navigation"
1104+
"group": "secondary"
10901105
},
10911106
{
10921107
"command": "vscode-couchbase.tools.DDLExport",
1093-
"group": "navigation"
1108+
"group": "secondary"
10941109
}
10951110
],
10961111
"vscode-couchbase.filterDocumentsMenu": [
@@ -1185,4 +1200,4 @@
11851200
}
11861201
]
11871202
}
1188-
}
1203+
}

src/commands/extensionCommands/commands.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ export namespace Commands {
6161
export const checkAndCreatePrimaryIndex: string = "vscode-couchbase.checkAndCreatePrimaryIndex";
6262
export const dataExport: string = "vscode-couchbase.tools.dataExport";
6363
export const mdbMigrate: string = "vscode-couchbase.tools.mdbMigrate";
64+
export const dynamodbMigrate: string = "vscode-couchbase.tools.dynamodbMigrate";
6465
export const dataImport: string = "vscode-couchbase.tools.dataImport";
6566
export const ddlExport: string = "vscode-couchbase.tools.DDLExport";
6667
export const couchbaseIqViewsCommand: string = "couchbase-iq";

src/extension.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ import { SecretService } from "./util/secretService";
7777
import { kvTypeFilterDocuments } from "./commands/documents/documentFilters/kvTypeFilterDocuments";
7878
import { fetchNamedParameters } from "./pages/namedParameters/namedParameters";
7979
import { sqlppComlpletions, sqlppNamedParametersCompletions, sqlppSchemaComlpletions } from "./commands/sqlpp/sqlppCompletions";
80+
import { dynamodbMigrate } from "./pages/Tools/DynamoDbMigrate/dynamoDbMigrate";
8081

8182
export function activate(context: vscode.ExtensionContext) {
8283
Global.setState(context.globalState);
@@ -586,6 +587,15 @@ export function activate(context: vscode.ExtensionContext) {
586587
)
587588
);
588589

590+
subscriptions.push(
591+
vscode.commands.registerCommand(
592+
Commands.dynamodbMigrate,
593+
async () => {
594+
await dynamodbMigrate(context);
595+
}
596+
)
597+
);
598+
589599
subscriptions.push(
590600
vscode.commands.registerCommand(
591601
Commands.dataImport,

src/handlers/handleCLIDownloader.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ class DependenciesDownloader {
108108
map.set(
109109
this.TOOL_MDB_MIGRATE,
110110
this.getToolSpec(
111-
"https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.0.1-beta_darwin_amd64.zip",
111+
"https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.1.0_darwin_amd64.zip",
112112
this.TOOL_MDB_MIGRATE,
113113
OSUtil.MACOS_64
114114
)
@@ -141,7 +141,7 @@ class DependenciesDownloader {
141141
map.set(
142142
this.TOOL_MDB_MIGRATE,
143143
this.getToolSpec(
144-
"https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.0.1-beta_darwin_arm64.zip",
144+
"https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.1.0_darwin_arm64.zip",
145145
this.TOOL_MDB_MIGRATE,
146146
OSUtil.MACOS_ARM
147147
)
@@ -174,7 +174,7 @@ class DependenciesDownloader {
174174
map.set(
175175
this.TOOL_MDB_MIGRATE,
176176
this.getToolSpec(
177-
"https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.0.1-beta_windows_amd64.zip",
177+
"https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.1.0_windows_amd64.zip",
178178
this.TOOL_MDB_MIGRATE,
179179
OSUtil.WINDOWS_64
180180
)
@@ -207,7 +207,7 @@ class DependenciesDownloader {
207207
map.set(
208208
this.TOOL_MDB_MIGRATE,
209209
this.getToolSpec(
210-
"https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.0.1-beta_windows_amd64.zip",
210+
"https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.1.0_windows_amd64.zip",
211211
this.TOOL_MDB_MIGRATE,
212212
OSUtil.WINDOWS_ARM
213213
)
@@ -240,7 +240,7 @@ class DependenciesDownloader {
240240
map.set(
241241
this.TOOL_MDB_MIGRATE,
242242
this.getToolSpec(
243-
"https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.0.1-beta_linux_amd64.zip",
243+
"https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.1.0_linux_amd64.zip",
244244
this.TOOL_MDB_MIGRATE,
245245
OSUtil.LINUX_64
246246
)
@@ -265,7 +265,7 @@ class DependenciesDownloader {
265265
map.set(
266266
this.TOOL_MDB_MIGRATE,
267267
this.getToolSpec(
268-
"https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.0.1-beta_linux_arm64.zip",
268+
"https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.1.0_linux_arm64.zip",
269269
this.TOOL_MDB_MIGRATE,
270270
OSUtil.LINUX_ARM
271271
)

src/handlers/versionConfig.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ export const config = {
55
SHELL_KEY: "shell",
66
CBIMPORT_EXPORT_KEY: "cbimport_export",
77
TOOLS_VERSION: "7.2",
8-
CBMIGRATE_VERSION: "1",
8+
CBMIGRATE_VERSION: "2",
99
SHELL_VERSION: "1",
1010
CBIMPORT_EXPORT_VERSION: "7.6",
1111
};

0 commit comments

Comments
 (0)