Merge pull request #8909 from MsysTechnologiesllc/VSingh/remove-secret-short-option

[knife] Deprecate data bag secret (-s) short option due to conflict with --server-url option

1 files changed, 11 insertions, 4 deletions

diff --git a/lib/chef/knife/data_bag_secret_options.rb b/lib/chef/knife/data_bag_secret_options.rb
index 4b4cb8a7e1..d94aa4aa50 100644
--- a/lib/chef/knife/data_bag_secret_options.rb
+++ b/lib/chef/knife/data_bag_secret_options.rb
@@ -36,7 +36,7 @@ class Chef
       def self.included(base)
         base.option :secret,
           short: "-s SECRET",
-          long: "--secret ",
+          long: "--secret SECRET",
           description: "The secret key to use to encrypt data bag item values. Can also be defaulted in your config with the key 'secret'.",
           # Need to store value from command line in separate variable - knife#merge_configs populates same keys
           # on config object from
@@ -80,9 +80,16 @@ class Chef
       end
 
       def validate_secrets
-        if has_cl_secret? && has_cl_secret_file?
-          ui.fatal("Please specify only one of --secret, --secret-file")
-          exit(1)
+        if has_cl_secret?
+          if opt_parser.default_argv.include?("-s")
+            ui.warn("Secret short option -s is deprecated and will remove in the future. Please use --secret instead.
+")
+          end
+
+          if has_cl_secret_file?
+            ui.fatal("Please specify only one of --secret, --secret-file")
+            exit(1)
+          end
         end
 
         if knife_config[:secret] && knife_config[:secret_file]