(chocolatey#1443) Reset config via action after every package upgrade

This adds a extra parameter to the upgrade_run method, which
is used to pass an action which resets the configuration in the
function that calls upgrade_run.

This fixes a bug when useRememberedArguments is enabled that causes
arguments to be reused in the chocolateyInstall.ps1 when multiple
packages are upgraded. It happens because OptionSet.parse() sets the
configuration via the actions specified in the UpgradeCommand optionSet
setup (and likewise in configuration builder as well). It only sets
options that are saved, so if a later package does not have an option,
it is not set, and the previous option is reused.

This fixes the bug because it resets the configuration at the
ChocolateyPackageService level, which is enough to reset the
configuration for action that runs the PowerShell as well.

src/chocolatey/infrastructure.app/services/ChocolateyPackageService.cs

@@ -830,6 +830,8 @@ public virtual ConcurrentDictionary<string, PackageResult> upgrade_run(Chocolate
 
             try
             {
+                var resetConfigAction = new Action<ChocolateyConfiguration>(newConfig => config = newConfig.deep_copy());
+
                 Action<PackageResult> action = null;
                 if (config.SourceType == SourceType.normal)
                 {
@@ -839,7 +841,7 @@ public virtual ConcurrentDictionary<string, PackageResult> upgrade_run(Chocolate
                 get_environment_before(config, allowLogging: true);
 
                 var beforeUpgradeAction = new Action<PackageResult>(packageResult => before_package_modify(packageResult, config));
-                var results = perform_source_runner_function(config, r => r.upgrade_run(config, action, beforeUpgradeAction));
+                var results = perform_source_runner_function(config, r => r.upgrade_run(config, action, resetConfigAction, beforeUpgradeAction));
 
                 foreach (var result in results)
                 {

src/chocolatey/infrastructure.app/services/CygwinService.cs

@@ -267,7 +267,7 @@ public ConcurrentDictionary<string, PackageResult> upgrade_noop(ChocolateyConfig
             return new ConcurrentDictionary<string, PackageResult>(StringComparer.InvariantCultureIgnoreCase);
         }
 
-        public ConcurrentDictionary<string, PackageResult> upgrade_run(ChocolateyConfiguration config, Action<PackageResult> continueAction, Action<PackageResult> beforeUpgradeAction = null)
+        public ConcurrentDictionary<string, PackageResult> upgrade_run(ChocolateyConfiguration config, Action<PackageResult> continueAction, Action<ChocolateyConfiguration> resetConfigAction, Action<PackageResult> beforeUpgradeAction = null)
         {
             throw new NotImplementedException("{0} does not implement upgrade".format_with(APP_NAME));
         }

src/chocolatey/infrastructure.app/services/ISourceRunner.cs

@@ -87,9 +87,10 @@ public interface ISourceRunner
         /// </summary>
         /// <param name="config">The configuration.</param>
         /// <param name="continueAction">The action to continue with when upgrade is successful.</param>
+        /// <param name="resetConfigAction">The action that can be used to reset the configuration in the caller</param>
         /// <param name="beforeUpgradeAction">The action (if any) to run on any currently installed package before triggering the upgrade.</param>
         /// <returns>results of installs</returns>
-        ConcurrentDictionary<string, PackageResult> upgrade_run(ChocolateyConfiguration config, Action<PackageResult> continueAction, Action<PackageResult> beforeUpgradeAction = null);
+        ConcurrentDictionary<string, PackageResult> upgrade_run(ChocolateyConfiguration config, Action<PackageResult> continueAction, Action<ChocolateyConfiguration> resetConfigAction, Action<PackageResult> beforeUpgradeAction = null);
 
         /// <summary>
         ///   Run uninstall in noop mode

src/chocolatey/infrastructure.app/services/NugetService.cs

@@ -586,15 +586,16 @@ public virtual void remove_rollback_directory_if_exists(string packageName)
         public ConcurrentDictionary<string, PackageResult> upgrade_noop(ChocolateyConfiguration config, Action<PackageResult> continueAction)
         {
             config.Force = false;
-            return upgrade_run(config, continueAction, performAction: false);
+            var resetConfigAction = new Action<ChocolateyConfiguration>(newConfig => { });
+            return upgrade_run(config, continueAction, false, resetConfigAction);
         }
 
-        public ConcurrentDictionary<string, PackageResult> upgrade_run(ChocolateyConfiguration config, Action<PackageResult> continueAction, Action<PackageResult> beforeUpgradeAction = null)
+        public ConcurrentDictionary<string, PackageResult> upgrade_run(ChocolateyConfiguration config, Action<PackageResult> continueAction, Action<ChocolateyConfiguration> resetConfigAction, Action<PackageResult> beforeUpgradeAction = null)
         {
-            return upgrade_run(config, continueAction, performAction: true, beforeUpgradeAction: beforeUpgradeAction);
+            return upgrade_run(config, continueAction, true, resetConfigAction, beforeUpgradeAction);
         }
 
-        public virtual ConcurrentDictionary<string, PackageResult> upgrade_run(ChocolateyConfiguration config, Action<PackageResult> continueAction, bool performAction, Action<PackageResult> beforeUpgradeAction = null)
+        public virtual ConcurrentDictionary<string, PackageResult> upgrade_run(ChocolateyConfiguration config, Action<PackageResult> continueAction, bool performAction, Action<ChocolateyConfiguration> resetConfigAction, Action<PackageResult> beforeUpgradeAction = null)
         {
             _fileSystem.create_directory_if_not_exists(ApplicationParameters.PackagesLocation);
             var packageInstalls = new ConcurrentDictionary<string, PackageResult>(StringComparer.InvariantCultureIgnoreCase);
@@ -877,6 +878,7 @@ public virtual ConcurrentDictionary<string, PackageResult> upgrade_run(Chocolate
                         }
                     }
                 }
+                resetConfigAction.Invoke(originalConfig);
             }
 
             return packageInstalls;
@@ -951,6 +953,7 @@ public virtual ConcurrentDictionary<string, PackageResult> get_outdated(Chocolat
                 packageResult.Messages.Add(new ResultMessage(ResultType.Note, logMessage));
 
                 this.Log().Info("{0}|{1}|{2}|{3}".format_with(installedPackage.Id, installedPackage.Version, latestPackage.Version, isPinned.to_string().to_lower()));
+
             }
 
             return outdatedPackages;

src/chocolatey/infrastructure.app/services/PythonService.cs

@@ -411,7 +411,7 @@ public ConcurrentDictionary<string, PackageResult> upgrade_noop(ChocolateyConfig
             return new ConcurrentDictionary<string, PackageResult>(StringComparer.InvariantCultureIgnoreCase);
         }
 
-        public ConcurrentDictionary<string, PackageResult> upgrade_run(ChocolateyConfiguration config, Action<PackageResult> continueAction, Action<PackageResult> beforeUpgradeAction = null)
+        public ConcurrentDictionary<string, PackageResult> upgrade_run(ChocolateyConfiguration config, Action<PackageResult> continueAction, Action<ChocolateyConfiguration> resetConfigAction, Action<PackageResult> beforeUpgradeAction = null)
         {
             if (config.PackageNames.is_equal_to(ApplicationParameters.AllPackages))
             {

src/chocolatey/infrastructure.app/services/RubyGemsService.cs

@@ -265,7 +265,7 @@ public ConcurrentDictionary<string, PackageResult> upgrade_noop(ChocolateyConfig
             return new ConcurrentDictionary<string, PackageResult>(StringComparer.InvariantCultureIgnoreCase);
         }
 
-        public ConcurrentDictionary<string, PackageResult> upgrade_run(ChocolateyConfiguration config, Action<PackageResult> continueAction, Action<PackageResult> beforeUpgradeAction = null)
+        public ConcurrentDictionary<string, PackageResult> upgrade_run(ChocolateyConfiguration config, Action<PackageResult> continueAction, Action<ChocolateyConfiguration> resetConfigAction, Action<PackageResult> beforeUpgradeAction = null)
         {
             throw new NotImplementedException("{0} does not implement upgrade".format_with(APP_NAME));
         }

src/chocolatey/infrastructure.app/services/WebPiService.cs

@@ -258,7 +258,7 @@ public ConcurrentDictionary<string, PackageResult> upgrade_noop(ChocolateyConfig
             return new ConcurrentDictionary<string, PackageResult>(StringComparer.InvariantCultureIgnoreCase);
         }
 
-        public ConcurrentDictionary<string, PackageResult> upgrade_run(ChocolateyConfiguration config, Action<PackageResult> continueAction, Action<PackageResult> beforeUpgradeAction = null)
+        public ConcurrentDictionary<string, PackageResult> upgrade_run(ChocolateyConfiguration config, Action<PackageResult> continueAction, Action<ChocolateyConfiguration> resetConfigAction, Action<PackageResult> beforeUpgradeAction = null)
         {
             throw new NotImplementedException("{0} does not implement upgrade".format_with(APP_NAME));
         }

src/chocolatey/infrastructure.app/services/WindowsFeatureService.cs

@@ -328,7 +328,7 @@ public ConcurrentDictionary<string, PackageResult> upgrade_noop(ChocolateyConfig
             return new ConcurrentDictionary<string, PackageResult>(StringComparer.InvariantCultureIgnoreCase);
         }
 
-        public ConcurrentDictionary<string, PackageResult> upgrade_run(ChocolateyConfiguration config, Action<PackageResult> continueAction, Action<PackageResult> beforeUpgradeAction = null)
+        public ConcurrentDictionary<string, PackageResult> upgrade_run(ChocolateyConfiguration config, Action<PackageResult> continueAction, Action<ChocolateyConfiguration> resetConfigAction, Action<PackageResult> beforeUpgradeAction = null)
         {
             set_executable_path_if_not_set();
             throw new NotImplementedException("{0} does not implement upgrade".format_with(APP_NAME));