diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 4d48da86..190c269c 100644 --- a/.github/workflows/e2e.yml +++ b/.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 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bad5ecef..15abed31 100644 --- a/.github/workflows/main.yml +++ b/.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 diff --git a/.vscodeignore b/.vscodeignore index da5b578f..8aa712b8 100644 --- a/.vscodeignore +++ b/.vscodeignore @@ -17,5 +17,3 @@ !server/out/**/*.js.map !server/out/zetasql/**/* !server/out/snowflake/**/* - -!server/remote_server_* diff --git a/package-lock.json b/package-lock.json index 1d219ec7..7cc4731f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "dbt-language-server", - "version": "0.25.0", + "version": "0.25.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "dbt-language-server", - "version": "0.25.0", + "version": "0.25.1", "hasInstallScript": true, "license": "MIT", "devDependencies": { diff --git a/package.json b/package.json index af5a70bc..924d9f3b 100644 --- a/package.json +++ b/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, diff --git a/prepare_node_modules.sh b/prepare_node_modules.sh index d6fa8d19..1a1259de 100755 --- a/prepare_node_modules.sh +++ b/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 diff --git a/server/package-lock.json b/server/package-lock.json index 8eec2380..54aeca18 100644 --- a/server/package-lock.json +++ b/server/package-lock.json @@ -8,8 +8,8 @@ "name": "dbt-language-server", "version": "0.0.1", "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", @@ -43,6 +43,10 @@ "node": "*" } }, + "../common": { + "version": "0.0.1", + "license": "MIT" + }, "node_modules/@azure/abort-controller": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@azure/abort-controller/-/abort-controller-1.1.0.tgz", @@ -199,18 +203,18 @@ } }, "node_modules/@fivetrandevelopers/zetasql": { - "version": "1.11.0-0", - "resolved": "https://registry.npmjs.org/@fivetrandevelopers/zetasql/-/zetasql-1.11.0-0.tgz", - "integrity": "sha512-A/kuTz5V+uMy6l/4aHzZNJrXkaEP3hFioV17HT9gfC2XfLL8li47v+ipq2+eQ3aZMba9aGIhBiJA3i4uBaM5OA==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/@fivetrandevelopers/zetasql/-/zetasql-1.11.0.tgz", + "integrity": "sha512-xtiWRgo4Rvu/7VsNUMpd3PFQkxXfAW+u3iHsYMW1kI5lyB4+KLshBSsLUnLINzLZCp6VMpijgJMllSRmTYQ2/g==", "dependencies": { "@grpc/grpc-js": "^1.8.13", "@grpc/proto-loader": "0.7.6" } }, "node_modules/@fivetrandevelopers/zetasql-snowflake": { - "version": "0.4.0-0", - "resolved": "https://registry.npmjs.org/@fivetrandevelopers/zetasql-snowflake/-/zetasql-snowflake-0.4.0-0.tgz", - "integrity": "sha512-AtYmCd3QjH0JewJPHrNN37JYcwr/HE4YSG4jask0vn1O6e5Zumq3DlR1wxzDtszqhDh72mSxt80gv2yZZGvRsg==", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@fivetrandevelopers/zetasql-snowflake/-/zetasql-snowflake-0.4.0.tgz", + "integrity": "sha512-hc5WH6ONWebqTaZLtasKbddD7IoMCr3Lijb6O1XiWQ0grcc0ENWnmgSQgO3d7KSYq4Wq0C3Z7rMTwrPDSa6HHQ==", "dependencies": { "@grpc/grpc-js": "^1.8.13", "@grpc/proto-loader": "0.7.6" @@ -1082,9 +1086,8 @@ } }, "node_modules/dbt-language-server-common": { - "version": "0.0.1", - "resolved": "file:../common", - "license": "MIT" + "resolved": "../common", + "link": true }, "node_modules/debug": { "version": "4.3.2", @@ -3891,18 +3894,18 @@ } }, "@fivetrandevelopers/zetasql": { - "version": "1.11.0-0", - "resolved": "https://registry.npmjs.org/@fivetrandevelopers/zetasql/-/zetasql-1.11.0-0.tgz", - "integrity": "sha512-A/kuTz5V+uMy6l/4aHzZNJrXkaEP3hFioV17HT9gfC2XfLL8li47v+ipq2+eQ3aZMba9aGIhBiJA3i4uBaM5OA==", + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/@fivetrandevelopers/zetasql/-/zetasql-1.11.0.tgz", + "integrity": "sha512-xtiWRgo4Rvu/7VsNUMpd3PFQkxXfAW+u3iHsYMW1kI5lyB4+KLshBSsLUnLINzLZCp6VMpijgJMllSRmTYQ2/g==", "requires": { "@grpc/grpc-js": "^1.8.13", "@grpc/proto-loader": "0.7.6" } }, "@fivetrandevelopers/zetasql-snowflake": { - "version": "0.4.0-0", - "resolved": "https://registry.npmjs.org/@fivetrandevelopers/zetasql-snowflake/-/zetasql-snowflake-0.4.0-0.tgz", - "integrity": "sha512-AtYmCd3QjH0JewJPHrNN37JYcwr/HE4YSG4jask0vn1O6e5Zumq3DlR1wxzDtszqhDh72mSxt80gv2yZZGvRsg==", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/@fivetrandevelopers/zetasql-snowflake/-/zetasql-snowflake-0.4.0.tgz", + "integrity": "sha512-hc5WH6ONWebqTaZLtasKbddD7IoMCr3Lijb6O1XiWQ0grcc0ENWnmgSQgO3d7KSYq4Wq0C3Z7rMTwrPDSa6HHQ==", "requires": { "@grpc/grpc-js": "^1.8.13", "@grpc/proto-loader": "0.7.6" @@ -4617,7 +4620,7 @@ "integrity": "sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og==" }, "dbt-language-server-common": { - "version": "0.0.1" + "version": "file:../common" }, "debug": { "version": "4.3.2", diff --git a/server/package.json b/server/package.json index a7e1ef13..c9648527 100644 --- a/server/package.json +++ b/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", diff --git a/server/remote_server_bigquery b/server/remote_server_bigquery deleted file mode 100644 index e4e4536f..00000000 Binary files a/server/remote_server_bigquery and /dev/null differ diff --git a/server/remote_server_snowflake b/server/remote_server_snowflake deleted file mode 100755 index 4001f1bc..00000000 Binary files a/server/remote_server_snowflake and /dev/null differ diff --git a/server/src/ZetaSqlApi.ts b/server/src/ZetaSqlApi.ts index d81a9957..28304a43 100644 --- a/server/src/ZetaSqlApi.ts +++ b/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));