Skip to content

Commit 0f3a987

Browse files
AsafMahyogilad
AsafMah
and
yogilad
authored
KCSB alignment (#560)
Co-authored-by: Yochai Gilad <[email protected]>
1 parent a1363ec commit 0f3a987

File tree

9 files changed

+485
-302
lines changed

9 files changed

+485
-302
lines changed

‎CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1010

1111
## [4.6.2] - 2025-01-07
1212

13+
### Changed
14+
- [BREAKING] Aligned the Connection String Builder keywords with the rest of the SDKs.
15+
This means that some keywords were removed, and they will no longer be parsed as part of the Connection String.
16+
Building the Connection String using the builder method will still work as expected.
17+
The following keywords have been removed:
18+
- `msi_auth` / `msi_authentication`
19+
- `msi_params` / `msi_type`
20+
- `interactive_login`
21+
- `az_cli`
22+
1323
### Fixed
1424
- Added `py.typed` markers
1525
- Fixed semantic error handling

‎azure-kusto-data/MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
include *.rst
22
include azure/__init__.py
33
include azure/kusto/data/wellKnownKustoEndpoints.json
4+
include azure/kusto/data/kcsb.json
45
recursive-exclude tests *

‎azure-kusto-data/azure/kusto/data/helpers.py

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import sys
2-
from typing import TYPE_CHECKING, Union, Callable, Dict, Optional
1+
import json
32
from functools import lru_cache
4-
import copy
3+
from pathlib import Path
4+
from typing import TYPE_CHECKING, Union, Callable, Dict, Optional
55

66
if TYPE_CHECKING:
77
import pandas as pd
@@ -11,6 +11,12 @@
1111
Converter = Dict[str, Union[str, Callable[[str, "pd.DataFrame"], "pd.Series"]]]
1212

1313

14+
def load_bundled_json(file_name: str) -> Dict:
15+
filename = Path(__file__).absolute().parent.joinpath(file_name)
16+
with filename.open("r", encoding="utf-8") as data:
17+
return json.load(data)
18+
19+
1420
@lru_cache(maxsize=1, typed=False)
1521
def default_dict() -> Converter:
1622
import pandas as pd

‎azure-kusto-data/azure/kusto/data/kcsb.json

Lines changed: 218 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,218 @@
1+
{
2+
"keywords": [
3+
{
4+
"name": "Data Source",
5+
"aliases": [
6+
"server",
7+
"addr",
8+
"address",
9+
"networkaddress"
10+
],
11+
"type": "string",
12+
"secret": false
13+
},
14+
{
15+
"name": "dSTS Federated Security",
16+
"aliases": [
17+
"dstsfed",
18+
"dststokentype"
19+
],
20+
"type": "bool",
21+
"secret": false
22+
},
23+
{
24+
"name": "Streaming",
25+
"aliases": [],
26+
"type": "bool",
27+
"secret": false
28+
},
29+
{
30+
"name": "Uncompressed",
31+
"aliases": [],
32+
"type": "bool",
33+
"secret": false
34+
},
35+
{
36+
"name": "EnforceMfa",
37+
"aliases": [],
38+
"type": "bool",
39+
"secret": false
40+
},
41+
{
42+
"name": "Accept",
43+
"aliases": [],
44+
"type": "bool",
45+
"secret": false
46+
},
47+
{
48+
"name": "Query Consistency",
49+
"aliases": [],
50+
"type": "bool",
51+
"secret": false
52+
},
53+
{
54+
"name": "Password",
55+
"aliases": [
56+
"pwd"
57+
],
58+
"type": "string",
59+
"secret": true
60+
},
61+
{
62+
"name": "Data Source Uri",
63+
"aliases": [
64+
"serveruri",
65+
"clusteruri"
66+
],
67+
"type": "string",
68+
"secret": false
69+
},
70+
{
71+
"name": "Azure Region",
72+
"aliases": [
73+
"region"
74+
],
75+
"type": "string",
76+
"secret": false
77+
},
78+
{
79+
"name": "Namespace",
80+
"aliases": [
81+
"ns"
82+
],
83+
"type": "string",
84+
"secret": false
85+
},
86+
{
87+
"name": "Application Certificate Thumbprint",
88+
"aliases": [
89+
"appcert"
90+
],
91+
"type": "string",
92+
"secret": true
93+
},
94+
{
95+
"name": "Application Certificate Issuer Distinguished Name",
96+
"aliases": [
97+
"applicationcertificateissuer"
98+
],
99+
"type": "string",
100+
"secret": true
101+
},
102+
{
103+
"name": "Application Certificate Subject Distinguished Name",
104+
"aliases": [
105+
"applicationcertificatesubject"
106+
],
107+
"type": "string",
108+
"secret": true
109+
},
110+
{
111+
"name": "Application Token",
112+
"aliases": [
113+
"apptoken"
114+
],
115+
"type": "string",
116+
"secret": true
117+
},
118+
{
119+
"name": "User Token",
120+
"aliases": [
121+
"usrtoken"
122+
],
123+
"type": "string",
124+
"secret": true
125+
},
126+
{
127+
"name": "Application Key",
128+
"aliases": [
129+
"appkey"
130+
],
131+
"type": "string",
132+
"secret": true
133+
},
134+
{
135+
"name": "Application Certificate Blob",
136+
"aliases": [],
137+
"type": "string",
138+
"secret": true
139+
},
140+
{
141+
"name": "Application Certificate SendX5c",
142+
"aliases": [
143+
"applicationcertificatex5c",
144+
"sendx5c",
145+
"applicationcertificatesendpubliccertificate",
146+
"sendcertificatechain"
147+
],
148+
"type": "bool",
149+
"secret": false
150+
},
151+
{
152+
"name": "User ID",
153+
"aliases": [
154+
"user",
155+
"uid",
156+
"loginhint",
157+
"aaduserid"
158+
],
159+
"type": "string",
160+
"secret": false
161+
},
162+
{
163+
"name": "Initial Catalog",
164+
"aliases": [
165+
"database"
166+
],
167+
"type": "string",
168+
"secret": false
169+
},
170+
{
171+
"name": "AAD Federated Security",
172+
"aliases": [
173+
"federatedsecurity",
174+
"aadfed",
175+
"fed",
176+
"federated"
177+
],
178+
"type": "bool",
179+
"secret": false
180+
},
181+
{
182+
"name": "Authority Id",
183+
"aliases": [
184+
"tenantid",
185+
"tid",
186+
"tenant",
187+
"authority",
188+
"domainhint"
189+
],
190+
"type": "string",
191+
"secret": false
192+
},
193+
{
194+
"name": "Application Name for Tracing",
195+
"aliases": [
196+
"traceappname"
197+
],
198+
"type": "string",
199+
"secret": false
200+
},
201+
{
202+
"name": "User Name for Tracing",
203+
"aliases": [
204+
"traceusername"
205+
],
206+
"type": "string",
207+
"secret": false
208+
},
209+
{
210+
"name": "Application Client Id",
211+
"aliases": [
212+
"appclientid"
213+
],
214+
"type": "string",
215+
"secret": false
216+
}
217+
]
218+
}

0 commit comments

Comments
 (0)