PR Changes

Author: refortie

src/LogicApp/LogicApp/Cmdlets/IntegrationAccount/NewAzureIntegrationAccountMapCommand.cs

@@ -14,12 +14,13 @@
 
 namespace Microsoft.Azure.Commands.LogicApp.Cmdlets
 {
-    using System;
-    using System.Management.Automation;
     using Microsoft.Azure.Commands.LogicApp.Utilities;
     using Microsoft.Azure.Management.Logic.Models;
+    using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
     using Microsoft.WindowsAzure.Commands.Utilities.Common;
     using ResourceManager.Common.ArgumentCompleters;
+    using System;
+    using System.Management.Automation;
 
     /// <summary>
     /// Creates a new integration account map.
@@ -62,6 +63,7 @@ public class NewAzureIntegrationAccountMapCommand : LogicAppBaseCmdlet
 
         [Parameter(Mandatory = false, HelpMessage = "The integration account map content type.")]
         [ValidateNotNullOrEmpty]
+        [CmdletParameterBreakingChange("ContentType", ChangeDescription = Constants.DeprecatedContentTypeMessage)]
         public string ContentType { get; set; }
 
         [Parameter(Mandatory = false, HelpMessage = "The integration account map metadata.",
@@ -90,10 +92,7 @@ public override void ExecuteCmdlet()
                 this.MapDefinition = CmdletHelper.GetContentFromFile(this.TryResolvePath(this.MapFilePath));
             }
 
-            if (string.IsNullOrEmpty(this.ContentType))
-            {
-                this.ContentType = this.MapType.Equals("liquid", StringComparison.CurrentCultureIgnoreCase) ? "text/plain" : "application/xml";
-            }
+            this.ContentType = this.MapType.Equals("liquid", StringComparison.CurrentCultureIgnoreCase) ? "text/plain" : "application/xml";
 
             this.WriteObject(IntegrationAccountClient.CreateIntegrationAccountMap(this.ResourceGroupName, integrationAccount.Name, this.MapName,
                 new IntegrationAccountMap

src/LogicApp/LogicApp/Cmdlets/IntegrationAccount/UpdateAzureIntegrationAccountMapCommand.cs

@@ -14,13 +14,14 @@
 
 namespace Microsoft.Azure.Commands.LogicApp.Cmdlets
 {
-    using System;
-    using System.Management.Automation;
     using Microsoft.Azure.Commands.LogicApp.Utilities;
     using Microsoft.Azure.Management.Logic.Models;
+    using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
     using Microsoft.WindowsAzure.Commands.Utilities.Common;
-    using System.Globalization;
     using ResourceManager.Common.ArgumentCompleters;
+    using System;
+    using System.Globalization;
+    using System.Management.Automation;
 
     /// <summary>
     /// Updates the integration account map.
@@ -63,6 +64,7 @@ public class UpdateAzureIntegrationAccountMapCommand : LogicAppBaseCmdlet
 
         [Parameter(Mandatory = false, HelpMessage = "The integration account map content type.")]
         [ValidateNotNullOrEmpty]
+        [CmdletParameterBreakingChange("ContentType", ChangeDescription = Constants.DeprecatedContentTypeMessage)]
         public string ContentType { get; set; }
 
         [Parameter(Mandatory = false, HelpMessage = "The integration account map metadata.",

src/LogicApp/LogicApp/Utilities/Constants.cs

@@ -46,5 +46,7 @@ public class Constants
         public const string IsAcknowledgementSessionIdSuffix = "-ACK";
 
         public const string NoAgreementTypeParameterWarningMessage = "By default, you are using the X12 agreement type. Please provide a value for AgreementType if you would like to specify the agreement type. Possible values are X12 and Edifact.";
+
+        public const string DeprecatedContentTypeMessage = "ContentType is being deprecated without being replaced. It will be inferred from MapType";
     }
 }

tools/StaticAnalysis/Exceptions/Az.LogicApp/BreakingChangeIssues.csv

@@ -46,4 +46,6 @@
 "Microsoft.Azure.PowerShell.Cmdlets.LogicApp.dll","Microsoft.Azure.Commands.LogicApp.Cmdlets.GetAzureLogicAppTriggerCommand","Get-AzLogicAppTrigger","0","3000","The type of property 'State' of type 'Microsoft.Azure.Management.Logic.Models.WorkflowTrigger' has changed from 'System.Nullable`1[Microsoft.Azure.Management.Logic.Models.WorkflowState]' to 'System.String'.","Change the type of property 'State' back to 'System.Nullable`1[Microsoft.Azure.Management.Logic.Models.WorkflowState]'."
 "Microsoft.Azure.PowerShell.Cmdlets.LogicApp.dll","Microsoft.Azure.Commands.LogicApp.Cmdlets.GetAzureLogicAppTriggerCommand","Get-AzLogicAppTrigger","0","3000","The type of property 'Status' of type 'Microsoft.Azure.Management.Logic.Models.WorkflowTrigger' has changed from 'System.Nullable`1[Microsoft.Azure.Management.Logic.Models.WorkflowStatus]' to 'System.String'.","Change the type of property 'Status' back to 'System.Nullable`1[Microsoft.Azure.Management.Logic.Models.WorkflowStatus]'."
 "Microsoft.Azure.PowerShell.Cmdlets.LogicApp.dll","Microsoft.Azure.Commands.LogicApp.Cmdlets.GetAzureLogicAppTriggerCommand","Get-AzLogicAppTrigger","0","3000","The type of property 'ProvisioningState' of type 'Microsoft.Azure.Management.Logic.Models.WorkflowTrigger' has changed from 'System.Nullable`1[Microsoft.Azure.Management.Logic.Models.WorkflowTriggerProvisioningState]' to 'System.String'.","Change the type of property 'ProvisioningState' back to 'System.Nullable`1[Microsoft.Azure.Management.Logic.Models.WorkflowTriggerProvisioningState]'."
-"Microsoft.Azure.PowerShell.Cmdlets.LogicApp.dll","Microsoft.Azure.Commands.LogicApp.Cmdlets.GetAzureLogicAppTriggerHistoryCommand","Get-AzLogicAppTriggerHistory","0","3000","The type of property 'Status' of type 'Microsoft.Azure.Management.Logic.Models.WorkflowTriggerHistory' has changed from 'System.Nullable`1[Microsoft.Azure.Management.Logic.Models.WorkflowStatus]' to 'System.String'.","Change the type of property 'Status' back to 'System.Nullable`1[Microsoft.Azure.Management.Logic.Models.WorkflowStatus]'."
+"Microsoft.Azure.PowerShell.Cmdlets.LogicApp.dll","Microsoft.Azure.Commands.LogicApp.Cmdlets.GetAzureLogicAppTriggerHistoryCommand","Get-AzLogicAppTriggerHistory","0","3000","The type of property 'Status' of type 'Microsoft.Azure.Management.Logic.Models.WorkflowTriggerHistory' has changed from 'System.Nullable`1[Microsoft.Azure.Management.Logic.Models.WorkflowStatus]' to 'System.String'.","Change the type of property 'Status' back to 'System.Nullable`1[Microsoft.Azure.Management.Logic.Models.WorkflowStatus]'."
+"Microsoft.Azure.PowerShell.Cmdlets.LogicApp.dll","Microsoft.Azure.Commands.LogicApp.Cmdlets.NewAzureIntegrationAccountCommand","New-AzIntegrationAccount","0","2050","A validate set has been added for parameter 'Sku' for cmdlet 'New-AzIntegrationAccount'.","Remove the validate set from parameter 'Sku'."
+"Microsoft.Azure.PowerShell.Cmdlets.LogicApp.dll","Microsoft.Azure.Commands.LogicApp.Cmdlets.UpdateAzureIntegrationAccountCommand","Set-AzIntegrationAccount","0","2050","A validate set has been added for parameter 'Sku' for cmdlet 'Set-AzIntegrationAccount'.","Remove the validate set from parameter 'Sku'."