Skip to content

Commit 3f6505a

Browse files
Divyansh-dbDivyansh-db
committed
ran make fmt
1 parent 3304bbf commit 3f6505a

File tree

3 files changed

+40
-29
lines changed

3 files changed

+40
-29
lines changed

‎databricks/sdk/credentials_provider.py‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ def oauth_credentials_strategy(name: str, require: List[str], env_vars: Optional
103103
"""Given the function that receives a Config and returns an OauthHeaderFactory,
104104
create an OauthCredentialsProvider with a given name and required configuration
105105
attribute names to be present for this function to be called.
106-
106+
107107
Args:
108108
name: The name of the authentication strategy
109109
require: List of config attributes that must be present
@@ -118,7 +118,7 @@ def wrapper(cfg: "Config") -> Optional[OAuthCredentialsProvider]:
118118
# Early environment detection - check before config validation
119119
if env_vars and not all(os.environ.get(var) for var in env_vars):
120120
return None
121-
121+
122122
for attr in require:
123123
if not getattr(cfg, attr):
124124
return None
@@ -418,9 +418,16 @@ def token() -> oauth.Token:
418418

419419

420420
@oauth_credentials_strategy(
421-
"azdo-oidc",
422-
["host", "client_id"],
423-
env_vars=["SYSTEM_ACCESSTOKEN", "SYSTEM_TEAMFOUNDATIONCOLLECTIONURI", "SYSTEM_TEAMPROJECTID", "SYSTEM_PLANID", "SYSTEM_JOBID", "SYSTEM_HOSTTYPE"]
421+
"azdo-oidc",
422+
["host", "client_id"],
423+
env_vars=[
424+
"SYSTEM_ACCESSTOKEN",
425+
"SYSTEM_TEAMFOUNDATIONCOLLECTIONURI",
426+
"SYSTEM_TEAMPROJECTID",
427+
"SYSTEM_PLANID",
428+
"SYSTEM_JOBID",
429+
"SYSTEM_HOSTTYPE",
430+
],
424431
)
425432
def azure_devops_oidc(cfg: "Config") -> Optional[CredentialsProvider]:
426433
"""

‎databricks/sdk/oidc_token_supplier.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,14 @@ def get_oidc_token(self, audience: str) -> Optional[str]:
3131
class AzureDevOpsOIDCTokenSupplier:
3232
"""
3333
Supplies OIDC tokens from Azure DevOps pipelines.
34-
34+
3535
Constructs the OIDC token request URL using official Azure DevOps predefined variables.
3636
See: https://docs.microsoft.com/en-us/azure/devops/pipelines/build/variables
3737
"""
3838

3939
def get_oidc_token(self, audience: str) -> Optional[str]:
4040
# Note: Azure DevOps OIDC tokens have a fixed audience of "api://AzureADTokenExchange"
4141
# The audience parameter is ignored but kept for interface compatibility with other OIDC suppliers
42-
4342

4443
access_token = os.environ.get("SYSTEM_ACCESSTOKEN")
4544
collection_uri = os.environ.get("SYSTEM_TEAMFOUNDATIONCOLLECTIONURI")

‎tests/test_oidc_token_supplier.py‎

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ class AzureDevOpsOIDCTestCase:
2525
"SYSTEM_TEAMPROJECTID": "project-123",
2626
"SYSTEM_PLANID": "plan-456",
2727
"SYSTEM_JOBID": "job-789",
28-
"SYSTEM_HOSTTYPE": "build"
28+
"SYSTEM_HOSTTYPE": "build",
2929
},
3030
response_ok=True,
3131
response_json={"oidcToken": "test-azdo-jwt-token"},
@@ -36,9 +36,9 @@ class AzureDevOpsOIDCTestCase:
3636
env_vars={
3737
"SYSTEM_ACCESSTOKEN": "azdo-access-token",
3838
"SYSTEM_TEAMFOUNDATIONCOLLECTIONURI": "https://dev.azure.com/myorg/",
39-
"SYSTEM_TEAMPROJECTID": "project-123",
39+
"SYSTEM_TEAMPROJECTID": "project-123",
4040
"SYSTEM_PLANID": "plan-456",
41-
"SYSTEM_JOBID": "job-789"
41+
"SYSTEM_JOBID": "job-789",
4242
},
4343
want_none=True,
4444
),
@@ -47,9 +47,9 @@ class AzureDevOpsOIDCTestCase:
4747
env_vars={
4848
"SYSTEM_TEAMFOUNDATIONCOLLECTIONURI": "https://dev.azure.com/myorg/",
4949
"SYSTEM_TEAMPROJECTID": "project-123",
50-
"SYSTEM_PLANID": "plan-456",
50+
"SYSTEM_PLANID": "plan-456",
5151
"SYSTEM_JOBID": "job-789",
52-
"SYSTEM_HOSTTYPE": "build"
52+
"SYSTEM_HOSTTYPE": "build",
5353
},
5454
want_none=True,
5555
),
@@ -60,7 +60,7 @@ class AzureDevOpsOIDCTestCase:
6060
"SYSTEM_TEAMFOUNDATIONCOLLECTIONURI": "https://dev.azure.com/myorg/",
6161
"SYSTEM_TEAMPROJECTID": "project-123",
6262
"SYSTEM_JOBID": "job-789",
63-
"SYSTEM_HOSTTYPE": "build"
63+
"SYSTEM_HOSTTYPE": "build",
6464
},
6565
want_none=True,
6666
),
@@ -71,7 +71,7 @@ class AzureDevOpsOIDCTestCase:
7171
"SYSTEM_TEAMFOUNDATIONCOLLECTIONURI": "https://dev.azure.com/myorg/",
7272
"SYSTEM_TEAMPROJECTID": "project-123",
7373
"SYSTEM_PLANID": "plan-456",
74-
"SYSTEM_HOSTTYPE": "build"
74+
"SYSTEM_HOSTTYPE": "build",
7575
},
7676
want_none=True,
7777
),
@@ -82,7 +82,7 @@ class AzureDevOpsOIDCTestCase:
8282
"SYSTEM_TEAMPROJECTID": "project-123",
8383
"SYSTEM_PLANID": "plan-456",
8484
"SYSTEM_JOBID": "job-789",
85-
"SYSTEM_HOSTTYPE": "build"
85+
"SYSTEM_HOSTTYPE": "build",
8686
},
8787
want_none=True,
8888
),
@@ -93,7 +93,7 @@ class AzureDevOpsOIDCTestCase:
9393
"SYSTEM_TEAMFOUNDATIONCOLLECTIONURI": "https://dev.azure.com/myorg/",
9494
"SYSTEM_PLANID": "plan-456",
9595
"SYSTEM_JOBID": "job-789",
96-
"SYSTEM_HOSTTYPE": "build"
96+
"SYSTEM_HOSTTYPE": "build",
9797
},
9898
want_none=True,
9999
),
@@ -105,7 +105,7 @@ class AzureDevOpsOIDCTestCase:
105105
"SYSTEM_TEAMPROJECTID": "project-123",
106106
"SYSTEM_PLANID": "plan-456",
107107
"SYSTEM_JOBID": "job-789",
108-
"SYSTEM_HOSTTYPE": "build"
108+
"SYSTEM_HOSTTYPE": "build",
109109
},
110110
response_ok=False,
111111
want_none=True,
@@ -116,9 +116,9 @@ class AzureDevOpsOIDCTestCase:
116116
"SYSTEM_ACCESSTOKEN": "azdo-access-token",
117117
"SYSTEM_TEAMFOUNDATIONCOLLECTIONURI": "https://dev.azure.com/myorg/",
118118
"SYSTEM_TEAMPROJECTID": "project-123",
119-
"SYSTEM_PLANID": "plan-456",
119+
"SYSTEM_PLANID": "plan-456",
120120
"SYSTEM_JOBID": "job-789",
121-
"SYSTEM_HOSTTYPE": "build"
121+
"SYSTEM_HOSTTYPE": "build",
122122
},
123123
response_ok=True,
124124
response_json={"error": "no oidcToken"},
@@ -134,23 +134,29 @@ def test_azure_devops_oidc_token_supplier(test_case: AzureDevOpsOIDCTestCase, mo
134134
if test_case.env_vars:
135135
for key, value in test_case.env_vars.items():
136136
monkeypatch.setenv(key, value)
137-
137+
138138
# Mock requests.post if we have all required environment variables (including HOSTTYPE)
139-
required_vars = ["SYSTEM_ACCESSTOKEN", "SYSTEM_TEAMFOUNDATIONCOLLECTIONURI",
140-
"SYSTEM_TEAMPROJECTID", "SYSTEM_PLANID", "SYSTEM_JOBID", "SYSTEM_HOSTTYPE"]
139+
required_vars = [
140+
"SYSTEM_ACCESSTOKEN",
141+
"SYSTEM_TEAMFOUNDATIONCOLLECTIONURI",
142+
"SYSTEM_TEAMPROJECTID",
143+
"SYSTEM_PLANID",
144+
"SYSTEM_JOBID",
145+
"SYSTEM_HOSTTYPE",
146+
]
141147
has_required_vars = test_case.env_vars and all(var in test_case.env_vars for var in required_vars)
142-
148+
143149
mock_post = None
144150
if has_required_vars: # Only mock if all required vars exist
145151
mock_response = mocker.Mock()
146152
mock_response.ok = test_case.response_ok
147153
if test_case.response_json:
148154
mock_response.json.return_value = test_case.response_json
149-
mock_post = mocker.patch('requests.post', return_value=mock_response)
150-
155+
mock_post = mocker.patch("requests.post", return_value=mock_response)
156+
151157
supplier = AzureDevOpsOIDCTokenSupplier()
152158
token = supplier.get_oidc_token("ignored-audience") # Audience is ignored for Azure DevOps
153-
159+
154160
if test_case.want_none:
155161
assert token is None
156162
else:
@@ -166,7 +172,6 @@ def test_azure_devops_oidc_token_supplier(test_case: AzureDevOpsOIDCTestCase, mo
166172
headers={
167173
"Authorization": "Bearer azdo-access-token",
168174
"Content-Type": "application/json",
169-
"Content-Length": "0"
170-
}
175+
"Content-Length": "0",
176+
},
171177
)
172-

0 commit comments

Comments
 (0)