Merge pull request #2182 from solankisamir/sasolank_updatepowershell

markcowl · markcowl · commit e105e79880a0 · 2016-04-30T01:12:09.000Z
[Release-1.4.0] Better Error communication in case of Long Running Operation
diff --git a/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/ApiManagementClient.cs b/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/ApiManagementClient.cs
@@ -1689,7 +1689,7 @@ public TenantConfigurationLongRunningOperation BeginSaveTenantGitConfiguration(
                 context.ServiceName,
                 saveConfigurationParams);
 
-            return TenantConfigurationLongRunningOperation.CreateLongRunningOperation("Save-AzureRmApiManagement", longrunningResponse);
+            return TenantConfigurationLongRunningOperation.CreateLongRunningOperation("Save-AzureRmApiManagementTenantGitConfiguration", longrunningResponse);
         }
 
         public TenantConfigurationLongRunningOperation BeginPublishTenantGitConfiguration(
@@ -1707,7 +1707,7 @@ public TenantConfigurationLongRunningOperation BeginPublishTenantGitConfiguratio
                 context.ServiceName,
                 deployConfigurationParams);
 
-            return TenantConfigurationLongRunningOperation.CreateLongRunningOperation("Publish-AzureRmApiManagement", longrunningResponse);
+            return TenantConfigurationLongRunningOperation.CreateLongRunningOperation("Publish-AzureRmApiManagementTenantGitConfiguration", longrunningResponse);
         }
 
         public TenantConfigurationLongRunningOperation BeginValidateTenantGitConfiguration(
@@ -1725,7 +1725,7 @@ public TenantConfigurationLongRunningOperation BeginValidateTenantGitConfigurati
                 context.ServiceName,
                 deployConfigurationParams);
 
-            return TenantConfigurationLongRunningOperation.CreateLongRunningOperation("Publish-AzureRmApiManagement -ValidateOnly", longrunningResponse);
+            return TenantConfigurationLongRunningOperation.CreateLongRunningOperation("Publish-AzureRmApiManagementTenantGitConfiguration -ValidateOnly", longrunningResponse);
         }
 
         public PsApiManagementTenantConfigurationSyncState GetTenantConfigurationSyncState(
diff --git a/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/AzureApiManagementCmdletBase.cs b/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/AzureApiManagementCmdletBase.cs
@@ -107,8 +107,7 @@ protected TenantConfigurationLongRunningOperation WaitForOperationToComplete(Ten
 
         protected void ExecuteTenantConfigurationLongRunningCmdletWrap(
             Func<TenantConfigurationLongRunningOperation> func,
-            bool passThru = false,
-            object passThruValue = null)
+            bool passThru = false)
         {
             try
             {
@@ -121,12 +120,21 @@ protected void ExecuteTenantConfigurationLongRunningCmdletWrap(
                         longRunningOperation.OperationResult.Error.Message
                         : longRunningOperation.OperationName;
 
+                    WriteObject(longRunningOperation.OperationResult);
+                    if (longRunningOperation.OperationResult.Error != null)
+                    {
+                        WriteObject(longRunningOperation.OperationResult.Error);
+                        if (longRunningOperation.OperationResult.Error.Details != null)
+                        {
+                            WriteObject(longRunningOperation.OperationResult.Error.Details, true);
+                        }
+                    }
+
                     WriteErrorWithTimestamp(errorMessage);
-                    WriteObject(passThruValue ?? longRunningOperation.OperationResult);
                 }
                 else if (passThru)
                 {
-                    WriteObject(passThruValue ?? longRunningOperation.OperationResult);
+                    WriteObject(longRunningOperation.OperationResult);
                 }
             }
             catch (ArgumentException ex)
diff --git a/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/NewAzureApiManagementProduct.cs b/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/NewAzureApiManagementProduct.cs
@@ -88,14 +88,10 @@ public override void ExecuteApiManagementCmdlet()
             string productId = ProductId ?? Guid.NewGuid().ToString("N");
 
             bool? approvalRequired = null;
-            if (SubscriptionRequired.HasValue && SubscriptionRequired.Value)
-            {
-                approvalRequired = ApprovalRequired ?? false;
-            }
-
             Int32? subscriptionsLimit = null;
             if (SubscriptionRequired.HasValue && SubscriptionRequired.Value)
             {
+                approvalRequired = ApprovalRequired ?? false;
                 subscriptionsLimit = SubscriptionsLimit ?? 1;
             }
 
diff --git a/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/NewAzureApiManagmentProperty.cs b/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/NewAzureApiManagmentProperty.cs
@@ -57,7 +57,7 @@ public class NewAzureApiManagementProperty : AzureApiManagementCmdletBase
             ValueFromPipelineByPropertyName = true,
             Mandatory = false,
             HelpMessage = "Determines whether the value is a secret and should be encrypted or not." +
-                          " This parameter is optional. Default Value is not Secret.")]
+                          " This parameter is optional. Default Value is false.")]
         public SwitchParameter Secret { get; set; }
 
         [Parameter(
diff --git a/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/PublishAzureApiManagementTenantConfiguration.cs b/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/PublishAzureApiManagementTenantConfiguration.cs
@@ -58,7 +58,7 @@ public class PublishAzureApiManagementTenantConfiguration : AzureApiManagementCm
             ValueFromPipelineByPropertyName = true,
             Mandatory = false,
             HelpMessage = "If specified then instance of Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Models.PsApiManagementOperationResult" +
-                          " type representing the operation result.")]
+                          " type representing the operation result will be written to output.")]
         public SwitchParameter PassThru { get; set; }
 
         public override void ExecuteApiManagementCmdlet()
diff --git a/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/SaveAzureApiManagementTenantConfiguration.cs b/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/SaveAzureApiManagementTenantConfiguration.cs
@@ -51,7 +51,7 @@ public class SaveAzureApiManagementTenantConfiguration : AzureApiManagementCmdle
             Mandatory = false,
             HelpMessage = "If specified then instance of" +
                           " Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Models.PsApiManagementOperationResult type" +
-                          " representing the operation result.")]
+                          " representing the operation result will be written to output.")]
         public SwitchParameter PassThru { get; set; }
 
         public override void ExecuteApiManagementCmdlet()
diff --git a/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/SetAzureApiManagementLogger.cs b/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/SetAzureApiManagementLogger.cs
@@ -68,7 +68,7 @@ public class SetAzureApiManagementLogger : AzureApiManagementCmdletBase
             Mandatory = false,
             HelpMessage = "If specified then instance of " +
                           "Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Models.PsApiManagementLogger type " +
-                          " representing the modified logger.")]
+                          " representing the modified logger will be written to output.")]
         public SwitchParameter PassThru { get; set; }
 
         public override void ExecuteApiManagementCmdlet()
diff --git a/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/SetAzureApiManagementOpenIdConnectProvider.cs b/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/SetAzureApiManagementOpenIdConnectProvider.cs
@@ -71,7 +71,7 @@ public class SetAzureApiManagementOpenIdConnectProvider : AzureApiManagementCmdl
             Mandatory = false,
             HelpMessage = "If specified then instance of " +
                           "Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Models.PsApiManagementOpenIdConnectProvider type" +
-                          " representing the modified OpenId Connect Provider.")]
+                          " representing the modified OpenId Connect Provider will be written to output.")]
         public SwitchParameter PassThru { get; set; }
 
         public override void ExecuteApiManagementCmdlet()
diff --git a/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/SetAzureApiManagementProperty.cs b/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands/SetAzureApiManagementProperty.cs
@@ -69,7 +69,7 @@ public class SetAzureApiManagementProperty : AzureApiManagementCmdletBase
             Mandatory = false,
             HelpMessage = "If specified then instance of " +
                           "Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Models.PsApiManagementProperty type " +
-                          "representing the modified property.")]
+                          "representing the modified property will be written to output.")]
         public SwitchParameter PassThru { get; set; }
 
         public override void ExecuteApiManagementCmdlet()

Original file line number	Diff line number	Diff line change
`@@ -1689,7 +1689,7 @@ public TenantConfigurationLongRunningOperation BeginSaveTenantGitConfiguration(`
`1689`	`1689`	`context.ServiceName,`
`1690`	`1690`	`saveConfigurationParams);`
`1691`	`1691`
`1692`		`- return TenantConfigurationLongRunningOperation.CreateLongRunningOperation("Save-AzureRmApiManagement", longrunningResponse);`
	`1692`	`+ return TenantConfigurationLongRunningOperation.CreateLongRunningOperation("Save-AzureRmApiManagementTenantGitConfiguration", longrunningResponse);`
`1693`	`1693`	`}`
`1694`	`1694`
`1695`	`1695`	`public TenantConfigurationLongRunningOperation BeginPublishTenantGitConfiguration(`
`@@ -1707,7 +1707,7 @@ public TenantConfigurationLongRunningOperation BeginPublishTenantGitConfiguratio`
`1707`	`1707`	`context.ServiceName,`
`1708`	`1708`	`deployConfigurationParams);`
`1709`	`1709`
`1710`		`- return TenantConfigurationLongRunningOperation.CreateLongRunningOperation("Publish-AzureRmApiManagement", longrunningResponse);`
	`1710`	`+ return TenantConfigurationLongRunningOperation.CreateLongRunningOperation("Publish-AzureRmApiManagementTenantGitConfiguration", longrunningResponse);`
`1711`	`1711`	`}`
`1712`	`1712`
`1713`	`1713`	`public TenantConfigurationLongRunningOperation BeginValidateTenantGitConfiguration(`
`@@ -1725,7 +1725,7 @@ public TenantConfigurationLongRunningOperation BeginValidateTenantGitConfigurati`
`1725`	`1725`	`context.ServiceName,`
`1726`	`1726`	`deployConfigurationParams);`
`1727`	`1727`
`1728`		`- return TenantConfigurationLongRunningOperation.CreateLongRunningOperation("Publish-AzureRmApiManagement -ValidateOnly", longrunningResponse);`
	`1728`	`+ return TenantConfigurationLongRunningOperation.CreateLongRunningOperation("Publish-AzureRmApiManagementTenantGitConfiguration -ValidateOnly", longrunningResponse);`
`1729`	`1729`	`}`
`1730`	`1730`
`1731`	`1731`	`public PsApiManagementTenantConfigurationSyncState GetTenantConfigurationSyncState(`
Original file line number	Diff line number	Diff line change
`@@ -107,8 +107,7 @@ protected TenantConfigurationLongRunningOperation WaitForOperationToComplete(Ten`
`107`	`107`
`108`	`108`	`protected void ExecuteTenantConfigurationLongRunningCmdletWrap(`
`109`	`109`	`Func<TenantConfigurationLongRunningOperation> func,`
`110`		`- bool passThru = false,`
`111`		`- object passThruValue = null)`
	`110`	`+ bool passThru = false)`
`112`	`111`	`{`
`113`	`112`	`try`
`114`	`113`	`{`
`@@ -121,12 +120,21 @@ protected void ExecuteTenantConfigurationLongRunningCmdletWrap(`
`121`	`120`	`longRunningOperation.OperationResult.Error.Message`
`122`	`121`	`: longRunningOperation.OperationName;`
`123`	`122`
	`123`	`+ WriteObject(longRunningOperation.OperationResult);`
	`124`	`+ if (longRunningOperation.OperationResult.Error != null)`
	`125`	`+ {`
	`126`	`+ WriteObject(longRunningOperation.OperationResult.Error);`
	`127`	`+ if (longRunningOperation.OperationResult.Error.Details != null)`
	`128`	`+ {`
	`129`	`+ WriteObject(longRunningOperation.OperationResult.Error.Details, true);`
	`130`	`+ }`
	`131`	`+ }`
	`132`	`+`
`124`	`133`	`WriteErrorWithTimestamp(errorMessage);`
`125`		`- WriteObject(passThruValue ?? longRunningOperation.OperationResult);`
`126`	`134`	`}`
`127`	`135`	`else if (passThru)`
`128`	`136`	`{`
`129`		`- WriteObject(passThruValue ?? longRunningOperation.OperationResult);`
	`137`	`+ WriteObject(longRunningOperation.OperationResult);`
`130`	`138`	`}`
`131`	`139`	`}`
`132`	`140`	`catch (ArgumentException ex)`
Original file line number	Diff line number	Diff line change
`@@ -88,14 +88,10 @@ public override void ExecuteApiManagementCmdlet()`
`88`	`88`	`string productId = ProductId ?? Guid.NewGuid().ToString("N");`
`89`	`89`
`90`	`90`	`bool? approvalRequired = null;`
`91`		`- if (SubscriptionRequired.HasValue && SubscriptionRequired.Value)`
`92`		`- {`
`93`		`- approvalRequired = ApprovalRequired ?? false;`
`94`		`- }`
`95`		`-`
`96`	`91`	`Int32? subscriptionsLimit = null;`
`97`	`92`	`if (SubscriptionRequired.HasValue && SubscriptionRequired.Value)`
`98`	`93`	`{`
	`94`	`+ approvalRequired = ApprovalRequired ?? false;`
`99`	`95`	`subscriptionsLimit = SubscriptionsLimit ?? 1;`
`100`	`96`	`}`
`101`	`97`