Remove "durableEnabled" checks (#536)

Author: AnatoliB

src/Durable/DurableController.cs

@@ -22,7 +22,6 @@ namespace Microsoft.Azure.Functions.PowerShellWorker.Durable
     /// </summary>
     internal class DurableController
     {
-        private readonly bool _durableEnabled;
         private readonly DurableFunctionInfo _durableFunctionInfo;
         private readonly IPowerShellServices _powerShellServices;
         private readonly IOrchestrationInvoker _orchestrationInvoker;
@@ -32,20 +31,17 @@ public DurableController(
             DurableFunctionInfo durableDurableFunctionInfo,
             PowerShell pwsh)
             : this(
-                Utils.AreDurableFunctionsEnabled(),
                 durableDurableFunctionInfo,
                 new PowerShellServices(pwsh),
                 new OrchestrationInvoker())
         {
         }
 
         internal DurableController(
-            bool durableEnabled,
             DurableFunctionInfo durableDurableFunctionInfo,
             IPowerShellServices powerShellServices,
             IOrchestrationInvoker orchestrationInvoker)
         {
-            _durableEnabled = durableEnabled;
             _durableFunctionInfo = durableDurableFunctionInfo;
             _powerShellServices = powerShellServices;
             _orchestrationInvoker = orchestrationInvoker;
@@ -57,8 +53,6 @@ public void BeforeFunctionInvocation(IList<ParameterBinding> inputData)
             // in the module context for the 'Start-NewOrchestration' function to use.
             if (_durableFunctionInfo.IsDurableClient)
             {
-                ThrowIfDurableNotEnabled();
-
                 var durableClient =
                     inputData.First(item => item.Name == _durableFunctionInfo.DurableClientBindingName)
                         .Data.ToObject();
@@ -67,8 +61,6 @@ public void BeforeFunctionInvocation(IList<ParameterBinding> inputData)
             }
             else if (_durableFunctionInfo.IsOrchestrationFunction)
             {
-                ThrowIfDurableNotEnabled();
-
                 _orchestrationBindingInfo = CreateOrchestrationBindingInfo(inputData);
                 _powerShellServices.SetOrchestrationContext(_orchestrationBindingInfo.Context);
             }
@@ -96,7 +88,7 @@ public bool TryGetInputBindingParameterValue(string bindingName, out object valu
         public void AddPipelineOutputIfNecessary(Collection<object> pipelineItems, Hashtable result)
         {
             var shouldAddPipelineOutput =
-                _durableEnabled && _durableFunctionInfo.Type == DurableFunctionType.ActivityFunction;
+                _durableFunctionInfo.Type == DurableFunctionType.ActivityFunction;
 
             if (shouldAddPipelineOutput)
             {
@@ -131,13 +123,5 @@ private static OrchestrationBindingInfo CreateOrchestrationBindingInfo(IList<Par
                 context.Name,
                 JsonConvert.DeserializeObject<OrchestrationContext>(context.Data.String));
         }
-
-        private void ThrowIfDurableNotEnabled()
-        {
-            if (!_durableEnabled)
-            {
-                throw new NotImplementedException(PowerShellWorkerStrings.DurableFunctionsDisabled);
-            }
-        }
     }
 }

src/Modules/Microsoft.Azure.Functions.PowerShellWorker/Microsoft.Azure.Functions.PowerShellWorker.psm1

@@ -6,13 +6,6 @@
 # Set aliases for cmdlets to export
 Set-Alias -Name Wait-ActivityFunction -Value Wait-DurableTask
 
-function CheckIfDurableFunctionsEnabled {
-    if (($null -ne $env:PSWorkerEnableExperimentalDurableFunctions) -and
-            (-not [bool]::Parse($env:PSWorkerEnableExperimentalDurableFunctions))) {
-		throw 'PowerShell Durable Functions are disabled (check the PSWorkerEnableExperimentalDurableFunctions environment variable).'
-	}
-}
-
 function GetDurableClientFromModulePrivateData {
     $PrivateData = $PSCmdlet.MyInvocation.MyCommand.Module.PrivateData
     if ($PrivateData) {
@@ -55,8 +48,6 @@ function Start-NewOrchestration {
         [object] $DurableClient
     )
 
-    CheckIfDurableFunctionsEnabled
-    
     if ($null -eq $DurableClient) {
         $DurableClient = GetDurableClientFromModulePrivateData
         if ($null -eq $DurableClient) {
@@ -105,8 +96,6 @@ function New-OrchestrationCheckStatusResponse {
         [object] $DurableClient
     )
 
-	CheckIfDurableFunctionsEnabled
-
     if ($null -eq $DurableClient) {
         $DurableClient = GetDurableClientFromModulePrivateData
         if ($null -eq $DurableClient) {

src/Utility/Utils.cs

@@ -39,13 +39,6 @@ internal static PowerShell NewPwshInstance()
             {
                 s_iss = InitialSessionState.CreateDefault();
 
-                if (!AreDurableFunctionsEnabled())
-                {
-                    // TODO: This is probably not necessary, but this is how it was
-                    // before introducing durable functions, so leaving it here until we test thoroughly.
-                    s_iss.ThreadOptions = PSThreadOptions.UseCurrentThread;
-                }
-
                 if (FunctionLoader.FunctionAppRootPath != null)
                 {
                     s_iss.EnvironmentVariables.Add(

src/resources/PowerShellWorkerStrings.resx

@@ -160,9 +160,6 @@
   <data name="UnsupportedMessage" xml:space="preserve">
     <value>Unsupported message type: {0}.</value>
   </data>
-  <data name="DurableFunctionsDisabled" xml:space="preserve">
-    <value>Durable PowerShell Functions are disabled (check the PSWorkerEnableExperimentalDurableFunctions environment variable).</value>
-  </data>
   <data name="FailToConvertToHttpResponseContext" xml:space="preserve">
     <value>The given value for the 'http' output binding '{0}' cannot be converted to the type 'HttpResponseContext'. The conversion failed with the following error: {1}</value>
   </data>

test/Unit/Durable/DurableControllerTests.cs

@@ -238,7 +238,6 @@ private DurableController CreateDurableController(
             var durableFunctionInfo = new DurableFunctionInfo(durableFunctionType, durableClientBindingName);
 
             return new DurableController(
-                            durableEnabled: true,
                             durableFunctionInfo,
                             _mockPowerShellServices.Object,
                             _mockOrchestrationInvoker.Object);