CodeToCloud tool feature parity for Deploy and Quota area

.github/CODEOWNERS

@@ -157,10 +157,10 @@
 # ServiceOwners:                       @sajeetharan @xiangyan99
 
 # PRLabel: %tools-Deploy
-/tools/Azure.Mcp.Tools.Deploy/         @qianwens @xiaofanzhou @microsoft/azure-mcp
+/tools/Azure.Mcp.Tools.Deploy/         @qianwens @xfz11 @wchigit @microsoft/azure-mcp
 
 # ServiceLabel: %tools-Deploy
-# ServiceOwners:                       @qianwens @xiaofanzhou
+# ServiceOwners:                       @qianwens @xfz11 @wchigit
 
 # ServiceLabel: %tools-Docker
 # ServiceOwners:                       @conniey @microsoft/azure-mcp
@@ -283,10 +283,10 @@
 # ServiceOwners:                     @anannya03 @microsoft/azure-mcp
 
 # PRLabel: %tools-Quota
-/tools/Azure.Mcp.Tools.Quota/          @qianwens @xiaofanzhou @microsoft/azure-mcp
+/tools/Azure.Mcp.Tools.Quota/          @qianwens @xfz11 @wchigit @microsoft/azure-mcp
 
 # ServiceLabel: %tools-Quota
-# ServiceOwners:                       @qianwens @xiaofanzhou
+# ServiceOwners:                       @qianwens @xfz11 @wchigit
 
 # PRLabel: %tools-Redis
 /tools/Azure.Mcp.Tools.Redis/           @philon-msft @sharedferret @xiangyan99 @microsoft/azure-mcp

servers/Azure.Mcp.Server/changelog-entries/1773132657117.yaml

@@ -0,0 +1,17 @@
+pr: 1663
+changes:
+  - section: "Breaking Changes"
+    description: |
+      `azmcp deploy pipeline guidance get` option renames and removals:
+      - `--use-azd-pipeline-config` renamed to `--is-azd-project`
+      - `--azd-iac-options` renamed to `--iac-options`
+      - `--organization-name`, `--repository-name`, and `--github-environment-name` options removed
+      - `--pipeline-platform` and `--deploy-option` added as new options
+      This new design allows an overall better user experience to generate CI/CD pipeline to Azure. 
+  - section: "Features Added"
+    description: |
+      CodeToCloud feature parity improvements for Deploy and Quota areas:
+      - Support deployment using Azure CLI with Bicep/Terraform
+      - Support creation of a deploy-to-existing-resources plan
+      - New resource type support in quota checks, including SQL, MySQL, and CosmosDB
+      - New IaC rules added for better support regarding code quality, configuration success and security

servers/Azure.Mcp.Server/docs/azmcp-commands.md

@@ -1044,18 +1044,21 @@ azmcp deploy iac rules get --deployment-tool <deployment-tool> \
 
 # Get the ci/cd pipeline guidance
 # ❌ Destructive | ✅ Idempotent | ❌ OpenWorld | ✅ ReadOnly | ❌ Secret | ❌ LocalRequired
-azmcp deploy pipeline guidance get [--use-azd-pipeline-config <use-azd-pipeline-config>] \
-                                   [--organization-name <organization-name>] \
-                                   [--repository-name <repository-name>] \
-                                   [--github-environment-name <github-environment-name>]
+azmcp deploy pipeline guidance get [--is-azd-project <is-azd-project>] \
+                                   [--pipeline-platform <pipeline-platform>] \
+                                   [--deploy-option <deploy-option>] 
 
 # Get a deployment plan for a specific project
 # ❌ Destructive | ✅ Idempotent | ❌ OpenWorld | ✅ ReadOnly | ❌ Secret | ❌ LocalRequired
 azmcp deploy plan get --workspace-folder <workspace-folder> \
                       --project-name <project-name> \
                       --target-app-service <target-app-service> \
                       --provisioning-tool <provisioning-tool> \
-                      [--azd-iac-options <azd-iac-options>]
+                      --source-type <source-type> \
+                      [--iac-options <iac-options>] \
+                      [--deploy-option <deploy-option>] \
+                      [--resource-group <resource-group>] \
+                      [--subscription <subscription>]
 ```
 
 ### Azure Event Grid Operations

servers/Azure.Mcp.Server/docs/e2eTestPrompts.md

@@ -279,9 +279,9 @@ This file contains prompts used for end-to-end testing to ensure each tool is in
 |:----------|:----------|
 | deploy_app_logs_get | Show me the log of the application deployed by azd  |
 | deploy_architecture_diagram_generate | Generate the azure architecture diagram for this application |
-| deploy_iac_rules_get | Show me the rules to generate bicep scripts  |
-| deploy_pipeline_guidance_get | How can I create a CI/CD pipeline to deploy this app to Azure? |
-| deploy_plan_get | Create a plan to deploy this application to azure |
+| deploy_iac_rules_get | Show me the rules to generate bicep scripts for \<resource-type>  |
+| deploy_pipeline_guidance_get | Help me set up a CI/CD pipeline to deploy to Azure. |
+| deploy_plan_get | Scan my project carefully to identify all Azure-relevant resources, programming languages, frameworks, dependencies, and configuration files needed for deployment. Develop a provision-and-deploy plan and follow it to deploy my application to Azure. deployTool: azcli, IacType: Terraform, hosting service: Container Apps.|
 
 ## Azure Event Grid
 

tools/Azure.Mcp.Tools.Deploy/src/Azure.Mcp.Tools.Deploy.csproj

@@ -9,7 +9,6 @@
   <ItemGroup>
     <ProjectReference Include="..\..\..\core\Azure.Mcp.Core\src\Azure.Mcp.Core.csproj" />
   </ItemGroup>
-  <ItemGroup />
   <ItemGroup>
     <PackageReference Include="Azure.Core" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
@@ -20,7 +19,7 @@
     <PackageReference Include="Azure.ResourceManager.AppService" />
     <PackageReference Include="Azure.ResourceManager.AppContainers" />
     <PackageReference Include="Azure.ResourceManager.Resources" />
-    <PackageReference Include="Azure.ResourceManager.Compute"/>
+    <PackageReference Include="Azure.ResourceManager.Compute" />
     <PackageReference Include="Azure.ResourceManager.MachineLearning" />
     <PackageReference Include="Azure.ResourceManager.Network" />
     <PackageReference Include="Azure.ResourceManager.ContainerInstance" />

tools/Azure.Mcp.Tools.Deploy/src/Commands/Infrastructure/RulesGetCommand.cs

@@ -33,7 +33,7 @@ public sealed class RulesGetCommand(ILogger<RulesGetCommand> logger)
 
     public override string Description =>
         """
-        This tool offers guidelines for creating Bicep/Terraform files to deploy applications on Azure. The guidelines outline rules to improve the quality of Infrastructure as Code files, ensuring they are compatible with the azd tool and adhere to best practices.
+        This tool offers guidelines for creating Bicep/Terraform files to deploy applications on Azure as well as general Azure Resource Rules. The guidelines outline rules to improve the quality of Infrastructure as Code files and resource configurations, ensuring they are compatible with the azd tool or az cli and adhere to best practices.
         """;
 
     protected override void RegisterOptions(Command command)
@@ -70,7 +70,7 @@ public override Task<CommandResponse> ExecuteAsync(CommandContext context, Parse
                 .AddTag(DeployTelemetryTags.ComputeHostResources, options.ResourceTypes);
 
             var resourceTypes = options.ResourceTypes.Split(',')
-                .Select(rt => rt.Trim())
+                .Select(rt => rt.Trim().ToLowerInvariant())
                 .Where(rt => !string.IsNullOrWhiteSpace(rt))
                 .ToArray();
 

tools/Azure.Mcp.Tools.Deploy/src/Commands/Pipeline/GuidanceGetCommand.cs

@@ -24,7 +24,7 @@ public sealed class GuidanceGetCommand(ILogger<GuidanceGetCommand> logger)
 
     public override string Description =>
         """
-        Guidance to create a CI/CD pipeline which provision Azure resources and build and deploy applications to Azure. Use this tool BEFORE generating/creating a Github actions workflow file for DEPLOYMENT on Azure. Infrastructure files should be ready and the application should be ready to be containerized.
+        This tool helps create a CI/CD pipeline to deploy a project to Azure. BEFORE calling this tool, you MUST confirm with user 1. if they want to use Github Actions or ADO pipeline 2. if they have existing Azure resources to deploy for different environments. If user has existing Azure resources, *ASK* for subscription ID, resource groups, environments, Azure hosting service TYPEs. If user does not have existing resources, *ASK* whether to include provision in the pipeline. *DO NOT call this tool UNTIL you made these confirmations with user*.
         """;
 
     public override string Title => CommandTitle;
@@ -41,19 +41,17 @@ public sealed class GuidanceGetCommand(ILogger<GuidanceGetCommand> logger)
     protected override void RegisterOptions(Command command)
     {
         base.RegisterOptions(command);
-        command.Options.Add(DeployOptionDefinitions.PipelineGenerateOptions.UseAZDPipelineConfig);
-        command.Options.Add(DeployOptionDefinitions.PipelineGenerateOptions.OrganizationName);
-        command.Options.Add(DeployOptionDefinitions.PipelineGenerateOptions.RepositoryName);
-        command.Options.Add(DeployOptionDefinitions.PipelineGenerateOptions.GithubEnvironmentName);
+        command.Options.Add(DeployOptionDefinitions.PipelineGenerateOptions.IsAZDProject);
+        command.Options.Add(DeployOptionDefinitions.PipelineGenerateOptions.PipelinePlatform);
+        command.Options.Add(DeployOptionDefinitions.PipelineGenerateOptions.DeployOption);
     }
 
     protected override GuidanceGetOptions BindOptions(ParseResult parseResult)
     {
         var options = base.BindOptions(parseResult);
-        options.UseAZDPipelineConfig = parseResult.GetValueOrDefault<bool>(DeployOptionDefinitions.PipelineGenerateOptions.UseAZDPipelineConfig.Name);
-        options.OrganizationName = parseResult.GetValueOrDefault<string>(DeployOptionDefinitions.PipelineGenerateOptions.OrganizationName.Name);
-        options.RepositoryName = parseResult.GetValueOrDefault<string>(DeployOptionDefinitions.PipelineGenerateOptions.RepositoryName.Name);
-        options.GithubEnvironmentName = parseResult.GetValueOrDefault<string>(DeployOptionDefinitions.PipelineGenerateOptions.GithubEnvironmentName.Name);
+        options.IsAZDProject = parseResult.GetValueOrDefault<bool>(DeployOptionDefinitions.PipelineGenerateOptions.IsAZDProject.Name);
+        options.PipelinePlatform = parseResult.GetValueOrDefault<string>(DeployOptionDefinitions.PipelineGenerateOptions.PipelinePlatform.Name);
+        options.DeployOption = parseResult.GetValueOrDefault<string>(DeployOptionDefinitions.PipelineGenerateOptions.DeployOption.Name);
         return options;
     }
 

tools/Azure.Mcp.Tools.Deploy/src/Commands/Plan/GetCommand.cs

@@ -5,13 +5,15 @@
 using System.Security.Cryptography;
 using System.Text;
 using Azure.Mcp.Core.Extensions;
+using Azure.Mcp.Core.Models.Option;
 using Azure.Mcp.Tools.Deploy.Models;
 using Azure.Mcp.Tools.Deploy.Options;
 using Azure.Mcp.Tools.Deploy.Options.Plan;
 using Azure.Mcp.Tools.Deploy.Services.Util;
 using Microsoft.Extensions.Logging;
 using Microsoft.Mcp.Core.Commands;
 using Microsoft.Mcp.Core.Models.Command;
+using Microsoft.Mcp.Core.Models.Option;
 
 namespace Azure.Mcp.Tools.Deploy.Commands.Plan;
 
@@ -26,7 +28,7 @@ public sealed class GetCommand(ILogger<GetCommand> logger)
 
     public override string Description =>
         """
-        Generates a deployment plan to construct the infrastructure and deploy the application on Azure. Agent should read its output and generate a deploy plan in '.azure/plan.copilotmd' for execution steps, recommended azure services based on the information agent detected from project. Before calling this tool, please scan this workspace to detect the services to deploy and their dependent services.
+        Entry point to help the agent deploy a service to the cloud. Agent should read its output and generate a deploy plan in '.azure/plan.${COPILOT_MD_EXTENSION}' for execution steps, recommended Azure services based on the information agent detected from project. Before calling this tool, scan this workspace to detect the services to deploy and their dependent services. If user has existing resources and only wants to deploy to existing resources, agent MUST first help user to pick existing Azure resources's ARM ID with Az CLI command or prompt user to provide!
         """;
 
     public override string Title => CommandTitle;
@@ -47,7 +49,10 @@ protected override void RegisterOptions(Command command)
         command.Options.Add(DeployOptionDefinitions.PlanGet.ProjectName);
         command.Options.Add(DeployOptionDefinitions.PlanGet.TargetAppService);
         command.Options.Add(DeployOptionDefinitions.PlanGet.ProvisioningTool);
-        command.Options.Add(DeployOptionDefinitions.PlanGet.AzdIacOptions);
+        command.Options.Add(DeployOptionDefinitions.PlanGet.IacOptions);
+        command.Options.Add(DeployOptionDefinitions.PlanGet.SourceType);
+        command.Options.Add(DeployOptionDefinitions.PlanGet.DeployOption);
+        command.Options.Add(OptionDefinitions.Common.ResourceGroup.AsOptional());
     }
 
     protected override GetOptions BindOptions(ParseResult parseResult)
@@ -58,7 +63,10 @@ protected override GetOptions BindOptions(ParseResult parseResult)
             ProjectName = parseResult.GetValueOrDefault<string>(DeployOptionDefinitions.PlanGet.ProjectName.Name) ?? string.Empty,
             TargetAppService = parseResult.GetValueOrDefault<string>(DeployOptionDefinitions.PlanGet.TargetAppService.Name) ?? string.Empty,
             ProvisioningTool = parseResult.GetValueOrDefault<string>(DeployOptionDefinitions.PlanGet.ProvisioningTool.Name) ?? string.Empty,
-            AzdIacOptions = parseResult.GetValueOrDefault<string>(DeployOptionDefinitions.PlanGet.AzdIacOptions.Name) ?? string.Empty
+            IacOptions = parseResult.GetValueOrDefault<string>(DeployOptionDefinitions.PlanGet.IacOptions.Name) ?? string.Empty,
+            SourceType = parseResult.GetValueOrDefault<string>(DeployOptionDefinitions.PlanGet.SourceType.Name) ?? string.Empty,
+            DeployOption = parseResult.GetValueOrDefault<string>(DeployOptionDefinitions.PlanGet.DeployOption.Name) ?? string.Empty,
+            ResourceGroup = parseResult.GetValueOrDefault<string>(OptionDefinitions.Common.ResourceGroup.Name) ?? string.Empty,
         };
     }
 
@@ -81,9 +89,11 @@ public override Task<CommandResponse> ExecuteAsync(CommandContext context, Parse
             context.Activity?
                     .AddTag(DeployTelemetryTags.ComputeHostResources, options.TargetAppService)
                     .AddTag(DeployTelemetryTags.DeploymentTool, options.ProvisioningTool)
-                    .AddTag(DeployTelemetryTags.IacType, options.AzdIacOptions ?? string.Empty);
+                    .AddTag(DeployTelemetryTags.IacType, options.IacOptions ?? string.Empty)
+                    .AddTag(DeployTelemetryTags.DeployOption, options.DeployOption ?? string.Empty)
+                    .AddTag(DeployTelemetryTags.SourceType, options.SourceType ?? string.Empty);
 
-            var planTemplate = DeploymentPlanTemplateUtil.GetPlanTemplate(options.ProjectName, options.TargetAppService, options.ProvisioningTool, options.AzdIacOptions);
+            var planTemplate = DeploymentPlanTemplateUtil.GetPlanTemplate(options.ProjectName, options.TargetAppService, options.ProvisioningTool, options.SourceType ?? string.Empty, options.DeployOption ?? string.Empty, options.IacOptions, options.Subscription, options.ResourceGroup);
 
             context.Response.Message = planTemplate;
             context.Response.Status = HttpStatusCode.OK;

tools/Azure.Mcp.Tools.Deploy/src/Models/Consts.cs

@@ -48,6 +48,8 @@ public static class DeployTelemetryTags
     public static readonly string ComputeHostResources = AddPrefix("ComputeHostResources");
     public static readonly string DeploymentTool = AddPrefix("DeploymentTool");
     public static readonly string IacType = AddPrefix("IacType");
+    public static readonly string DeployOption = AddPrefix("DeployOption");
+    public static readonly string SourceType = AddPrefix("SourceType");
     public static readonly string ProjectName = AddPrefix("ProjectName");
     public static readonly string ServiceCount = AddPrefix("ServiceCount");
     public static readonly string BackingServiceResources = AddPrefix("BackingServiceResources");

tools/Azure.Mcp.Tools.Deploy/src/Models/IaCRulesParameters.cs

@@ -7,6 +7,13 @@ public static class DeploymentTool
     public const string AzCli = "AzCli";
 }
 
+public static class SourceType
+{
+    public const string FromAzure = "from-azure";
+    public const string FromProject = "from-project";
+    public const string FromContext = "from-context";
+}
+
 public static class IacType
 {
     public const string Bicep = "bicep";
@@ -18,5 +25,11 @@ public static class AzureServiceNames
     public const string AzureContainerApp = "containerapp";
     public const string AzureAppService = "appservice";
     public const string AzureFunctionApp = "function";
-    public const string AzureStorage = "storage";
+    public const string AzureKubernetesService = "aks";
+    public const string AzureDatabaseForPostgreSql = "azuredatabaseforpostgresql";
+    public const string AzureDatabaseForMySql = "azuredatabaseformysql";
+    public const string AzureSqlDatabase = "azuresqldatabase";
+    public const string AzureCosmosDb = "azurecosmosdb";
+    public const string AzureStorageAccount = "azurestorageaccount";
+    public const string AzureKeyVault = "azurekeyvault";
 }

tools/Azure.Mcp.Tools.Deploy/src/Models/PipelineParameters.cs

@@ -0,0 +1,14 @@
+namespace Azure.Mcp.Tools.Deploy.Models;
+
+public static class DeployOption
+{
+    public const string ProvisionAndDeploy = "provision-and-deploy";
+    public const string DeployOnly = "deploy-only";
+    public const string ProvisionOnly = "provision-only";
+}
+
+public static class PipelinePlatform
+{
+    public const string GitHubActions = "github-actions";
+    public const string AzureDevOps = "azure-devops";
+}

tools/Azure.Mcp.Tools.Deploy/src/Models/Templates/CLIExecutionStepsTemplateParameters.cs

@@ -0,0 +1,52 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT License.
+
+namespace Azure.Mcp.Tools.Deploy.Models.Templates;
+
+/// <summary>
+/// Parameters for generating deployment plan templates.
+/// </summary>
+public sealed class CLIExecutionStepsTemplateParameters
+{
+    /// <summary>
+    /// The azure compute host display name.
+    /// </summary>
+    public string AzureComputeHost { get; set; } = string.Empty;
+
+    /// <summary>
+    /// The azure cli command group title
+    /// </summary>
+    public string TargetAppCommandTitle { get; set; } = string.Empty;
+
+    /// <summary>
+    /// The deployment steps
+    /// </summary>
+    public string DeploymentSteps { get; set; } = string.Empty;
+
+    /// <summary>
+    /// The IaC type
+    /// </summary>
+    public string IaCType { get; set; } = string.Empty;
+
+    /// <summary>
+    /// The step to check ACR dependencies
+    /// </summary>
+    public string ACRDependencyCheck { get; set; } = string.Empty;
+
+
+    /// <summary>
+    /// Converts the parameters to a dictionary for template processing.
+    /// </summary>
+    /// <returns>A dictionary with parameter names as keys and their values.</returns>
+    public Dictionary<string, string> ToDictionary()
+    {
+        return new Dictionary<string, string>
+        {
+            { nameof(IaCType), IaCType },
+            { nameof(AzureComputeHost), AzureComputeHost },
+            { nameof(TargetAppCommandTitle), TargetAppCommandTitle },
+            { nameof(DeploymentSteps), DeploymentSteps },
+            { nameof(ACRDependencyCheck), ACRDependencyCheck }
+        };
+    }
+}