sambot 0.1.219 → 0.1.220

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45b23316b2350595cf8b0b3052f49266b0a2433c
-  data.tar.gz: 895ea0d1fea324d7d0c0e8b6a89e5929c86c5b74
+  metadata.gz: be24c61be67746ca0541bd4bfaa73b78c85ef8e2
+  data.tar.gz: 355d7fc441ea881b6a17ae89b44c4d0d674dbe87
 SHA512:
-  metadata.gz: 8484086210d62a90fd30ee22d03fbc7d69527ce9efd99a5fdab8ab5c557d5f99e295d914c5e2a8c35e2a0e936dcb680d4a89a4193bdf757e22393e9d5bb14e01
-  data.tar.gz: 8214613e0155362f697b13f047bcf989f8ef3fd40519076cb814d1bab66f5f1d7557aa2a350e20b979e21466071f7ba597a86deca2063d901937b6109e272984
+  metadata.gz: 55606498feff855d8632e7eca6f34be0d90496f03ad245f7221e730036cf1912b42a5391a80609d466c4a2f28ca1cfd4b093dd03acb1cd21f7ca2ea357cd9561
+  data.tar.gz: b07b398d3a241ceb021f3de5a5c7a086d537a87ecbfe1c1d47319db4cbb7dc803c0ea2e19273f593f13ead8977b9f0fff13c0216ea611a65e085f9720ea745af

data/lib/sambot/templates/Vagrantfile.erb

@@ -95,14 +95,13 @@ Vagrant.configure("2") do |c|
   #################################################################################
   <%
     puts 'Generating the wrapped token to pass in to the bootstrap script'
-    centos_token = ::Sambot::Testing::VaultHelper.generate_wrapped_token
-    windows_token = ::Sambot::Testing::VaultHelper.generate_wrapped_token
-    puts 'The tokens generated were ' + centos_token + ' and ' + windows_token
+    token = ::Sambot::Testing::VaultHelper.generate_wrapped_token
+    puts 'The token generated was ' + token
   %>
   <% if config[:box] =~ /centos/ %>
-    c.vm.provision "shell", inline: "bash /vagrant/bootstrap.sh \"<%= centos_token %>\""
+    c.vm.provision "shell", inline: "bash /vagrant/bootstrap.sh \"<%= token %>\""
   <% else %>
-    c.vm.provision "shell", inline: "powershell -ExecutionPolicy Bypass -File C:/Vagrant/bootstrap.ps1 -Token '<%= windows_token %>'"
+    c.vm.provision "shell", inline: "powershell -ExecutionPolicy Bypass -File C:/Vagrant/bootstrap.ps1 -Token '<%= token %>'"
   <% end %>
 
   c.vm.provider "virtualbox" do |p|

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

@@ -61,7 +61,7 @@ $json = @"
 {
     "vault-addr": "<%= ENV['GCP_VAULT_ADDR'] %>",
     "skip-verify": true,
-    "wrapped": "<%= ENV['GCP_VAULT_TOKEN'] %>",
+    "wrapped": "<%= ENV['GCP_LINUX_VAULT_TOKEN'] %>",
     "access": ""
 }
 "@

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

@@ -38,7 +38,7 @@ cat << EOF > /etc/vault/tokens.json
 {
     "vault-addr": "<%= ENV['GCP_VAULT_ADDR'] %>",
     "skip-verify": true,
-    "wrapped": "<%= ENV['GCP_VAULT_TOKEN'] %>",
+    "wrapped": "<%= ENV['GCP_WINDOWS_VAULT_TOKEN'] %>",
     "access": ""
 }
 EOF

data/lib/sambot/version.rb

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

metadata

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