Update libs for arm and macos (#923)

* change working with libs on windows

* add logs

* fix path

* update libs

* bump version

* fix environment

* add log

* fix tests

.github/workflows/e2e.yml

@@ -40,11 +40,6 @@ jobs:
       - name: delete libraries for other platforms
         run: |
           find server/node_modules/@fivetrandevelopers/zetasql/lib/zetasql -maxdepth 1 -type f ! -name 'remote_server' -exec rm -f {} \;
-          rm server/remote_server_bigquery
-          rm server/remote_server_snowflake
-
-      - name: set variable for prepare_node_modules.sh script
-        run: echo darwin-x64 > target_os
 
       - name: package to vsix file
         run: npx @vscode/vsce package -o ${FILE_NAME} --target darwin-x64 --githubBranch main

.github/workflows/main.yml

@@ -19,16 +19,17 @@ jobs:
             target: darwin-arm64
             zetasql-lib: remote_server_arm
 
-          - os: ubuntu-20.04
+          - os: ubuntu-latest
             target: linux-x64
             zetasql-lib: remote_server.so
 
-          - os: ubuntu-20.04
+          - os: ubuntu-latest
             target: linux-arm64
             zetasql-lib: remote_server_arm.so
 
           - os: windows-latest
             target: win32-x64
+            zetasql-lib: remote_server.so
 
     runs-on: ${{ matrix.os }}
     defaults:
@@ -60,17 +61,6 @@ jobs:
           # TODO: uncomment when zetasql-snowflake is ready
           # find server/node_modules/@fivetrandevelopers/zetasql-snowflake/lib/snowflake -maxdepth 1 -type f ! -name '${{ matrix.zetasql-lib }}' -exec rm -f {} \;
           find server/node_modules/@fivetrandevelopers/zetasql-snowflake/lib/snowflake -maxdepth 1 -type f -exec rm -f {} \;
-          rm server/remote_server_snowflake
-
-      - name: delete executable for Ubuntu in WSL
-        if: matrix.os != 'windows-latest'
-        run: |
-          rm server/remote_server_bigquery
-          # TODO: uncomment when zetasql-snowflake is ready
-          # rm server/remote_server_snowflake
-
-      - name: set variable for prepare_node_modules.sh script
-        run: echo ${{ matrix.target }} > target_os
 
       - name: package to vsix file
         run: |
@@ -105,7 +95,7 @@ jobs:
             python-version: '3.10.7'
 
           - install-dbt: '${PYTHON_INSTALL_LOC} -m pip install dbt-bigquery dbt-snowflake dbt-postgres'
-            os: ubuntu-latest
+            os: ubuntu-20.04
             target: linux-x64
             prepare-for-tests: |
               Xvfb -ac :99 -screen 0 1280x1024x16 &
@@ -115,7 +105,7 @@ jobs:
             SKIP_TESTS: 'vscode_commands.spec.js'
 
           - install-dbt: '${PYTHON_INSTALL_LOC} -m pip install dbt-bigquery dbt-snowflake dbt-postgres'
-            os: ubuntu-20.04
+            os: ubuntu-latest
             target: linux-x64
             prepare-for-tests: |
               Xvfb -ac :99 -screen 0 1280x1024x16 &
@@ -190,6 +180,7 @@ jobs:
       - name: add custom python venv
         run: | # https://github.com/dbt-labs/dbt-core/issues/4745
           ${PYTHON_INSTALL_LOC} -m venv ~/dbt_1_2_2_env
+          ls ~/dbt_1_2_2_env
           ${{ matrix.activate-venv }}
           python -m pip install pytz dbt-core==1.2.2 dbt-bigquery==1.2.0
           python -m pip list | grep dbt

.vscodeignore

@@ -17,5 +17,3 @@
 !server/out/**/*.js.map
 !server/out/zetasql/**/*
 !server/out/snowflake/**/*
-
-!server/remote_server_*

package.json

@@ -3,7 +3,7 @@
   "displayName": "Wizard for dbt Core (TM)",
   "description": "This extension will help you work with dbt",
   "icon": "images/Icon.png",
-  "version": "0.25.0",
+  "version": "0.25.1",
   "publisher": "Fivetran",
   "license": "MIT",
   "preview": true,

prepare_node_modules.sh

@@ -2,4 +2,6 @@
 
 # Prepare protos and libs
 cp -R server/node_modules/@fivetrandevelopers/zetasql/lib/zetasql server/out/zetasql
+ls server/out/zetasql
 cp -R server/node_modules/@fivetrandevelopers/zetasql-snowflake/lib/snowflake server/out/snowflake
+ls server/out/snowflake

server/package.json

@@ -5,8 +5,8 @@
     "node": "*"
   },
   "dependencies": {
-    "@fivetrandevelopers/zetasql": "1.11.0-0",
-    "@fivetrandevelopers/zetasql-snowflake": "0.4.0-0",
+    "@fivetrandevelopers/zetasql": "^1.11.0",
+    "@fivetrandevelopers/zetasql-snowflake": "^0.4.0",
     "@google-cloud/bigquery": "^6.2.0",
     "async-retry": "^1.3.3",
     "axios": "^1.1.0",

server/src/ZetaSqlApi.ts

@@ -35,12 +35,11 @@ export class ZetaSqlApi {
     const port = await findFreePortPmfy(randomNumber(ZetaSqlApi.MIN_PORT, ZetaSqlApi.MAX_PORT));
     console.log(`Starting zetasql on port ${port}`);
     if (process.platform === 'win32') {
-      const fsPath = slash(path.normalize(`${__dirname}/../remote_server_${this.destination.toString()}`));
+      const subfolder = this.destination === 'bigquery' ? 'zetasql' : 'snowflake';
+      const fsPath = slash(path.normalize(`${__dirname}/${subfolder}/remote_server.so`));
       const wslPath = `/mnt/${fsPath.replace(':', '')}`;
       console.log(`Path in WSL: ${wslPath}`);
-      const stdHandler = (data: string): void => {
-        console.log(data);
-      };
+      const stdHandler = (data: string): void => console.log(data);
       new ProcessExecutor()
         .execProcess(`wsl -d ${FeatureFinder.getWslUbuntuName()} "${wslPath}" ${port}`, stdHandler, stdHandler)
         .catch(e => console.log(e));