ops_manager_ui_drivers 2.29.0 → 2.30.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 86556ab5023acf0bb8d15ec0f453878c4c355a77
-  data.tar.gz: 9b876bcc55f8090931d145cf4e0ab41d398ed8bb
+  metadata.gz: 149c3a5d06d22c573a767a39a062128150dea595
+  data.tar.gz: 3ba62d70eac91251cc1c9002b999376c084029cc
 SHA512:
-  metadata.gz: 47412c86a58520a62794e355805fc4577140e355dc4cecf161f358284e5716043f7f2099a748052782d224c323f2ccb577239984f4ef034c0a328f080a13656a
-  data.tar.gz: 95b8f5247571a498b8c97e1aaf12da4af0150bdc57d5bc78fdd8be230b5deeadcc087a24a57904ec58bbab9f5959f4748f77d51402cbba742848c47da93c282c
+  metadata.gz: 5a1dfa69094017801133674e59f3bb7dbd44e00f9e93f1655e03a068e0d824ec71a91cd08df90c8c9548a64baeab5b6b5d037d519cd457fc5cc4f052c8e8d46b
+  data.tar.gz: 9bdd8d43e1bb9a840ba8dcccd44e0d41ca78e49211154fa800d5a5cbcc7d3ffd275af7d6b1aa14ab295d42f0b90414de8a76f874359ba6269e4fcf223ff05e66

data/lib/ops_manager_ui_drivers/version.rb

@@ -1,3 +1,3 @@
 module OpsManagerUiDrivers
-  VERSION = '2.29.0'
+  VERSION = '2.30.0'
 end

data/lib/ops_manager_ui_drivers/version17/settings.rb

@@ -12,6 +12,13 @@ module OpsManagerUiDrivers
         settings_class.new(test_settings)
       end
 
+      def self.build_browser_command(command, arg)
+        {
+          'browser_command' => command,
+          'browser_arg' => arg,
+        }
+      end
+
       class Vcloud
         def self.works_with?(iaas_type)
           iaas_type == 'vcloud'
@@ -99,17 +106,10 @@ module OpsManagerUiDrivers
 
         private
 
-        def build_browser_command(command, arg)
-          {
-            'browser_command' => command,
-            'browser_arg' => arg,
-          }
-        end
-
         def iaas_security_configuration_fields
           if @test_settings.dig('ops_manager', 'aws', 'instance_profile')
             {
-              'access_type' => build_browser_command('choose', 'Use AWS Instance Profile'),
+              'access_type' => Settings.build_browser_command('choose', 'Use AWS Instance Profile'),
               'iam_instance_profile' => @test_settings.dig('ops_manager', 'aws', 'instance_profile'),
             }
           else

data/lib/ops_manager_ui_drivers/version18/settings.rb

@@ -13,6 +13,13 @@ module OpsManagerUiDrivers
         settings_class.new(test_settings)
       end
 
+      def self.build_browser_command(command, arg)
+        {
+          'browser_command' => command,
+          'browser_arg' => arg,
+        }
+      end
+
       class Vcloud < Version17::Settings::Vcloud
       end
 
@@ -39,13 +46,28 @@ module OpsManagerUiDrivers
             'project' => @test_settings.dig('ops_manager', 'google', 'project'),
             'region' => @test_settings.dig('ops_manager', 'google', 'region'),
             'ssh_private_key' => @test_settings.dig('ops_manager', 'google', 'ssh_private_key'),
-          }
+          }.merge(iaas_security_configuration_fields)
         end
 
         def advanced_infrastructure_config_fields
           {
           }
         end
+
+        private
+
+        def iaas_security_configuration_fields
+          if @test_settings.dig('ops_manager', 'google', 'auth_json')
+            {
+              'access_type' => Settings.build_browser_command('choose', 'AuthJSON'),
+              'auth_json' => @test_settings.dig('ops_manager', 'google', 'auth_json'),
+            }
+          else
+            {
+              'access_type' => Settings.build_browser_command('choose', 'Default Service Account'),
+            }
+          end
+        end
       end
 
       class Azure

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ops_manager_ui_drivers
 version: !ruby/object:Gem::Version
-  version: 2.29.0
+  version: 2.30.0
 platform: ruby
 authors:
 - Pivotal, Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-08-15 00:00:00.000000000 Z
+date: 2016-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport