knife-uploader 0.3.0 → 0.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/chef/knife/uploader_base.rb +12 -7
- data/lib/chef/knife/uploader_data_bag.rb +12 -4
- metadata +2 -2
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: fcc9484804ca9f66f58700ac210996a74772566d
|
4
|
+
data.tar.gz: b569f9fd687aebe8b0a391d831a6515b4fc2b790
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 0758984dea2bd60386c10be3fd3eb20c80e39bc65ed77556edd745df895a72367bb0613d57e39845bb1e88c2ae0fac60b0fc00aac66f9b5d62d87973b1886ad2
|
7
|
+
data.tar.gz: 130d96553f42d95a4760e79b90b9c4f3c63f84fd0002d3e8edec19b72f4c8d761fc95ffc29bb5a0ed2e6eba7a859f5b1116d095d0fdfa98b81475b692b3b0e04
|
@@ -103,16 +103,21 @@ module KnifeUploader
|
|
103
103
|
end
|
104
104
|
|
105
105
|
option :pattern,
|
106
|
-
:
|
107
|
-
:
|
108
|
-
:
|
106
|
+
short: '-p PATTERN',
|
107
|
+
long: '--pattern PATTERN',
|
108
|
+
description: 'A regular expression pattern to restrict the set of objects to ' +
|
109
109
|
'manipulate',
|
110
|
-
:
|
110
|
+
proc: Proc.new { |value| Chef::Config[:knife][:pattern] = value }
|
111
111
|
|
112
112
|
option :debug,
|
113
|
-
:
|
114
|
-
:
|
115
|
-
:
|
113
|
+
long: '--debug',
|
114
|
+
description: 'Turn on debug messages',
|
115
|
+
proc: Proc.new { |value| Chef::Config[:knife][:debug] = value }
|
116
|
+
|
117
|
+
option :show_encrypted,
|
118
|
+
long: '--show_encrypted',
|
119
|
+
description: 'Show the decrypted data bag contets when different.',
|
120
|
+
prod: Proc.new { |value| Chef::Config[:knife][:show_encrypted] = value }
|
116
121
|
end
|
117
122
|
end
|
118
123
|
end
|
@@ -82,6 +82,8 @@ module KnifeUploader
|
|
82
82
|
old_decrypted_formatted = Utils.json_with_sorted_keys(old_decrypted)
|
83
83
|
new_decrypted_formatted = Utils.json_with_sorted_keys(new_decrypted)
|
84
84
|
|
85
|
+
show_encrypted = locate_config_value(:show_encrypted) || false
|
86
|
+
|
85
87
|
# Encrypted data could differ but decrypted data could still be the same.
|
86
88
|
if old_decrypted_formatted == new_decrypted_formatted
|
87
89
|
ui.info("#{item_id} has differences before decryption " +
|
@@ -89,10 +91,16 @@ module KnifeUploader
|
|
89
91
|
return false
|
90
92
|
end
|
91
93
|
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
94
|
+
if !show_encrypted && (old_could_decrypt || new_could_decrypt)
|
95
|
+
ui.info("#{diff_comment_prefix} data bag item #{item_id}. \n" +
|
96
|
+
"\tNot showing the diff since they are encrypted.\n" +
|
97
|
+
"\tUse --show_encrypted to display the diff.\n\n")
|
98
|
+
else
|
99
|
+
ui.info("#{diff_comment_prefix} data bag item #{item_id} " +
|
100
|
+
"(#{old_could_decrypt ? 'decrypted' : 'raw'} #{desc1} vs." +
|
101
|
+
" #{new_could_decrypt ? 'decrypted' : 'raw'} #{desc2}):\n" +
|
102
|
+
diff_color(old_decrypted_formatted, new_decrypted_formatted) + "\n")
|
103
|
+
end
|
96
104
|
true
|
97
105
|
end
|
98
106
|
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: knife-uploader
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.3.
|
4
|
+
version: 0.3.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Mikhail Bautin
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2015-
|
11
|
+
date: 2015-04-22 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: chef
|