From b39c0d20597701ac26e23f387b9bc6eb0fac31b5 Mon Sep 17 00:00:00 2001 From: "Grace Huang (from Dev Box)" Date: Thu, 7 Mar 2024 14:49:22 -0500 Subject: [PATCH 1/3] temp add back in custom error handling --- ...ewAzSupportCommunication_CreateExpanded.cs | 17 ++++++++ ...unicationsNoSubscription_CreateExpanded.cs | 17 ++++++++ .../NewAzSupportTicket_CreateExpanded.cs | 17 ++++++++ ...ortTicketsNoSubscription_CreateExpanded.cs | 17 ++++++++ .../custom/csharp/RestErrorHandler.cs | 40 +++++++++++++++++++ .../UpdateAzSupportTicket_UpdateExpanded.cs | 17 ++++++++ ...SupportTicket_UpdateViaIdentityExpanded.cs | 17 ++++++++ ...ortTicketsNoSubscription_UpdateExpanded.cs | 17 ++++++++ ...oSubscription_UpdateViaIdentityExpanded.cs | 17 ++++++++ 9 files changed, 176 insertions(+) create mode 100644 src/Support/Support.Autorest/custom/csharp/NewAzSupportCommunication_CreateExpanded.cs create mode 100644 src/Support/Support.Autorest/custom/csharp/NewAzSupportCommunicationsNoSubscription_CreateExpanded.cs create mode 100644 src/Support/Support.Autorest/custom/csharp/NewAzSupportTicket_CreateExpanded.cs create mode 100644 src/Support/Support.Autorest/custom/csharp/NewAzSupportTicketsNoSubscription_CreateExpanded.cs create mode 100644 src/Support/Support.Autorest/custom/csharp/RestErrorHandler.cs create mode 100644 src/Support/Support.Autorest/custom/csharp/UpdateAzSupportTicket_UpdateExpanded.cs create mode 100644 src/Support/Support.Autorest/custom/csharp/UpdateAzSupportTicket_UpdateViaIdentityExpanded.cs create mode 100644 src/Support/Support.Autorest/custom/csharp/UpdateAzSupportTicketsNoSubscription_UpdateExpanded.cs create mode 100644 src/Support/Support.Autorest/custom/csharp/UpdateAzSupportTicketsNoSubscription_UpdateViaIdentityExpanded.cs diff --git a/src/Support/Support.Autorest/custom/csharp/NewAzSupportCommunication_CreateExpanded.cs b/src/Support/Support.Autorest/custom/csharp/NewAzSupportCommunication_CreateExpanded.cs new file mode 100644 index 000000000000..dda7085345b7 --- /dev/null +++ b/src/Support/Support.Autorest/custom/csharp/NewAzSupportCommunication_CreateExpanded.cs @@ -0,0 +1,17 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +using System.Net.Http; +using System.Threading.Tasks; +using Microsoft.Azure.PowerShell.Cmdlets.Support.Models; + +namespace Microsoft.Azure.PowerShell.Cmdlets.Support.Cmdlets +{ + public partial class NewAzSupportCommunication_CreateExpanded + { + partial void overrideOnDefault(HttpResponseMessage responseMessage, Task errorResponseTask, ref Task returnNow) + { + this.WriteError(responseMessage, errorResponseTask, ref returnNow); + } + } +} \ No newline at end of file diff --git a/src/Support/Support.Autorest/custom/csharp/NewAzSupportCommunicationsNoSubscription_CreateExpanded.cs b/src/Support/Support.Autorest/custom/csharp/NewAzSupportCommunicationsNoSubscription_CreateExpanded.cs new file mode 100644 index 000000000000..6b79f6f1acbe --- /dev/null +++ b/src/Support/Support.Autorest/custom/csharp/NewAzSupportCommunicationsNoSubscription_CreateExpanded.cs @@ -0,0 +1,17 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +using System.Net.Http; +using System.Threading.Tasks; +using Microsoft.Azure.PowerShell.Cmdlets.Support.Models; + +namespace Microsoft.Azure.PowerShell.Cmdlets.Support.Cmdlets +{ + public partial class NewAzSupportCommunicationsNoSubscription_CreateExpanded + { + partial void overrideOnDefault(HttpResponseMessage responseMessage, Task errorResponseTask, ref Task returnNow) + { + this.WriteError(responseMessage, errorResponseTask, ref returnNow); + } + } +} \ No newline at end of file diff --git a/src/Support/Support.Autorest/custom/csharp/NewAzSupportTicket_CreateExpanded.cs b/src/Support/Support.Autorest/custom/csharp/NewAzSupportTicket_CreateExpanded.cs new file mode 100644 index 000000000000..1baf777cef5e --- /dev/null +++ b/src/Support/Support.Autorest/custom/csharp/NewAzSupportTicket_CreateExpanded.cs @@ -0,0 +1,17 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +using System.Net.Http; +using System.Threading.Tasks; +using Microsoft.Azure.PowerShell.Cmdlets.Support.Models; + +namespace Microsoft.Azure.PowerShell.Cmdlets.Support.Cmdlets +{ + public partial class NewAzSupportTicket_CreateExpanded + { + partial void overrideOnDefault(HttpResponseMessage responseMessage, Task errorResponseTask, ref Task returnNow) + { + this.WriteError(responseMessage, errorResponseTask, ref returnNow); + } + } +} \ No newline at end of file diff --git a/src/Support/Support.Autorest/custom/csharp/NewAzSupportTicketsNoSubscription_CreateExpanded.cs b/src/Support/Support.Autorest/custom/csharp/NewAzSupportTicketsNoSubscription_CreateExpanded.cs new file mode 100644 index 000000000000..e126746b8815 --- /dev/null +++ b/src/Support/Support.Autorest/custom/csharp/NewAzSupportTicketsNoSubscription_CreateExpanded.cs @@ -0,0 +1,17 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +using System.Net.Http; +using System.Threading.Tasks; +using Microsoft.Azure.PowerShell.Cmdlets.Support.Models; + +namespace Microsoft.Azure.PowerShell.Cmdlets.Support.Cmdlets +{ + public partial class NewAzSupportTicketsNoSubscription_CreateExpanded + { + partial void overrideOnDefault(HttpResponseMessage responseMessage, Task errorResponseTask, ref Task returnNow) + { + this.WriteError(responseMessage, errorResponseTask, ref returnNow); + } + } +} \ No newline at end of file diff --git a/src/Support/Support.Autorest/custom/csharp/RestErrorHandler.cs b/src/Support/Support.Autorest/custom/csharp/RestErrorHandler.cs new file mode 100644 index 000000000000..a25dbdb76114 --- /dev/null +++ b/src/Support/Support.Autorest/custom/csharp/RestErrorHandler.cs @@ -0,0 +1,40 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +using System.Management.Automation; +using System.Net.Http; +using System.Threading.Tasks; +using Microsoft.Azure.PowerShell.Cmdlets.Support.Models; + +namespace Microsoft.Azure.PowerShell.Cmdlets.Support.Cmdlets +{ + internal static class CmdletRestExtension + { + public static void WriteError(this Cmdlet cmdlet, HttpResponseMessage responseMessage, Task errorResponseTask, ref Task returnNow) + { + var errorResponse = errorResponseTask?.ConfigureAwait(false).GetAwaiter().GetResult(); + + if (errorResponse?.Detail != null && errorResponse?.Detail.Count > 0) + { + var errorDetails = errorResponse.Detail; + var errorDetailsString = ""; + + foreach (var errorDetail in errorDetails) + { + errorDetailsString += errorDetail.Message + " "; + } + + cmdlet.WriteError(new ErrorRecord(new System.Exception(), null, ErrorCategory.InvalidOperation, null) + { + ErrorDetails = new ErrorDetails(errorDetailsString) { RecommendedAction = string.Empty } + }); + + returnNow = Task.FromResult(true); + } + else + { + returnNow = Task.FromResult(false); + } + } + } +} \ No newline at end of file diff --git a/src/Support/Support.Autorest/custom/csharp/UpdateAzSupportTicket_UpdateExpanded.cs b/src/Support/Support.Autorest/custom/csharp/UpdateAzSupportTicket_UpdateExpanded.cs new file mode 100644 index 000000000000..998dfa6fc3f4 --- /dev/null +++ b/src/Support/Support.Autorest/custom/csharp/UpdateAzSupportTicket_UpdateExpanded.cs @@ -0,0 +1,17 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +using System.Net.Http; +using System.Threading.Tasks; +using Microsoft.Azure.PowerShell.Cmdlets.Support.Models; + +namespace Microsoft.Azure.PowerShell.Cmdlets.Support.Cmdlets +{ + public partial class UpdateAzSupportTicket_UpdateExpanded + { + partial void overrideOnDefault(HttpResponseMessage responseMessage, Task errorResponseTask, ref Task returnNow) + { + this.WriteError(responseMessage, errorResponseTask, ref returnNow); + } + } +} \ No newline at end of file diff --git a/src/Support/Support.Autorest/custom/csharp/UpdateAzSupportTicket_UpdateViaIdentityExpanded.cs b/src/Support/Support.Autorest/custom/csharp/UpdateAzSupportTicket_UpdateViaIdentityExpanded.cs new file mode 100644 index 000000000000..d5ad29278b29 --- /dev/null +++ b/src/Support/Support.Autorest/custom/csharp/UpdateAzSupportTicket_UpdateViaIdentityExpanded.cs @@ -0,0 +1,17 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +using System.Net.Http; +using System.Threading.Tasks; +using Microsoft.Azure.PowerShell.Cmdlets.Support.Models; + +namespace Microsoft.Azure.PowerShell.Cmdlets.Support.Cmdlets +{ + public partial class UpdateAzSupportTicket_UpdateViaIdentityExpanded + { + partial void overrideOnDefault(HttpResponseMessage responseMessage, Task errorResponseTask, ref Task returnNow) + { + this.WriteError(responseMessage, errorResponseTask, ref returnNow); + } + } +} \ No newline at end of file diff --git a/src/Support/Support.Autorest/custom/csharp/UpdateAzSupportTicketsNoSubscription_UpdateExpanded.cs b/src/Support/Support.Autorest/custom/csharp/UpdateAzSupportTicketsNoSubscription_UpdateExpanded.cs new file mode 100644 index 000000000000..bc3382b9f7b6 --- /dev/null +++ b/src/Support/Support.Autorest/custom/csharp/UpdateAzSupportTicketsNoSubscription_UpdateExpanded.cs @@ -0,0 +1,17 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +using System.Net.Http; +using System.Threading.Tasks; +using Microsoft.Azure.PowerShell.Cmdlets.Support.Models; + +namespace Microsoft.Azure.PowerShell.Cmdlets.Support.Cmdlets +{ + public partial class UpdateAzSupportTicketsNoSubscription_UpdateExpanded + { + partial void overrideOnDefault(HttpResponseMessage responseMessage, Task errorResponseTask, ref Task returnNow) + { + this.WriteError(responseMessage, errorResponseTask, ref returnNow); + } + } +} \ No newline at end of file diff --git a/src/Support/Support.Autorest/custom/csharp/UpdateAzSupportTicketsNoSubscription_UpdateViaIdentityExpanded.cs b/src/Support/Support.Autorest/custom/csharp/UpdateAzSupportTicketsNoSubscription_UpdateViaIdentityExpanded.cs new file mode 100644 index 000000000000..b8f3ca67f9bd --- /dev/null +++ b/src/Support/Support.Autorest/custom/csharp/UpdateAzSupportTicketsNoSubscription_UpdateViaIdentityExpanded.cs @@ -0,0 +1,17 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +using System.Net.Http; +using System.Threading.Tasks; +using Microsoft.Azure.PowerShell.Cmdlets.Support.Models; + +namespace Microsoft.Azure.PowerShell.Cmdlets.Support.Cmdlets +{ + public partial class UpdateAzSupportTicketsNoSubscription_UpdateViaIdentityExpanded + { + partial void overrideOnDefault(HttpResponseMessage responseMessage, Task errorResponseTask, ref Task returnNow) + { + this.WriteError(responseMessage, errorResponseTask, ref returnNow); + } + } +} \ No newline at end of file From 8e66b2138e4f7bd1428a3c4f09199d4ad68f5268 Mon Sep 17 00:00:00 2001 From: "Grace Huang (from Dev Box)" Date: Thu, 7 Mar 2024 18:45:55 -0500 Subject: [PATCH 2/3] print whole error --- .../custom/csharp/RestErrorHandler.cs | 51 +++++++++++-------- 1 file changed, 30 insertions(+), 21 deletions(-) diff --git a/src/Support/Support.Autorest/custom/csharp/RestErrorHandler.cs b/src/Support/Support.Autorest/custom/csharp/RestErrorHandler.cs index a25dbdb76114..e24320cc5ff1 100644 --- a/src/Support/Support.Autorest/custom/csharp/RestErrorHandler.cs +++ b/src/Support/Support.Autorest/custom/csharp/RestErrorHandler.cs @@ -12,29 +12,38 @@ internal static class CmdletRestExtension { public static void WriteError(this Cmdlet cmdlet, HttpResponseMessage responseMessage, Task errorResponseTask, ref Task returnNow) { - var errorResponse = errorResponseTask?.ConfigureAwait(false).GetAwaiter().GetResult(); + var errorDetailsString = responseMessage.Content.ReadAsStringAsync().Result; - if (errorResponse?.Detail != null && errorResponse?.Detail.Count > 0) + cmdlet.WriteError(new ErrorRecord(new System.Exception(), null, ErrorCategory.InvalidOperation, null) { - var errorDetails = errorResponse.Detail; - var errorDetailsString = ""; - - foreach (var errorDetail in errorDetails) - { - errorDetailsString += errorDetail.Message + " "; - } - - cmdlet.WriteError(new ErrorRecord(new System.Exception(), null, ErrorCategory.InvalidOperation, null) - { - ErrorDetails = new ErrorDetails(errorDetailsString) { RecommendedAction = string.Empty } - }); - - returnNow = Task.FromResult(true); - } - else - { - returnNow = Task.FromResult(false); - } + ErrorDetails = new ErrorDetails(errorDetailsString) { RecommendedAction = string.Empty } + }); + + returnNow = Task.FromResult(true); + //var errorResponse = errorResponseTask?.ConfigureAwait(false).GetAwaiter().GetResult(); + + //if (errorResponse?.Detail != null && errorResponse?.Detail.Count > 0) + //{ + // //var errorDetails = errorResponse.Detail; + // //var errorDetailsString = ""; + + // //foreach (var errorDetail in errorDetails) + // //{ + // // errorDetailsString += errorDetail.Message + " "; + // //} + // var errorDetailsString = responseMessage.Content.ReadAsStringAsync().Result; + + // cmdlet.WriteError(new ErrorRecord(new System.Exception(), null, ErrorCategory.InvalidOperation, null) + // { + // ErrorDetails = new ErrorDetails(errorDetailsString) { RecommendedAction = string.Empty } + // }); + + // returnNow = Task.FromResult(true); + //} + //else + //{ + // returnNow = Task.FromResult(false); + //} } } } \ No newline at end of file From f33fd59741cbaee8eba7b40d8910cace90cf5207 Mon Sep 17 00:00:00 2001 From: "Grace Huang (from Dev Box)" Date: Thu, 14 Mar 2024 18:04:00 -0400 Subject: [PATCH 3/3] remove comments --- .../custom/csharp/RestErrorHandler.cs | 29 ++----------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/src/Support/Support.Autorest/custom/csharp/RestErrorHandler.cs b/src/Support/Support.Autorest/custom/csharp/RestErrorHandler.cs index e24320cc5ff1..b52bcb7bc7ca 100644 --- a/src/Support/Support.Autorest/custom/csharp/RestErrorHandler.cs +++ b/src/Support/Support.Autorest/custom/csharp/RestErrorHandler.cs @@ -12,38 +12,13 @@ internal static class CmdletRestExtension { public static void WriteError(this Cmdlet cmdlet, HttpResponseMessage responseMessage, Task errorResponseTask, ref Task returnNow) { - var errorDetailsString = responseMessage.Content.ReadAsStringAsync().Result; - + var errorString = responseMessage.Content.ReadAsStringAsync().ConfigureAwait(false).GetAwaiter().GetResult(); cmdlet.WriteError(new ErrorRecord(new System.Exception(), null, ErrorCategory.InvalidOperation, null) { - ErrorDetails = new ErrorDetails(errorDetailsString) { RecommendedAction = string.Empty } + ErrorDetails = new ErrorDetails(errorString) { RecommendedAction = string.Empty } }); returnNow = Task.FromResult(true); - //var errorResponse = errorResponseTask?.ConfigureAwait(false).GetAwaiter().GetResult(); - - //if (errorResponse?.Detail != null && errorResponse?.Detail.Count > 0) - //{ - // //var errorDetails = errorResponse.Detail; - // //var errorDetailsString = ""; - - // //foreach (var errorDetail in errorDetails) - // //{ - // // errorDetailsString += errorDetail.Message + " "; - // //} - // var errorDetailsString = responseMessage.Content.ReadAsStringAsync().Result; - - // cmdlet.WriteError(new ErrorRecord(new System.Exception(), null, ErrorCategory.InvalidOperation, null) - // { - // ErrorDetails = new ErrorDetails(errorDetailsString) { RecommendedAction = string.Empty } - // }); - - // returnNow = Task.FromResult(true); - //} - //else - //{ - // returnNow = Task.FromResult(false); - //} } } } \ No newline at end of file