From c7043190e38bf6a4dcbc29574798121c9d6fe4aa Mon Sep 17 00:00:00 2001
From: Marko Lazaric <marko.lazaric@gmail.com>
Date: Tue, 15 Jul 2025 00:28:25 +0200
Subject: [PATCH] feat: Add AZURE_OPENAI_API_KEY as a visible config parameter
 (#3265)

---
 crates/goose/src/providers/azure.rs                    |  7 +++++--
 .../components/settings/providers/ProviderRegistry.tsx | 10 +++++-----
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/crates/goose/src/providers/azure.rs b/crates/goose/src/providers/azure.rs
index 51a31c06..3825ef21 100644
--- a/crates/goose/src/providers/azure.rs
+++ b/crates/goose/src/providers/azure.rs
@@ -67,8 +67,10 @@ impl AzureProvider {
             .get_param("AZURE_OPENAI_API_VERSION")
             .unwrap_or_else(|_| AZURE_DEFAULT_API_VERSION.to_string());
 
-        // Try to get API key first, if not found use Azure credential chain
-        let api_key = config.get_secret("AZURE_OPENAI_API_KEY").ok();
+        let api_key = config
+            .get_secret("AZURE_OPENAI_API_KEY")
+            .ok()
+            .filter(|key: &String| !key.is_empty());
         let auth = AzureAuth::new(api_key)?;
 
         let client = Client::builder()
@@ -227,6 +229,7 @@ impl Provider for AzureProvider {
                 ConfigKey::new("AZURE_OPENAI_ENDPOINT", true, false, None),
                 ConfigKey::new("AZURE_OPENAI_DEPLOYMENT_NAME", true, false, None),
                 ConfigKey::new("AZURE_OPENAI_API_VERSION", true, false, Some("2024-10-21")),
+                ConfigKey::new("AZURE_OPENAI_API_KEY", true, true, Some("")),
             ],
         )
     }
diff --git a/ui/desktop/src/components/settings/providers/ProviderRegistry.tsx b/ui/desktop/src/components/settings/providers/ProviderRegistry.tsx
index 56aa7ed7..10931cdb 100644
--- a/ui/desktop/src/components/settings/providers/ProviderRegistry.tsx
+++ b/ui/desktop/src/components/settings/providers/ProviderRegistry.tsx
@@ -195,11 +195,6 @@ export const PROVIDER_REGISTRY: ProviderRegistry[] = [
       description:
         'Access Azure OpenAI models using API key or Azure credentials. If no API key is provided, Azure credential chain will be used.',
       parameters: [
-        {
-          name: 'AZURE_OPENAI_API_KEY',
-          is_secret: true,
-          required: false,
-        },
         {
           name: 'AZURE_OPENAI_ENDPOINT',
           is_secret: false,
@@ -213,6 +208,11 @@ export const PROVIDER_REGISTRY: ProviderRegistry[] = [
           is_secret: false,
           default: '2024-10-21',
         },
+        {
+          name: 'AZURE_OPENAI_API_KEY',
+          is_secret: true,
+          default: '',
+        },
       ],
     },
   },