sambot 0.1.225 → 0.1.226

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 181b34f8dc667713236f6eb5b977d4867b03dcb5
-  data.tar.gz: 73117bd92de7f49725971cb1a1a71671f48852dd
+  metadata.gz: affbea566a85c539706f2cfd4631f0cc284fe180
+  data.tar.gz: 04e0a3981f427552ba2862c9cfdec0301e1155bc
 SHA512:
-  metadata.gz: eb5c17af4f26acf78f6409965e524ae0959cedc09b5c96d5c8f23e8770cea813f0f91446895fb8286a7be195fc29b13c05b77046a9733fd3bdfea3f0290cfb4a
-  data.tar.gz: 07f4af7a8f0bf13babb5293c4220543c0689490fe876871e414b9568c10ccac24d89a458af0e82e7ff7a1f5bc2f13009849c21911de175599c288dc26f921ede
+  metadata.gz: 12f8c11b2047fd44b983573a09112f6ac2c1a05bbb6f642ba3108ab64d0edacf1b5bf1d72f6538c837b1eee1e3a0c93403ed119667b57d569bdc2caa1d170943
+  data.tar.gz: 4fb72537af45b48ab69d5188bf6b2f85abf55e7d9fc584534c2578c3a75d4586026c313de509e16ee655f344f8a790c43e900de89a3134cd12cb9bd5c7a949ed

data/lib/sambot/tasks/populate.rb

@@ -9,9 +9,12 @@ module Sambot
       no_commands do
 
         def run(options)
+          config = Config.read
+          #Sambot::Testing::DataBagsHelper.import_databags
           Sambot::Testing::VaultHelper.setup
-          Sambot::Testing::VaultHelper.load_secrets(Config.read)
-          Sambot::Testing::ConsulHelper.load_values(Config.read)
+          Sambot::Testing::VaultHelper.load_secrets(config)
+          Sambot::Testing::ConsulHelper.load_values(config)
+
         end
 
       end

data/lib/sambot/templates/bootstrap_scripts/google/bootstrap.sh.erb

@@ -34,6 +34,7 @@ yum install -y unzip wget
 
 if [ ! -d /etc/vault ]; then mkdir /etc/vault; fi
 
+echo 'Creating /etc/vault/tokens.json'
 cat << EOF > /etc/vault/tokens.json
 {
     "vault-addr": "<%= ENV['GCP_VAULT_ADDR'] %>",
@@ -43,9 +44,11 @@ cat << EOF > /etc/vault/tokens.json
 }
 EOF
 
+cat /etc/vault/tokens.json
+
+echo 'Setting permissions on /etc/vault/tokens.json'
 groupadd -fg 9897 vault-tokens
 usermod -aG vault-tokens root
-
 chmod 0640 /etc/vault/tokens.json
 chown root:vault-tokens /etc/vault/tokens.json
 
@@ -53,6 +56,7 @@ chown root:vault-tokens /etc/vault/tokens.json
 # Install Advertising Studio's as-vault-tool binary.                            #
 #################################################################################
 
+echo 'Installing the as-vault-tool binary'
 if [ ! -d /opt/as-vault-tool/<%= ENV['AS_VAULT_TOOL_VERSION'] %> ]; then
     mkdir -p /opt/as-vault-tool/<%= ENV['AS_VAULT_TOOL_VERSION'] %>
 fi
@@ -64,4 +68,5 @@ unzip linux_amd64 -d /opt/as-vault-tool/<%= ENV['AS_VAULT_TOOL_VERSION'] %>/
 # tokens.json file.                                                             #
 #################################################################################
 
+echo 'Running the as-vault-tool in order to unwrap the token'
 /opt/as-vault-tool/<%= ENV['AS_VAULT_TOOL_VERSION'] %>/as-vault-tool tokenrenew

data/lib/sambot/testing/vault_helper.rb

@@ -56,11 +56,12 @@ module Sambot
 
         def load_secrets(config, src = 'local_testing')
           UI.info('Reading secrets from the configuration file')
-          if config.secrets.nil? || config.secrets.empty?
+          secrets = merge_wrapper_cookbook_secrets(config.dependencies, config.secrets)
+          if secrets.nil? || secrets.empty?
             UI.info('No secrets were found in the secrets configuration file')
             return 0
           else
-            store_secrets(config.secrets, src)
+            store_secrets(secrets, src)
           end
         end
 
@@ -76,6 +77,10 @@ module Sambot
 
         private
 
+        def merge_wrapper_cookbook_secrets(dependencies, secrets)
+          secrets
+        end
+
         def store_secrets(secrets, src)
           counter = 0
           secrets.each do |secret|

data/lib/sambot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sambot
-  VERSION = '0.1.225'
+  VERSION = '0.1.226'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sambot
 version: !ruby/object:Gem::Version
-  version: 0.1.225
+  version: 0.1.226
 platform: ruby
 authors:
 - Olivier Kouame
@@ -470,6 +470,7 @@ files:
 - lib/sambot/templates/vault-config
 - lib/sambot/templates/winrm_config
 - lib/sambot/testing/consul_helper.rb
+- lib/sambot/testing/data_bags_helper.rb
 - lib/sambot/testing/fixtures.rb
 - lib/sambot/testing/vault_helper.rb
 - lib/sambot/ui.rb