(chocolatey#2986) Strip config list down to just config

We have other commands for listing features, sources, apikeys, etc. Config can finally just be config.
vexx32 · Mar 15, 2023 · 1a5cf9b · 1a5cf9b
1 parent 647e600
commit 1a5cf9b
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 31 deletions.
diff --git a/src/chocolatey/infrastructure.app/commands/ChocolateyConfigCommand.cs b/src/chocolatey/infrastructure.app/commands/ChocolateyConfigCommand.cs
@@ -33,14 +33,6 @@ public class ChocolateyConfigCommand : ICommand
     {
         private readonly IChocolateyConfigSettingsService _configSettingsService;
 
-        internal const string DeprecatedConfigListResultsMessage = @"
-Starting in v2.0.0, the `config list` command will only list the
- configuration values, instead of also listing the configured features
- and sources.
- Use the `choco feature` or `choco source` commands to list and interact
- with these values.
-";
-
         public ChocolateyConfigCommand(IChocolateyConfigSettingsService configSettingsService)
         {
             _configSettingsService = configSettingsService;
@@ -106,9 +98,6 @@ Chocolatey will allow you to interact with the configuration file settings.
 NOTE: Available in 0.9.9.9+.
 ");
 
-            this.Log().Warn(ChocolateyLoggers.Important, "DEPRECATION NOTICE");
-            this.Log().Warn(DeprecatedConfigListResultsMessage);
-
             "chocolatey".Log().Info(ChocolateyLoggers.Important, "Usage");
             "chocolatey".Log().Info(@"
     choco config [list]|get|set|unset [<options/switches>]

diff --git a/src/chocolatey/infrastructure.app/services/ChocolateyConfigSettingsService.cs b/src/chocolatey/infrastructure.app/services/ChocolateyConfigSettingsService.cs
@@ -370,26 +370,6 @@ public void config_list(ChocolateyConfiguration configuration)
             {
                 this.Log().Info(() => "{0} = {1} | {2}".format_with(config.Key, config.Value, config.Description));
             }
-
-            this.Log().Info("");
-            this.Log().Info(ChocolateyLoggers.Important, "Sources");
-            this.Log().Warn(ChocolateyLoggers.Important, "DEPRECATION NOTICE");
-            this.Log().Warn(ChocolateyConfigCommand.DeprecatedConfigListResultsMessage);
-            source_list(configuration);
-            this.Log().Info("");
-            this.Log().Info(@"NOTE: Use choco source to interact with sources.");
-            this.Log().Info("");
-            this.Log().Info(ChocolateyLoggers.Important, "Features");
-            this.Log().Warn(ChocolateyLoggers.Important, "DEPRECATION NOTICE");
-            this.Log().Warn(ChocolateyConfigCommand.DeprecatedConfigListResultsMessage);
-            feature_list(configuration);
-            this.Log().Info("");
-            this.Log().Info(@"NOTE: Use choco feature to interact with features.");
-            ;
-            this.Log().Info("");
-            this.Log().Info(ChocolateyLoggers.Important, "API Keys");
-            this.Log().Info(@"NOTE: Api Keys are not shown through this command.
- Use choco apikey to interact with API keys.");
         }
 
         public void config_get(ChocolateyConfiguration configuration)