Skip to content

fix(vertex_ai): support pluggable (executable) credential_source for WIF auth#24700

Merged
krrish-berri-2 merged 1 commit intoBerriAI:litellm_oss_staging_04_02_2026_p1from
michelligabriele:fix/vertex-wif-pluggable-credential-dispatch
Apr 3, 2026
Merged

fix(vertex_ai): support pluggable (executable) credential_source for WIF auth#24700
krrish-berri-2 merged 1 commit intoBerriAI:litellm_oss_staging_04_02_2026_p1from
michelligabriele:fix/vertex-wif-pluggable-credential-dispatch

Conversation

@michelligabriele
Copy link
Copy Markdown
Collaborator

The WIF credential dispatch in load_auth() only handled identity_pool and aws credential types. When credential_source.executable was present (used for Azure Managed Identity via Workload Identity Federation), it fell through to identity_pool.Credentials which rejected it with MalformedError.

Add dispatch to google.auth.pluggable.Credentials for executable-type credential sources, following the same pattern as the existing identity_pool and aws helpers.

Fixes authentication for Azure Container Apps → GCP Vertex AI via WIF with executable credential sources.

Relevant issues

Pre-Submission checklist

Please complete all items before asking a LiteLLM maintainer to review your PR

  • I have Added testing in the tests/test_litellm/ directory, Adding at least 1 test is a hard requirement - see details
  • My PR passes all unit tests on make test-unit
  • My PR's scope is as isolated as possible, it only solves 1 specific problem
  • I have requested a Greptile review by commenting @greptileai and received a Confidence Score of at least 4/5 before requesting a maintainer review

Delays in PR merge?

If you're seeing a delay in your PR being merged, ping the LiteLLM Team on Slack (#pr-review).

CI (LiteLLM team)

CI status guideline:

  • 50-55 passing tests: main is stable with minor issues.
  • 45-49 passing tests: acceptable but needs attention
  • <= 40 passing tests: unstable; be careful with your merges and assess the risk.
  • Branch creation CI run
    Link:

  • CI run for the last commit
    Link:

  • Merge / cherry-pick CI run
    Links:

Type

🐛 Bug Fix

Changes

  • litellm/llms/vertex_ai/vertex_llm_base.py: Added elif branch in the WIF dispatch logic (inside load_auth()) to check for credential_source.executable and route to new _credentials_from_pluggable() helper, which calls google.auth.pluggable.Credentials.from_info(). Follows the same pattern as the existing _credentials_from_identity_pool() and _credentials_from_identity_pool_with_aws() helpers.
  • tests/test_litellm/llms/vertex_ai/test_vertex_llm_base.py: Added 3 unit tests:
    • test_credentials_from_pluggable_implementation — verifies helper dispatches to pluggable.Credentials with scopes
    • test_credentials_from_pluggable_no_scopes_needed — verifies helper works when scopes not required
    • test_load_auth_dispatches_to_pluggable_for_executable — verifies load_auth() routes executable credential_source to pluggable (not identity_pool)

…WIF auth

The WIF credential dispatch in load_auth() only handled identity_pool and
aws credential types. When credential_source.executable was present (used
for Azure Managed Identity via Workload Identity Federation), it fell
through to identity_pool.Credentials which rejected it with MalformedError.

Add dispatch to google.auth.pluggable.Credentials for executable-type
credential sources, following the same pattern as the existing identity_pool
and aws helpers.

Fixes authentication for Azure Container Apps → GCP Vertex AI via WIF
with executable credential sources.
@vercel
Copy link
Copy Markdown

vercel Bot commented Mar 27, 2026

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
litellm Ready Ready Preview, Comment Mar 27, 2026 8:38pm

Request Review

@greptile-apps
Copy link
Copy Markdown
Contributor

greptile-apps Bot commented Mar 27, 2026

Greptile Summary

This PR fixes a MalformedError crash that occurred when WIF credentials used an executable-type credential_source (e.g. Azure Managed Identity → GCP Vertex AI via Workload Identity Federation). The load_auth() dispatch logic previously only handled aws environment IDs and fell through to identity_pool.Credentials, which rejected executable sources. The fix adds a targeted elif branch and a new _credentials_from_pluggable() helper that mirrors the pattern of the existing _credentials_from_identity_pool() and _credentials_from_identity_pool_with_aws() helpers.\n\n- Added elif isinstance(credential_source, dict) and \"executable\" in credential_source branch in load_auth() to route pluggable credentials correctly.\n- Added _credentials_from_pluggable() using google.auth.pluggable.Credentials.from_info(), consistent with the surrounding helpers (same import-guard, same requires_scopes check, same scopes application).\n- Added 3 unit tests covering: scoped dispatch, no-scopes-needed path, and the load_auth() routing — all fully mocked with no real network calls, satisfying the test-folder policy.

Confidence Score: 5/5

Safe to merge — minimal, well-scoped fix that adds a missing dispatch branch without touching any existing code paths.

The change is a pure additive elif branch and a new helper method; no existing behavior is altered. The new helper is a direct copy of the established _credentials_from_identity_pool pattern (same import guard, same requires_scopes check). Three new mock tests cover scoped, unscoped, and routing scenarios with no real network calls. No P0 or P1 findings identified.

No files require special attention.

Important Files Changed

Filename Overview
litellm/llms/vertex_ai/vertex_llm_base.py Adds elif dispatch branch for executable credential sources and a new _credentials_from_pluggable() helper, following the exact same pattern as existing identity_pool and AWS helpers.
tests/test_litellm/llms/vertex_ai/test_vertex_llm_base.py Adds 3 new mock-only tests covering the pluggable helper and the load_auth() dispatch; no existing tests modified, no real network calls.

Flowchart

%%{init: {'theme': 'neutral'}}%%
flowchart TD
    A[load_auth called with external_account credentials] --> B{credential_source\nenvironment_id contains 'aws'?}
    B -->|Yes| C{Explicit AWS params present?}
    C -->|Yes| D[VertexAIAwsWifAuth.credentials_from_explicit_aws]
    C -->|No| E[_credentials_from_identity_pool_with_aws]
    B -->|No| F{credential_source\nhas 'executable' key?}
    F -->|Yes| G[_credentials_from_pluggable\ngoogle.auth.pluggable.Credentials]
    F -->|No| H[_credentials_from_identity_pool\ngoogle.auth.identity_pool.Credentials]
    G --> I[Apply scopes if requires_scopes]
    H --> I
    D --> I
    E --> I
    I --> J[refresh_auth & return creds, project_id]
Loading

Reviews (1): Last reviewed commit: "fix(vertex_ai): support pluggable (execu..." | Re-trigger Greptile

@codspeed-hq
Copy link
Copy Markdown
Contributor

codspeed-hq Bot commented Mar 27, 2026

Merging this PR will not alter performance

✅ 16 untouched benchmarks


Comparing michelligabriele:fix/vertex-wif-pluggable-credential-dispatch (1704bd0) with main (d949085)

Open in CodSpeed

@krrish-berri-2 krrish-berri-2 self-requested a review April 3, 2026 04:32
@krrish-berri-2 krrish-berri-2 changed the base branch from main to litellm_oss_staging_04_02_2026_p1 April 3, 2026 04:33
@krrish-berri-2 krrish-berri-2 merged commit f00d255 into BerriAI:litellm_oss_staging_04_02_2026_p1 Apr 3, 2026
40 of 41 checks passed
Sameerlite pushed a commit that referenced this pull request Apr 8, 2026
…WIF auth (#24700)

The WIF credential dispatch in load_auth() only handled identity_pool and
aws credential types. When credential_source.executable was present (used
for Azure Managed Identity via Workload Identity Federation), it fell
through to identity_pool.Credentials which rejected it with MalformedError.

Add dispatch to google.auth.pluggable.Credentials for executable-type
credential sources, following the same pattern as the existing identity_pool
and aws helpers.

Fixes authentication for Azure Container Apps → GCP Vertex AI via WIF
with executable credential sources.
krrish-berri-2 added a commit that referenced this pull request Apr 9, 2026
* fix(vertex_ai): support pluggable (executable) credential_source for WIF auth (#24700)

The WIF credential dispatch in load_auth() only handled identity_pool and
aws credential types. When credential_source.executable was present (used
for Azure Managed Identity via Workload Identity Federation), it fell
through to identity_pool.Credentials which rejected it with MalformedError.

Add dispatch to google.auth.pluggable.Credentials for executable-type
credential sources, following the same pattern as the existing identity_pool
and aws helpers.

Fixes authentication for Azure Container Apps → GCP Vertex AI via WIF
with executable credential sources.

* feat(logging): add component and logger fields to JSON logs for 3rd p… (#24447)

* feat(logging): add component and logger fields to JSON logs for 3rd party filtering

* Let user-supplied extra fields win over auto-generated component/logger, tighten test assertions

* Feat - Add organization into the metrics metadata for org_id & org_alias (#24440)

* Add org_id and org_alias label names to Prometheus metric definitions

* Add user_api_key_org_alias to StandardLoggingUserAPIKeyMetadata

* Populate user_api_key_org_alias in pre-call metadata

* Pass org_id and org_alias into per-request Prometheus metric labels

* Add test for org labels on per-request Prometheus metrics

* chore: resolve test mockdata

* Address review: populate org_alias from DB view, add feature flag, use .get() for org metadata

* Add org labels to failure path and verify flag behavior in test

* Fix test: build flag-off enum_values without org fields

* Gate org labels behind feature flag in get_labels() instead of static metric lists

* Scope org label injection to metrics that carry team context, remove orphaned budget label defs, add test teardown

* Use explicit metric allowlist for org label injection instead of team heuristic

* Fix duplicate org label guard, move _org_label_metrics to class constant

* Reset custom_prometheus_metadata_labels after duplicate label assertion

* fix: emit org labels by default, remove flag, fix missing org_alias in all metadata paths

* fix: emit org labels by default, no opt-in flag required

* fix: write org_alias to metadata unconditionally in proxy_server.py

* fix: 429s from batch creation being converted to 500 (#24703)

* add us gov models (#24660)

* add us gov models

* added max tokens

* Litellm dev 04 02 2026 p1 (#25052)

* fix: replace hardcoded url

* fix: Anthropic web search cost not tracked for Chat Completions

The ModelResponse branch in response_object_includes_web_search_call()
only checked url_citation annotations and prompt_tokens_details, missing
Anthropic's server_tool_use.web_search_requests field. This caused
_handle_web_search_cost() to never fire for Anthropic Claude models.

Also routes vertex_ai/claude-* models to the Anthropic cost calculator
instead of the Gemini one, since Claude on Vertex uses the same
server_tool_use billing structure as the direct Anthropic API.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>

---------

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>

* fix(anthropic): pass logging_obj to client.post for litellm_overhead_time_ms (#24071)

When LITELLM_DETAILED_TIMING=true, litellm_overhead_time_ms was null for
Anthropic because the handler did not pass logging_obj to client.post(),
so track_llm_api_timing could not set llm_api_duration_ms. Pass
logging_obj=logging_obj at all four post() call sites (make_call,
make_sync_call, acompletion, completion). Add test to ensure make_call
passes logging_obj to client.post.

Made-with: Cursor

* sap - add additional parameters for grounding

- additional parameter for grounding added for the sap provider

* sap - fix models

* (sap) add filtering, masking, translation SAP GEN AI Hub modules

* (sap) add tests and docs for new SAP modules

* (sap) add support of multiple modules config

* (sap) code refactoring

* (sap) rename file

* test(): add safeguard tests

* (sap) update tests

* (sap) update docs, solve merge conflict in transformation.py

* (sap) linter fix

* (sap) Align embedding request transformation with current API

* (sap) fix after bot review

* (sap) fix after bot review

* (sap) fix after bot review

* (sap) fix after bot review

* (sap) fix after bot review

* (sap) fix after bot review

* (sap) fix after bot review

* (sap) fix after bot review

* (sap) fix after bot review

* (sap) fix after bot review

* (sap) fix after bot review

* (sap) fix after bot review

* (sap) mock commit

* (sap) run black formater

* (sap) add literals to models, add negative tests, fix test for tool transformation

* (sap) fix formating

* (sap) fix models

* (sap) fix after bot review

* (sap) fix after bot review

* (sap) fix after bot review

* (sap) fix after bot review

* (sap) fix after bot review

* (sap) fix after bot review

* (sap) commit for rerun bot review

* (sap) minor improve

* (sap) fix after bot review

* (sap) lint fix

* docs(sap): update documentation

* fix(sap): change creds priority

* fix(sap): change creds priority

* fix(sap): fix sap creds unit test

* fix(sap): linter fix

* fix(sap): linter fix

* linter fix

* (sap) update logic of fetching creds, add additional tests

* (sap) clean up code

* (sap) fix after review

* (sap) fix after bot review

* (sap) fix after bot review

* (sap) fix after bot review

* (sap) fix after bot review

* (sap) fix after bot review

* (sap) fix after bot review

* (sap) fix after bot review

* (sap) fix after bot review

* (sap) fix after bot review

* (sap) fix after bot review

* (sap) fix after bot review

* (sap) add a possibility to put the service key by both variants

* (sap) fix after bot review

* (sap) fix after bot review

* (sap) fix after bot review

* (sap) update test

* (sap) update service key resolve function

* (sap) run black formater

* (sap) fix validate credentials, add negative tests for credential fetching

* (sap) fix validate credentials, add negative tests for credential fetching

* (sap) fix after bot review

* (sap) fix after bot review

* (sap) fix after bot review

* (sap) fix after bot review

* (sap) lint fix

* (sap) lint fix

* feat: support service_tier in gemini

* chore: add a service_tier field mapping from openai to gemini

* fix: use x-gemini-service-tier header in response

* docs: add service_tier to gemini docs

* chore: add defaut/standard mapping, and some tests

* chore: tidying up some case insensitivity

* chore: remove unnecessary guard

* fix: remove redundant test file

* fix: handle 'auto' case-insensitively

* fix: return service_tier on final steamed chunk

* chore: black

* feat: enable supports_service_tier to gemini models

* Fix get_standard_logging_metadata tests

* Fix test_get_model_info_bedrock_models

* Fix test_get_model_info_bedrock_models

* Fix remaining tests

* Fix mypy issues

* Fix tests

* Fix merge conflicts

* Fix code qa

* Fix code qa

* Fix code qa

* Fix greptile review

---------

Co-authored-by: michelligabriele <gabriele.michelli@icloud.com>
Co-authored-by: Josh <36064836+J-Byron@users.noreply.github.com>
Co-authored-by: mubashir1osmani <mubashir.osmani777@gmail.com>
Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
Co-authored-by: milan-berri <milan@berri.ai>
Co-authored-by: Alperen Kömürcü <alperen.koemuercue@sap.com>
Co-authored-by: Vasilisa Parshikova <vasilisa.parshikova@sap.com>
Co-authored-by: Lin Xu <lin.xu03@sap.com>
Co-authored-by: Mark McDonald <macd@google.com>
Co-authored-by: Sameer Kankute <sameer@berri.ai>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants