From 8f62870b01d76e1ac72e67a806dcf1f59c05342c Mon Sep 17 00:00:00 2001
From: skamenan7 <skamenan@redhat.com>
Date: Fri, 29 Aug 2025 12:12:24 -0400
Subject: [PATCH] Update Bedrock provider configuration

- Remove unnecessary provider file since Bedrock is in-tree
- Add Bedrock runtime configuration to run.yaml with optional AWS env vars
---
 .../providers.d/remote/inference/aws_bedrock.yaml   |  7 -------
 redhat-distribution/run.yaml                        | 13 +++++++++++++
 2 files changed, 13 insertions(+), 7 deletions(-)
 delete mode 100644 redhat-distribution/providers.d/remote/inference/aws_bedrock.yaml

diff --git a/redhat-distribution/providers.d/remote/inference/aws_bedrock.yaml b/redhat-distribution/providers.d/remote/inference/aws_bedrock.yaml
deleted file mode 100644
index 1ed273ceb..000000000
--- a/redhat-distribution/providers.d/remote/inference/aws_bedrock.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-adapter:
-  adapter_type: bedrock
-  pip_packages: ["boto3>=1.26.137", "botocore"]
-  config_class: llama_stack.providers.remote.inference.bedrock.config.BedrockConfig
-  module: llama_stack.providers.remote.inference.bedrock
-api_dependencies: ["inference"]
-optional_api_dependencies: []
\ No newline at end of file
diff --git a/redhat-distribution/run.yaml b/redhat-distribution/run.yaml
index b58f04d31..62b1d9c33 100644
--- a/redhat-distribution/run.yaml
+++ b/redhat-distribution/run.yaml
@@ -19,6 +19,19 @@ providers:
       max_tokens: ${env.VLLM_MAX_TOKENS:=4096}
       api_token: ${env.VLLM_API_TOKEN:=fake}
       tls_verify: ${env.VLLM_TLS_VERIFY:=true}
+  - provider_id: bedrock-inference
+    provider_type: remote::bedrock
+    config:
+      aws_access_key_id: ${env.AWS_ACCESS_KEY_ID:=}
+      aws_secret_access_key: ${env.AWS_SECRET_ACCESS_KEY:=}
+      aws_session_token: ${env.AWS_SESSION_TOKEN:=}
+      region_name: ${env.AWS_DEFAULT_REGION:=}
+      profile_name: ${env.AWS_PROFILE:=}
+      total_max_attempts: ${env.AWS_MAX_ATTEMPTS:=}
+      retry_mode: ${env.AWS_RETRY_MODE:=}
+      connect_timeout: ${env.AWS_CONNECT_TIMEOUT:=}
+      read_timeout: ${env.AWS_READ_TIMEOUT:=}
+      session_ttl: ${env.AWS_SESSION_TTL:=}
   - provider_id: sentence-transformers
     provider_type: inline::sentence-transformers
     config: {}