diff options
| author | Seth Falcon <seth@opscode.com> | 2011-04-29 09:48:13 -0700 |
|---|---|---|
| committer | Seth Falcon <seth@opscode.com> | 2011-04-29 09:50:48 -0700 |
| commit | 34f9c71ff58d17754e8437d6fa709f0ad9a3bfe6 (patch) | |
| tree | 7fcd687e2d1af9e07c8b4921f068c3fe039635ee | |
| parent | 2d918a238cde6f3421d3c8a66e5dea710e95aa08 (diff) | |
| download | chef-34f9c71ff58d17754e8437d6fa709f0ad9a3bfe6.tar.gz | |
[CHEF-2290] Option for knife data bag * use dashes not underscores
--secret_file => --secret-file
| -rw-r--r-- | chef/lib/chef/knife/data_bag_create.rb | 4 | ||||
| -rw-r--r-- | chef/lib/chef/knife/data_bag_edit.rb | 4 | ||||
| -rw-r--r-- | chef/lib/chef/knife/data_bag_from_file.rb | 4 | ||||
| -rw-r--r-- | chef/lib/chef/knife/data_bag_show.rb | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/chef/lib/chef/knife/data_bag_create.rb b/chef/lib/chef/knife/data_bag_create.rb index a329bcec7b..5abc30ce1f 100644 --- a/chef/lib/chef/knife/data_bag_create.rb +++ b/chef/lib/chef/knife/data_bag_create.rb @@ -37,7 +37,7 @@ class Chef :description => "The secret key to use to encrypt data bag item values" option :secret_file, - :long => "--secret_file SECRET_FILE", + :long => "--secret-file SECRET_FILE", :description => "A file containing the secret key to use to encrypt data bag item values" def read_secret @@ -50,7 +50,7 @@ class Chef def use_encryption if config[:secret] && config[:secret_file] - stdout.puts "please specify only one of --secret, --secret_file" + stdout.puts "please specify only one of --secret, --secret-file" exit(1) end config[:secret] || config[:secret_file] diff --git a/chef/lib/chef/knife/data_bag_edit.rb b/chef/lib/chef/knife/data_bag_edit.rb index 49c493440c..9ea9e5d282 100644 --- a/chef/lib/chef/knife/data_bag_edit.rb +++ b/chef/lib/chef/knife/data_bag_edit.rb @@ -37,7 +37,7 @@ class Chef :description => "The secret key to use to encrypt data bag item values" option :secret_file, - :long => "--secret_file SECRET_FILE", + :long => "--secret-file SECRET_FILE", :description => "A file containing the secret key to use to encrypt data bag item values" def read_secret @@ -50,7 +50,7 @@ class Chef def use_encryption if config[:secret] && config[:secret_file] - stdout.puts "please specify only one of --secret, --secret_file" + stdout.puts "please specify only one of --secret, --secret-file" exit(1) end config[:secret] || config[:secret_file] diff --git a/chef/lib/chef/knife/data_bag_from_file.rb b/chef/lib/chef/knife/data_bag_from_file.rb index f3c1ca06f7..3aaa8d7d4a 100644 --- a/chef/lib/chef/knife/data_bag_from_file.rb +++ b/chef/lib/chef/knife/data_bag_from_file.rb @@ -40,7 +40,7 @@ class Chef :description => "The secret key to use to encrypt data bag item values" option :secret_file, - :long => "--secret_file SECRET_FILE", + :long => "--secret-file SECRET_FILE", :description => "A file containing the secret key to use to encrypt data bag item values" def read_secret @@ -53,7 +53,7 @@ class Chef def use_encryption if config[:secret] && config[:secret_file] - stdout.puts "please specify only one of --secret, --secret_file" + stdout.puts "please specify only one of --secret, --secret-file" exit(1) end config[:secret] || config[:secret_file] diff --git a/chef/lib/chef/knife/data_bag_show.rb b/chef/lib/chef/knife/data_bag_show.rb index 0b62965078..81b1425f78 100644 --- a/chef/lib/chef/knife/data_bag_show.rb +++ b/chef/lib/chef/knife/data_bag_show.rb @@ -37,7 +37,7 @@ class Chef :description => "The secret key to use to decrypt data bag item values" option :secret_file, - :long => "--secret_file SECRET_FILE", + :long => "--secret-file SECRET_FILE", :description => "A file containing the secret key to use to decrypt data bag item values" def read_secret @@ -50,7 +50,7 @@ class Chef def use_encryption if config[:secret] && config[:secret_file] - stdout.puts "please specify only one of --secret, --secret_file" + stdout.puts "please specify only one of --secret, --secret-file" exit(1) end config[:secret] || config[:secret_file] |