socotra-build 0.3.46 → 0.3.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e173cbb231f00b97623514d1ee2548899dd87d28
-  data.tar.gz: 99f0bbffceb76700d6fe3c2444d150dcce0c50a9
+  metadata.gz: 105b9a92916d116c3c0045a5c815e194bf721896
+  data.tar.gz: 2b42b8a7b4ae330b71eda818398648b048e8284a
 SHA512:
-  metadata.gz: 6c61977c0c970b25feafd15decd39a1dd784159a8fedfdaef789157238a7440bf1e1b587964745316db2c1278f0307084ecda2ecbfa98145f245763582f6632e
-  data.tar.gz: a309e16c835d59d0dc8bab260f02ca4f6d316e60965650313eef789393a845a447d68ad95c9bd7869b8f96cd8fefaf0a3f95d2e40b8d4c458c38d78f954e46c4
+  metadata.gz: 88952073df2c626efbbd3cac12c8206068bda03cecc1d34fe975084e59ebd5996d98a510d199598fb8603607d7ea6397b462a4d60b571a03608a1d2502ecbcf1
+  data.tar.gz: a9bff08ffbe87bd543b45112f60a8ec0b04a5562466e1bbca77f51cd6f4c28efad63da2a556ab9bca21ede24b38ef157a1ed1f410a233b20ea7086e3748efceb

data/lib/socotra-build.rb

@@ -3,8 +3,8 @@ require 'set'
 require 'timeout'
 require_relative 's3_uploader'
 
-def self.safe_retry(cmd, description, error_message="command failed", raise_on_fail=true, log_level="ERROR", log=true, tries=3, timeout=0)
-    retry_count ||= 0
+def self.safe_retry(cmd, description, error_message="command failed", raise_on_fail=true, log=true, tries=3, timeout=0)
+    retry_count = 0
     begin
         if retry_count == (tries - 1)
             last_try = true
@@ -12,7 +12,7 @@ def self.safe_retry(cmd, description, error_message="command failed", raise_on_f
             last_try = false
         end
 
-        status, output = system_safe(cmd, description, error_message, raise_on_fail=raise_on_fail, log_level=log_level, log=log, print_command=true, retry_exec=true, timeout=timeout, log_file_number=retry_count, last_try=last_try)
+        status, output = system_safe(cmd, description, error_message, raise_on_fail=raise_on_fail, log=log, print_command=true, retry_exec=true, timeout=timeout, log_file_number=retry_count, last_try=last_try)
     rescue
         sleep 5
         retry if (retry_count += 1) < (tries)
@@ -104,11 +104,11 @@ def self.logger(log, success, retry_exec, raise_on_fail, log_out, log_err, log_l
     if log
         log("INFO", "Logs available here: #{log_err} and #{log_out}" )
     else
-        log("INFO", "INFO: Logs unavailable due to user settings")
+        log("INFO", "Logs unavailable due to user settings")
     end
 
     if not (success or retry_exec)
-        log(log_level, error_message)
+        log("ERROR", error_message)
         raise
     end
 
@@ -131,7 +131,7 @@ def self.logger(log, success, retry_exec, raise_on_fail, log_out, log_err, log_l
     end
 end
 
-def self.system_safe(cmd=cmd, cmd_description=cmd_description, error_message=error_message, raise_on_fail=true, log_level="ERROR", log=true, print_command=true, retry_exec=false, timeout=0, log_file_number=1, last_try=true)
+def self.system_safe(cmd=cmd, cmd_description=cmd_description, error_message=error_message, raise_on_fail=true, log=true, print_command=true, retry_exec=false, timeout=0, log_file_number=1, last_try=true)
     start = Time.now.to_i
     
     cmd_sanitized = get_sanitized_cmd(cmd)
@@ -158,7 +158,7 @@ def self.system_safe(cmd=cmd, cmd_description=cmd_description, error_message=err
     file = File.open(log_out, "rb")
     out = file.read
 
-    logger(log, success, retry_exec, raise_on_fail, log_out, log_err, log_level, error_message, last_try)
+    logger(log, success, retry_exec, raise_on_fail, log_out, log_err, error_message, last_try)
 
     return success
 end
@@ -177,25 +177,25 @@ 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", true, "ERROR", false)
+	system_safe(cmd, log_identifier, "Put secret failed", true, 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", true, "ERROR", false)
+	status, output = system_safe(cmd, log_identifier, "AWS key generation failed", true, 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", true, "ERROR", false, false)
+	status, account_access_key = system_safe(cmd, "get_generated_access_key", "Getting account access key failed", true, false, 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", true, "ERROR", false, false)
+	status, account_secret_key = system_safe(cmd, "get_generated_access_key", "Getting account access key failed", true, false, 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", true, "ERROR", false, false)
+	status, lease_id = system_safe(cmd, "get_generated_access_key", "Getting account access key failed", true, false, false)
 	lease_id = lease_id.strip
 
 	return account_access_key, account_secret_key, lease_id

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: socotra-build
 version: !ruby/object:Gem::Version
-  version: 0.3.46
+  version: 0.3.47
 platform: ruby
 authors:
 - Chris Antenesse
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-25 00:00:00.000000000 Z
+date: 2017-07-26 00:00:00.000000000 Z
 dependencies: []
 description: Common functions for build
 email: chris.antenesse@socotra.com