sambot 0.1.139 → 0.1.140

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1796f56afff94228802fc2a26f7df73234c2c4b0
-  data.tar.gz: af0d40157704499333c37f7f3185beda02522b34
+  metadata.gz: 4a527304ade136459c28b29152006319c9ad5596
+  data.tar.gz: 8ecfc7577f98d44e7e19846d420ed982ad98fa66
 SHA512:
-  metadata.gz: 0e43182a75ad9f37771d06fbb5453a31f416268adc653bd1ef27c0091aadf89816b5564629b869ad1e934623fa53719c0e0bcec3d2ccd6f4e8ecad69bf9742b8
-  data.tar.gz: 2acba0bb4c74774069efcfea070dd6085857c689a43b9f6c903b82f1124ff8fcaed7c87986bac597bfba3c26c2b17ac7ecf669ceb89c422c96a92af277ba3da2
+  metadata.gz: 69240de3b48ecee23cf9a5176b1bc98448049e139455d6bb1d8bd40cc523a766dbe0c7e2b6e0e500bf46d40b29ef0449ea215e260bfe222df797578df4ae5d99
+  data.tar.gz: 65cb09747286f0e8eccf6acefd78a4da23cc871d86ec39c2c5eba8fc6e20faa42d64f55b1b195f9bf2575f4bd32d97b6f175a989ead5a1d0559a425b0e8d1dfe

data/lib/sambot/chef/kitchen.rb

@@ -47,10 +47,19 @@ module Sambot
 
           def add_platform_identifier(value, platform)
             value['suites'].each do |config|
-              config['attributes'] = config['attributes'] || {}
-              config['attributes']['cloud_platform'] = platform
-              config['attributes']['vault'] = config['attributes']['vault'] || {}
-              config['attributes']['vault']['exec_renew'] = false
+              params = handle_custom_suites(config, platform)
+              params['attributes'] = params['attributes'] || {}
+              params['attributes']['cloud_platform'] = platform
+              params['attributes']['vault'] = params['attributes']['vault'] || {}
+              params['attributes']['vault']['exec_renew'] = false
+            end
+          end
+
+          def handle_custom_suites(config, platform)
+            if config['local'] && config['dev']
+              platform == 'LOCAL' ? config['local'] : config['dev']
+            else
+              config
             end
           end
 

data/lib/sambot/templates/gcp_bootstrap.sh.erb

@@ -1,7 +1,7 @@
 #!/bin/bash -e
 
 yum install -y unzip wget
-mkdir /etc/vault
+if [ ! -d /etc/vault ]; then mkdir /etc/vault; fi
 
 token=$(vault token-create -policy=nightswatch-ro -role=nightswatch-ro -wrap-ttl=72h | awk '/^wrapping_token:/ {print $2}')
 cat << EOF > /etc/vault/tokens.json
@@ -13,7 +13,9 @@ cat << EOF > /etc/vault/tokens.json
 }
 EOF
 
-mkdir -p /opt/as-vault-tool/<%= ENV['AS_VAULT_TOOL_VERSION'] %>
+if [ ! -d /opt/as-vault-tool/<%= ENV['AS_VAULT_TOOL_VERSION'] %> ]; then
+    mkdir -p /opt/as-vault-tool/<%= ENV['AS_VAULT_TOOL_VERSION'] %>
+fi
 wget https://storage.googleapis.com/ads-devops-chef/as-vault-tool/<%= ENV['AS_VAULT_TOOL_VERSION'] %>/linux_amd64.zip
 unzip linux_amd64 -d /opt/as-vault-tool/<%= ENV['AS_VAULT_TOOL_VERSION'] %>/
 /opt/as-vault-tool/<%= ENV['AS_VAULT_TOOL_VERSION'] %>/as-vault-tool tokenrenew

data/lib/sambot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sambot
-  VERSION = '0.1.139'.freeze
+  VERSION = '0.1.140'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sambot
 version: !ruby/object:Gem::Version
-  version: 0.1.139
+  version: 0.1.140
 platform: ruby
 authors:
 - Olivier Kouame