Handle $ErrorActionPreference value (#4079)

Handle $ErrorActionPreference in the same way as -ErrorAction cmdlet parameter is handled Co-authored-by: Gautam Sheth <[email protected]>
pnp · Aug 9, 2024 · 0b8ae41 · 0b8ae41
1 parent 5a517b1
commit 0b8ae41
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/src/Commands/Base/BasePSCmdlet.cs b/src/Commands/Base/BasePSCmdlet.cs
@@ -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()
         { }
 

diff --git a/src/Commands/Base/ConnectOnline.cs b/src/Commands/Base/ConnectOnline.cs
@@ -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);
                     }

diff --git a/src/Commands/Base/PnPConnectedCmdlet.cs b/src/Commands/Base/PnPConnectedCmdlet.cs
@@ -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);
                 }
@@ -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;