sambot 0.1.137 → 0.1.138

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88abd41e053c9866b8f2466db3cb2e4d9a8507e5
-  data.tar.gz: 4dfebc52309da38dee4aeddbac1779bd6f3a64b5
+  metadata.gz: cfc866ec66a95cbeea052093c2715fddd315ec0a
+  data.tar.gz: 02fb758ebf416f3ec07c9757519809137b329e76
 SHA512:
-  metadata.gz: df7201e96ff1be8e8eb2b9888b91740634274ece0e308d6eddab6308c0c8af9f5b6a578a6d075098c637e4f45fc0bd99256450142dc58199179ee3dcb5736450
-  data.tar.gz: 2c2a356116320d76908586c0d26d312b1844bfdd906544d09f0bafdf706c4b92d541a4c50632b5943d2a6fd75989ad1ff99c138ce63056f8f7355769f89ac426
+  metadata.gz: 2f26b250a995fed84b8494444938b1177d50a7a8b6c1d66f99664b25bb56f0d42e5bc426599409fb41b8b3f2fd175724cae361ce7fe42a24bf0e3c5b71217d1a
+  data.tar.gz: e8c9223e041d7b1d9657dff06af2333fe542daa627b16442c9468e76ae0e7df8985b52018001acb5a1d0b5778be2871b6267d6f07adbd4ee30234ebc7144e547

data/lib/sambot/chef/cookbook.rb

@@ -20,7 +20,8 @@ module Sambot
         '.rubocop.yml': {eruby: false, dest: '.rubocop.yml', platform: [:windows, :centos]},
         '.gitignore.sample': {eruby: false, dest: '.gitignore', platform: [:windows, :centos]},
         'bootstrap.sh': {eruby: false, dest: 'bootstrap.sh', platform: [:centos]},
-        'bootstrap.ps1': {eruby: false, dest: 'bootstrap.ps1', platform: [:windows]},
+        'gcp_bootstrap.sh.erb': {eruby: true, dest: 'gcp_bootstrap.sh', platform: [:centos]},
+        'bootstrap.ps1.er ': {eruby: true, dest: 'bootstrap.ps1', platform: [:windows]},
         'Vagrantfile.erb': {eruby: false, dest: 'Vagrantfile.erb', platform: [:windows, :centos]},
         'winrm_config': {eruby: false, dest: 'winrm_config', platform: [:windows]}
       }

data/lib/sambot/templates/.kitchen.gcp.yml.erb

@@ -24,7 +24,7 @@ platforms:
       preemptible: true
       service_account_name: <%= ENV['GCP_SERVICE_ACCOUNT_NAME'] %>
       custom_metadata_from_disk:
-        startup-script: <%= ENV['GCP_BOOTSTRAP_SCRIPT'] %>
+        startup-script: <%= ENV['GCP_BOOTSTRAP_SCRIPT_CENTOS'] %>
       service_account_scopes:
         - userinfo-email
         - logging-write
@@ -53,8 +53,8 @@ platforms:
       preemptible: true
       disk_size: 80
       service_account_name: <%= ENV['GCP_SERVICE_ACCOUNT_NAME'] %>
-      custom_metadata:
-        windows-startup-script-url: https://storage.googleapis.com/test-kitchen-sfmc/startup-script.ps1
+      custom_metadata_from_disk:
+        windows-startup-script: <%= ENV['GCP_BOOTSTRAP_SCRIPT_WINDOWS'] %>
       service_account_scopes:
         - userinfo-email
         - logging-write

data/lib/sambot/templates/Vagrantfile.erb

@@ -86,9 +86,9 @@ Vagrant.configure("2") do |c|
   <% end %>
 
   <% if config[:box] =~ /centos/ %>
-    c.vm.provision "shell", inline: "bash /vagrant/bootstrap.sh"
+    c.vm.provision "shell", inline: "bash /vagrant/local_bootstrap.sh"
   <% else %>
-    c.vm.provision "shell", inline: "powershell -ExecutionPolicy Bypass -File C:/Vagrant/bootstrap.ps1"
+    c.vm.provision "shell", inline: "powershell -ExecutionPolicy Bypass -File C:/Vagrant/local_bootstrap.ps1"
   <% end %>
 
   c.vm.provider "virtualbox" do |p|

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

@@ -0,0 +1,28 @@
+netsh advfirewall firewall add rule name="winrm" dir=in action=allow protocol=TCP localport=5985
+winrm quickconfig -q
+winrm set winrm/config/service @{AllowUnencrypted="true"}
+winrm set winrm/config/service/auth @{Basic="true"}
+
+Add-Type -AssemblyName "System.IO.Compression.FileSystem"
+[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12
+
+$output = "C:\Program Files\vault"
+New-Item $output -ItemType Directory -Force
+$url = "https://storage.googleapis.com/ads-devops-chef/as-vault-tool/<%= ENV['AS_VAULT_TOOL_VERSION'] %>/windows_amd64.zip"
+$zipfile = "$output\$($url.Split('/')[-1])"
+$wc.DownloadFile($url, $zipfile)
+[System.IO.Compression.ZipFile]::ExtractToDirectory($zipfile, $output)
+
+$json = @"
+{
+    "vault-addr": "<%= ENV['GCP_VAULT_ADDR'] %>",
+    "skip-verify": true,
+    "wrapped": "<%= ENV['GCP_VAULT_TOKEN'] %>",
+    "access": ""
+}
+"@
+
+New-Item 'C:\ProgramData\vault' -ItemType Directory -Force
+Set-Content -Path 'C:\ProgramData\vault\tokens.json' -Value $json
+
+& "$output\as-vault-tool" tokenrenew

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

@@ -0,0 +1,19 @@
+#!/bin/bash -e
+
+yum install -y unzip wget
+mkdir /etc/vault
+
+token=$(vault token-create -policy=nightswatch-ro -role=nightswatch-ro -wrap-ttl=72h | awk '/^wrapping_token:/ {print $2}')
+cat << EOF > /etc/vault/tokens.json
+{
+    "vault-addr": "<%= ENV['GCP_VAULT_ADDR'] %>",
+    "skip-verify": true,
+    "wrapped": "<%= ENV['GCP_VAULT_TOKEN'] %>",
+    "access": ""
+}
+EOF
+
+mkdir -p /opt/as-vault-tool/<%= ENV['AS_VAULT_TOOL_VERSION'] %>
+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.137'.freeze
+  VERSION = '0.1.138'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sambot
 version: !ruby/object:Gem::Version
-  version: 0.1.137
+  version: 0.1.138
 platform: ruby
 authors:
 - Olivier Kouame
@@ -480,12 +480,13 @@ files:
 - lib/sambot/templates/.rubocop.yml
 - lib/sambot/templates/Berksfile
 - lib/sambot/templates/Vagrantfile.erb
-- lib/sambot/templates/bootstrap.ps1
-- lib/sambot/templates/bootstrap.sh
 - lib/sambot/templates/chefignore
+- lib/sambot/templates/gcp_bootstrap.ps1.erb
+- lib/sambot/templates/gcp_bootstrap.sh.erb
+- lib/sambot/templates/local_bootstrap.ps1
+- lib/sambot/templates/local_bootstrap.sh
 - lib/sambot/templates/metadata.rb.erb
 - lib/sambot/templates/pre-push
-- lib/sambot/templates/startup-script.ps1
 - lib/sambot/templates/teamcity.sh.erb
 - lib/sambot/templates/winrm_config
 - lib/sambot/ui.rb

data/lib/sambot/templates/startup-script.ps1

@@ -1,4 +0,0 @@
-netsh advfirewall firewall add rule name="winrm" dir=in action=allow protocol=TCP localport=5985
-winrm quickconfig -q
-winrm set winrm/config/service @{AllowUnencrypted="true"}
-winrm set winrm/config/service/auth @{Basic="true"}