Stream handling, param block, PowerShellManager #11

TylerLeonhardt · 2018-08-28T18:42:12Z

This PR accomplishes 3 things (that could have been 3 PRs... but that's on me)

Switches from using as custom host for logging to using Stream handlers on the DataAdding event
Switches to passing in the parameters via a param block per our discussion with @joeyaiello
The PowerShellManager object which is responsible for managing the PowerShell instance we use to execute functions. It contains:
- setting up the logging
- executing powershell script in the runspace
- clean/reseting the runspace
- sets the stage for concurrency if/when we go down that road

I know there's a lack of documentation and associated tests but I plan on adding those in a separate PR to address #6

daxian-dbw · 2018-08-28T19:14:39Z

src/Azure.Functions.PowerShell.Worker/PowerShell/StreamHandler.cs

+            }
+        }
+
+        public void ErrorDataAdding(object data, DataAddingEventArgs e)


The first parameter of an event handler should be object sender.

src/Azure.Functions.PowerShell.Worker/PowerShell/PowerShellManager.cs

daxian-dbw · 2018-08-28T19:20:23Z

src/Azure.Functions.PowerShell.Worker/PowerShell/PowerShellManager.cs

+
+            // Add HttpResponseContext namespace so users can reference
+            // HttpResponseContext without needing to specify the full namespace
+            ExecuteScriptAndClearCommands($"using namespace {typeof(HttpResponseContext).Namespace}");


When initing the worker, we need to run Set-ExecutionPolicy when running on windows, because by default the policy is restricted, so no script can be executed.
We will use a Linux container, but still better to future proof.

And no need to run this using namespace more than once for a runspace.

daxian-dbw · 2018-08-28T19:41:16Z

src/Azure.Functions.PowerShell.Worker/PowerShell/PowerShellManager.cs

+            _logger = logger;
+        }
+
+        public static PowerShellManager Create(PowerShell pwsh, RpcLogger logger)


It looks to me you don't really need pwsh to be passed in.

daxian-dbw · 2018-08-28T20:49:10Z

src/Azure.Functions.PowerShell.Worker/PowerShell/PowerShellManager.cs

+            pwsh.Streams.Verbose.DataAdding += streamHandler.VerboseDataAdding;
+            pwsh.Streams.Warning.DataAdding += streamHandler.WarningDataAdding;
+
+            manager.ResetRunspace();


I guess no need to call reset when creating the PowerShellManager.

src/Azure.Functions.PowerShell.Worker/PowerShell/PowerShellManager.cs

src/Azure.Functions.PowerShell.Worker/Utility/ExecutionTimer.cs

daxian-dbw · 2018-08-28T23:12:36Z

src/Azure.Functions.PowerShell.Worker/Utility/ExecutionTimer.cs

+            _logger.LogTrace(logMessage);
+        }
+    }
+}


Add a new line to the end.

daxian-dbw · 2018-08-29T19:30:05Z

examples/PSCoreApp/MyHttpTrigger/run.ps1

-Write-Warning "Warning $name"
+# you can write to the same streams as you would in a normal PowerShell script
+Write-Verbose "Verbose $name" -Verbose
+Write-Warning "Warning $i"


Where is $i coming from?

src/Azure.Functions.PowerShell.Worker/Utility/ExecutionTimer.cs

src/Azure.Functions.PowerShell.Worker/PowerShell/PowerShellManager.cs

daxian-dbw

LGTM for now. Will need to rewrite some of the code after moving to the module approach.

src/Azure.Functions.PowerShell.Worker/PowerShell/PowerShellManager.cs

…-functions-powershell-worker into params-and-powershellmanager

TylerLeonhardt · 2018-08-29T23:01:06Z

Thanks @daxian-dbw!

# This is the 1st commit message: separate DF SDK classes from DF worker classes # This is the commit message #2: fix typo # This is the commit message #3: DurableSDK now compiles by itself # This is the commit message #4: Allow ExternalSDK to handle orchestration # This is the commit message #5: document next steps # This is the commit message #6: allow external SDK to set the user-code's input. Still need to refactor this logic for the worker to continue working with old SDK # This is the commit message #7: add import module # This is the commit message #8: supress traces # This is the commit message #9: avoid nullptr # This is the commit message #10: pass tests # This is the commit message #11: fix E2E tests # This is the commit message #12: develop E2E tests # This is the commit message #13: Enabled external durable client (#765) Co-authored-by: Michael Peng <[email protected]> # This is the commit message #14: bindings work # This is the commit message #15: conditional binding intialization # This is the commit message #16: conditional import # This is the commit message #17: Added exception handling logic # This is the commit message #18: Revert durableController name to durableFunctionsUtils # This is the commit message #19: Ensure unit tests are functioning properly # This is the commit message #20: Corrected unit test names # This is the commit message #21: Turned repeated variables in unit tests into static members # This is the commit message #22: Fixed issue with building the worker # This is the commit message #23: Fix E2E test # This is the commit message #24: Fixed unit test setup # This is the commit message #25: Fixed another unit test setup # This is the commit message #26: Remove string representation of booleans # This is the commit message #27: patch e2e test # This is the commit message #28: remove typo in toString # This is the commit message #29: Update PowerShell language worker pipelines (#750) * Install .Net to a global location * Remove .Net installation tasks * Update install .Net 6 task * Update Windows image to use windows-latest # This is the commit message #30: Make throughput warning message visible for tooling diagnosis (#757) # This is the commit message #31: Update grpc.tools to version 2.43.0 # This is the commit message #32: Update Google.Protobuf.Tools to version 3.19.4 # This is the commit message #33: Revert "Update Google.Protobuf.Tools to version 3.19.4" This reverts commit bcbd022. # This is the commit message #34: Revert "Update grpc.tools to version 2.43.0" This reverts commit ccb323a. # This is the commit message #35: Update Google.Protobuf to 3.19.4 and grpc.tools to 2.43.0 (#762) * Update grpc.tools to version 2.43.0 * Update Google.Protobuf.Tools to version 3.19.4 # This is the commit message #36: Switch from Grpc.Core to Grpc.Net.Client (#758) * Upgraded protobuf versions and removed Grpc.Core dependency * Updated channel and option types used * Change channel credentials * Added http prefix to url * Add valid URL check and explicitly include credentials # This is the commit message #37: Update pipeline logic to generate the SBOM for release builds (#767)

TylerLeonhardt added 3 commits August 28, 2018 11:02

param block is back and fix multiple execution issue

36b6a75

reworked PowerShellExtension methods into a PowerShellManager object

a49c02b

move InitPowerShell into PowerShellManager

57d499e

TylerLeonhardt requested a review from daxian-dbw August 28, 2018 18:42

TylerLeonhardt added 2 commits August 28, 2018 11:59

have all logging use correct index in collection

4ecc4be

switch DataAdded to DataAdding

a48c045

daxian-dbw reviewed Aug 28, 2018

View reviewed changes

address Dongbo's feedback

99fe181

daxian-dbw reviewed Aug 28, 2018

View reviewed changes

TylerLeonhardt added 4 commits August 28, 2018 22:47

Merge branch 'dev' into params-and-powershellmanager

e4ebf22

new lines and fixed Set-ExecutionPolicy

1b2629d

made timer threadstatic and deleted StartupArgumentsTests

f1271e3

switch to ThreadStatic stopwatch

4bf7c3d

TylerLeonhardt mentioned this pull request Aug 29, 2018

CustomHost logs line by line #7

Closed

daxian-dbw reviewed Aug 29, 2018

View reviewed changes

TylerLeonhardt and others added 5 commits August 29, 2018 14:05

address Dongbo's feedback

b712cb8

remove messaging

f33e466

merge conflicts addressed and tests work again

f3f2d0c

added headers to a few files

f0bcd22

Add new line to the end

5862bdc

daxian-dbw approved these changes Aug 29, 2018

View reviewed changes

src/Azure.Functions.PowerShell.Worker/PowerShell/PowerShellManager.cs Outdated Show resolved Hide resolved

TylerLeonhardt added 2 commits August 29, 2018 15:58

change to Write-Information

5ffcf14

Merge branch 'params-and-powershellmanager' of github.com:Azure/azure…

89f0d5e

…-functions-powershell-worker into params-and-powershellmanager

TylerLeonhardt merged commit 58924c8 into dev Aug 29, 2018

TylerLeonhardt deleted the params-and-powershellmanager branch August 29, 2018 23:01

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Stream handling, param block, PowerShellManager #11

Stream handling, param block, PowerShellManager #11

TylerLeonhardt commented Aug 28, 2018 •

edited

Loading

daxian-dbw Aug 28, 2018

daxian-dbw Aug 28, 2018

daxian-dbw Aug 28, 2018

daxian-dbw Aug 28, 2018

daxian-dbw Aug 28, 2018

daxian-dbw Aug 28, 2018

TylerLeonhardt Aug 29, 2018

daxian-dbw Aug 29, 2018

TylerLeonhardt Aug 29, 2018

daxian-dbw left a comment

TylerLeonhardt commented Aug 29, 2018

Stream handling, param block, PowerShellManager #11

Stream handling, param block, PowerShellManager #11

Conversation

TylerLeonhardt commented Aug 28, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

daxian-dbw left a comment

Choose a reason for hiding this comment

TylerLeonhardt commented Aug 29, 2018

TylerLeonhardt commented Aug 28, 2018 •

edited

Loading