sambot 0.1.112 → 0.1.113

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0de72fb94d33394f6a22bc622e7bb25bc006fad5
-  data.tar.gz: 2b9c9c892cf49945ef7fe560c4b018df0a59ff45
+  metadata.gz: e27a0242225518e356de8ec660debdeed7ab5c07
+  data.tar.gz: 40c3677ed6d41aa92c5a4ffb902fd58246162e81
 SHA512:
-  metadata.gz: 6752fc68229ee431c8c4d831d61ba300a2b35736f6c376457b344eb99c7f02b19fb8de1e7cc1d114c940148c77c0b212e3f0782077c2bd3e234e7f608cdea156
-  data.tar.gz: 745daed4cc978fe0c7eccf6c6623f7d8a1357965534efefa4d6d8dd09abab5e5fd92a5bd56a6e354e3d98deba0ab29e664ea2d58b0b052b7415e688218bbac15
+  metadata.gz: f714c9358725f402933712fde9a05a8568502d752dac1f33f7915a6ba45e6e58c9110cfd119bd838d0bb305af93e99d4dc1065f76bf534328c3c0c4dee9fe030
+  data.tar.gz: a9cfbfcff2b7991a3a4f7aef821e9dc461ade7d9130ee000d3e1edf3998992979c8baa0970e695de26d1e39efb66a99b570d8006ec7527117465fa6d3c7bd346

data/lib/sambot/developer_workflow/session.rb

@@ -20,9 +20,9 @@ module Sambot
 
       FORWARDS = {
         'chef.brighter.io': { ip: '127.0.0.13', port: 443, local_port: 9013 },
-        'teamcity.brighter.io': { ip: '127.0.0.14', port: 443, local_port: 9014 },
-        'splunk.brighter.io': { ip: '127.0.0.15', port: 443, local_port: 9015 },
-        'jenkins.brighter.io': { ip: '127.0.0.16', port: 443, local_port: 9016 },
+        'teamcity.brighter.io': { ip: '127.0.0.14', port: 80, local_port: 9014 },
+        'splunk.brighter.io': { ip: '127.0.0.15', port: 80, local_port: 9015 },
+        'jenkins.brighter.io': { ip: '127.0.0.16', port: 80, local_port: 9016 },
         'vault.brighter.io': { ip: '127.0.0.1', port: 8200, local_port: 9017 }
       }
 
@@ -66,7 +66,7 @@ module Sambot
       end
 
       def setup_secrets_management(username, password)
-        unless Vault.has_environment_variables?
+        unless Vault.has_environment_variables?(FORWARDS)
           UI.info("You have either not configured your workstation or you have not opened up a new shell to pick up the changes applied during configuration")
         end
         UI.debug "Authenticating with Hashicorp Vault in Rackspace DEV/QE"

data/lib/sambot/developer_workflow/vault.rb

@@ -21,7 +21,7 @@ module Sambot
         end
       end
 
-      def self.setup_environment(forwards, target = '~/.bash_profile')
+      def self.setup_environment(forwards, target = File.expand_path('~/.bash_profile'))
         save_environment_variable('VAULT_SKIP_VERIFY', true, target)
         save_environment_variable('VAULT_ADDR', build_vault_address(forwards), target)
       end
@@ -30,7 +30,7 @@ module Sambot
         "https://vault.brighter.io:#{forwards[:'vault.brighter.io'][:local_port]}"
       end
 
-      def self.save_environment_variable(key, value, target = '~/.bash_profile')
+      def self.save_environment_variable(key, value, target = File.expand_path('~/.bash_profile'))
         contents = File.read(target)
         contents = contents.gsub(/export #{key}=#{value}/, '') if has_environment_variable?(key, value, target)
         contents << "export #{key}=#{value.to_s}\n"
@@ -38,18 +38,18 @@ module Sambot
         ENV[key] = value.to_s
       end
 
-      def self.has_environment_variables?(forwards, target = '~/.bash_profile')
+      def self.has_environment_variables?(forwards, target = File.expand_path('~/.bash_profile'))
         has_vault_skip_verify = has_environment_variable?('VAULT_SKIP_VERIFY', true, target)
         has_vault_addr = has_environment_variable?('VAULT_ADDR', build_vault_address(forwards), target)
         (has_vault_addr != nil) && (has_vault_skip_verify != nil)
       end
 
-      def self.has_environment_variable?(key, value, target = '~/.bash_profile')
+      def self.has_environment_variable?(key, value, target = File.expand_path('~/.bash_profile'))
         contents = File.read(target)
         contents.match(/export #{key}=#{value}/)
       end
 
-      def self.save_token(token, home_directory = '~')
+      def self.save_token(token, home_directory = File.expand_path('~'))
         File.write(File.expand_path(File.join(home_directory, '.vault-token')), token)
       end
 

data/lib/sambot/developer_workflow/workstation.rb

@@ -50,7 +50,7 @@ module Sambot
 
       def self.update_environment_variables
         UI.debug('Updating your Vault environment variables')
-        Vault.setup_environment
+        Vault.setup_environment(Session::FORWARDS)
       end
 
     end

data/lib/sambot/version.rb

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

metadata

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