Revert "feat(util.py/azure.py): Add OIDC support when running in Azure Kubernetes Service (AKS)."

This reverts commit 640b955e12.
This commit is contained in:
David Manouchehri 2024-06-11 15:52:07 +00:00
parent 7154c25903
commit 95a4bc46d4
No known key found for this signature in database
2 changed files with 3 additions and 12 deletions

View File

@ -136,10 +136,9 @@ def select_azure_base_url_or_endpoint(azure_client_params: dict):
def get_azure_ad_token_from_oidc(azure_ad_token: str):
azure_client_id = os.getenv("AZURE_CLIENT_ID", None)
azure_tenant_id = os.getenv("AZURE_TENANT_ID", None)
azure_authority_host = os.getenv("AZURE_AUTHORITY_HOST", "https://login.microsoftonline.com")
azure_tenant = os.getenv("AZURE_TENANT_ID", None)
if azure_client_id is None or azure_tenant_id is None:
if azure_client_id is None or azure_tenant is None:
raise AzureOpenAIError(
status_code=422,
message="AZURE_CLIENT_ID and AZURE_TENANT_ID must be set",
@ -154,7 +153,7 @@ def get_azure_ad_token_from_oidc(azure_ad_token: str):
)
req_token = httpx.post(
f"{azure_authority_host}/{azure_tenant_id}/oauth2/v2.0/token",
f"https://login.microsoftonline.com/{azure_tenant}/oauth2/v2.0/token",
data={
"client_id": azure_client_id,
"grant_type": "client_credentials",

View File

@ -10085,14 +10085,6 @@ def get_secret(
return oidc_token
else:
raise ValueError("Github OIDC provider failed")
elif oidc_provider == "azure":
# https://azure.github.io/azure-workload-identity/docs/quick-start.html
azure_federated_token_file = os.getenv("AZURE_FEDERATED_TOKEN_FILE")
if azure_federated_token_file is None:
raise ValueError("AZURE_FEDERATED_TOKEN_FILE not found in environment")
with open(azure_federated_token_file, "r") as f:
oidc_token = f.read()
return oidc_token
else:
raise ValueError("Unsupported OIDC provider")