socotra-build 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64e8db502c8303df28468d82068a85e8d0ead25b
-  data.tar.gz: 23347c3cacee8ce6beb9d29f3fecb95b3ca67bcf
+  metadata.gz: 4e0d522a8ad37ce502372411b1805ed2eed8bf4b
+  data.tar.gz: e357ce6703bcc71a6bf5f2491134dfe286db3055
 SHA512:
-  metadata.gz: 46a02ba71c031c00b977b4a5c380e01ca23e8861a5fd9c5253d3732576b64d42cf970adde30ececd0f42d129cb4a10175242316de152a7d24f445d20c271325d
-  data.tar.gz: 26b9c545a577692ec73fdd78d5c0dc842d60d22bcf3170c6695051fc401fde31e76d80c02bd3586fbc39b656f9b83c0f92b86dbef7fa2b3b457dd2a6c13c4010
+  metadata.gz: 7d18da3d1b99eeca877b52083cbf42a762d3d6efeb6d00519c969d9304d89fc97864c1d21f4ffbcb0497f4e07489a30c92e6fb4a3791b5285d1c327a378ea990
+  data.tar.gz: f798e8ba250171737ba786db02dc325a0a45ea7f2bae3bd9c61ddfba06de5ba1de838ba7ad49e6a8b669ea7b8a8d57fe8999194ba8100694a5a172cf72bc557b

data/lib/socotra-build.rb

@@ -19,21 +19,28 @@ def self.safe_retry(cmd, description, error_message="command failed", raise_on_f
 	return status
 end
 
-def self.system_safe(cmd, cmd_description, error_message, raise_on_fail=true, log_level="ERROR")
-	puts "executing command: #{cmd}\n"
-  start = Time.now.to_i
+def self.system_safe(cmd, cmd_description, error_message, raise_on_fail=true, log_level="ERROR", log=true)
+	if log
+        puts "executing command: #{cmd}\n"
+	end
+
+    start = Time.now.to_i
 	stdout, stderr, status = Open3.capture3(cmd)
-  elapsed = Time.now.to_i - start
+    elapsed = Time.now.to_i - start
 
-	File.open("logs/#{cmd_description}_out.log" , 'w') { |file| file.write(stdout) }
-	File.open("logs/#{cmd_description}_err.log" , 'w') { |file| file.write(stderr) }
+    if log
+	    File.open("logs/#{cmd_description}_out.log" , 'w') { |file| file.write(stdout) }
+	    File.open("logs/#{cmd_description}_err.log" , 'w') { |file| file.write(stderr) }
+	    puts "\tLogs available here: #{cmd_description}_err.log and #{cmd_description}_out.log\n\n"
+	end
 
-  puts "\t#{cmd_description} took #{elapsed} seconds"
-	puts "\tLogs available here: #{cmd_description}_err.log and #{cmd_description}_out.log\n\n"
+    puts "\t#{cmd_description} took #{elapsed} seconds"
 
 	if not status.success? and raise_on_fail
-		puts "#{log_level}: see logs/#{cmd_description}_out.log and #{cmd_description}_err.log for details"
-		raise "#{log_level}: #{error_message}"
+		if log
+			puts "#{log_level}: see logs/#{cmd_description}_out.log and #{cmd_description}_err.log for details"
+		end
+        raise "#{log_level}: #{error_message}"
 	end
 
 	return [status.success?, stdout]
@@ -46,31 +53,31 @@ end
 
 def self.get_secret(key, subkey, log_identifier)
     cmd = "vault read -field=#{subkey} #{key}"
-    status, secret = system_safe(cmd, log_identifier, "Get secret failed")
+    status, secret = system_safe(cmd, log_identifier, "Get secret failed", true, "ERROR", false)
 	secret = secret.strip
 end
 
 def self.put_secret(key, subkey_value_map, log_identifier)
 	cmd = "vault write #{key} #{subkey_value_map}"
-	system_safe(cmd, log_identifier, "Put secret failed")
+	system_safe(cmd, log_identifier, "Put secret failed", true, "ERROR", false)
 end
 
 def self.generate_aws_keys(key, log_identifier)
 	cmd = "vault read #{key}"
 
-	status, output = system_safe(cmd, log_identifier, "AWS key generation failed")
+	status, output = system_safe(cmd, log_identifier, "AWS key generation failed", true, "ERROR", false)
 
 	cmd = "echo '#{output}' |grep access_key|awk '{print $2'}"
-	status, account_access_key = system_safe(cmd, "get_generated_access_key", "Getting account access key failed")
+	status, account_access_key = system_safe(cmd, "get_generated_access_key", "Getting account access key failed", true, "ERROR", false)
 
 	account_access_key = account_access_key.strip
 
 	cmd = "echo '#{output}' |grep secret_key|awk '{print $2'}"
-	status, account_secret_key = system_safe(cmd, "get_generated_access_key", "Getting account access key failed")
+	status, account_secret_key = system_safe(cmd, "get_generated_access_key", "Getting account access key failed", true, "ERROR", false)
 	account_secret_key = account_secret_key.strip
 
 	cmd = "echo '#{output}' |grep lease_id|awk '{print $2'}"
-	status, lease_id = system_safe(cmd, "get_generated_access_key", "Getting account access key failed")
+	status, lease_id = system_safe(cmd, "get_generated_access_key", "Getting account access key failed", true, "ERROR", false)
 	lease_id = lease_id.strip
 
 	return account_access_key, account_secret_key, lease_id
@@ -78,5 +85,5 @@ end
 
 def self.revoke_lease(lease_id, log_identifier)
 	cmd = "vault revoke #{lease_id}"
-	safe_retry(cmd, log_identifier, "Revoking lease failed", false)
+	safe_retry(cmd, log_identifier, "Revoking lease failed", false, "ERROR", false)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: socotra-build
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Chris Antenesse