Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

When formatting, if collection is modified, don't fail the entire pipeline #14438

Merged
merged 8 commits into from Jan 28, 2021
Merged

When formatting, if collection is modified, don't fail the entire pipeline #14438

Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ab49afc
When formatting, if an exception occurs during enumeration, don't fai…
SteveL-MSFT Aug 6, 2020
b353ffa
address Rob's feedback
SteveL-MSFT Jan 7, 2021
bb277ef
Address Ilya's feedback adding comment
SteveL-MSFT Jan 8, 2021
6a704b0
add tracing when empty string is emitted due to exception
SteveL-MSFT Jan 14, 2021
5d5125e
address Codefactor issue
SteveL-MSFT Jan 14, 2021
058b178
Update src/System.Management.Automation/FormatAndOutput/common/Utilit…
SteveL-MSFT Jan 15, 2021
352553e
Update src/System.Management.Automation/FormatAndOutput/common/Utilit…
SteveL-MSFT Jan 15, 2021
f87d673
address Rob's feedback to log the Exception message
SteveL-MSFT Jan 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 11 additions & 3 deletions src/System.Management.Automation/FormatAndOutput/common/Utilities/MshObjectUtil.cs
View file
Open in desktop
Expand Up @@ -7,6 +7,7 @@
using System.Collections.ObjectModel;
using System.Globalization;
using System.Management.Automation;
using System.Management.Automation.Internal;
using System.Management.Automation.Runspaces;
using System.Reflection;
using System.Text;
Expand All @@ -19,6 +20,11 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
/// </summary>
internal static class PSObjectHelper
{
#region tracer
[TraceSource("PSObjectHelper", "PSObjectHelper")]
internal static readonly PSTraceSource Tracer = PSTraceSource.GetTracer("PSObjectHelper", "PSObjectHelper");
SteveL-MSFT marked this conversation as resolved.
Show resolved Hide resolved
#endregion tracer

internal const char Ellipsis = '\u2026';

internal static string PSObjectIsOfExactType(Collection<string> typeNames)
Expand Down Expand Up @@ -290,10 +296,12 @@ internal static string SmartToString(PSObject so, PSPropertyExpressionFactory ex
// take care of the case there is no base object
return so.ToString();
}
catch (ExtendedTypeSystemException e)
catch (Exception e) when (e is ExtendedTypeSystemException || e is InvalidOperationException)
{
// NOTE: we catch all the exceptions, since we do not know
// what the underlying object access would throw
SteveL-MSFT marked this conversation as resolved.
Show resolved Hide resolved
// These exceptions are being caught and handled by returning an empty string when
// the object cannot be stringified due to ETS or an instance in the collection has been modified
Tracer.WriteLine("Exception during conversion to string, emitting empty string.");
SteveL-MSFT marked this conversation as resolved.
Show resolved Hide resolved

if (formatErrorObject != null)
{
formatErrorObject.sourceObject = so;
Expand Down