rebase and error code fix

Author: achyuth-ms

docs/azmcp-commands.md

@@ -236,7 +236,7 @@ azmcp appconfig kv list --subscription <subscription> \
                         [--key <key>] \
                         [--label <label>]
 
-# Lock (make it read-only) or unlock (remove read-only) a key-value setting 
+# Lock (make it read-only) or unlock (remove read-only) a key-value setting
 azmcp appconfig kv lock set --subscription <subscription> \
                             --account <account> \
                             --key <key> \
@@ -695,7 +695,7 @@ azmcp keyvault key list --subscription <subscription> \
 Tools that handle sensitive data such as secrets require user consent before execution through a security mechanism called **elicitation**. When you run commands that access sensitive information, the MCP client will prompt you to confirm the operation before proceeding.
 
 > **🛡️ Elicitation (user confirmation) Security Feature:**
-> 
+>
 > Elicitation prompts appear when tools may expose sensitive information like:
 > - Key Vault secrets
 > - Connection strings and passwords
@@ -1115,7 +1115,7 @@ azmcp sql db delete --subscription <subscription> \
 azmcp sql db list --subscription <subscription> \
                   --resource-group <resource-group> \
                   --server <server-name>
-                  
+
 # Rename an existing SQL database to a new name within the same server
 azmcp sql db rename --subscription <subscription> \
                     --resource-group <resource-group> \
@@ -1150,7 +1150,7 @@ azmcp sql db export --subscription <subscription> \
                     --database <database-name> \
                     --storage-uri <storage-uri> \
                     --storage-key <storage-key> \
-                    --storage-key-type <StorageAccessKey|SharedAccessKey|ManagedIdentity> \
+                    --storage-key-type <StorageAccessKey|SharedAccessKey> \
                     --admin-user <admin-user> \
                     --admin-password <admin-password> \
                     [--auth-type <SQL|ADPassword|ManagedIdentity>]

servers/Azure.Mcp.Server/CHANGELOG.md

@@ -14,6 +14,7 @@ The Azure MCP Server updates automatically by default whenever a new release com
 
 - Added support for listing SQL servers in a subscription and resource group via the command `azmcp_sql_server_list`. [[#503](https://github.com/microsoft/mcp/issues/503)]
 - Added support for renaming Azure SQL databases within a server while retaining configuration via the `azmcp sql db rename` command. [[#542](https://github.com/microsoft/mcp/pull/542)]
+- Added support for exporting Azure SQL databases to BACPAC files in Azure Storage via the `azmcp sql db export` command. [[#526](https://github.com/microsoft/mcp/pull/526)]
 - Added support for Azure App Service database management via the command `azmcp_appservice_database_add`. [[#59](https://github.com/microsoft/mcp/pull/59)]
 - Added the following Azure Foundry agents commands: [[#55](https://github.com/microsoft/mcp/pull/55)]
   - `azmcp_foundry_agents_connect`: Connect to an agent in an AI Foundry project and query it

tools/Azure.Mcp.Tools.Sql/src/Commands/Database/DatabaseExportCommand.cs

@@ -3,6 +3,7 @@
 
 using System.CommandLine;
 using System.CommandLine.Parsing;
+using System.Net;
 using Azure.Mcp.Core.Commands;
 using Azure.Mcp.Core.Extensions;
 using Azure.Mcp.Core.Models.Command;
@@ -37,7 +38,7 @@ operation is equivalent to 'az sql db export'. Returns export operation informat
         Destructive = false,
         Idempotent = false,
         OpenWorld = false,
-        ReadOnly = true,
+        ReadOnly = false,
         LocalRequired = false,
         Secret = true
     };
@@ -77,63 +78,60 @@ public override async Task<CommandResponse> ExecuteAsync(CommandContext context,
         // Additional validation for export-specific parameters
         if (string.IsNullOrEmpty(options.StorageUri))
         {
-            context.Response.Status = 400;
+            context.Response.Status = HttpStatusCode.BadRequest;
             context.Response.Message = "Storage URI is required for database export.";
             return context.Response;
         }
 
         if (string.IsNullOrEmpty(options.StorageKey))
         {
-            context.Response.Status = 400;
+            context.Response.Status = HttpStatusCode.BadRequest;
             context.Response.Message = "Storage key is required for database export.";
             return context.Response;
         }
 
         if (string.IsNullOrEmpty(options.StorageKeyType))
         {
-            context.Response.Status = 400;
+            context.Response.Status = HttpStatusCode.BadRequest;
             context.Response.Message = "Storage key type is required for database export.";
             return context.Response;
         }
 
         if (string.IsNullOrEmpty(options.AdminUser))
         {
-            context.Response.Status = 400;
+            context.Response.Status = HttpStatusCode.BadRequest;
             context.Response.Message = "Administrator user is required for database export.";
             return context.Response;
         }
 
         if (string.IsNullOrEmpty(options.AdminPassword))
         {
-            context.Response.Status = 400;
+            context.Response.Status = HttpStatusCode.BadRequest;
             context.Response.Message = "Administrator password is required for database export.";
             return context.Response;
         }
 
-        // Validate storage key type
-        var validStorageKeyTypes = new[] { "StorageAccessKey", "SharedAccessKey", "ManagedIdentity" };
+        var validStorageKeyTypes = new[] { "StorageAccessKey", "SharedAccessKey" };
         if (!validStorageKeyTypes.Contains(options.StorageKeyType, StringComparer.OrdinalIgnoreCase))
         {
-            context.Response.Status = 400;
+            context.Response.Status = HttpStatusCode.BadRequest;
             context.Response.Message = $"Invalid storage key type '{options.StorageKeyType}'. Valid values are: {string.Join(", ", validStorageKeyTypes)}";
             return context.Response;
         }
 
-        // Validate storage URI format
         if (!Uri.TryCreate(options.StorageUri, UriKind.Absolute, out _))
         {
-            context.Response.Status = 400;
+            context.Response.Status = HttpStatusCode.BadRequest;
             context.Response.Message = "Storage URI must be a valid absolute URI.";
             return context.Response;
         }
 
-        // Validate authentication type if provided
         if (!string.IsNullOrEmpty(options.AuthType))
         {
             var validAuthTypes = new[] { "SQL", "ADPassword", "ManagedIdentity" };
             if (!validAuthTypes.Contains(options.AuthType, StringComparer.OrdinalIgnoreCase))
             {
-                context.Response.Status = 400;
+                context.Response.Status = HttpStatusCode.BadRequest;
                 context.Response.Message = $"Invalid authentication type '{options.AuthType}'. Valid values are: {string.Join(", ", validAuthTypes)}";
                 return context.Response;
             }
@@ -173,11 +171,11 @@ public override async Task<CommandResponse> ExecuteAsync(CommandContext context,
 
     protected override string GetErrorMessage(Exception ex) => ex switch
     {
-        RequestFailedException reqEx when reqEx.Status == 404 =>
+        RequestFailedException reqEx when reqEx.Status == (int)HttpStatusCode.NotFound =>
             "SQL database or server not found. Verify the database name, server name, resource group, and that you have access.",
-        RequestFailedException reqEx when reqEx.Status == 403 =>
+        RequestFailedException reqEx when reqEx.Status == (int)HttpStatusCode.Forbidden =>
             $"Authorization failed exporting the SQL database. Verify you have appropriate permissions and the storage account is accessible. Details: {reqEx.Message}",
-        RequestFailedException reqEx when reqEx.Status == 400 =>
+        RequestFailedException reqEx when reqEx.Status == (int)HttpStatusCode.BadRequest =>
             $"Invalid export parameters. Check your storage URI, credentials, and database configuration. Details: {reqEx.Message}",
         ArgumentException argEx =>
             $"Invalid argument: {argEx.Message}",

tools/Azure.Mcp.Tools.Sql/src/Commands/SqlJsonContext.cs

@@ -43,6 +43,7 @@ namespace Azure.Mcp.Tools.Sql.Commands;
 [JsonSerializable(typeof(SqlElasticPoolProperties))]
 [JsonSerializable(typeof(SqlElasticPoolPerDatabaseSettings))]
 [JsonSerializable(typeof(SqlFirewallRuleData))]
+[JsonSerializable(typeof(SqlDatabaseExportResult))]
 [JsonSourceGenerationOptions(
     PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase,
     WriteIndented = true,

tools/Azure.Mcp.Tools.Sql/src/Options/SqlOptionDefinitions.cs

@@ -212,7 +212,7 @@ public static class SqlOptionDefinitions
         $"--{StorageKeyType}"
     )
     {
-        Description = "The storage key type (StorageAccessKey, SharedAccessKey, or ManagedIdentity).",
+        Description = "The storage key type (StorageAccessKey or SharedAccessKey).",
         Required = true
     };
 

tools/Azure.Mcp.Tools.Sql/src/Services/SqlService.cs

@@ -402,19 +402,19 @@ public async Task<SqlDatabaseExportResult> ExportDatabaseAsync(
             var sqlServerResource = await resourceGroupResource.Value.GetSqlServers().GetAsync(serverName);
             var databaseResource = await sqlServerResource.Value.GetSqlDatabases().GetAsync(databaseName);
 
-            // Parse storage key type
             if (!Enum.TryParse<ResourceManager.Sql.Models.StorageKeyType>(storageKeyType, true, out var storageKeyTypeEnum))
             {
-                throw new ArgumentException($"Invalid storage key type: {storageKeyType}. Valid values are: StorageAccessKey, SharedAccessKey, ManagedIdentity");
+                throw new ArgumentException($"Invalid storage key type: {storageKeyType}. Valid values are: StorageAccessKey, SharedAccessKey");
             }
 
             var exportDefinition = new ResourceManager.Sql.Models.DatabaseExportDefinition(
                 storageKeyTypeEnum,
                 storageKey,
                 new Uri(storageUri),
-                adminUser)
+                adminUser,
+                adminPassword)
             {
-                AdministratorLoginPassword = adminPassword
+                AuthenticationType = !string.IsNullOrEmpty(authType) ? authType : "Sql"
             };
 
             var operation = await databaseResource.Value.ExportAsync(
@@ -428,7 +428,6 @@ public async Task<SqlDatabaseExportResult> ExportDatabaseAsync(
                 "Successfully started SQL database export. Server: {Server}, Database: {Database}, ResourceGroup: {ResourceGroup}, OperationId: {OperationId}",
                 serverName, databaseName, resourceGroup, result?.Id?.ToString());
 
-            // Convert string times to DateTimeOffset if possible
             DateTimeOffset? queuedTime = null;
             DateTimeOffset? lastModifiedTime = null;
 

tools/Azure.Mcp.Tools.Sql/src/SqlSetup.cs

@@ -25,6 +25,7 @@ public void ConfigureServices(IServiceCollection services)
         services.AddSingleton<DatabaseListCommand>();
         services.AddSingleton<DatabaseCreateCommand>();
         services.AddSingleton<DatabaseRenameCommand>();
+        services.AddSingleton<DatabaseExportCommand>();
         services.AddSingleton<DatabaseUpdateCommand>();
         services.AddSingleton<DatabaseDeleteCommand>();
 

tools/Azure.Mcp.Tools.Sql/tests/Azure.Mcp.Tools.Sql.UnitTests/Database/DatabaseExportCommandTests.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT License.
 
 using System.CommandLine;
+using System.Net;
 using Azure.Mcp.Core.Models.Command;
 using Azure.Mcp.Core.Options;
 using Azure.Mcp.Tools.Sql.Commands.Database;
@@ -98,11 +99,11 @@ public async Task ExecuteAsync_WithValidParameters_ReturnsSuccessResult()
         // Assert
         Assert.NotNull(response);
         // Debug: Add detailed error info
-        if (response.Status != 200)
+        if (response.Status != HttpStatusCode.OK)
         {
-            throw new Exception($"Expected 200 but got {response.Status}. Message: {response.Message}");
+            throw new Exception($"Expected OK but got {response.Status}. Message: {response.Message}");
         }
-        Assert.Equal(200, response.Status);
+        Assert.Equal(HttpStatusCode.OK, response.Status);
         Assert.NotNull(response.Results);
         Assert.Equal("Success", response.Message);
     }
@@ -143,7 +144,7 @@ public async Task ExecuteAsync_WithServiceException_ReturnsErrorResult()
         var response = await _command.ExecuteAsync(_context, args);
 
         // Assert
-        Assert.Equal(500, response.Status);
+        Assert.Equal(HttpStatusCode.InternalServerError, response.Status);
         Assert.Contains("Database not found", response.Message);
     }
 
@@ -167,7 +168,7 @@ public async Task ExecuteAsync_WithMissingSubscription_ReturnsValidationError()
         var response = await _command.ExecuteAsync(_context, args);
 
         // Assert
-        Assert.Equal(400, response.Status);
+        Assert.Equal(HttpStatusCode.BadRequest, response.Status);
         Assert.Contains("subscription", response.Message, StringComparison.OrdinalIgnoreCase);
     }
 
@@ -191,7 +192,7 @@ public async Task ExecuteAsync_WithMissingStorageUri_ReturnsValidationError()
         var response = await _command.ExecuteAsync(_context, args);
 
         // Assert
-        Assert.Equal(400, response.Status);
+        Assert.Equal(HttpStatusCode.BadRequest, response.Status);
         Assert.Contains("Missing Required options: --storage-uri", response.Message);
     }
 
@@ -201,7 +202,7 @@ public async Task ExecuteAsync_WithInvalidStorageUri_ReturnsValidationError()
         // Arrange
         var args = _commandDefinition.Parse([
             "--subscription", "test-subscription",
-            "--resource-group", "test-rg", 
+            "--resource-group", "test-rg",
             "--server", "test-server",
             "--database", "test-db",
             "--storage-uri", "invalid-uri",
@@ -216,7 +217,7 @@ public async Task ExecuteAsync_WithInvalidStorageUri_ReturnsValidationError()
         var response = await _command.ExecuteAsync(_context, args);
 
         // Assert
-        Assert.Equal(400, response.Status);
+        Assert.Equal(HttpStatusCode.BadRequest, response.Status);
         Assert.Contains("Storage URI must be a valid absolute URI", response.Message);
     }
 
@@ -231,7 +232,7 @@ public async Task ExecuteAsync_WithInvalidStorageKeyType_ReturnsValidationError(
             "--database", "test-db",
             "--storage-uri", "https://storage.blob.core.windows.net/container/export.bacpac",
             "--storage-key", "storagekey123",
-            "--storage-key-type", "InvalidType",
+            "--storage-key-type", "ManagedIdentity", // This is now invalid for storage key type
             "--admin-user", "admin",
             "--admin-password", "password123",
             "--auth-type", "SQL"
@@ -241,8 +242,8 @@ public async Task ExecuteAsync_WithInvalidStorageKeyType_ReturnsValidationError(
         var response = await _command.ExecuteAsync(_context, args);
 
         // Assert
-        Assert.Equal(400, response.Status);
-        Assert.Contains("Invalid storage key type", response.Message);
+        Assert.Equal(HttpStatusCode.BadRequest, response.Status);
+        Assert.Contains("Invalid storage key type 'ManagedIdentity'. Valid values are: StorageAccessKey, SharedAccessKey", response.Message);
     }
 
     [Fact]
@@ -266,7 +267,7 @@ public async Task ExecuteAsync_WithInvalidAuthenticationType_ReturnsValidationEr
         var response = await _command.ExecuteAsync(_context, args);
 
         // Assert
-        Assert.Equal(400, response.Status);
+        Assert.Equal(HttpStatusCode.BadRequest, response.Status);
         Assert.Contains("Invalid authentication type", response.Message);
     }
 
@@ -336,7 +337,6 @@ await _sqlService.Received(1).ExportDatabaseAsync(
     [Theory]
     [InlineData("StorageAccessKey")]
     [InlineData("SharedAccessKey")]
-    [InlineData("ManagedIdentity")]
     public async Task ExecuteAsync_WithValidStorageKeyTypes_ExecutesSuccessfully(string storageKeyType)
     {
         // Arrange
@@ -384,7 +384,7 @@ public async Task ExecuteAsync_WithValidStorageKeyTypes_ExecutesSuccessfully(str
         var response = await _command.ExecuteAsync(_context, args);
 
         // Assert
-        Assert.Equal(200, response.Status);
+        Assert.Equal(HttpStatusCode.OK, response.Status);
     }
 
     [Theory]
@@ -438,7 +438,7 @@ public async Task ExecuteAsync_WithValidAuthTypes_ExecutesSuccessfully(string au
         var response = await _command.ExecuteAsync(_context, args);
 
         // Assert
-        Assert.Equal(200, response.Status);
+        Assert.Equal(HttpStatusCode.OK, response.Status);
     }
 
     [Fact]
@@ -461,7 +461,7 @@ public async Task ExecuteAsync_WithMissingAdminUser_ReturnsValidationError()
         var response = await _command.ExecuteAsync(_context, args);
 
         // Assert
-        Assert.Equal(400, response.Status);
+        Assert.Equal(HttpStatusCode.BadRequest, response.Status);
         Assert.Contains("Missing Required options: --admin-user", response.Message);
     }
 
@@ -485,7 +485,7 @@ public async Task ExecuteAsync_WithMissingAdminPassword_ReturnsValidationError()
         var response = await _command.ExecuteAsync(_context, args);
 
         // Assert
-        Assert.Equal(400, response.Status);
+        Assert.Equal(HttpStatusCode.BadRequest, response.Status);
         Assert.Contains("Missing Required options: --admin-password", response.Message);
     }
-}
+}