dapp 0.14.10 → 0.14.11
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/dapp/kube/dapp/command/common.rb +1 -1
- data/lib/dapp/kube/dapp/command/secret_edit.rb +12 -2
- data/lib/dapp/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 9ad114008afe7eb82b0d3ad627dabaccd88bcfcf
|
|
4
|
+
data.tar.gz: fc5442598b8110af32df65852993e4b194691f4c
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 98fa765aa71da71698636960cb085f29e2bf4e08fc28c16d4f39339e000304904719c63a8658736217a99a5aa988d9a8ad3210ca8884af8ce9261f78bfe6945c
|
|
7
|
+
data.tar.gz: e6a9b8fb77875c16d69be688d60cc82488db0d316717edcb13dd9636e87992374659810499f6b55a256da3f906f20749d1f04768636adc096fad2898ee2753fd
|
|
@@ -21,7 +21,7 @@ module Dapp
|
|
|
21
21
|
case value
|
|
22
22
|
when Array then value.map { |v| change_json_value.call(v) }
|
|
23
23
|
when Hash then send(:"kube_helm_#{type}_json", secret, value)
|
|
24
|
-
when '' then ''
|
|
24
|
+
when '', nil then ''
|
|
25
25
|
else
|
|
26
26
|
secret.nil? ? '' : secret.public_send(secret_method, value)
|
|
27
27
|
end
|
|
@@ -34,7 +34,7 @@ module Dapp
|
|
|
34
34
|
deep_delete_if_key_not_exist(encoded_values, updated_decoded_values)
|
|
35
35
|
|
|
36
36
|
modified_decoded_values = deep_select_modified_keys(updated_decoded_values, decoded_values)
|
|
37
|
-
updated_encoded_values = encoded_values
|
|
37
|
+
updated_encoded_values = deep_merge(encoded_values, kube_helm_encode_json(secret, modified_decoded_values))
|
|
38
38
|
deep_sort_by_same_structure(updated_encoded_values, updated_decoded_values).to_yaml
|
|
39
39
|
else
|
|
40
40
|
kube_secret_file(tmp_file_path)
|
|
@@ -46,7 +46,7 @@ module Dapp
|
|
|
46
46
|
rescue ::Dapp::Error::Base => e
|
|
47
47
|
log_warning(Helper::NetStatus.message(e))
|
|
48
48
|
print 'Do you want to change file (Y/n)?'
|
|
49
|
-
response = $stdin.
|
|
49
|
+
response = $stdin.getch.tap { print "\n" }
|
|
50
50
|
return if response.strip == 'n'
|
|
51
51
|
end
|
|
52
52
|
end
|
|
@@ -61,6 +61,16 @@ module Dapp
|
|
|
61
61
|
|
|
62
62
|
private
|
|
63
63
|
|
|
64
|
+
def deep_merge(hash1, hash2)
|
|
65
|
+
hash1.merge(hash2) do |_, v1, v2|
|
|
66
|
+
if v1.is_a?(::Hash) && v2.is_a?(::Hash)
|
|
67
|
+
deep_merge(v1, v2)
|
|
68
|
+
else
|
|
69
|
+
v2
|
|
70
|
+
end
|
|
71
|
+
end
|
|
72
|
+
end
|
|
73
|
+
|
|
64
74
|
def deep_select_modified_keys(hash1, hash2)
|
|
65
75
|
{}.tap do |hash|
|
|
66
76
|
hash1.each do |k, v|
|
data/lib/dapp/version.rb
CHANGED