opsmgr 0.34.6 → 0.34.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98a5d3ec68d13e79a28359983cfb2c992e0a2f43
-  data.tar.gz: 91cd8d00821a78015e92cbcb8411ce02d98e77a3
+  metadata.gz: e4bb25a8258c39d67773e4fdd543df2d6d2b74e9
+  data.tar.gz: f1ca37b482308adfeb7373737dde9d1c8020f1b6
 SHA512:
-  metadata.gz: 25bf024931606d04efba69ad4af8067b5043b25e5220b6d2d9a806597d543f727745cd3850d5e243c05854a977ebd29fc26acea94ba6dddc4baa55591c14a3d1
-  data.tar.gz: 7ac29429cc877afa5341748dd349a62e419d355b842abad424595a0351faecabd882a5d40fa01833c4e4651591740f82a565ca63a9185fef75f43f24d41e36f7
+  metadata.gz: 28bfe4c5f2598db439b64b3b0804de51fe5366274c450d4e6f5deb11df75506b72601ff0c89c036d822d8a4db2150163a89061a50e45c24df24510e1322abdf7
+  data.tar.gz: e5781a414abd95de90c577d9e11c7c9ef26404ff8ec6e16327cb66675fc512a97cb17f3f536a3e670fbe6217d287920069a357df12063751f5909a004f6b1851

data/lib/opsmgr/api/client.rb

@@ -36,6 +36,15 @@ module Opsmgr
         basic_success_or_error("Error adding '#{product_name} #{version}'", response)
       end
 
+      def root_ca_certificate
+        response = http_client.root_ca_certificate
+        if response.code == '200'
+          JSON.parse(response.body)['root_ca_certificate_pem']
+        else
+          Error.new('Error retrieving the root ca certificate', response)
+        end
+      end
+
       def upgrade_product(product_guid, to_version)
         response = http_client.upgrade_product(product_guid, to_version)
         basic_success_or_error("Error upgrading '#{product_guid}' to '#{to_version}'", response)

data/lib/opsmgr/api/http_client.rb

@@ -86,6 +86,13 @@ module Opsmgr
         end
       end
 
+      def root_ca_certificate
+        req = Net::HTTP::Get.new(endpoints.root_ca_certificate_path)
+        add_auth_header(req)
+
+        http.request(req)
+      end
+
       def add_product(product_name, version)
         req = Net::HTTP::Post.new(endpoints.add_product_path)
         req.set_form_data('name' => product_name, 'product_version' => version)

data/lib/opsmgr/api/version20/endpoints.rb

@@ -88,6 +88,10 @@ module Opsmgr
           '/api/stemcells'
         end
 
+        def root_ca_certificate_path
+          '/api/v0/security/root_ca_certificate'
+        end
+
         def uaa_get_user_by_username_path(username)
           "/uaa/Users?attributes=id&filter=userName%20eq%20'#{username}'"
         end

data/lib/opsmgr/cmd/bosh_command.rb

@@ -8,7 +8,6 @@ require 'ops_manager_ui_drivers'
 require 'capybara'
 require 'capybara/dsl'
 require 'capybara/webkit'
-require 'net/ssh/gateway'
 require 'net/scp'
 
 module Opsmgr
@@ -62,7 +61,7 @@ module Opsmgr
       def configure_client_credentials
         return unless Gem::Version.new(om_version) >= Gem::Version.new('1.7')
 
-        installation_settings = Opsmgr::Api::Client.new(Opsmgr::Environments.for(@env_name), @om_version).installation_settings.as_hash
+        installation_settings = api_client.installation_settings.as_hash
         uaa_credentials = installation_settings['products'].find { |p| p['identifier'] == 'p-bosh' }['uaa_credentials']
 
 
@@ -70,30 +69,21 @@ module Opsmgr
         @bosh_client_secret = uaa_credentials['password']
       end
 
-      def root_cert_file
-        @root_cert_file_name ||= begin
-          Net::SCP.download!(
-            env_settings['ops_manager']['url'].gsub('https://', '').delete('/'),
-            'ubuntu',
-            '/var/tempest/workspaces/default/root_ca_certificate',
-            filename,
-            ssh: { password: 'tempest', key_data: ops_manager_ssh_key }
-          )
-          filename
-        end
+      def api_client
+        @api_client ||= Opsmgr::Api::Client.new(Opsmgr::Environments.for(@env_name), @om_version)
       end
 
-      def filename
-        ENV.fetch('TMPDIR', '/tmp') + '/root_ca_certificate'
-      end
+      def root_cert_file
+        return @file_path if @file_path
+        tmp_dir = ENV.fetch('TMPDIR', '/tmp')
+        FileUtils.mkpath(tmp_dir)
+        @file_path = tmp_dir + 'root_ca_certificate'
 
-      def ops_manager_ssh_key
-        case @env_settings.dig('iaas_type')
-        when 'aws'
-          @env_settings.dig('ops_manager', 'aws', 'ssh_key')
-        when 'openstack'
-          @env_settings.dig('ops_manager', 'openstack', 'ssh_private_key')
-        end
+        result = api_client.root_ca_certificate
+        fail result.message if result.is_a?(Api::Error)
+        File.write(@file_path, result)
+
+        @file_path
       end
 
       def setup_or_login

data/lib/opsmgr/version.rb

@@ -1,5 +1,5 @@
 module Opsmgr
-  VERSION = '0.34.6'.freeze
+  VERSION = '0.34.7'.freeze
 end
 # Copyright (c) 2014-2015 Pivotal Software, Inc.
 # All rights reserved.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opsmgr
 version: !ruby/object:Gem::Version
-  version: 0.34.6
+  version: 0.34.7
 platform: ruby
 authors:
 - Release Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-10 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake