dremio-cli 1.2.0__tar.gz → 1.3.0__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {dremio_cli-1.2.0/dremio_cli.egg-info → dremio_cli-1.3.0}/PKG-INFO +1 -1
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/docs/README.md +22 -13
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/docs/jobs.md +3 -1
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/docs/profiles.md +17 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/client/auth.py +10 -1
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/client/base.py +8 -1
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/client/cloud.py +3 -1
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/client/factory.py +10 -2
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/client/software.py +58 -4
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/env.py +7 -1
- {dremio_cli-1.2.0 → dremio_cli-1.3.0/dremio_cli.egg-info}/PKG-INFO +1 -1
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/pyproject.toml +1 -1
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/LICENSE +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/MANIFEST.in +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/README.md +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/completions/dremio-completion.bash +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/completions/dremio-completion.zsh +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/docs/advanced-features.md +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/docs/catalog.md +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/docs/grants.md +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/docs/installation.md +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/docs/quickstart.md +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/docs/roles.md +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/docs/sources.md +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/docs/spaces-folders.md +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/docs/sql.md +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/docs/tables.md +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/docs/tags-wiki.md +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/docs/users.md +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/docs/views.md +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/__init__.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/__main__.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/cli.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/client/__init__.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/commands/__init__.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/commands/catalog.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/commands/favorite.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/commands/folder.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/commands/grant.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/commands/history.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/commands/job.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/commands/lineage.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/commands/profile.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/commands/role.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/commands/source.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/commands/space.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/commands/sql.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/commands/table.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/commands/tag.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/commands/udf.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/commands/user.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/commands/view.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/commands/wiki.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/config.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/formatters/__init__.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/formatters/json.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/formatters/table.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/formatters/yaml.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/history.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/utils/__init__.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/utils/exceptions.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/utils/helpers.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli/utils/validators.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli.egg-info/SOURCES.txt +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli.egg-info/dependency_links.txt +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli.egg-info/entry_points.txt +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli.egg-info/requires.txt +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/dremio_cli.egg-info/top_level.txt +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/setup.cfg +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/setup.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/tests/__init__.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/tests/test_config.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/tests/test_grant_commands.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/tests/test_history_favorite.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/tests/test_integration.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/tests/test_job_commands.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/tests/test_role_commands.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/tests/test_source_commands.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/tests/test_space_folder_commands.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/tests/test_sql_commands.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/tests/test_table_commands.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/tests/test_tag_wiki_commands.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/tests/test_user_commands.py +0 -0
- {dremio_cli-1.2.0 → dremio_cli-1.3.0}/tests/test_view_commands.py +0 -0
|
@@ -126,19 +126,28 @@ dremio role list # List roles
|
|
|
126
126
|
|
|
127
127
|
## 🌐 Platform Support
|
|
128
128
|
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
|
134
|
-
|
|
135
|
-
|
|
|
136
|
-
|
|
|
137
|
-
|
|
|
138
|
-
|
|
|
139
|
-
|
|
|
140
|
-
|
|
|
141
|
-
|
|
|
129
|
+
## 🌐 Platform Support
|
|
130
|
+
|
|
131
|
+
The CLI is designed to work across Dremio Cloud and Dremio Software (versions 24+). It automatically handles API version differences (v2/v3) and authentication methods.
|
|
132
|
+
|
|
133
|
+
| Feature | Software (v26) | Software (v25) | Cloud | Notes |
|
|
134
|
+
|---------|:--------------:|:--------------:|:-----:|-------|
|
|
135
|
+
| **Connect / Auth** | ✅ | ✅ | ✅ | Supports PAT (Cloud/Soft) & User/Pass (Software v25/v26) |
|
|
136
|
+
| **Catalog Operations** | ✅ | ✅ | ✅ | Browse items, get details, lookup by path |
|
|
137
|
+
| **SQL Execution** | ✅ | ✅ | ✅ | Execute, wait, poll, and fetch results |
|
|
138
|
+
| **Source Management** | ✅ | ✅ | ✅ | List, get, create, delete sources |
|
|
139
|
+
| **Job Management** | ✅ | ✅ | ⚠️ | Cloud job **listing** is limited via API; SQL execution status/results work fully. |
|
|
140
|
+
| **User Management** | ✅ | ✅ | N/A | Managed via Console/SCIM on Cloud. v25/v26 use Legacy API fallback. |
|
|
141
|
+
| **Role Management** | ✅ | ✅ | N/A | Managed via Console/SCIM on Cloud. v25/v26 use Legacy API fallback. |
|
|
142
|
+
| **View/Space/Folder** | ✅ | ✅ | ✅ | Full CRUD support |
|
|
143
|
+
| **Tags & Wiki** | ✅ | ✅ | ✅ | |
|
|
144
|
+
| **Grants** | ✅ | ✅ | ✅ | |
|
|
145
|
+
|
|
146
|
+
### Compatibility Notes
|
|
147
|
+
|
|
148
|
+
- **Cloud**: `job list` is currently not supported via the public API. Use the Dremio Console for job history or `sql execute` for running specific queries.
|
|
149
|
+
- **Software v25/Legacy**: The CLI supports legacy username/password authentication (via HTTP/HTTPS) and automatically falls back to the `apiv2` endpoints for listing jobs, users, and roles where `apiv3` is unavailable.
|
|
150
|
+
- **SSL**: For local development or instances with self-signed certificates, use `DREMIO_{PROFILE}_SSL=false` in your environment or `.env` file.
|
|
142
151
|
|
|
143
152
|
## 💡 Tips & Best Practices
|
|
144
153
|
|
|
@@ -8,10 +8,12 @@ This guide covers job management operations including listing, monitoring, and m
|
|
|
8
8
|
|
|
9
9
|
List recent jobs.
|
|
10
10
|
|
|
11
|
-
```
|
|
11
|
+
```
|
|
12
12
|
dremio job list [OPTIONS]
|
|
13
13
|
```
|
|
14
14
|
|
|
15
|
+
> **Note (Cloud)**: Job listing via the CLI is currently limited or unavailable on Dremio Cloud due to API restrictions. Use the Dremio Console to view full job history. SQL execution and result retrieval for specific jobs work normally.
|
|
16
|
+
|
|
15
17
|
**Options:**
|
|
16
18
|
- `--max-results INTEGER` - Maximum number of results to return
|
|
17
19
|
- `--filter TEXT` - Filter expression (e.g., `state=COMPLETED`)
|
|
@@ -106,6 +106,23 @@ DREMIO_CLOUD_PROJECTID=788baab4-3c3b-42da-9f1d-5cc6dc03147d
|
|
|
106
106
|
DREMIO_CLOUD_TOKEN=s3JcLOqFTR6qnurWp09epkXfy0+06N9i5oSwG0KbRthqmgiL1DvMgd2+LSNgUA==
|
|
107
107
|
DREMIO_CLOUD_TESTING_FOLDER=testing
|
|
108
108
|
|
|
109
|
+
### Software (PAT Auth)
|
|
110
|
+
```bash
|
|
111
|
+
DREMIO_SOFTWARE_TYPE=software
|
|
112
|
+
DREMIO_SOFTWARE_BASE_URL=https://dremio.example.com/api/v3
|
|
113
|
+
DREMIO_SOFTWARE_AUTH_TYPE=pat
|
|
114
|
+
DREMIO_SOFTWARE_TOKEN=my-secret-pat
|
|
115
|
+
```
|
|
116
|
+
|
|
117
|
+
### Software v25 / Legacy (Username/Password)
|
|
118
|
+
```bash
|
|
119
|
+
DREMIO_V25_TYPE=software
|
|
120
|
+
DREMIO_V25_BASE_URL=https://localhost:9047
|
|
121
|
+
# Note: /api/v3 is automatically appended for API calls, stripped for login
|
|
122
|
+
DREMIO_V25_AUTH_TYPE=username_password
|
|
123
|
+
DREMIO_V25_USERNAME=alex
|
|
124
|
+
DREMIO_V25_PASSWORD=password123
|
|
125
|
+
```
|
|
109
126
|
# Software Profile
|
|
110
127
|
DREMIO_SOFTWARE_TYPE=software
|
|
111
128
|
DREMIO_SOFTWARE_BASE_URL=https://v26.dremio.org/api/v3
|
|
@@ -10,6 +10,7 @@ def authenticate_with_username_password(
|
|
|
10
10
|
base_url: str,
|
|
11
11
|
username: str,
|
|
12
12
|
password: str,
|
|
13
|
+
verify: bool = True,
|
|
13
14
|
) -> str:
|
|
14
15
|
"""Authenticate with username and password (Dremio Software only).
|
|
15
16
|
|
|
@@ -25,7 +26,14 @@ def authenticate_with_username_password(
|
|
|
25
26
|
AuthenticationError: If authentication fails
|
|
26
27
|
"""
|
|
27
28
|
# Use v2 API for login
|
|
28
|
-
|
|
29
|
+
# Handle base URLs that might include /api/v3 or trailing slashes
|
|
30
|
+
clean_base_url = base_url.rstrip("/")
|
|
31
|
+
if clean_base_url.endswith("/api/v3"):
|
|
32
|
+
clean_base_url = clean_base_url[:-7] # remove /api/v3
|
|
33
|
+
elif clean_base_url.endswith("/api/v2"):
|
|
34
|
+
clean_base_url = clean_base_url[:-7] # remove /api/v2 if present
|
|
35
|
+
|
|
36
|
+
login_url = f"{clean_base_url}/apiv2/login"
|
|
29
37
|
|
|
30
38
|
try:
|
|
31
39
|
response = requests.post(
|
|
@@ -33,6 +41,7 @@ def authenticate_with_username_password(
|
|
|
33
41
|
json={"userName": username, "password": password},
|
|
34
42
|
headers={"Content-Type": "application/json"},
|
|
35
43
|
timeout=30,
|
|
44
|
+
verify=verify,
|
|
36
45
|
)
|
|
37
46
|
|
|
38
47
|
if not response.ok:
|
|
@@ -19,6 +19,7 @@ class BaseClient:
|
|
|
19
19
|
token: Optional[str] = None,
|
|
20
20
|
timeout: int = 30,
|
|
21
21
|
max_retries: int = 3,
|
|
22
|
+
verify: bool = True,
|
|
22
23
|
):
|
|
23
24
|
"""Initialize base client.
|
|
24
25
|
|
|
@@ -26,11 +27,14 @@ class BaseClient:
|
|
|
26
27
|
base_url: Base URL for API
|
|
27
28
|
token: Authentication token
|
|
28
29
|
timeout: Request timeout in seconds
|
|
30
|
+
timeout: Request timeout in seconds
|
|
29
31
|
max_retries: Maximum number of retries
|
|
32
|
+
verify: Verify SSL certificates (default: True)
|
|
30
33
|
"""
|
|
31
34
|
self.base_url = base_url.rstrip("/")
|
|
32
35
|
self.token = token
|
|
33
36
|
self.timeout = timeout
|
|
37
|
+
self.verify = verify
|
|
34
38
|
|
|
35
39
|
# Create session with retry logic
|
|
36
40
|
self.session = requests.Session()
|
|
@@ -56,7 +60,10 @@ class BaseClient:
|
|
|
56
60
|
}
|
|
57
61
|
|
|
58
62
|
if self.token:
|
|
59
|
-
|
|
63
|
+
if self.token.startswith("_dremio"):
|
|
64
|
+
headers["Authorization"] = self.token
|
|
65
|
+
else:
|
|
66
|
+
headers["Authorization"] = f"Bearer {self.token}"
|
|
60
67
|
|
|
61
68
|
return headers
|
|
62
69
|
|
|
@@ -14,6 +14,7 @@ class CloudClient(BaseClient):
|
|
|
14
14
|
project_id: str,
|
|
15
15
|
token: str,
|
|
16
16
|
timeout: int = 30,
|
|
17
|
+
verify: bool = True,
|
|
17
18
|
):
|
|
18
19
|
"""Initialize Cloud client.
|
|
19
20
|
|
|
@@ -22,8 +23,9 @@ class CloudClient(BaseClient):
|
|
|
22
23
|
project_id: Project ID
|
|
23
24
|
token: Authentication token
|
|
24
25
|
timeout: Request timeout in seconds
|
|
26
|
+
verify: Verify SSL certificates
|
|
25
27
|
"""
|
|
26
|
-
super().__init__(base_url, token, timeout)
|
|
28
|
+
super().__init__(base_url, token, timeout, verify=verify)
|
|
27
29
|
self.project_id = project_id
|
|
28
30
|
|
|
29
31
|
def _project_endpoint(self, endpoint: str) -> str:
|
|
@@ -52,11 +52,18 @@ def create_client(profile: Dict[str, Any]) -> Union[CloudClient, SoftwareClient]
|
|
|
52
52
|
base_url=base_url,
|
|
53
53
|
project_id=project_id,
|
|
54
54
|
token=token,
|
|
55
|
+
verify=profile.get("verify", True),
|
|
55
56
|
)
|
|
56
57
|
else: # software
|
|
58
|
+
# Ensure base_url ends with /api/v3 for software/v25
|
|
59
|
+
software_base_url = base_url.rstrip("/")
|
|
60
|
+
if not software_base_url.endswith("/api/v3"):
|
|
61
|
+
software_base_url = f"{software_base_url}/api/v3"
|
|
62
|
+
|
|
57
63
|
return SoftwareClient(
|
|
58
|
-
base_url=
|
|
64
|
+
base_url=software_base_url,
|
|
59
65
|
token=token,
|
|
66
|
+
verify=profile.get("verify", True),
|
|
60
67
|
)
|
|
61
68
|
|
|
62
69
|
|
|
@@ -112,7 +119,8 @@ def _get_token(profile: Dict[str, Any], auth: Dict[str, Any], base_url: str) ->
|
|
|
112
119
|
"Username/password auth only supported for Dremio Software"
|
|
113
120
|
)
|
|
114
121
|
|
|
115
|
-
|
|
122
|
+
verify = profile.get("verify", True)
|
|
123
|
+
token = authenticate_with_username_password(base_url, username, password, verify=verify)
|
|
116
124
|
|
|
117
125
|
# TODO: Cache token in profile for future use
|
|
118
126
|
|
|
@@ -3,6 +3,7 @@
|
|
|
3
3
|
from typing import Any, Dict, Optional
|
|
4
4
|
|
|
5
5
|
from dremio_cli.client.base import BaseClient
|
|
6
|
+
from dremio_cli.utils.exceptions import ApiError
|
|
6
7
|
|
|
7
8
|
|
|
8
9
|
class SoftwareClient(BaseClient):
|
|
@@ -13,6 +14,7 @@ class SoftwareClient(BaseClient):
|
|
|
13
14
|
base_url: str,
|
|
14
15
|
token: str,
|
|
15
16
|
timeout: int = 30,
|
|
17
|
+
verify: bool = True,
|
|
16
18
|
):
|
|
17
19
|
"""Initialize Software client.
|
|
18
20
|
|
|
@@ -20,8 +22,9 @@ class SoftwareClient(BaseClient):
|
|
|
20
22
|
base_url: Base URL for Dremio Software API
|
|
21
23
|
token: Authentication token
|
|
22
24
|
timeout: Request timeout in seconds
|
|
25
|
+
verify: Verify SSL certificates
|
|
23
26
|
"""
|
|
24
|
-
super().__init__(base_url, token, timeout)
|
|
27
|
+
super().__init__(base_url, token, timeout, verify=verify)
|
|
25
28
|
|
|
26
29
|
# Catalog operations
|
|
27
30
|
def get_catalog(
|
|
@@ -136,7 +139,27 @@ class SoftwareClient(BaseClient):
|
|
|
136
139
|
params["filter"] = filter_expr
|
|
137
140
|
if sort:
|
|
138
141
|
params["sort"] = sort
|
|
139
|
-
|
|
142
|
+
if sort:
|
|
143
|
+
params["sort"] = sort
|
|
144
|
+
|
|
145
|
+
try:
|
|
146
|
+
return self.get("job", params=params if params else None)
|
|
147
|
+
except ApiError as e:
|
|
148
|
+
# Fallback to APIv2 for older Software versions (v25)
|
|
149
|
+
if e.status_code == 404:
|
|
150
|
+
# Construct v2 URL by stripping /api/v3 and appending /apiv2/jobs
|
|
151
|
+
v2_base = self.base_url.replace("/api/v3", "")
|
|
152
|
+
url = f"{v2_base}/apiv2/jobs"
|
|
153
|
+
|
|
154
|
+
response = self.session.get(
|
|
155
|
+
url,
|
|
156
|
+
headers=self._get_headers(),
|
|
157
|
+
params=params,
|
|
158
|
+
timeout=self.timeout,
|
|
159
|
+
verify=self.verify,
|
|
160
|
+
)
|
|
161
|
+
return self._handle_response(response)
|
|
162
|
+
raise
|
|
140
163
|
|
|
141
164
|
def get_job_profile(self, job_id: str) -> Any:
|
|
142
165
|
"""Get job profile for performance analysis.
|
|
@@ -411,7 +434,23 @@ class SoftwareClient(BaseClient):
|
|
|
411
434
|
Returns:
|
|
412
435
|
Users data
|
|
413
436
|
"""
|
|
414
|
-
|
|
437
|
+
try:
|
|
438
|
+
return self.get("user")
|
|
439
|
+
except ApiError as e:
|
|
440
|
+
# Fallback to APIv2 for Software versions where v3 GET user is not supported
|
|
441
|
+
if e.status_code in [404, 405]:
|
|
442
|
+
# Construct v2 URL by stripping /api/v3 and appending /apiv2/user
|
|
443
|
+
v2_base = self.base_url.replace("/api/v3", "")
|
|
444
|
+
url = f"{v2_base}/apiv2/user"
|
|
445
|
+
|
|
446
|
+
response = self.session.get(
|
|
447
|
+
url,
|
|
448
|
+
headers=self._get_headers(),
|
|
449
|
+
timeout=self.timeout,
|
|
450
|
+
verify=self.verify,
|
|
451
|
+
)
|
|
452
|
+
return self._handle_response(response)
|
|
453
|
+
raise
|
|
415
454
|
|
|
416
455
|
def get_user(self, user_id: str) -> Dict[str, Any]:
|
|
417
456
|
"""Get user by ID.
|
|
@@ -462,7 +501,22 @@ class SoftwareClient(BaseClient):
|
|
|
462
501
|
Returns:
|
|
463
502
|
Roles data
|
|
464
503
|
"""
|
|
465
|
-
|
|
504
|
+
try:
|
|
505
|
+
return self.get("role")
|
|
506
|
+
except ApiError as e:
|
|
507
|
+
# Fallback to APIv2
|
|
508
|
+
if e.status_code in [404, 405]:
|
|
509
|
+
v2_base = self.base_url.replace("/api/v3", "")
|
|
510
|
+
url = f"{v2_base}/apiv2/role"
|
|
511
|
+
|
|
512
|
+
response = self.session.get(
|
|
513
|
+
url,
|
|
514
|
+
headers=self._get_headers(),
|
|
515
|
+
timeout=self.timeout,
|
|
516
|
+
verify=self.verify,
|
|
517
|
+
)
|
|
518
|
+
return self._handle_response(response)
|
|
519
|
+
raise
|
|
466
520
|
|
|
467
521
|
def get_role(self, role_id: str) -> Dict[str, Any]:
|
|
468
522
|
"""Get role by ID.
|
|
@@ -49,7 +49,10 @@ def load_dotenv(dotenv_path: Optional[Path] = None) -> None:
|
|
|
49
49
|
|
|
50
50
|
if "=" in line:
|
|
51
51
|
key, value = line.split("=", 1)
|
|
52
|
-
|
|
52
|
+
key = key.strip()
|
|
53
|
+
# Don't overwrite existing environment variables
|
|
54
|
+
if key not in os.environ:
|
|
55
|
+
os.environ[key] = value.strip()
|
|
53
56
|
|
|
54
57
|
|
|
55
58
|
def get_profile_names_from_env() -> List[str]:
|
|
@@ -110,6 +113,9 @@ def get_profile_from_env(profile_name: str) -> Optional[Dict[str, Any]]:
|
|
|
110
113
|
elif config_key == "testing_folder":
|
|
111
114
|
# Store testing folder for test utilities
|
|
112
115
|
profile_data["testing_folder"] = value
|
|
116
|
+
elif config_key == "ssl":
|
|
117
|
+
# Store SSL verification setting (convert to boolean)
|
|
118
|
+
profile_data["verify"] = value.lower() == "true"
|
|
113
119
|
else:
|
|
114
120
|
# Store any other keys as-is
|
|
115
121
|
profile_data[config_key] = value
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|