sambot 0.1.227 → 0.1.228

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a1df7024da35a9375f4ca03c669d62689387f95
-  data.tar.gz: 5a4bbb27ced8a359571891d5566495cc9e60f668
+  metadata.gz: bda9133f7ed24f05e3ad91a15e2ed933902fba72
+  data.tar.gz: 9422f661f2028371f577d68384d04e7ae8cf13d1
 SHA512:
-  metadata.gz: 23b8ec60a5dc557a7b2cd610d6dfe5b9e2037ae77e09ea6dbadd313c1e64e5ea45b1380fa62b019344364c45ec142f7e16d43888867811ce7d892e7d83da09c5
-  data.tar.gz: 6ffb2148d45b6def1a19e5faebfb4716d003d8eea178f7eec69f753acd6800c3141536f157e06369772bdd7c6b43deb04e36dcbbc3904f50bd356ee2d998a8a3
+  metadata.gz: 6b4be40fa31d74f8677efa618ef14dbc7f0d19c62c8be84e439ffa193083d6467ceb14728d59b0304a26d4d7280e80c908ec7f667c363e4000bcc0e476116f19
+  data.tar.gz: 45285574dc129ab7c05d5117440bf1e59929eef4e4f843b0dbfd0d1378c30af385c555ff77c306bd4d779bea9729deac75c6c24fa25cbac4dd048c20a23f80eb

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

@@ -1,3 +1,16 @@
+
+<%
+
+  def check_environment(name)
+    raise "The environment variable #{name} has not been configured" unless ENV[name]
+  end
+
+  check_environment('GCP_VAULT_ADDR')
+  check_environment('GCP_WINDOWS_VAULT_TOKEN')
+  check_environment('AS_VAULT_TOOL_VERSION')
+
+%>
+
 #################################################################################
 # PROVISIONING A WINDOWS BOX                                                    #
 #################################################################################
@@ -61,7 +74,7 @@ $json = @"
 {
     "vault-addr": "<%= ENV['GCP_VAULT_ADDR'] %>",
     "skip-verify": true,
-    "wrapped": "<%= ENV['GCP_LINUX_VAULT_TOKEN'] %>",
+    "wrapped": "<%= ENV['GCP_WINDOWS_VAULT_TOKEN'] %>",
     "access": ""
 }
 "@

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

@@ -7,7 +7,7 @@
   end
 
   check_environment('GCP_VAULT_ADDR')
-  check_environment('GCP_WINDOWS_VAULT_TOKEN')
+  check_environment('GCP_LINUX_VAULT_TOKEN')
   check_environment('AS_VAULT_TOOL_VERSION')
 
 %>
@@ -51,7 +51,7 @@ cat << EOF > /etc/vault/tokens.json
 {
     "vault-addr": "<%= ENV['GCP_VAULT_ADDR'] %>",
     "skip-verify": true,
-    "wrapped": "<%= ENV['GCP_WINDOWS_VAULT_TOKEN'] %>",
+    "wrapped": "<%= ENV['GCP_LINUX_VAULT_TOKEN'] %>",
     "access": ""
 }
 EOF

data/lib/sambot/testing/vault_helper.rb

@@ -78,7 +78,21 @@ module Sambot
         private
 
         def merge_wrapper_cookbook_secrets(dependencies, secrets)
-          secrets
+          all = secrets || []
+          Dir.mktmpdir do |temp_dir|
+            Dir.chdir(temp_dir) do
+              dependencies.each do |dependency|
+                UI.info("Cloning the #{dependency} repository to check it for secrets")
+                `git clone --depth=1 --single-branch -q git@github.exacttarget.com:ads-wrapper-cookbooks/#{dependency}.git`
+                target = "#{dependency}/.config.yml"
+                if File.exist?(target)
+                  config = Config.read(target)
+                  all = all + config.secrets if config.secrets
+                end
+              end
+            end
+          end
+          all
         end
 
         def store_secrets(secrets, src)

data/lib/sambot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sambot
 version: !ruby/object:Gem::Version
-  version: 0.1.227
+  version: 0.1.228
 platform: ruby
 authors:
 - Olivier Kouame
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-09 00:00:00.000000000 Z
+date: 2017-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor-hollaback