Skip to content

Commit 3c578aa

Browse files
kartikgupta-dbilia-dbgithub-actions[bot]web-floweng-dev-ecosystem-bot
authored
Merge branch 'main' of github.com:databricks/databricks-vscode into bundle-integ (#991)
## Changes <!-- Summary of your changes that are easy to understand --> ## Tests <!-- How is this tested? --> --------- Co-authored-by: Ilia Babanov <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: releasebot <[email protected]> Co-authored-by: eng-dev-ecosystem-bot <[email protected]> Co-authored-by: eng-dev-ecosystem-bot <[email protected]> Co-authored-by: Serge Smertin <[email protected]>
1 parent 6b2caca commit 3c578aa

30 files changed

+676
-597
lines changed

‎.github/workflows/tests.yml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,12 @@ jobs:
7676
run: yarn run test:cov
7777
working-directory: packages/databricks-vscode
7878

79-
- name: Integration Tests
80-
run: yarn run test:integ
79+
# - name: Integration Tests
80+
# run: yarn run test:integ
81+
# working-directory: packages/databricks-vscode
82+
83+
- name: Integration Tests SDK wrappers
84+
run: yarn run test:integ:sdk
8185
working-directory: packages/databricks-vscode
8286

8387
- name: Upload test logs

‎.github/workflows/update-cli-version.yml‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: update-cli-version
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
version:
7+
type: string
8+
required: true
9+
10+
jobs:
11+
update-cli-version:
12+
runs-on: ubuntu-latest
13+
14+
strategy:
15+
matrix:
16+
node-version: [18.x]
17+
18+
steps:
19+
- uses: actions/checkout@v3
20+
with:
21+
fetch-depth: 0
22+
23+
- name: Install JQ
24+
run: sudo apt-get install jq
25+
26+
- name: Update CLI version
27+
run: jq '.cli.version = "${{ github.event.inputs.version }}"' packages/databricks-vscode/package.json --indent 4 > tmp.json && mv tmp.json packages/databricks-vscode/package.json
28+
29+
- name: Create a pull request
30+
uses: peter-evans/create-pull-request@v5
31+
with:
32+
token: ${{ secrets.DECO_GITHUB_TOKEN }}
33+
commit-message: Update Databricks CLI to v${{ github.event.inputs.version }}
34+
body: Update Databricks CLI to v${{ github.event.inputs.version }}
35+
committer: GitHub <[email protected]>
36+
branch: update-cli-v${{ github.event.inputs.version }}
37+
title: 'Update Databricks CLI to v${{ github.event.inputs.version }}'
38+
draft: false

‎LICENSE‎

Lines changed: 59 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,69 @@
1-
DB license
1+
Databricks License
2+
Copyright (2022) Databricks, Inc.
23

3-
Copyright (2022) Databricks, Inc.
4+
Definitions.
45

5-
Definitions.
6+
Agreement: The agreement between Databricks, Inc., and you governing
7+
the use of the Databricks Services, as that term is defined in
8+
the Master Cloud Services Agreement (MCSA) located at
9+
www.databricks.com/legal/mcsa.
610

7-
Agreement: The agreement between Databricks, Inc., and you governing the use of the Databricks Services, which shall be, with respect to Databricks, the Databricks Terms of Service located at www.databricks.com/termsofservice, and with respect to Databricks Community Edition, the Community Edition Terms of Service located at www.databricks.com/ce-termsofuse, in each case unless you have entered into a separate written agreement with Databricks governing the use of the applicable Databricks Services.
11+
Licensed Materials: The source code, object code, data, and/or other
12+
works to which this license applies.
813

9-
Software: The source code and object code to which this license applies.
14+
Scope of Use. You may not use the Licensed Materials except in
15+
connection with your use of the Databricks Services pursuant to
16+
the Agreement. Your use of the Licensed Materials must comply at all
17+
times with any restrictions applicable to the Databricks Services,
18+
generally, and must be used in accordance with any applicable
19+
documentation. You may view, use, copy, modify, publish, and/or
20+
distribute the Licensed Materials solely for the purposes of using
21+
the Licensed Materials within or connecting to the Databricks Services.
22+
If you do not agree to these terms, you may not view, use, copy,
23+
modify, publish, and/or distribute the Licensed Materials.
1024

11-
Scope of Use. You may not use this Software except in connection with your use of the Databricks Services pursuant to the Agreement. Your use of the Software must comply at all times with any restrictions applicable to the Databricks Services, generally, and must be used in accordance with any applicable documentation. You may view, use, copy, modify, publish, and/or distribute the Software solely for the purposes of using the code within or connecting to the Databricks Services. If you do not agree to these terms, you may not view, use, copy, modify, publish, and/or distribute the Software.
25+
Redistribution. You may redistribute and sublicense the Licensed
26+
Materials so long as all use is in compliance with these terms.
27+
In addition:
1228

13-
Redistribution. You may redistribute and sublicense the Software so long as all use is in compliance with these terms. In addition:
29+
- You must give any other recipients a copy of this License;
30+
- You must cause any modified files to carry prominent notices
31+
stating that you changed the files;
32+
- You must retain, in any derivative works that you distribute,
33+
all copyright, patent, trademark, and attribution notices,
34+
excluding those notices that do not pertain to any part of
35+
the derivative works; and
36+
- If a "NOTICE" text file is provided as part of its
37+
distribution, then any derivative works that you distribute
38+
must include a readable copy of the attribution notices
39+
contained within such NOTICE file, excluding those notices
40+
that do not pertain to any part of the derivative works.
1441

15-
You must give any other recipients a copy of this License;
16-
You must cause any modified files to carry prominent notices stating that you changed the files;
17-
You must retain, in the source code form of any derivative works that you distribute, all copyright, patent, trademark, and attribution notices from the source code form, excluding those notices that do not pertain to any part of the derivative works; and
18-
If the source code form includes a "NOTICE" text file as part of its distribution, then any derivative works that you distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the derivative works.
19-
You may add your own copyright statement to your modifications and may provide additional license terms and conditions for use, reproduction, or distribution of your modifications, or for any such derivative works as a whole, provided your use, reproduction, and distribution of the Software otherwise complies with the conditions stated in this License.
42+
You may add your own copyright statement to your modifications and may
43+
provide additional license terms and conditions for use, reproduction,
44+
or distribution of your modifications, or for any such derivative works
45+
as a whole, provided your use, reproduction, and distribution of
46+
the Licensed Materials otherwise complies with the conditions stated
47+
in this License.
2048

21-
Termination. This license terminates automatically upon your breach of these terms or upon the termination of your Agreement. Additionally, Databricks may terminate this license at any time on notice. Upon termination, you must permanently delete the Software and all copies thereof.
49+
Termination. This license terminates automatically upon your breach of
50+
these terms or upon the termination of your Agreement. Additionally,
51+
Databricks may terminate this license at any time on notice. Upon
52+
termination, you must permanently delete the Licensed Materials and
53+
all copies thereof.
2254

23-
DISCLAIMER; LIMITATION OF LIABILITY.
55+
DISCLAIMER; LIMITATION OF LIABILITY.
2456

25-
THE SOFTWARE IS PROVIDED “AS-IS” AND WITH ALL FAULTS. DATABRICKS, ON BEHALF OF ITSELF AND ITS LICENSORS, SPECIFICALLY DISCLAIMS ALL WARRANTIES RELATING TO THE SOURCE CODE, EXPRESS AND IMPLIED, INCLUDING, WITHOUT LIMITATION, IMPLIED WARRANTIES, CONDITIONS AND OTHER TERMS OF MERCHANTABILITY, SATISFACTORY QUALITY OR FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. DATABRICKS AND ITS LICENSORS TOTAL AGGREGATE LIABILITY RELATING TO OR ARISING OUT OF YOUR USE OF OR DATABRICKS’ PROVISIONING OF THE SOURCE CODE SHALL BE LIMITED TO ONE THOUSAND ($1,000) DOLLARS. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
57+
THE LICENSED MATERIALS ARE PROVIDED “AS-IS” AND WITH ALL FAULTS.
58+
DATABRICKS, ON BEHALF OF ITSELF AND ITS LICENSORS, SPECIFICALLY
59+
DISCLAIMS ALL WARRANTIES RELATING TO THE LICENSED MATERIALS, EXPRESS
60+
AND IMPLIED, INCLUDING, WITHOUT LIMITATION, IMPLIED WARRANTIES,
61+
CONDITIONS AND OTHER TERMS OF MERCHANTABILITY, SATISFACTORY QUALITY OR
62+
FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. DATABRICKS AND
63+
ITS LICENSORS TOTAL AGGREGATE LIABILITY RELATING TO OR ARISING OUT OF
64+
YOUR USE OF OR DATABRICKS’ PROVISIONING OF THE LICENSED MATERIALS SHALL
65+
BE LIMITED TO ONE THOUSAND ($1,000) DOLLARS. IN NO EVENT SHALL
66+
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
67+
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
68+
ARISING FROM, OUT OF OR IN CONNECTION WITH THE LICENSED MATERIALS OR
69+
THE USE OR OTHER DEALINGS IN THE LICENSED MATERIALS.

‎README.md‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ Currently, we have the following packages:
1515
The VSCode extension for Databricks published to the VSCode marketplace.
1616
- [databricks-vscode-types](https://github.com/databricks/databricks-vscode/tree/main/packages/databricks-vscode-types)
1717
Type definition of the public API of the VSCode extension.
18-
- [databricks-sdk-js](https://github.com/databricks/databricks-vscode/tree/main/packages/databricks-sdk-js)
19-
JavaScript and TypeScript SDK for the Databricks REST API.
2018

2119
### Getting Started
2220

@@ -27,6 +25,20 @@ npm install -g yarn@2
2725
yarn install
2826
```
2927

28+
Prepare Databricks JavaScript SDK:
29+
30+
```
31+
yarn run install:sdk
32+
```
33+
34+
Prepare Databricks CLI:
35+
36+
```
37+
yarn workspace databricks run package:cli:fetch
38+
```
39+
40+
After that you are ready to build and test the `databricks-vscode` extension.
41+
3042
### Found an issue?
3143

3244
If you find an issue/bug or have a feature request, please file an issue here: https://github.com/databricks/databricks-vscode/issues/new

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@databricks/databricks-vscode",
3-
"version": "1.2.2",
3+
"version": "1.2.4",
44
"private": true,
55
"workspaces": [
66
"packages/*"

‎packages/databricks-vscode-types/CHANGELOG.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
# Release: v1.2.4
2+
3+
## packages/databricks-vscode-types
4+
5+
## <small>1.2.4 (2023-12-05)</small>
6+
7+
# Release: v1.2.3
8+
9+
## packages/databricks-vscode-types
10+
11+
## <small>1.2.3 (2023-11-06)</small>
12+
113
# Release: v1.2.2
214

315
## packages/databricks-vscode-types

‎packages/databricks-vscode-types/LICENSE‎

Lines changed: 59 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,69 @@
1-
DB license
1+
Databricks License
2+
Copyright (2022) Databricks, Inc.
23

3-
Copyright (2022) Databricks, Inc.
4+
Definitions.
45

5-
Definitions.
6+
Agreement: The agreement between Databricks, Inc., and you governing
7+
the use of the Databricks Services, as that term is defined in
8+
the Master Cloud Services Agreement (MCSA) located at
9+
www.databricks.com/legal/mcsa.
610

7-
Agreement: The agreement between Databricks, Inc., and you governing the use of the Databricks Services, which shall be, with respect to Databricks, the Databricks Terms of Service located at www.databricks.com/termsofservice, and with respect to Databricks Community Edition, the Community Edition Terms of Service located at www.databricks.com/ce-termsofuse, in each case unless you have entered into a separate written agreement with Databricks governing the use of the applicable Databricks Services.
11+
Licensed Materials: The source code, object code, data, and/or other
12+
works to which this license applies.
813

9-
Software: The source code and object code to which this license applies.
14+
Scope of Use. You may not use the Licensed Materials except in
15+
connection with your use of the Databricks Services pursuant to
16+
the Agreement. Your use of the Licensed Materials must comply at all
17+
times with any restrictions applicable to the Databricks Services,
18+
generally, and must be used in accordance with any applicable
19+
documentation. You may view, use, copy, modify, publish, and/or
20+
distribute the Licensed Materials solely for the purposes of using
21+
the Licensed Materials within or connecting to the Databricks Services.
22+
If you do not agree to these terms, you may not view, use, copy,
23+
modify, publish, and/or distribute the Licensed Materials.
1024

11-
Scope of Use. You may not use this Software except in connection with your use of the Databricks Services pursuant to the Agreement. Your use of the Software must comply at all times with any restrictions applicable to the Databricks Services, generally, and must be used in accordance with any applicable documentation. You may view, use, copy, modify, publish, and/or distribute the Software solely for the purposes of using the code within or connecting to the Databricks Services. If you do not agree to these terms, you may not view, use, copy, modify, publish, and/or distribute the Software.
25+
Redistribution. You may redistribute and sublicense the Licensed
26+
Materials so long as all use is in compliance with these terms.
27+
In addition:
1228

13-
Redistribution. You may redistribute and sublicense the Software so long as all use is in compliance with these terms. In addition:
29+
- You must give any other recipients a copy of this License;
30+
- You must cause any modified files to carry prominent notices
31+
stating that you changed the files;
32+
- You must retain, in any derivative works that you distribute,
33+
all copyright, patent, trademark, and attribution notices,
34+
excluding those notices that do not pertain to any part of
35+
the derivative works; and
36+
- If a "NOTICE" text file is provided as part of its
37+
distribution, then any derivative works that you distribute
38+
must include a readable copy of the attribution notices
39+
contained within such NOTICE file, excluding those notices
40+
that do not pertain to any part of the derivative works.
1441

15-
You must give any other recipients a copy of this License;
16-
You must cause any modified files to carry prominent notices stating that you changed the files;
17-
You must retain, in the source code form of any derivative works that you distribute, all copyright, patent, trademark, and attribution notices from the source code form, excluding those notices that do not pertain to any part of the derivative works; and
18-
If the source code form includes a "NOTICE" text file as part of its distribution, then any derivative works that you distribute must include a readable copy of the attribution notices contained within such NOTICE file, excluding those notices that do not pertain to any part of the derivative works.
19-
You may add your own copyright statement to your modifications and may provide additional license terms and conditions for use, reproduction, or distribution of your modifications, or for any such derivative works as a whole, provided your use, reproduction, and distribution of the Software otherwise complies with the conditions stated in this License.
42+
You may add your own copyright statement to your modifications and may
43+
provide additional license terms and conditions for use, reproduction,
44+
or distribution of your modifications, or for any such derivative works
45+
as a whole, provided your use, reproduction, and distribution of
46+
the Licensed Materials otherwise complies with the conditions stated
47+
in this License.
2048

21-
Termination. This license terminates automatically upon your breach of these terms or upon the termination of your Agreement. Additionally, Databricks may terminate this license at any time on notice. Upon termination, you must permanently delete the Software and all copies thereof.
49+
Termination. This license terminates automatically upon your breach of
50+
these terms or upon the termination of your Agreement. Additionally,
51+
Databricks may terminate this license at any time on notice. Upon
52+
termination, you must permanently delete the Licensed Materials and
53+
all copies thereof.
2254

23-
DISCLAIMER; LIMITATION OF LIABILITY.
55+
DISCLAIMER; LIMITATION OF LIABILITY.
2456

25-
THE SOFTWARE IS PROVIDED “AS-IS” AND WITH ALL FAULTS. DATABRICKS, ON BEHALF OF ITSELF AND ITS LICENSORS, SPECIFICALLY DISCLAIMS ALL WARRANTIES RELATING TO THE SOURCE CODE, EXPRESS AND IMPLIED, INCLUDING, WITHOUT LIMITATION, IMPLIED WARRANTIES, CONDITIONS AND OTHER TERMS OF MERCHANTABILITY, SATISFACTORY QUALITY OR FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. DATABRICKS AND ITS LICENSORS TOTAL AGGREGATE LIABILITY RELATING TO OR ARISING OUT OF YOUR USE OF OR DATABRICKS’ PROVISIONING OF THE SOURCE CODE SHALL BE LIMITED TO ONE THOUSAND ($1,000) DOLLARS. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
57+
THE LICENSED MATERIALS ARE PROVIDED “AS-IS” AND WITH ALL FAULTS.
58+
DATABRICKS, ON BEHALF OF ITSELF AND ITS LICENSORS, SPECIFICALLY
59+
DISCLAIMS ALL WARRANTIES RELATING TO THE LICENSED MATERIALS, EXPRESS
60+
AND IMPLIED, INCLUDING, WITHOUT LIMITATION, IMPLIED WARRANTIES,
61+
CONDITIONS AND OTHER TERMS OF MERCHANTABILITY, SATISFACTORY QUALITY OR
62+
FITNESS FOR A PARTICULAR PURPOSE, AND NON-INFRINGEMENT. DATABRICKS AND
63+
ITS LICENSORS TOTAL AGGREGATE LIABILITY RELATING TO OR ARISING OUT OF
64+
YOUR USE OF OR DATABRICKS’ PROVISIONING OF THE LICENSED MATERIALS SHALL
65+
BE LIMITED TO ONE THOUSAND ($1,000) DOLLARS. IN NO EVENT SHALL
66+
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
67+
OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
68+
ARISING FROM, OUT OF OR IN CONNECTION WITH THE LICENSED MATERIALS OR
69+
THE USE OR OTHER DEALINGS IN THE LICENSED MATERIALS.

‎packages/databricks-vscode-types/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@databricks/databricks-vscode-types",
3-
"version": "1.2.2",
3+
"version": "1.2.4",
44
"description": "Package with types and interfaces to develop extensions to the Databricks VSCode plugin",
55
"main": "index.js",
66
"types": "index.d.ts",

‎packages/databricks-vscode/CHANGELOG.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
# Release: v1.2.4
2+
3+
## packages/databricks-vscode
4+
5+
## <small>1.2.4 (2023-12-05)</small>
6+
7+
- Fix: set notebook directory as current directory for pip installs from workspace fs, closes [#958](https://github.com/databricks/databricks-vscode/issues/958)
8+
- Fix: show error for a corrupted config file
9+
- Feature: update Databricks CLI to v0.210.1
10+
11+
# Release: v1.2.3
12+
13+
## packages/databricks-vscode
14+
15+
## <small>1.2.3 (2023-11-06)</small>
16+
17+
- Fix: Make configuration wizard sticky
18+
- Feature: Use databricks CLI log-file option to capture the logs. This deprecates the `databricks.cli.verboseMode` option.
19+
- Feature: Upgrade databricks cli to `v0.209.0`.
20+
121
# Release: v1.2.2
222

323
## packages/databricks-vscode

‎packages/databricks-vscode/DATABRICKS.quickstart.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ This extension contributes the following settings:
7575
- `databricks.logs.maxArrayLength`: The maximum number of items to show for array fields
7676
- `databricks.logs.enabled`: Enable/disable logging. Reload window for changes to take effect
7777
- `databricks.clusters.onlyShowAccessibleClusters`: Only show clusters that the user has access to
78-
- `databricks.cli.verboseMode`: Show debug logs for the sync command
7978

8079
## <a id="commands"></a>`Databricks:` Commands
8180

0 commit comments

Comments
 (0)