Add deprecation warning if secret option -s is passed

Signed-off-by: Vivek Singh <vivek.singh@msystechnologies.com>

1 files changed, 11 insertions, 3 deletions

diff --git a/lib/chef/knife/data_bag_secret_options.rb b/lib/chef/knife/data_bag_secret_options.rb
index 43f60494ba..d94aa4aa50 100644
--- a/lib/chef/knife/data_bag_secret_options.rb
+++ b/lib/chef/knife/data_bag_secret_options.rb
@@ -35,6 +35,7 @@ class Chef
 
       def self.included(base)
         base.option :secret,
+          short: "-s 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
@@ -79,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]