prof 0.34.4 → 0.35.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5bab5f87d0566da6220767190bdb7a884c99afb
-  data.tar.gz: 4f024aca73c988642646b9f419b0a716ae670332
+  metadata.gz: c4ddd8d05c9400b4e036c41efc1cc02d953def92
+  data.tar.gz: dfb0062b8677454840308cb7ff9164fed7f7c7b1
 SHA512:
-  metadata.gz: de84ee0c2bf6cf5e6ad705fcfb4e71877271628a8fca3ef8c1cdfdb6071739b0396b59cfbad5be12e1034069fea8fe386ec23f3343cdc8f4d7f8309e5698ffd4
-  data.tar.gz: fce47667145828d976948e42848dfafe0871f8e10eb45c4e10a6ab542da8cb035906356eee1b046b256e92b48106e1db60d16a3df7581c247104a312cfd7bb75
+  metadata.gz: 2eeb2d83c91ee66cd12cd1d5c02de75fb26e50174b80efbd23ffbb7bd58b5d82f46f53357004210e2d0222d84647c029a6689535140bbae579e6cab96d2b9a28
+  data.tar.gz: 6ed2f347b987fdd1c2daa75f217377da25c8ab62731b3cbc9b50ffe4b30749cd817460bd3acf65f161e5277c151fb8d1b488f43070007ff9c864ac83bff55104

data/lib/prof/environment/cloud_foundry.rb

@@ -36,10 +36,13 @@ module Prof
         bosh_target:               'https://192.168.50.4:25555',
         bosh_username:             'admin',
         bosh_password:             'admin',
+        bosh_ca_cert_path:         nil,
+        bosh_env_login:            false,
 
         ssh_gateway_host:          '192.168.50.4',
         ssh_gateway_username:      'vagrant',
         ssh_gateway_password:      'vagrant',
+        ssh_gateway_private_key:   nil,
 
         bosh_service_broker_job_name:,
         bosh_manifest_path:,
@@ -54,9 +57,12 @@ module Prof
         @bosh_target = bosh_target
         @bosh_username = bosh_username
         @bosh_password = bosh_password
+        @bosh_ca_cert_path = bosh_ca_cert_path
+        @bosh_env_login = bosh_env_login
         @ssh_gateway_host = ssh_gateway_host
         @ssh_gateway_username = ssh_gateway_username
         @ssh_gateway_password = ssh_gateway_password
+        @ssh_gateway_private_key = ssh_gateway_private_key
         @bosh_service_broker_job_name = bosh_service_broker_job_name
         @bosh_manifest_path = bosh_manifest_path
         @cloud_foundry_api_url = cloud_foundry_api_url
@@ -95,19 +101,28 @@ module Prof
 
       def bosh_director
         @bosh_director ||= Hula::BoshDirector.new(
-          target_url:    bosh_target,
-          username:      bosh_username,
-          password:      bosh_password,
-          manifest_path: bosh_manifest_path
+          target_url:       bosh_target,
+          username:         bosh_username,
+          password:         bosh_password,
+          manifest_path:    bosh_manifest_path,
+          certificate_path: bosh_ca_cert_path,
+          env_login:        bosh_env_login
         )
       end
 
       def ssh_gateway
-        @ssh_gateway ||= SshGateway.new(
+        opts = {
           gateway_host:     ssh_gateway_host,
           gateway_username: ssh_gateway_username,
-          gateway_password: ssh_gateway_password
-        )
+        }
+
+        if @ssh_gateway_private_key
+          opts[:gateway_private_key] = ssh_gateway_private_key
+        else
+          opts[:gateway_password] = ssh_gateway_password
+        end
+
+        @ssh_gateway ||= Prof::SshGateway.new(opts)
       end
 
       def cloud_foundry_uaa
@@ -135,7 +150,7 @@ module Prof
       attr_reader :cloud_controller_identity, :cloud_controller_password,
                   :cloud_foundry_username, :cloud_foundry_password, :bosh_target, :bosh_username, :bosh_password,
                   :ssh_gateway_host, :ssh_gateway_username, :ssh_gateway_password, :bosh_manifest_path,
-                  :cloud_foundry_api_url, :use_proxy
+                  :cloud_foundry_api_url, :use_proxy, :ssh_gateway_private_key, :bosh_ca_cert_path, :bosh_env_login
 
       def broker_registrar_properties
         bosh_manifest.job('broker-registrar').properties.fetch('broker')

data/lib/prof/environment/pcf_drinks.rb

@@ -31,7 +31,7 @@ module Prof
       end
 
       def cloud_foundry
-        @cloud_foundry ||= CloudFoundry.new(
+        @cloud_foundry ||= Prof::CloudFoundry.new(
           domain:   cloud_foundry_domain,
           username: ops_manager.cf_admin_credentials.username,
           password: ops_manager.cf_admin_credentials.password

data/lib/prof/ssh_gateway.rb

@@ -15,18 +15,19 @@ require 'uri'
 
 module Prof
   class SshGateway
-    def initialize(gateway_host:, gateway_username:, gateway_password: nil, ssh_key: nil)
-      @gateway_host     = gateway_host
+    def initialize(gateway_host:, gateway_username:, gateway_password: nil, gateway_private_key: nil, ssh_key: nil)
+      @gateway_host = gateway_host
       @gateway_username = gateway_username
       @gateway_password = gateway_password
-      @ssh_key          = ssh_key
-      @forwards         = {}
+      @gateway_private_key = gateway_private_key
+      @ssh_key = ssh_key
+      @forwards = {}
     end
 
     def execute_on(host, cmd, options = {})
-      user           = options.fetch(:user, 'vcap')
-      password       = options.fetch(:password, 'c1oudc0w')
-      run_as_root    = options.fetch(:root, false)
+      user = options.fetch(:user, 'vcap')
+      password = options.fetch(:password, 'c1oudc0w')
+      run_as_root = options.fetch(:root, false)
       discard_stderr = options.fetch(:discard_stderr, false)
 
       cmd = "echo -e \"#{password}\\n\" | sudo -S #{cmd}" if run_as_root
@@ -82,8 +83,6 @@ module Prof
 
     private
 
-    attr_reader :gateway_username, :gateway_password, :forwards
-
     def ssh_agent
       @ssh_agent ||= Net::SSH::Authentication::Agent.connect
     end
@@ -93,15 +92,21 @@ module Prof
     end
 
     def ssh_gateway
+      opts = { paranoid: false }
+      if @gateway_private_key
+        opts[:keys] = [@gateway_private_key]
+      else
+        opts[:password] = @gateway_password
+      end
+
       @ssh_gateway ||= Net::SSH::Gateway.new(
         gateway_host,
-        gateway_username,
-        password: gateway_password,
-        paranoid: false
+        @gateway_username,
+        opts
       )
     rescue Net::SSH::AuthenticationFailed
       message = [
-        "Failed to connect to #{gateway_host}, with #{gateway_username}:#{gateway_password}.",
+        "Failed to connect to #{gateway_host}, with #{@gateway_username}:#{@gateway_password}.",
         "The ssh-agent has #{ssh_agent.identities.size} identities. Please either add a key, or correct password"
       ].join(' ')
       raise Net::SSH::AuthenticationFailed, message

data/lib/prof/version.rb

@@ -9,5 +9,5 @@
 #
 
 module Prof
-  VERSION = '0.34.4'
+  VERSION = '0.35.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prof
 version: !ruby/object:Gem::Version
-  version: 0.34.4
+  version: 0.35.0
 platform: ruby
 authors:
 - CF London
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-24 00:00:00.000000000 Z
+date: 2017-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gem-release