(chocolateyGH-63) Support passing sources by name to push command.

If multiple sources are passed throw exception.
TheCakeIsNaOH · Jan 17, 2022 · 91bb317 · 91bb317
1 parent 7bdb81b
commit 91bb317
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 0 deletions.
diff --git a/src/chocolatey.tests/infrastructure.app/commands/ChocolateyPushCommandSpecs.cs b/src/chocolatey.tests/infrastructure.app/commands/ChocolateyPushCommandSpecs.cs
@@ -26,6 +26,7 @@ namespace chocolatey.tests.infrastructure.app.commands
     using chocolatey.infrastructure.app.services;
     using chocolatey.infrastructure.commandline;
     using Moq;
+    using NUnit.Framework;
     using Should;
 
     public class ChocolateyPushCommandSpecs
@@ -196,6 +197,33 @@ public void should_not_try_to_determine_the_key_if_source_is_set_for_an_unc_sour
 
                 configSettingsService.Verify(c => c.get_api_key(It.IsAny<ChocolateyConfiguration>(), It.IsAny<Action<ConfigFileApiKeySetting>>()), Times.Never);
             }
+
+            [Fact]
+            public void should_throw_if_multiple_sources_are_passed()
+            {
+                reset();
+                configuration.Sources = "https://localhost/somewhere/out/there;https://localhost/somewhere/out/there";
+
+                Assert.Throws<ApplicationException>(() => because(), "Multiple sources are not support by push command.");
+            }
+
+            [Fact]
+            public void should_update_source_if_alias_is_passed()
+            {
+                reset();
+                configuration.Sources = "chocolatey";
+                configuration.MachineSources = new List<MachineSourceConfiguration>
+                {
+                    new MachineSourceConfiguration
+                    {
+                        Name = "chocolatey",
+                        Key = "https://localhost/somewhere/out/there"
+                    }
+                 };
+                because();
+
+                configuration.Sources.ShouldEqual("https://localhost/somewhere/out/there");
+            }
         }
 
         public class when_handling_validation : ChocolateyPushCommandSpecsBase

diff --git a/src/chocolatey/infrastructure.app/commands/ChocolateyPushCommand.cs b/src/chocolatey/infrastructure.app/commands/ChocolateyPushCommand.cs
@@ -18,6 +18,7 @@ namespace chocolatey.infrastructure.app.commands
 {
     using System;
     using System.Collections.Generic;
+    using System.Linq;
     using attributes;
     using commandline;
     using configuration;
@@ -100,6 +101,21 @@ The latter source url is now considered deprecated and will not be
 
             if (!string.IsNullOrWhiteSpace(configuration.Sources))
             {
+                IEnumerable<string> sources = configuration.Sources.Split(new[] { ";", "," }, StringSplitOptions.RemoveEmptyEntries);
+
+                if (sources.Count() > 1)
+                {
+                    throw new ApplicationException("Multiple sources are not support by push command.");
+                }
+
+                var machineSource = configuration.MachineSources.FirstOrDefault(m => m.Name.is_equal_to(configuration.Sources));
+                if (machineSource != null)
+                {
+                    "chocolatey".Log().Debug("Switching source name {0} to actual source value '{1}'.".format_with(configuration.Sources, machineSource.Key.to_string()));
+
+                    configuration.Sources = machineSource.Key;
+                }
+
                 var remoteSource = new Uri(configuration.Sources);
                 if (string.IsNullOrWhiteSpace(configuration.PushCommand.Key) && !remoteSource.IsUnc && !remoteSource.IsFile)
                 {