socotra-build 0.3.21 → 0.3.22
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/socotra-build.rb +13 -8
- 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: e13e26c72edfe29239b2075cd23b15b8c5cb1d37
|
|
4
|
+
data.tar.gz: 1739ec91908af92234b2a897abc1bbf2dd5193c0
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 51199b39782a08c05245ffc2c7a864d52a7b38a96b025947e4a9ee151fe06283fa171f45d9ac4909231b7560d0f3a29386465c69b794842a7f3e0e0ed2e79126
|
|
7
|
+
data.tar.gz: 5e40ba07ff7de27146f2dafe0bb9afd352ae1d6a36a062239995c67742e628c8a0e2baa8b0034253dd8c65c0349fd51c17fa7ea17c355e5830a98ba9e62ae0fa
|
data/lib/socotra-build.rb
CHANGED
|
@@ -19,12 +19,8 @@ def self.safe_retry(cmd, description, error_message="command failed", raise_on_f
|
|
|
19
19
|
return status
|
|
20
20
|
end
|
|
21
21
|
|
|
22
|
-
def self.
|
|
23
|
-
|
|
24
|
-
start = Time.now.to_i
|
|
25
|
-
stdout, stderr, status = Open3.capture3(cmd)
|
|
26
|
-
elapsed = Time.now.to_i - start
|
|
27
|
-
|
|
22
|
+
def self.get_sanitized_cmd(cmd)
|
|
23
|
+
|
|
28
24
|
secret_fields = ["AWS_ACCESS_KEY_ID",
|
|
29
25
|
"AWS_SECRET_ACCESS_KEY",
|
|
30
26
|
"password",
|
|
@@ -42,7 +38,7 @@ def self.system_safe(cmd, cmd_description, error_message, raise_on_fail=true, lo
|
|
|
42
38
|
"master_access_key",
|
|
43
39
|
"master_secret_key",
|
|
44
40
|
"github_password"]
|
|
45
|
-
|
|
41
|
+
|
|
46
42
|
cmd = cmd.gsub(/\s+/m, ' ').strip.split(" ")
|
|
47
43
|
replace = cmd.grep(Regexp.union(secret_fields))
|
|
48
44
|
unless replace.empty?
|
|
@@ -50,12 +46,21 @@ def self.system_safe(cmd, cmd_description, error_message, raise_on_fail=true, lo
|
|
|
50
46
|
cmd.collect! {|e| (replace.include? e) ? '<secret>': e}
|
|
51
47
|
end
|
|
52
48
|
cmd = cmd.join(' ')
|
|
49
|
+
end
|
|
50
|
+
|
|
51
|
+
def self.system_safe(cmd, cmd_description, error_message, raise_on_fail=true, log_level="ERROR", log=true, print_command=true, retry_exec=false)
|
|
53
52
|
|
|
53
|
+
start = Time.now.to_i
|
|
54
|
+
|
|
55
|
+
cmd_sanitized = get_sanitized_cmd(cmd)
|
|
54
56
|
if print_command
|
|
55
|
-
puts "Executing command: #{
|
|
57
|
+
puts "Executing command: #{cmd_sanitized}\n"
|
|
56
58
|
else
|
|
57
59
|
puts "Not logging command"
|
|
58
60
|
end
|
|
61
|
+
|
|
62
|
+
stdout, stderr, status = Open3.capture3(cmd)
|
|
63
|
+
elapsed = Time.now.to_i - start
|
|
59
64
|
|
|
60
65
|
if log
|
|
61
66
|
File.open("logs/#{cmd_description}_out.log" , 'w') { |file| file.write(stdout) }
|