Merge Development to main for release (#404)

Couchbase-Ecosystem · Jul 1, 2024 · 1966866 · 1966866
1 parent 36975d8
commit 1966866
Show file tree

Hide file tree

Showing 11 changed files with 2,405 additions and 18 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -54,7 +54,7 @@ jobs:
       - name: windows-specific
         shell: pwsh
         if: matrix.platform == 'win32'
-        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
+        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
       - name: mac-specific
         shell: bash
         if: matrix.platform == 'darwin'

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "vscode-couchbase",
   "displayName": "Couchbase",
   "description": "",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "engines": {
     "vscode": "^1.63.1"
   },
@@ -91,6 +91,8 @@
     "webpack-cli": "^5.1.4"
   },
   "dependencies": {
+    "@aws-sdk/client-dynamodb": "^3.602.0",
+    "@aws-sdk/credential-providers": "^3.600.0",
     "@chatscope/chat-ui-kit-styles": "^1.4.0",
     "@fortawesome/fontawesome-svg-core": "^6.5.1",
     "@fortawesome/free-solid-svg-icons": "^6.5.1",
@@ -569,6 +571,11 @@
         "title": "MongoDB Migrate",
         "category": "Couchbase"
       },
+      {
+        "command": "vscode-couchbase.tools.dynamodbMigrate",
+        "title": "DynamoDB Migrate",
+        "category": "Couchbase"
+      },
       {
         "command": "vscode-couchbase.tools.dataImport",
         "title": "Data Import",
@@ -898,6 +905,10 @@
           "command": "vscode-couchbase.tools.mdbMigrate",
           "when": "false"
         },
+        {
+          "command": "vscode-couchbase.tools.dynamodbMigrate",
+          "when": "false"
+        },
         {
           "command": "vscode-couchbase.tools.dataImport",
           "when": "false"
@@ -1078,19 +1089,23 @@
       "vscode-couchbase.toolsMenu": [
         {
           "command": "vscode-couchbase.tools.dataExport",
-          "group": "navigation"
+          "group": "secondary"
         },
         {
           "command": "vscode-couchbase.tools.mdbMigrate",
-          "group": "navigation"
+          "group": "tertiary"
+        },
+        {
+          "command": "vscode-couchbase.tools.dynamodbMigrate",
+          "group": "tertiary"
         },
         {
           "command": "vscode-couchbase.tools.dataImport",
-          "group": "navigation"
+          "group": "secondary"
         },
         {
           "command": "vscode-couchbase.tools.DDLExport",
-          "group": "navigation"
+          "group": "secondary"
         }
       ],
       "vscode-couchbase.filterDocumentsMenu": [
@@ -1185,4 +1200,4 @@
       }
     ]
   }
-}
+}
diff --git a/src/commands/extensionCommands/commands.ts b/src/commands/extensionCommands/commands.ts
@@ -61,6 +61,7 @@ export namespace Commands {
     export const checkAndCreatePrimaryIndex: string = "vscode-couchbase.checkAndCreatePrimaryIndex";
     export const dataExport: string = "vscode-couchbase.tools.dataExport";
     export const mdbMigrate: string = "vscode-couchbase.tools.mdbMigrate";
+    export const dynamodbMigrate: string = "vscode-couchbase.tools.dynamodbMigrate";
     export const dataImport: string = "vscode-couchbase.tools.dataImport";
     export const ddlExport: string = "vscode-couchbase.tools.DDLExport";
     export const couchbaseIqViewsCommand: string = "couchbase-iq";

diff --git a/src/extension.ts b/src/extension.ts
@@ -77,6 +77,7 @@ import { SecretService } from "./util/secretService";
 import { kvTypeFilterDocuments } from "./commands/documents/documentFilters/kvTypeFilterDocuments";
 import { fetchNamedParameters } from "./pages/namedParameters/namedParameters";
 import { sqlppComlpletions, sqlppNamedParametersCompletions, sqlppSchemaComlpletions } from "./commands/sqlpp/sqlppCompletions";
+import { dynamodbMigrate } from "./pages/Tools/DynamoDbMigrate/dynamoDbMigrate";
 
 export function activate(context: vscode.ExtensionContext) {
   Global.setState(context.globalState);
@@ -586,6 +587,15 @@ export function activate(context: vscode.ExtensionContext) {
     )
   );
 
+  subscriptions.push(
+    vscode.commands.registerCommand(
+      Commands.dynamodbMigrate,
+      async () => {
+        await dynamodbMigrate(context);
+      }
+    )
+  );
+
   subscriptions.push(
     vscode.commands.registerCommand(
       Commands.dataImport,

diff --git a/src/handlers/handleCLIDownloader.ts b/src/handlers/handleCLIDownloader.ts
@@ -108,7 +108,7 @@ class DependenciesDownloader {
             map.set(
                 this.TOOL_MDB_MIGRATE,
                 this.getToolSpec(
-                    "https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.0.1-beta_darwin_amd64.zip",
+                    "https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.1.0_darwin_amd64.zip",
                     this.TOOL_MDB_MIGRATE,
                     OSUtil.MACOS_64
                 )
@@ -141,7 +141,7 @@ class DependenciesDownloader {
             map.set(
                 this.TOOL_MDB_MIGRATE,
                 this.getToolSpec(
-                    "https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.0.1-beta_darwin_arm64.zip",
+                    "https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.1.0_darwin_arm64.zip",
                     this.TOOL_MDB_MIGRATE,
                     OSUtil.MACOS_ARM
                 )
@@ -174,7 +174,7 @@ class DependenciesDownloader {
             map.set(
                 this.TOOL_MDB_MIGRATE,
                 this.getToolSpec(
-                    "https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.0.1-beta_windows_amd64.zip",
+                    "https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.1.0_windows_amd64.zip",
                     this.TOOL_MDB_MIGRATE,
                     OSUtil.WINDOWS_64
                 )
@@ -207,7 +207,7 @@ class DependenciesDownloader {
             map.set(
                 this.TOOL_MDB_MIGRATE,
                 this.getToolSpec(
-                    "https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.0.1-beta_windows_amd64.zip",
+                    "https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.1.0_windows_amd64.zip",
                     this.TOOL_MDB_MIGRATE,
                     OSUtil.WINDOWS_ARM
                 )
@@ -240,7 +240,7 @@ class DependenciesDownloader {
             map.set(
                 this.TOOL_MDB_MIGRATE,
                 this.getToolSpec(
-                    "https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.0.1-beta_linux_amd64.zip",
+                    "https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.1.0_linux_amd64.zip",
                     this.TOOL_MDB_MIGRATE,
                     OSUtil.LINUX_64
                 )
@@ -265,7 +265,7 @@ class DependenciesDownloader {
             map.set(
                 this.TOOL_MDB_MIGRATE,
                 this.getToolSpec(
-                    "https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.0.1-beta_linux_arm64.zip",
+                    "https://intellij-plugin-dependencies.s3.us-east-2.amazonaws.com/cbmigrate/cbmigrate_0.1.0_linux_arm64.zip",
                     this.TOOL_MDB_MIGRATE,
                     OSUtil.LINUX_ARM
                 )

diff --git a/src/handlers/versionConfig.ts b/src/handlers/versionConfig.ts
@@ -5,7 +5,7 @@ export const config = {
     SHELL_KEY: "shell",
     CBIMPORT_EXPORT_KEY: "cbimport_export",
     TOOLS_VERSION: "7.2",
-    CBMIGRATE_VERSION: "1",
+    CBMIGRATE_VERSION: "2",
     SHELL_VERSION: "1",
     CBIMPORT_EXPORT_VERSION: "7.6",
 };