sambot 0.1.121 → 0.1.122

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 914922a1e3d87eb7e5b5c207a41dd88dc1b0998c
-  data.tar.gz: 9267e25c69db1c219ec06d79c42bef41ce518484
+  metadata.gz: a2612a9924613c9ac613d8ae3ad97305929cda3f
+  data.tar.gz: d405ff38f47c7719206ef02ebe33cad953d19bf5
 SHA512:
-  metadata.gz: dea64fb1138f4e55f4991c965adcc46b537bb11711d7402c41fe3050cb06f41ffd91574cc3dc588265eafb3c54c79da386445a8080acbda9220bfc9368394ee0
-  data.tar.gz: fb656a94088f1191d0e35c4da0ea63c61d0e7eeeb73430668cb64b47671f55b0ce720456562b139db66a5b2b53cc4935bf8215f212b0ae03d0b2865c0084e469
+  metadata.gz: 3692b8e21daa65591df42f7676d6e6def2143d2b8bc12676831483ae7bb53ac3501cdb1804014459743ba055d4353f3c8fa18090eb5dab5daeeb9b57241ddf5d
+  data.tar.gz: 395bed6e32d1dc491a9a0c6b0e5b7edc5aa6517e3a9c3d67b769a3cec84c8e62736039e2247261da22ead85f0fa347c5a8a0142012a5360e96ecf7b063e89432

data/lib/sambot/chef/kitchen.rb

@@ -49,6 +49,8 @@ module Sambot
             value['suites'].each do |config|
               config['attributes'] = config['attributes'] || {}
               config['attributes']['cloud_platform'] = platform
+              config['attributes']['vault'] = config['attributes']['vault'] || {}
+              config['attributes']['vault']['exec_renew'] = false
             end
           end
 

data/lib/sambot/cli.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require_relative 'commands/cookbook_cmd'
-require_relative 'commands/session_cmd'
-require_relative 'commands/workstation_cmd'
 
 module Sambot
   class CLI < Thor
@@ -10,11 +8,54 @@ module Sambot
     desc 'cookbook', 'Manage Chef cookbooks'
     subcommand 'cookbook', Sambot::Commands::CookbookCmd
 
-    desc 'session', 'Manage sessions'
-    subcommand 'session', Sambot::Commands::SessionCmd
+    desc 'clean', 'Remove all generated build files from a Chef cookbook'
+    def clean
+      execute { Chef::Cookbook.clean() }
+    end
 
-    desc 'workstation', 'Manage engineer workstations'
-    subcommand 'workstation', Sambot::Commands::WorkstationCmd
+    desc 'build', 'Builds a Chef cookbook from its configuration file'
+    def build
+      execute { Chef::Cookbook.build(config) }
+    end
+
+    desc 'generate', 'Creates a new Chef cookbook'
+    def generate
+      execute do
+        config = {
+          name: ask(' What is the name of this cookbook?'),
+          type: ask(' What type of cookbook will this be?', :limited_to => ['wrapper', 'role']),
+          platforms: ask(' What operating system will this cookbook run on?', :limited_to => ['windows', 'centos', 'both']),
+          description: ask(' What does this cookbook do?')
+        }
+        config[:identifier] = ask(' What will be the unique machiner identifier for this role cookbook?') if config[:type] == 'role'
+        config[:platforms] = config[:platforms] == 'both' ? ['centos', 'windows'] : [config[:platforms]]
+        Chef::Cookbook.generate(config)
+      end
+    end
+
+    desc 'version', 'Gives the cookbook version as a TeamCity service message'
+    def version
+      execute { puts "##teamcity[buildNumber '#{config['version'].to_s}']" }
+    end
+
+    desc 'configure', 'Sets up an engineering workstation'
+    def configure
+      execute(need_dev_credentials: true, need_sudo_password: true) do
+        Workflow::Workstation.configure(ENV['SAMBOT_DEV_PASSWORD'])
+      end
+    end
+
+    desc 'start', 'Start a new Sambot session'
+    def start
+      execute(need_dev_credentials: true, need_sudo_password: true) do
+        Workflow::Session.new.start(ENV['SAMBOT_DEV_USERNAME'], ENV['SAMBOT_DEV_PASSWORD'], ENV['SAMBOT_SUDO_PASSWORD'])
+      end
+    end
+
+    desc 'stop', 'Stop any active Sambot session'
+    def stop
+      execute(need_sudo_password: true) { Workflow::Session.new.stop }
+    end
 
   end
 end

data/lib/sambot/commands/base_command.rb

@@ -78,14 +78,14 @@ module Sambot
             UI.info("Sambot will need to make some secure operations on your behalf. You can provide your credentials below or set them as environment variables:")
           end
           if need_dev_credentials && !ENV['SAMBOT_DEV_USERNAME']
-            ENV['SAMBOT_DEV_USERNAME'] = UI.ask("Please provide your DEV/QE AD username: ")
+            ENV['SAMBOT_DEV_USERNAME'] = UI.ask("No environment variable SAMBOT_DEV_USERNAME found. Please provide your DEV/QE AD username: ")
           end
           if need_dev_credentials && !ENV['SAMBOT_DEV_PASSWORD']
-            ENV['SAMBOT_DEV_PASSWORD'] = UI.ask_password("Please provide your DEV/QE AD password: ")
+            ENV['SAMBOT_DEV_PASSWORD'] = UI.ask_password("No environment variable SAMBOT_DEV_PASSWORD found. Please provide your DEV/QE AD password: ")
             puts "\n"
           end
           if need_sudo_password && !ENV['SAMBOT_SUDO_PASSWORD']
-            ENV['SAMBOT_SUDO_PASSWORD'] = UI.ask_password("Please provide your sudo password - this is required for operations such as setting up your local SSH tunnels: ")
+            ENV['SAMBOT_SUDO_PASSWORD'] = UI.ask_password("No environment variable SAMBOT_SUDO_PASSWORD found. Please provide your sudo password - this is required for operations such as setting up your local SSH tunnels: ")
             puts "\n"
           end
           Runtime.ensure_latest

data/lib/sambot/templates/Vagrantfile.erb

@@ -86,7 +86,7 @@ Vagrant.configure("2") do |c|
   <% end %>
 
   <% if config[:box] =~ /centos/ %>
-    c.vm.provision "file", source: "~/.vault-token", destination: "~/.vault-token"
+    c.vm.provision "file", source: "~/.vault-token", destination: "/tmp/vault-token"
     c.vm.provision "shell", inline: "bash /vagrant/bootstrap.sh"
   <% else %>
     c.vm.provision "shell", inline: "powershell -ExecutionPolicy Bypass -File C:/Vagrant/bootstrap.ps1"

data/lib/sambot/templates/bootstrap.sh

@@ -1,9 +1,10 @@
 #!/bin/bash -e
-echo 'VAULT_SKIP_VERIFY=true' >> /etc/environment
-echo 'VAULT_ADDR=https://vault.brighter.io:8200' >> /etc/environment
-x=`ip route | awk '/default/ {print $3}'`
-echo "$x vault.brighter.io" > /etc/hosts
+token=$(cat /tmp/vault-token)
+sudo mkdir /etc/vault
+echo "{\"skip-verify\": true, \"access\": \"$token\", \"vault-addr\": \"https://vault.brighter.io:8200\"}" > /etc/vault/tokens.json
+rm -f /tmp/vault-token 
+host_ip=`ip route | awk '/default/ {print $3}'`
+echo "$host_ip vault.brighter.io" > /etc/hosts
 sudo yum install -y unzip
-wget "https://releases.hashicorp.com/vault/0.6.5/vault_0.6.5_linux_amd64.zip"
+wget "https://releases.hashicorp.com/vault/0.6.5/vault_0.6.5_linux_amd64.zip" –qnv
 unzip vault_0.6.5_linux_amd64.zip -d /usr/bin
-sudo mkdir /etc/vault

data/lib/sambot/version.rb

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

data/lib/sambot/workflow/session.rb

@@ -30,6 +30,9 @@ module Sambot
         },
         'vault.brighter.io': {
           tunnel_port: 9003, dest_port: 8200, proxy_port: 8200
+        },
+        'rundeck.brighter.io': {
+          tunnel_port: 9004, dest_port: 443, proxy_port: 443
         }
       }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sambot
 version: !ruby/object:Gem::Version
-  version: 0.1.121
+  version: 0.1.122
 platform: ruby
 authors:
 - Olivier Kouame
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-30 00:00:00.000000000 Z
+date: 2017-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor-hollaback
@@ -466,8 +466,6 @@ files:
 - lib/sambot/cli.rb
 - lib/sambot/commands/base_command.rb
 - lib/sambot/commands/cookbook_cmd.rb
-- lib/sambot/commands/session_cmd.rb
-- lib/sambot/commands/workstation_cmd.rb
 - lib/sambot/config.rb
 - lib/sambot/dns/records.rb
 - lib/sambot/dns/repository.rb

data/lib/sambot/commands/session_cmd.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'base_command'
-require_relative '../workflow/session'
-
-module Sambot
-  module Commands
-    class SessionCmd < BaseCommand
-
-      namespace 'session'
-
-      desc 'start', 'Start a new Sambot session'
-      def start
-        execute(need_dev_credentials: true, need_sudo_password: true) do
-          Workflow::Session.new.start(ENV['SAMBOT_DEV_USERNAME'], ENV['SAMBOT_DEV_PASSWORD'], ENV['SAMBOT_SUDO_PASSWORD'])
-        end
-      end
-
-      desc 'stop', 'Stop any active Sambot session'
-      def stop
-        execute(need_sudo_password: true) { Workflow::Session.new.stop }
-      end
-
-    end
-  end
-end

data/lib/sambot/commands/workstation_cmd.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'base_command'
-require_relative '../workflow/workstation'
-
-module Sambot
-  module Commands
-    class WorkstationCmd < BaseCommand
-
-      namespace 'workstation'
-
-      desc 'configure', 'Sets up an engineering workstation'
-      def configure
-        execute(need_dev_credentials: true, need_sudo_password: true) do
-          Workflow::Workstation.configure(ENV['SAMBOT_DEV_PASSWORD'])
-        end
-      end
-
-    end
-  end
-end