Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

KCSB alignment #560

Merged
merged 35 commits into from
Jan 15, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
96da96f
Refactor KustoConnectionStringBuilder to use centralized keyword defi…
AsafMah Dec 25, 2024
e9fdbc6
Update CHANGELOG with breaking changes to Connection String Builder k…
AsafMah Dec 25, 2024
6a30b54
Formatting
AsafMah Dec 25, 2024
88b183a
Formatting
AsafMah Dec 25, 2024
2afd5a9
Formatting
AsafMah Dec 25, 2024
e4f180f
Fix type
AsafMah Dec 25, 2024
e71ff7e
order
AsafMah Dec 26, 2024
2302a3d
black
AsafMah Dec 26, 2024
b644b1b
black
AsafMah Dec 26, 2024
d0da8c2
Fixes
AsafMah Dec 29, 2024
028236f
Fixes
AsafMah Dec 29, 2024
d883a56
Fixes
AsafMah Dec 29, 2024
23f9de3
PR Fixes
AsafMah Dec 30, 2024
c36ec9c
Apply suggestions from code review
AsafMah Dec 31, 2024
5f84d9e
PR fixes
AsafMah Dec 31, 2024
dfd8d48
PR fixes
AsafMah Dec 31, 2024
7a945a9
PR fixes
AsafMah Dec 31, 2024
3639143
PR fixes
AsafMah Dec 31, 2024
27b3180
Update azure-kusto-data/tests/test_kusto_connection_string_builder.py
AsafMah Dec 31, 2024
26f2708
PR fixes
AsafMah Dec 31, 2024
cea36c6
PR fixes
AsafMah Dec 31, 2024
ddd153b
PR fixes
AsafMah Dec 31, 2024
d623314
PR fixes
AsafMah Dec 31, 2024
930e53e
PR fixes
AsafMah Dec 31, 2024
90a309e
PR fixes
AsafMah Jan 1, 2025
bf5e1e8
Revert "PR fixes"
AsafMah Jan 1, 2025
e07c2f5
Update to class vars
AsafMah Jan 2, 2025
d213265
Formatting
AsafMah Jan 5, 2025
9a41f17
fix
AsafMah Jan 5, 2025
1d346eb
fix
AsafMah Jan 5, 2025
c92ec68
fix
AsafMah Jan 5, 2025
674776a
Merge branch 'master' into kcsb-
AsafMah Jan 6, 2025
a83228c
Update schema to be more friendly to other langs
AsafMah Jan 8, 2025
87c365e
Password valid
AsafMah Jan 8, 2025
15c2b3a
Refactor keyword enums for clarity and consistency
AsafMah Jan 9, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## Unreleased

### Changed
- [BREAKING] Aligned the Connection String Builder keywords with the rest of the SDKs.
This means that some keywords were removed, and they will no longer be parsed as part of the Connection String.
Building the Connection String using the builder method will still work as expected.
The following keywords have been removed:
- `msi_auth` / `msi_authentication`
- `msi_params` / `msi_type`
- `interactive_login`
- `az_cli`

### Fixed
- Added `py.typed` markers

Expand Down
1 change: 1 addition & 0 deletions azure-kusto-data/MANIFEST.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
include *.rst
include azure/__init__.py
include azure/kusto/data/wellKnownKustoEndpoints.json
include azure/kusto/data/kcsb.json
recursive-exclude tests *
12 changes: 9 additions & 3 deletions azure-kusto-data/azure/kusto/data/helpers.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import sys
from typing import TYPE_CHECKING, Union, Callable, Dict, Optional
import json
from functools import lru_cache
import copy
from pathlib import Path
from typing import TYPE_CHECKING, Union, Callable, Dict, Optional

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


def load_bundled_json(file_name: str) -> Dict:
filename = Path(__file__).absolute().parent.joinpath(file_name)
with filename.open("r", encoding="utf-8") as data:
return json.load(data)


@lru_cache(maxsize=1, typed=False)
def default_dict() -> Converter:
import pandas as pd
Expand Down
218 changes: 218 additions & 0 deletions azure-kusto-data/azure/kusto/data/kcsb.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,218 @@
{
"keywords": [
{
"name": "Data Source",
"aliases": [
"server",
"addr",
"address",
"networkaddress"
],
"type": "string",
"secret": false
},
{
"name": "dSTS Federated Security",
"aliases": [
"dstsfed",
"dststokentype"
],
"type": "bool",
"secret": false
},
{
"name": "Streaming",
"aliases": [],
"type": "bool",
"secret": false
},
{
"name": "Uncompressed",
"aliases": [],
"type": "bool",
"secret": false
},
{
"name": "EnforceMfa",
"aliases": [],
"type": "bool",
"secret": false
},
{
"name": "Accept",
"aliases": [],
"type": "bool",
"secret": false
},
{
"name": "Query Consistency",
"aliases": [],
"type": "bool",
"secret": false
},
{
"name": "Password",
"aliases": [
"pwd"
],
"type": "string",
"secret": true
},
{
"name": "Data Source Uri",
"aliases": [
"serveruri",
"clusteruri"
],
"type": "string",
"secret": false
},
{
"name": "Azure Region",
"aliases": [
"region"
],
"type": "string",
"secret": false
},
{
"name": "Namespace",
"aliases": [
"ns"
],
"type": "string",
"secret": false
},
{
"name": "Application Certificate Thumbprint",
"aliases": [
"appcert"
],
"type": "string",
"secret": true
},
{
"name": "Application Certificate Issuer Distinguished Name",
"aliases": [
"applicationcertificateissuer"
],
"type": "string",
"secret": true
},
{
"name": "Application Certificate Subject Distinguished Name",
"aliases": [
"applicationcertificatesubject"
],
"type": "string",
"secret": true
},
{
"name": "Application Token",
"aliases": [
"apptoken"
],
"type": "string",
"secret": true
},
{
"name": "User Token",
"aliases": [
"usrtoken"
],
"type": "string",
"secret": true
},
{
"name": "Application Key",
"aliases": [
"appkey"
],
"type": "string",
"secret": true
},
{
"name": "Application Certificate Blob",
"aliases": [],
"type": "string",
"secret": true
},
{
"name": "Application Certificate SendX5c",
"aliases": [
"applicationcertificatex5c",
"sendx5c",
"applicationcertificatesendpubliccertificate",
"sendcertificatechain"
],
"type": "bool",
"secret": false
},
{
"name": "User ID",
"aliases": [
"user",
"uid",
"loginhint",
"aaduserid"
],
"type": "string",
"secret": false
},
{
"name": "Initial Catalog",
"aliases": [
"database"
],
"type": "string",
"secret": false
},
{
"name": "AAD Federated Security",
"aliases": [
"federatedsecurity",
"aadfed",
"fed",
"federated"
],
"type": "bool",
"secret": false
},
{
"name": "Authority Id",
"aliases": [
"tenantid",
"tid",
"tenant",
"authority",
"domainhint"
],
"type": "string",
"secret": false
},
{
"name": "Application Name for Tracing",
"aliases": [
"traceappname"
],
"type": "string",
"secret": false
},
{
"name": "User Name for Tracing",
"aliases": [
"traceusername"
],
"type": "string",
"secret": false
},
{
"name": "Application Client Id",
"aliases": [
"appclientid"
],
"type": "string",
"secret": false
}
]
}
Loading
Loading