sambot 0.1.171 → 0.1.172

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecbe0a3db2399c37336a17169ab9c860dbf99786
-  data.tar.gz: 50d1391592f310d8045de5ef6c97ef6e538e9133
+  metadata.gz: 628d48236e3e996ef6f94921ad3757df406bceb4
+  data.tar.gz: 1fbf9c147b85d8678cef0eb7502850db091cb6cc
 SHA512:
-  metadata.gz: dad5bdc3cf3cc9978729fdc8a8bca632741ec3e5e9a9ba47541f218280affc6556e57269452c17aa57533cdb28301404ccc807f9b0b59d15506042f79adbf395
-  data.tar.gz: 6e2f307c140ba88bcf67d971677287903afe08514236a020e4829d52ffad984ed5c0dc218f3d5f5df8519bf7c93a20b2f87ee63209fad910369a226c229722a5
+  metadata.gz: 1b37a2a22495762bd5358ca30136aa467e1d40cdec9220ee43dc2a0dbc99a38d50709352a5d8fdb328d0561526210f81d1d14fcd2ecddd7a3aeaf0d76f3de754
+  data.tar.gz: 859afcc95326d0576b678bb024ec68e3bdda8d17e414ffad89fec4a8fe8a16038d310198a648b4fa281ec352c85426c1865bc1b2a271bae1fc2ce75ee02b2dc8

data/lib/sambot.rb

@@ -8,6 +8,9 @@ require_relative 'sambot/version'
 require_relative 'sambot/template'
 require_relative 'sambot/fs'
 
+require_relative 'sambot/testing/consul_helper'
+require_relative 'sambot/testing/vault_helper'
+
 require_relative 'sambot/chef/kitchen'
 require_relative 'sambot/chef/metadata'
 require_relative 'sambot/chef/hooks'

data/lib/sambot/chef/cookbook.rb

@@ -56,17 +56,12 @@ module Sambot
 
         def create_files(config)
           ['.vault.yml', '.consul.yml', 'README.md'].each { |resource| FS.copy(resource) unless FS.exist?(resource) }
-          ['spec', 'test', 'attributes', 'local'].each { |resource| FS.mkdir(resource) unless FS.exist?(resource) }
+          ['spec', 'test', 'attributes', 'vault'].each { |resource| FS.mkdir(resource) unless FS.exist?(resource) }
           Dir.chdir('attributes') { FileUtils.touch('default.rb') }
           Dir.chdir('spec') { FS.copy('spec_helper.rb') unless FS.exist?('spec_helper.rb') }
-          Dir.chdir('local') do
-            FS.mkdir('vault') unless FS.exist?('vault')
-            Dir.chdir('vault') { FS.copy('vault_helper.rb') }
-            FS.mkdir('consul') unless FS.exist?('consul')
-            Dir.chdir('consul') { FS.copy('consul_helper.rb')}
-          end
           ['recipes', 'libraries', 'resources', 'files', 'templates'].each { |target| FS.mkdir(target) unless FS.exist?(target) }
           Dir.chdir('recipes') do
+            # Need to correctly generate default.rb
             FileUtils.touch('install.rb') unless FS.exist?('install.rb')
             FileUtils.touch('configure.rb') unless FS.exist?('configure.rb')
             FileUtils.touch('default.rb') unless FS.exist?('default.rb')

data/lib/sambot/cli.rb

@@ -10,6 +10,20 @@ module Sambot
       execute { Chef::Cookbook.clean() }
     end
 
+    desc 'populate', 'Populates either Vault or Consul with seed data'
+    option :vault, :type => :boolean
+    option :consul, :type => :boolean
+    def populate
+      execute do
+        unless options[:vault] || options[:consul]
+          UI.error('Please select the datastore you are populating from the following: --vault or --consul')
+          exit
+        end
+        Sambot::Testing::VaultHelper.load_secrets if options[:vault]
+        Sambot::Testing::ConsulHelper.load_values if options[:consul]
+      end
+    end
+
     desc 'bump', 'Bump the patch version of a cookbook'
     def bump
       execute { Chef::Cookbook.bump() }

data/lib/sambot/templates/bootstrap_scripts/local/sidecar_vault/bootstrap.sh.erb

@@ -1,17 +1,30 @@
 #!/bin/bash -e
 
-## Download and install Hashicorp Vault
+cd /tmp
+
+## Install required tools
 sudo yum install -y unzip wget
+
+## Download and install Hashicorp Vault
 wget "https://releases.hashicorp.com/vault/0.6.5/vault_0.6.5_linux_amd64.zip"
 unzip vault_0.6.5_linux_amd64.zip -d /usr/bin
 sudo mkdir /etc/vault
 
+## Download and install Hashicorp Consul
+wget "https://releases.hashicorp.com/consul/0.8.5/consul_0.8.5_linux_amd64.zip"
+unzip consul_0.8.5_linux_amd64.zip -d /usr/bin
+sudo mkdir /etc/consul
+
+## Launch the Consul Agent in Development mode
+consul -dev -server -bootstrap
+
 ## Launch the Vault Server in Development mode
 export VAULT_ADDR="http://127.0.0.1:8200"
 export VAULT_TOKEN="root"
 vault server -dev -dev-root-token-id=${VAULT_TOKEN} -dev-listen-address=0.0.0.0:8200 < /dev/null &> /dev/null &
+vault mount -path=dev generic
 
-## Create the addressing file so that Chef and other applicatons can access the Vault server
+## Create the addressing file so that Chef and other applications can access the Vault server
 cat << EOF > /etc/vault/tokens.json
 {
     "vault-addr": "${VAULT_ADDR}",
@@ -24,8 +37,9 @@ EOF
 ## Install Ruby
 sudo yum install -y ruby
 
-## Install Ruby gems
-gem install vault
+## Install Sambot
+gem install sambot
 
 ## Populate Vault
-ruby /vagrant/local/vault/vault_helper.rb
+cd /vagrant
+sambot populate --vault

data/lib/sambot/testing/consul_helper.rb

@@ -0,0 +1,15 @@
+
+module Sambot
+  module Testing
+    class ConsulHelper
+
+      class << self
+
+        def load_values(filename)
+        end
+
+      end
+
+    end
+  end
+end

data/lib/sambot/testing/vault_helper.rb

@@ -0,0 +1,62 @@
+require 'yaml'
+require 'vault'
+
+module Sambot
+  module Testing
+    class VaultHelper
+
+      class << self
+
+        def load_secrets(filename = '.vault.yml', src = 'vault')
+          if File.exist?(filename)
+            read_secrets(filename, src)
+          else
+            UI.info("No secrets configuration file is available so Vault was not populated with any secrets")
+            return 0
+          end
+        end
+
+        private
+
+        def read_secrets(filename, src)
+          UI.info("Reading the secrets configuration file")
+          contents = File.read(filename)
+          if contents.empty?
+            UI.info("No secrets were found in the secrets configuration file")
+            return 0
+          else
+            store_secrets(contents, src)
+          end
+        end
+
+        def store_secrets(contents, src)
+          secrets = YAML.load(contents)
+          counter = 0
+          secrets.each do |secret|
+            secret['keys'].each do |item|
+              store_secret(src, secret['path'], item.keys[0], item.values[0])
+              counter = counter + 1
+            end
+          end
+          counter
+        end
+
+        def store_secret(src, path, key, value)
+          if value.start_with?('file::')
+            filename = value.gsub(/file::/, '')
+            location = File.expand_path(File.join(src, filename))
+            value = File.read(location)
+          end
+          write_to_vault(path, key, value)
+          UI.info("Updated the secret with key '#{key}' located at '#{path}'")
+        end
+
+        def write_to_vault(path, key, value)
+          Vault.logical.write(path, "#{key}".to_sym => value)
+        end
+
+      end
+
+    end
+  end
+end

data/lib/sambot/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sambot
-  VERSION = '0.1.171'.freeze
+  VERSION = '0.1.172'.freeze
 end

data/sambot.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'net-ssh'
   spec.add_dependency 'titan'
   spec.add_dependency 'open4'
+  spec.add_dependency 'diplomat'
   spec.add_dependency 'semantic'
   spec.add_dependency 'chef', '~> 12.18'
   spec.add_dependency 'thor', '~> 0.19'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sambot
 version: !ruby/object:Gem::Version
-  version: 0.1.171
+  version: 0.1.172
 platform: ruby
 authors:
 - Olivier Kouame
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-18 00:00:00.000000000 Z
+date: 2017-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor-hollaback
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: diplomat
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: semantic
   requirement: !ruby/object:Gem::Requirement
@@ -468,6 +482,8 @@ files:
 - lib/sambot/templates/test_kitchen/rackspace.yml.erb
 - lib/sambot/templates/vault_helper.rb
 - lib/sambot/templates/winrm_config
+- lib/sambot/testing/consul_helper.rb
+- lib/sambot/testing/vault_helper.rb
 - lib/sambot/ui.rb
 - lib/sambot/version.rb
 - lib/sambot/workflow/brew.rb