fix for copilot findings.

Author: nadoylemsft

application/single_app/functions_keyvault.py

@@ -66,9 +66,9 @@ def retrieve_secret_from_key_vault(secret_name, scope_value, scope="global", sou
         raise ValueError(f"Scope '{scope}' is not supported. Supported scopes: {supported_scopes}")
 
     full_secret_name = build_full_secret_name(secret_name, scope_value, source, scope)
-    return retrieve_secret_from_keyvault_by_full_name(full_secret_name)
+    return retrieve_secret_from_key_vault_by_full_name(full_secret_name)
 
-def retrieve_secret_from_keyvault_by_full_name(full_secret_name):
+def retrieve_secret_from_key_vault_by_full_name(full_secret_name):
     """
     Retrieve a secret from Key Vault using a preformatted full secret name.
 
@@ -83,14 +83,14 @@ def retrieve_secret_from_keyvault_by_full_name(full_secret_name):
     settings = get_settings()
     enable_key_vault_secret_storage = settings.get("enable_key_vault_secret_storage", False)
     if not enable_key_vault_secret_storage:
-        return value
+        return full_secret_name
 
     key_vault_name = settings.get("key_vault_name", None)
     if not key_vault_name:
-        return value
+        return full_secret_name
 
     if not validate_secret_name_dynamic(full_secret_name):
-        return value
+        return full_secret_name
 
     try:
         key_vault_url = f"https://{key_vault_name}{KEY_VAULT_DOMAIN}"
@@ -101,7 +101,7 @@ def retrieve_secret_from_keyvault_by_full_name(full_secret_name):
         return retrieved_secret.value
     except Exception as e:
         logging.error(f"Failed to retrieve secret '{full_secret_name}' from Key Vault: {str(e)}")
-        return value
+        return full_secret_name
 
 
 def store_secret_in_key_vault(secret_name, secret_value, scope_value, source="global", scope="global"):
@@ -369,7 +369,7 @@ def keyvault_plugin_get_helper(plugin_dict, scope_value, scope="global", return_
             if validate_secret_name_dynamic(value):
                 try:
                     if return_actual_key:
-                        actual_key = retrieve_secret_from_key_vault(plugin_name, scope_value, scope, source)
+                        actual_key = retrieve_secret_from_key_vault_by_full_name(value)
                         new_auth = dict(auth)
                         new_auth['key'] = actual_key
                         updated['auth'] = new_auth

application/single_app/json_schema_validation.py

@@ -43,7 +43,7 @@ def validate_plugin(plugin):
     validator = Draft7Validator(schema['definitions']['Plugin'])
     errors = sorted(validator.iter_errors(plugin_copy), key=lambda e: e.path)
     if errors:
-        return '; '.join([f"{plugin.name}: {e.message}" for e in errors])
+        return '; '.join([f"{plugin.get('name', '<Unknown>')}: {e.message}" for e in errors])
 
     # Additional business logic validation
     # For non-SQL plugins, endpoint must not be empty

application/single_app/route_backend_settings.py

@@ -716,8 +716,9 @@ def _test_key_vault_connection(payload):
         else:
             credential = DefaultAzureCredential()
 
-        if AZURE_ENVIRONMENT in ("custom"):
-            kv_client = SecretClient(vault_url=vault_url, credential=credential, credential_scopes=[key_vault_scope])
+        if AZURE_ENVIRONMENT == "custom":
+            #TODO: Needs to be tested with a custom environment
+            kv_client = SecretClient(vault_url=vault_url, credential=credential)
         else:
             kv_client = SecretClient(vault_url=vault_url, credential=credential)
 

application/single_app/semantic_kernel_loader.py

@@ -31,7 +31,7 @@
 from semantic_kernel_plugins.smart_http_plugin import SmartHttpPlugin
 from functions_debug import debug_print
 from flask import g
-from functions_keyvault import validate_secret_name_dynamic, retrieve_secret_from_key_vault, retrieve_secret_from_keyvault_by_full_name
+from functions_keyvault import validate_secret_name_dynamic, retrieve_secret_from_key_vault, retrieve_secret_from_key_vault_by_full_name
 from functions_global_actions import get_global_actions
 from functions_global_agents import get_global_agents
 from functions_personal_actions import get_personal_actions, ensure_migration_complete as ensure_actions_migration_complete
@@ -139,7 +139,7 @@ def get_user_apim():
             try:
                 if validate_secret_name_dynamic(key):
                     # Try to retrieve the secret from Key Vault
-                    resolved_key = retrieve_secret_from_keyvault_by_full_name(key)
+                    resolved_key = retrieve_secret_from_key_vault_by_full_name(key)
                     if resolved_key:
                         # Update the agent dict with the resolved key for this session
                         agent["azure_apim_gpt_subscription_key"] = resolved_key
@@ -160,7 +160,7 @@ def get_global_apim():
             try:
                 if validate_secret_name_dynamic(key):
                     # Try to retrieve the secret from Key Vault
-                    resolved_key = retrieve_secret_from_keyvault_by_full_name(key)
+                    resolved_key = retrieve_secret_from_key_vault_by_full_name(key)
                     if resolved_key:
                         # Update the settings dict with the resolved key for this session
                         settings["azure_apim_gpt_subscription_key"] = resolved_key
@@ -181,7 +181,7 @@ def get_user_gpt():
             try:
                 if validate_secret_name_dynamic(key):
                     # Try to retrieve the secret from Key Vault
-                    resolved_key = retrieve_secret_from_keyvault_by_full_name(key)
+                    resolved_key = retrieve_secret_from_key_vault_by_full_name(key)
                     if resolved_key:
                         # Update the agent dict with the resolved key for this session
                         agent["azure_openai_gpt_key"] = resolved_key
@@ -202,7 +202,7 @@ def get_global_gpt():
             try:
                 if validate_secret_name_dynamic(key):
                     # Try to retrieve the secret from Key Vault
-                    resolved_key = retrieve_secret_from_keyvault_by_full_name(key)
+                    resolved_key = retrieve_secret_from_key_vault_by_full_name(key)
                     if resolved_key:
                         # Update the settings dict with the resolved key for this session
                         settings["azure_openai_gpt_key"] = resolved_key
@@ -483,7 +483,7 @@ def load_agent_specific_plugins(kernel, plugin_names, settings, mode_label="glob
                 all_plugin_manifests = []
         else:
             # Global mode - get from global actions container
-            all_plugin_manifests = global_plugins
+            all_plugin_manifests = get_global_plugins(return_actual_key=True)
             print(f"[SK Loader] Retrieved {len(all_plugin_manifests)} global plugin manifests")
 
         # Filter manifests to only include requested plugins
@@ -828,7 +828,7 @@ def resolve_key_vault_secrets_in_plugins(plugin_manifest, settings):
 
     def resolve_value(value):
         if isinstance(value, str) and validate_secret_name_dynamic(value):
-            resolved = retrieve_secret_from_keyvault_by_full_name(value)
+            resolved = retrieve_secret_from_key_vault_by_full_name(value)
             if resolved:
                 return resolved
             else:

application/single_app/semantic_kernel_plugins/logged_plugin_loader.py

@@ -141,23 +141,21 @@ def normalize(s):
                 if matched_class:
                     try:
                         plugin = matched_class(manifest) if 'manifest' in matched_class.__init__.__code__.co_varnames else matched_class()
-                        log_event(f"[Logged Plugin Loader] Instanced plugin: {name} (type: {plugin_type}) [{mode_label}]", {"plugin_name": name, "plugin_type": plugin_type}, level=logging.INFO)
+                        log_event(f"[Logged Plugin Loader] Instanced plugin: {name} (type: {plugin_type})", {"plugin_name": name, "plugin_type": plugin_type}, level=logging.INFO)
                         return plugin
                     except Exception as e:
                         log_event(f"[Logged Plugin Loader] Failed to instantiate plugin: {name}: {e}", {"plugin_name": name, "plugin_type": plugin_type, "error": str(e)}, level=logging.ERROR, exceptionTraceback=True)
                 else:
-                    log_event(f"[Logged Plugin Loader] Unknown plugin type: {plugin_type} for plugin '{name}' [{mode_label}]", {"plugin_name": name, "plugin_type": plugin_type}, level=logging.WARNING)
+                    log_event(f"[Logged Plugin Loader] Unknown plugin type: {plugin_type} for plugin '{name}'", {"plugin_name": name, "plugin_type": plugin_type}, level=logging.WARNING)
             except Exception as e:
-                log_event(f"[Logged Plugin Loader] Error discovering plugin types for {mode_label} mode: {e}", {"error": str(e)}, level=logging.ERROR, exceptionTraceback=True)
+                log_event(f"[Logged Plugin Loader] Error discovering plugin types: {e}", {"error": str(e)}, level=logging.ERROR, exceptionTraceback=True)
 
     def _create_openapi_plugin(self, manifest: Dict[str, Any]):
         """Create an OpenAPI plugin instance."""
         plugin_name = manifest.get('name')
         log_event(f"[Logged Plugin Loader] Attempting to create OpenAPI plugin: {plugin_name}", level=logging.DEBUG)
 
         try:
-            log_event(f"[Logged Plugin Loader] Successfully imported OpenApiPluginFactory", level=logging.DEBUG)
-            
             log_event(f"[Logged Plugin Loader] Creating OpenAPI plugin using factory", 
                      extra={"plugin_name": plugin_name, "manifest": manifest}, 
                      level=logging.DEBUG)
@@ -357,7 +355,7 @@ def load_multiple_plugins(self, manifests: List[Dict[str, Any]],
         total_count = len(results)
 
         log_event(
-            f"[Plugin Loader] Loaded {successful_count}/{total_count} plugins",
+            f"[Logged Plugin Loader] Loaded {successful_count}/{total_count} plugins",
             extra={
                 "successful_plugins": [name for name, success in results.items() if success],
                 "failed_plugins": [name for name, success in results.items() if not success],

application/single_app/semantic_kernel_plugins/ui_test_plugin.py

@@ -1,8 +1,8 @@
 """
-SQL Schema Plugin for Semantic Kernel
-- Connects to various SQL databases (SQL Server, PostgreSQL, MySQL, SQLite)
-- Extracts schema information (tables, columns, data types, relationships)
-- Provides structured schema data for query generation
+UI Test Plugin for Semantic Kernel
+- Provides demonstration methods for UI testing (greeting, farewell, manifest retrieval)
+- Useful for testing plugin integration and UI workflows
+- Does not interact with external systems or databases
 """
 
 import json

application/single_app/static/js/plugin_modal_stepper.js

@@ -2112,7 +2112,7 @@ export class PluginModalStepper {
       if (typeof additionalFieldsObj === 'object' && additionalFieldsObj !== null) {
         previewContent = JSON.stringify(additionalFieldsObj, null, 2);
       } else {
-        previewContent = additionalFields;
+        previewContent = '';
       }
       document.getElementById('summary-additional-fields-content').textContent = previewContent;
       additionalFieldsPreview.style.display = '';

application/single_app/static/json/schemas/ui_test_plugin.plugin.schema.json

@@ -1,7 +1,7 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema#",
   "title": "UI Test Plugin",
-  "description": "Schema for UI Test Plugin configuration, restricting auth.type to key, connection_string, and identity.",
+  "description": "NYI-Schema for UI Test Plugin configuration, restricting auth.type to user, key, connection_string, and identity.",
   "allOf": [
     { "$ref": "plugin.schema.json" },
     {