sambot 0.1.197 → 0.1.198

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffe1d989549a35f6166b856dc83ff30d536e42c6
-  data.tar.gz: 0cf41173f56f4adcfb88329d9ed58678a69c4d24
+  metadata.gz: e83a497801a896e26973a5da27bcd6ce504551d7
+  data.tar.gz: f6c08bb358361f8d07c0fd452785c67004abce60
 SHA512:
-  metadata.gz: 643275e2af3e518eedcbd2d08a873de7454809c24c04c577968c18c625afaa49cb14c24b51acbfff28f97f2d6a4f4387601144f76d26ade1c75ed788f36df378
-  data.tar.gz: eb1b4bcafa4fa4718b9672d4281b4e6d172bd42397fafd3083196c0bfc1f58addb81b2d2c922e598808e99be275c179b165398a68adcb80d31ae4e3fc0728bba
+  metadata.gz: 51cce94ee0fe4d09702768401fb3203684571ad7f79a2916d48855913c25ed8799d2810f81cdd60767dba839015d39c8570c925b7a63a90eff0819cd35c83c07
+  data.tar.gz: ad1f1bf1b03bd786178e2dd35db0be3334a877b082f778a98f291007ae66d814b0c75acc38c8b36d8686ad97ea35a3265df4c8805efc2157a3541ade7362088c

data/lib/sambot/cli.rb

@@ -10,6 +10,30 @@ module Sambot
       execute { Chef::Cookbook.clean }
     end
 
+    desc 'up', 'Setup the Docker environment for testing cookbooks'
+    def up
+      execute do
+        `docker-compose -p chef up -d`
+        `chef exec sambot populate`
+      end
+    end
+
+    desc 'down', 'Destroy the Docker environment for testing cookbooks'
+    def down
+      execute do
+        `docker-compose down`
+      end
+    end
+
+    desc 'test', 'Test a cookbook using the Docker environment'
+    def down
+      execute do
+        `docker-compose -p chef up -d`
+        `chef exec sambot populate`
+        `docker-compose down`
+      end
+    end
+
     desc 'populate', 'Populates Vault and Consul with seed data'
     def populate
       execute do

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

@@ -69,7 +69,17 @@ $json = @"
 New-Item 'C:\ProgramData\vault' -ItemType Directory -Force
 Set-Content -Path 'C:\ProgramData\vault\tokens.json' -Value $json
 
-###### TODO - NEED TO ADD GROUPS STUFF!!!!!
+#################################################################################
+# Create the 'vault-tokens' group so other services/applications apart from     #
+# 'root' can access the file.                                                   #
+#################################################################################
+
+$acl = Get-Acl 'C:\ProgramData\vault\tokens.json'
+NET LOCALGROUP "vault-tokens" /add
+$ar = New-Object System.Security.AccessControl.FileSystemAccessRule('Administrators', 'FullControl', 'Allow')
+$acl.SetAccessRule($ar)
+$ar = New-Object System.Security.AccessControl.FileSystemAccessRule('vault-tokens', 'FullControl', 'Allow')
+$acl.SetAccessRule($ar)
 
 #################################################################################
 # Get the real token from the wrapped token and store it in the                 #

data/lib/sambot/templates/bootstrap_scripts/local/docker/bootstrap.ps1.erb

@@ -53,8 +53,8 @@ $json = @"
 {
     "vault-addr": "$env:VAULT_ADDR",
     "skip-verify": true,
-    "wrapped": "",
-    "access": "$Token"
+    "wrapped": "$Token",
+    "access": ""
 }
 "@
 
@@ -65,3 +65,10 @@ Set-Content -Path 'C:\ProgramData\vault\tokens.json' -Value $json
 # Create the 'vault-tokens' group so other services/applications apart from     #
 # 'root' can access the file.                                                   #
 #################################################################################
+
+$acl = Get-Acl 'C:\ProgramData\vault\tokens.json'
+NET LOCALGROUP "vault-tokens" /add
+$ar = New-Object System.Security.AccessControl.FileSystemAccessRule('Administrators', 'FullControl', 'Allow')
+$acl.SetAccessRule($ar)
+$ar = New-Object System.Security.AccessControl.FileSystemAccessRule('vault-tokens', 'FullControl', 'Allow')
+$acl.SetAccessRule($ar)

data/lib/sambot/templates/bootstrap_scripts/local/vagrant/bootstrap.ps1.erb

@@ -83,7 +83,12 @@ Set-Content -Path 'C:\ProgramData\vault\tokens.json' -Value $json
 # 'root' can access the file.                                                   #
 #################################################################################
 
-###### TODO - NEED TO ADD GROUPS STUFF!!!!!
+$acl = Get-Acl 'C:\ProgramData\vault\tokens.json'
+NET LOCALGROUP "vault-tokens" /add
+$ar = New-Object System.Security.AccessControl.FileSystemAccessRule('Administrators', 'FullControl', 'Allow')
+$acl.SetAccessRule($ar)
+$ar = New-Object System.Security.AccessControl.FileSystemAccessRule('vault-tokens', 'FullControl', 'Allow')
+$acl.SetAccessRule($ar)
 
 #################################################################################
 # Get the real token from the wrapped token and store it in the                 #

data/lib/sambot/templates/git_hooks/pre-push

@@ -21,9 +21,3 @@ if [ $? -ne 0 ]; then
     echo "Failed when running Cookstyle. Aborting the Git push."
     exit 1
 fi
-
-chef exec sambot clean
-if [ $? -ne 0 ]; then
-    echo "Failed when cleaning the cookbook. Aborting the Git push."
-    exit 1
-fi

data/lib/sambot/version.rb

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

metadata

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