socotra-build 0.3.2 → 0.3.4

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.
Files changed (3) hide show
  1. checksums.yaml +4 -4
  2. data/lib/socotra-build.rb +21 -21
  3. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 99ffa9b04659f68dc4762a157ef1f4e75bc137ed
4
- data.tar.gz: 6bd4ac68e81f54667d44d6e7504be2aa15af8137
3
+ metadata.gz: 4d576925bd645699e9d267bb31deb885a9109979
4
+ data.tar.gz: d184e4608c60b712e50177971a960ebbee7044ad
5
5
  SHA512:
6
- metadata.gz: f04bdd288b51f03eacf4de5708f82398f7510901fc9684a59046263deae851e8e6595c2fedced3eea49607f65e7edae9589fd6a425c2cab429e833f241443e4b
7
- data.tar.gz: 28d424acdb421db9b134b0b9465c364a928f6950a78115fc9365616a852a45dd3ebe379b678264073b4e90406f9b50266be700dc71682d092b7bb4881bafb9ed
6
+ metadata.gz: 9faf37c9ce31aeaf7a3f4f66db524db7335fc2587b9042ad026cbd934fcb047a8e36f377281028e6523e669970c44f6964848dc9c97410a18da9e61ef70a846b
7
+ data.tar.gz: 6800a9192fd37a6aac65e3e4e473598b4cc1d62a235e1327094f96fb11134593e3ff6b227d216ade8313c1a85963274955584410da0aec096a893ddbffb0d3fd
data/lib/socotra-build.rb CHANGED
@@ -1,4 +1,5 @@
1
1
  require 'open3'
2
+ require 'set'
2
3
 
3
4
  def self.safe_retry(cmd, description, error_message="command failed", raise_on_fail=true, log_level="ERROR", log=true, tries=3)
4
5
  begin
@@ -25,30 +26,29 @@ def self.system_safe(cmd, cmd_description, error_message, raise_on_fail=true, lo
25
26
  stdout, stderr, status = Open3.capture3(cmd)
26
27
  elapsed = Time.now.to_i - start
27
28
 
28
- cmd.collect! {|element|
29
- (element.include? "AWS_ACCESS_KEY_ID") ? "<secret>": element
30
- (element.include? "AWS_SECRET_ACCESS_KEY") ? "<secret>": element
31
- (element.include? "password") ? "<secret>": element
32
- (element.include? "aws_access_key_id") ? "<secret>": element
33
- (element.include? "aws_secret_access_key") ? "<secret>": element
34
- (element.include? "aws_access_key") ? "<secret>": element
35
- (element.include? "aws_secret_key") ? "<secret>": element
36
- (element.include? "account_access_key") ? "<secret>": element
37
- (element.include? "account_secret_key") ? "<secret>": element
38
- (element.include? "aws.accessKeyId") ? "<secret>": element
39
- (element.include? "aws.secretKey") ? "<secret>": element
40
- (element.include? "jwtsecret") ? "<secret>": element
41
- (element.include? "master_access_key") ? "<secret>": element
42
- (element.include? "master_secret_key") ? "<secret>": element
43
-
44
- }
29
+ secret_fields = Set.new("AWS_ACCESS_KEY_ID",
30
+ "AWS_SECRET_ACCESS_KEY",
31
+ "password",
32
+ "aws_access_key_id",
33
+ "aws_secret_access_key",
34
+ "aws_access_key",
35
+ "aws_secret_key",
36
+ "account_access_key",
37
+ "account_secret_key",
38
+ "aws.accessKeyId",
39
+ "aws.secretKey",
40
+ "jwtsecret",
41
+ "master_access_key",
42
+ "master_secret_key",
43
+ "github_password")
44
+ cmd.collect! {|e| secret_fields.include? e ? '<secret>': e }
45
45
  cmd = cmd.join(' ')
46
46
 
47
47
  if print_command
48
- puts "Executing command: #{cmd}\n"
49
- else
50
- puts "Not logging command"
51
- end
48
+ puts "Executing command: #{cmd}\n"
49
+ else
50
+ puts "Not logging command"
51
+ end
52
52
 
53
53
  if log
54
54
  File.open("logs/#{cmd_description}_out.log" , 'w') { |file| file.write(stdout) }
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: socotra-build
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.2
4
+ version: 0.3.4
5
5
  platform: ruby
6
6
  authors:
7
7
  - Chris Antenesse