socotra-build 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/socotra-build.rb +12 -5
- 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: 63fd69c49c594f64cf6dbef662fe8495088a14f2
|
|
4
|
+
data.tar.gz: 86cf85f5d7a42f63bd8103ceea56f6ee95ac62a2
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 0840273967f6dc00c6b7e7a67d83281302fa3dc9e97591eefb15f4fcaabc5b4a05890b5ba74f5a83b8f19e5a5e9f9651bdf80d873a29a55a2bc2a820a97eb894
|
|
7
|
+
data.tar.gz: cd66760bfc74145aeb4f6ac4fa40b8a034d3cabb1c9ee733494d7f2838ae1cb8ecebd2f0c21516c9a88c6a040eb7dba67a047bc0800ea409e1e3db79a1520e3e
|
data/lib/socotra-build.rb
CHANGED
|
@@ -19,7 +19,7 @@ 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.system_safe(cmd, cmd_description, error_message, raise_on_fail=true, log_level="ERROR", log=true)
|
|
22
|
+
def self.system_safe(cmd, cmd_description, error_message, raise_on_fail=true, log_level="ERROR", log=true, print_command=true)
|
|
23
23
|
|
|
24
24
|
start = Time.now.to_i
|
|
25
25
|
stdout, stderr, status = Open3.capture3(cmd)
|
|
@@ -28,10 +28,17 @@ def self.system_safe(cmd, cmd_description, error_message, raise_on_fail=true, lo
|
|
|
28
28
|
cmd = cmd.split.map(&:downcase)
|
|
29
29
|
cmd.collect! {|element|
|
|
30
30
|
(element.include? "aws") ? "<secret>": element
|
|
31
|
+
(element.include? "password") ? "<secret>": element
|
|
32
|
+
(element.include? "access_key") ? "<secret>": element
|
|
33
|
+
(element.include? "secret") ? "<secret>": element
|
|
31
34
|
}
|
|
32
35
|
cmd = cmd.join(' ')
|
|
33
36
|
|
|
34
|
-
|
|
37
|
+
if print_command
|
|
38
|
+
puts "Executing command: #{cmd}\n"
|
|
39
|
+
else
|
|
40
|
+
puts "Not logging command"
|
|
41
|
+
end
|
|
35
42
|
|
|
36
43
|
if log
|
|
37
44
|
File.open("logs/#{cmd_description}_out.log" , 'w') { |file| file.write(stdout) }
|
|
@@ -75,16 +82,16 @@ def self.generate_aws_keys(key, log_identifier)
|
|
|
75
82
|
status, output = system_safe(cmd, log_identifier, "AWS key generation failed", true, "ERROR", false)
|
|
76
83
|
|
|
77
84
|
cmd = "echo '#{output}' |grep access_key|awk '{print $2'}"
|
|
78
|
-
status, account_access_key = system_safe(cmd, "get_generated_access_key", "Getting account access key failed", true, "ERROR", false)
|
|
85
|
+
status, account_access_key = system_safe(cmd, "get_generated_access_key", "Getting account access key failed", true, "ERROR", false, false)
|
|
79
86
|
|
|
80
87
|
account_access_key = account_access_key.strip
|
|
81
88
|
|
|
82
89
|
cmd = "echo '#{output}' |grep secret_key|awk '{print $2'}"
|
|
83
|
-
status, account_secret_key = system_safe(cmd, "get_generated_access_key", "Getting account access key failed", true, "ERROR", false)
|
|
90
|
+
status, account_secret_key = system_safe(cmd, "get_generated_access_key", "Getting account access key failed", true, "ERROR", false, false)
|
|
84
91
|
account_secret_key = account_secret_key.strip
|
|
85
92
|
|
|
86
93
|
cmd = "echo '#{output}' |grep lease_id|awk '{print $2'}"
|
|
87
|
-
status, lease_id = system_safe(cmd, "get_generated_access_key", "Getting account access key failed", true, "ERROR", false)
|
|
94
|
+
status, lease_id = system_safe(cmd, "get_generated_access_key", "Getting account access key failed", true, "ERROR", false, false)
|
|
88
95
|
lease_id = lease_id.strip
|
|
89
96
|
|
|
90
97
|
return account_access_key, account_secret_key, lease_id
|