sambot 0.1.106 → 0.1.107

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 421762a59494d4a4c050140ac6d71b8d64e6315c
-  data.tar.gz: eb328554099dc00c8fde40df17ac9f2ffef092f9
+  metadata.gz: f107e9b5776ea6086c95712934150c1de36f1c50
+  data.tar.gz: 85c0d6f34327f86a55815fde3fad5ff7bccaffc9
 SHA512:
-  metadata.gz: 4d3c709ddd1bb57b11c1017ced553fb9b171233ab8cd1255b5af68cb5388d841bc3edce7e3516923d29f483554a46886c8c3de9ab975ee8de9fa889e9986db2e
-  data.tar.gz: a199de6c29a764a478ee4cacea3a485c00d77b7f1bf05273e9c1b17faaf08ba912302d15b8a65aca14b4fdc5b64b87964dbb3e488d15ffa6d409b32a7daafb86
+  metadata.gz: 702e3d8c1b4acd76559de55a44a78d991a471015a8b389627626d75da7f048cbaf9702a44c016831c5ba45a78c48a203c4b483b3e52254a82a67135d7d7f2879
+  data.tar.gz: 8ebe2e043d1d73efe5bf07f9650df3d7ba1e54c54152c0690b13debabbc5163a8fb48235114cf7a420e40021d91d3f30f49b1ef9ee6c5dedb26115780c2e0f00

data/README.md

@@ -1,19 +1,16 @@
 # Sambot
 
-Sambot is our internal Platform Engineering gem to help standardize and simplify our DevOps workflow.
+Sambot is our internal Platform Engineering toolchain to help standardize and simplify our DevOps workflow.
 
-It can be used both as a library - to read secrets from Hashicorp Vault in a Chef cookbook for example - or as an
-executable to guide tasks such as managing Chef cookbooks.
+It provides an executable with a variety of commands, grouped in various areas of functionality such as session management,
+DNS changes and cookbook management.
 
 ## Usage
 
-To install the gem, simply run `gem install sambot`.
+To install the gem, simply run `chef gem install sambot`. This will install the gem in your ChefDK installation.
 
-Run `sambot` to be shown the help menu.
-
-## Available Commands
-
-To view the list of available commands and their descriptions, refer to the files in lib/sambot/commands. 
+Run `chef exec sambot` to be shown the help menu. For help on specific commands, i.e. cookbook management and specific
+cookbook management commands, run `chef exec sambot help cookbook` or `chef exec sambot cookbook help generate` for example.
 
 ## Contributing
 

data/lib/sambot/developer_workflow/dns.rb

@@ -23,7 +23,7 @@ module Sambot
         hosts = Hosts::File.read(src)
         entries = hosts.elements
         forwards.each do |key, value|
-          entries.delete_if  { |entry| entry.is_a?(Aef::Hosts::Entry) && entry.name == key}
+          entries.delete_if  { |entry| entry.is_a?(Aef::Hosts::Entry) && entry.name == key.to_s}
           yield(entries, key, value) if block_given?
         end
         hosts.write

data/lib/sambot/developer_workflow/session.rb

@@ -33,7 +33,7 @@ module Sambot
         end
         setup_networking
         start_daemon_for_tunneling(username, password)
-        #setup_secrets_management(username, password)
+        setup_secrets_management(username, password)
         UI.info("Your session has now started. Run `sambot session stop` to close it.")
       end
 
@@ -73,6 +73,11 @@ module Sambot
       end
 
       def setup_secrets_management(username, password)
+        Vault.setup_environment('vault.brighter.io', FORWARDS['vault.brighter.io'.to_sym][:port], '/etc/profile.d/')
+        unless Vault.has_environment_variables?('/etc/profile.d/')
+          Vault.dump_environment('sambot.env')
+          UI.info("Because this is the first time you have created a session, environment variables need to be set. Run `source sambot.env` to add them this session - future sessions won't need this step.")
+        end
         UI.debug "Authenticating with Hashicorp Vault in Rackspace DEV/QE..."
         token = Vault.authenticate(username, password)
         UI.debug "Saving your Vault authentication token to ~/.vault-token..."

data/lib/sambot/developer_workflow/vault.rb

@@ -6,27 +6,36 @@ module Sambot
   module DeveloperWorkflow
     class Vault
 
-      ENVIRONMENT_VARIABLES = {
-        VAULT_ADDR: 'https://localhost:8200',
-        VAULT_SKIP_VERIFY: true
-      }
-
-      ENV_ROOT = '/etc/profile.d/'
+      TARGET = "https://vault.brighter.io:8200"
 
       def self.authenticate(username, password)
-        secret = ::Vault.auth.ldap(username, password)
+        secret = nil
+        ::Vault.configure do |config|
+          sleep(3)
+          config.address = TARGET
+          config.ssl_verify = false
+          secret = ::Vault.auth.ldap(username, password)
+        end
         secret.auth.client_token
       end
 
-      def self.setup_environment(root = ENV_ROOT)
-        ENVIRONMENT_VARIABLES.each_pair do |key, value|
-          path = File.join(root, "#{key}.sh")
-          File.write(path, "export #{key}=#{value}")
-        end
+      def self.setup_environment(host, port, root = '/etc/profile.d/')
+        save_environment_variable('VAULT_SKIP_VERIFY', true)
+        save_environment_variable('VAULT_ADDR', TARGET)
+      end
+
+      def self.save_environment_variable(key, value, path = '/etc/profile.d/')
+        path = File.join(path, "#{key}.sh")
+        File.write(path, "export #{key}=#{value}")
+        ENV[key] = value.to_s
+      end
+
+      def self.has_environment_variables?(path)
+        File.exist?(File.join(path, "VAULT_SKIP_VERIFY.sh")) && File.exist?(File.join(path, "VAULT_ADDR.sh"))
       end
 
-      def self.save_token(token)
-        File.write("~/.vault-token", token)
+      def self.save_token(token, home_directory = '~')
+        File.write(File.expand_path(File.join(home_directory, '.vault-token')), token)
       end
 
     end

data/lib/sambot/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sambot
 version: !ruby/object:Gem::Version
-  version: 0.1.106
+  version: 0.1.107
 platform: ruby
 authors:
 - Olivier Kouame
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-13 00:00:00.000000000 Z
+date: 2017-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor-hollaback
@@ -358,14 +358,24 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-description: "# Sambot\n\nSambot is our internal Platform Engineering gem to help
-  standardize and simplify our DevOps workflow.\n\nIt can be used both as a library
-  - to read secrets from Hashicorp Vault in a Chef cookbook for example - or as an\nexecutable
-  to guide tasks such as managing Chef cookbooks.\n\n## Usage\n\nTo install the gem,
-  simply run `gem install sambot`.\n\nRun `sambot` to be shown the help menu.\n\n##
-  Available Commands\n\nTo view the list of available commands and their descriptions,
-  refer to the files in lib/sambot/commands. \n\n## Contributing\n\nBug reports and
-  pull requests are welcome on GitHub at https://github.exacttarget.com/ads-devops/sambot.\n"
+description: |
+  # Sambot
+
+  Sambot is our internal Platform Engineering toolchain to help standardize and simplify our DevOps workflow.
+
+  It provides an executable with a variety of commands, grouped in various areas of functionality such as session management,
+  DNS changes and cookbook management.
+
+  ## Usage
+
+  To install the gem, simply run `chef gem install sambot`. This will install the gem in your ChefDK installation.
+
+  Run `chef exec sambot` to be shown the help menu. For help on specific commands, i.e. cookbook management and specific
+  cookbook management commands, run `chef exec sambot help cookbook` or `chef exec sambot cookbook help generate` for example.
+
+  ## Contributing
+
+  Bug reports and pull requests are welcome on GitHub at https://github.exacttarget.com/ads-devops/sambot.
 email:
 - olivier.kouame@gmail.com
 executables: