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

Handle $ErrorActionPreference value #4079

Merged
merged 2 commits into from
Aug 9, 2024
Merged

Handle $ErrorActionPreference value #4079

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e46cc6
Handle $ErrorActionPreference value
jackpoz Jul 8, 2024
261d852
Merge branch 'dev' into fixes/ErrorActionPreference
gautamdsheth Aug 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/Commands/Base/BasePSCmdlet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,17 @@ public bool ParameterSpecified(string parameterName)
return MyInvocation.BoundParameters.ContainsKey(parameterName);
}

protected string ErrorActionSetting
{
get
{
if (MyInvocation.BoundParameters.TryGetValue("ErrorAction", out object result))
return result.ToString() ?? "";
else
return SessionState.PSVariable.GetValue("ErrorActionPreference")?.ToString() ?? "";
}
}

protected virtual void ExecuteCmdlet()
{ }

Expand Down
2 changes: 1 addition & 1 deletion src/Commands/Base/ConnectOnline.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ protected void Connect(ref CancellationToken cancellationToken)
}

// If the ErrorAction is not set to Stop, Ignore or SilentlyContinue throw an exception, otherwise just continue
if (!ParameterSpecified("ErrorAction") || !new [] { "stop", "ignore", "silentlycontinue" }.Contains(MyInvocation.BoundParameters["ErrorAction"].ToString().ToLowerInvariant()))
if (!new [] { "stop", "ignore", "silentlycontinue" }.Contains(ErrorActionSetting.ToLowerInvariant()))
{
throw new PSInvalidOperationException(errorMessage);
}
Expand Down
4 changes: 2 additions & 2 deletions src/Commands/Base/PnPConnectedCmdlet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ protected override void ProcessRecord()
}

// If the ErrorAction is not set to Stop, Ignore or SilentlyContinue throw an exception, otherwise just continue
if (!ParameterSpecified("ErrorAction") || !(new [] { "stop", "ignore", "silentlycontinue" }.Contains(MyInvocation.BoundParameters["ErrorAction"].ToString().ToLowerInvariant())))
if (!(new [] { "stop", "ignore", "silentlycontinue" }.Contains(ErrorActionSetting.ToLowerInvariant())))
{
throw new PSInvalidOperationException(errorMessage);
}
Expand All @@ -107,7 +107,7 @@ protected override void ProcessRecord()
}

// With ErrorAction:Ignore, the $Error variable should not be populated with the error, otherwise it should
if (!ParameterSpecified("ErrorAction") || !new[] { "ignore" }.Contains(MyInvocation.BoundParameters["ErrorAction"].ToString().ToLowerInvariant()))
if (!new[] { "ignore" }.Contains(ErrorActionSetting.ToLowerInvariant()))
{
ex.Data["CorrelationId"] = Connection.Context.TraceCorrelationId;
ex.Data["TimeStampUtc"] = DateTime.UtcNow;
Expand Down
Loading