hammer_cli_foreman 3.4.0 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4787fbc9dbda1fcd2311672da8001300715cfc1448b82f985509a73cab3ab416
-  data.tar.gz: a2ee1f1044f4422181109b166040b8e83dd9c727310c7753e89d26c23dae3c7a
+  metadata.gz: b0498fc381643ec00359362e585a879ae2e6ef425f8546b6b1f1245ce4dd2891
+  data.tar.gz: 060dfe82dbe23fec7a3a84d89e8077c756c5e87aced3617a5b8923c8a2827967
 SHA512:
-  metadata.gz: d1fe6bb98a5c352f95ce509e7e56f7c398180aa3790d1105f2c7ffb98d8dcfca4e4ab1cda4331a1f70000a834a75671782ed8e1d6b7ba65b3d83b474f8a9f3c6
-  data.tar.gz: 8e490092a17af3fd13d8c8c5d6ff6f42227e3e9bfa888818975308679a0724e6f6e8183d811a3a47dcbd369da0e0f92ccf4b2131b4e90d9b0d17bda9c01950fc
+  metadata.gz: d913007afab58dbc5b387f3536215f2e1ce9fd7190eb1fbd7e494ee30e6bba325045d864e1f0d1326690922715a506fd44c7df1f5e6ec1340ade26425580e5e2
+  data.tar.gz: ec80e3b7f0386b4786830e0e676ea172ea3472b4ecd771aae5c3239720cd5bcf34846e91e5cda1a816e6f5d864269a72b202ad1b1a164769661584f7dbac7da6

data/config/foreman.yml

@@ -3,6 +3,7 @@
   :enable_module: true
 
   # Your foreman server address
+  # For development try using http with the fully domain name.
   :host: 'https://localhost/'
 
   # Credentials. You'll be asked for them interactively if you leave them blank here
@@ -13,6 +14,11 @@
   :username: 'admin'
   #:password: 'example'
 
+  # Basic Auth External:
+  #:default_auth_type: 'Basic_Auth_External'
+  #:username: 'admin'
+  #:password: 'example'
+
   # Oauth using the Password Grant Flow:
   # This authentication method requires sessions to be enabled, uncomment the following
   # lines to use this authentication method.

data/doc/release_notes.md

@@ -1,5 +1,18 @@
 Release notes
 =============
+### 3.6.0 (2023-02-23)
+* Support basic auth for external sources, [#11317](http://projects.theforeman.org/issues/11317)
+* Remove underscore from labels ([PR #608](https://github.com/theforeman/hammer-cli-foreman/pull/608)), [#35904](http://projects.theforeman.org/issues/35904)
+* Update foreman.yml - add a comment on defining the server address in a development environment ([PR #602](https://github.com/theforeman/hammer-cli-foreman/pull/602))
+* Fix typo in ovirt disk interface names
+* Bump to 3.6.0-develop
+
+### 3.5.0 (2022-10-31)
+* Extract gce related info ([PR #606](https://github.com/theforeman/hammer-cli-foreman/pull/606)), [#35659](http://projects.theforeman.org/issues/35659)
+* Change auth endpoint for negotiation, [#35473](http://projects.theforeman.org/issues/35473)
+* Enhance vmware listing commands and switch to cluster_name param ([PR #604](https://github.com/theforeman/hammer-cli-foreman/pull/604)), [#35438](http://projects.theforeman.org/issues/35438)
+* Bump to 3.5.0-develop
+
 ### 3.4.0 (2022-08-09)
 * Add options for table preferences cli ([PR #603](https://github.com/theforeman/hammer-cli-foreman/pull/603)), [#35219](http://projects.theforeman.org/issues/35219)
 * I18n - extracting new, pulling from tx, [#34629](http://projects.theforeman.org/issues/34629)

data/lib/hammer_cli_foreman/api/authenticator.rb

@@ -13,6 +13,8 @@ module HammerCLIForeman
           void_auth
         elsif auth_type == AUTH_TYPES[:basic_auth]
           basic_auth
+        elsif auth_type == AUTH_TYPES[:basic_auth_external]
+          basic_auth_external
         elsif auth_type == AUTH_TYPES[:negotiate]
           negotiate_auth
         elsif auth_type == AUTH_TYPES[:oauth_password_grant]
@@ -45,6 +47,24 @@ module HammerCLIForeman
         end
       end
 
+      def basic_auth_external
+        if HammerCLIForeman::Sessions.enabled?
+          authenticator = InteractiveBasicAuthExternal.new(
+            settings.get(:_params, :username) || ENV['FOREMAN_USERNAME'],
+            settings.get(:_params, :password) || ENV['FOREMAN_PASSWORD'],
+            uri
+          )
+          SessionAuthenticatorWrapper.new(authenticator, uri, auth_type)
+        else
+          username = settings.get(:_params, :username) || ENV['FOREMAN_USERNAME'] || settings.get(:foreman, :username)
+          password = settings.get(:_params, :password) || ENV['FOREMAN_PASSWORD']
+          if password.nil? && (username == settings.get(:foreman, :username))
+            password = settings.get(:foreman, :password)
+          end
+          InteractiveBasicAuthExternal.new(username, password, uri)
+        end
+      end
+
       def negotiate_auth
         return unless HammerCLIForeman::Sessions.enabled?
 

data/lib/hammer_cli_foreman/api/basic_auth.rb

@@ -0,0 +1,71 @@
+module HammerCLIForeman
+  module Api
+    module BasicAuth
+      def authenticate(request, args)
+        if HammerCLI.interactive?
+          get_user
+          get_password
+        end
+        super
+      end
+
+      def error(ex)
+        return unless ex.is_a?(RestClient::Unauthorized)
+
+        clear
+        default_message = _('Invalid username or password.')
+        message = begin
+          response_msg = JSON.parse(ex.response.body)['error']
+          response_msg.is_a?(Hash) ? response_msg['message'] : response_msg
+        rescue
+        end
+        return UnauthorizedError.new(default_message) unless message
+
+        UnauthorizedError.new("#{message}\n#{default_message}")
+      end
+
+      def status
+        unless @user.nil? || @password.nil?
+          _("Using configured credentials for user '%s'.") % @user
+        else
+          _('Credentials are not configured.')
+        end
+      end
+
+      def user(ask = nil)
+        @user ||= ask && get_user
+      end
+
+      def password(ask = nil)
+        @password ||= ask && get_password
+      end
+
+      def set_credentials(user, password)
+        @user = user
+        @password = password
+      end
+
+      def clear
+        set_credentials(nil, nil)
+      end
+
+      private
+
+      def get_user
+        @user ||= ask_user(_('[Foreman] Username:%s') % ' ')
+      end
+
+      def get_password
+        @password ||= ask_user(_("[Foreman] Password for %{user}:%{wsp}") % { user: @user, wsp: ' ' }, true)
+      end
+
+      def ask_user(prompt, silent = false)
+        if silent
+          HammerCLI.interactive_output.ask(prompt) { |q| q.echo = false }
+        else
+          HammerCLI.interactive_output.ask(prompt)
+        end
+      end
+    end
+  end
+end

data/lib/hammer_cli_foreman/api/connection.rb

@@ -1,6 +1,7 @@
 require 'hammer_cli_foreman/api/session_authenticator_wrapper'
 require 'hammer_cli_foreman/api/authenticator'
 require 'hammer_cli_foreman/api/interactive_basic_auth'
+require 'hammer_cli_foreman/api/interactive_basic_auth_external'
 require 'hammer_cli_foreman/api/negotiate_auth'
 require 'hammer_cli_foreman/api/oauth/authentication_code_grant'
 require 'hammer_cli_foreman/api/oauth/password_grant'
@@ -11,6 +12,7 @@ module HammerCLIForeman
   CONNECTION_NAME = 'foreman'
   AUTH_TYPES = {
     basic_auth: 'Basic_Auth',
+    basic_auth_external: 'Basic_Auth_External',
     negotiate: 'Negotiate_Auth',
     oauth_authentication_code_grant: 'Oauth_Authentication_Code_Grant',
     oauth_password_grant: 'Oauth_Password_Grant'
@@ -44,8 +46,7 @@ module HammerCLIForeman
 
       protected
 
-      def default_auth_type(settings)
-        return AUTH_TYPES[:basic_auth] unless HammerCLIForeman::Sessions.enabled?
+      def default_auth_type(_settings)
         HammerCLI::Settings.get(:foreman, :default_auth_type) || AUTH_TYPES[:basic_auth]
       end
 

data/lib/hammer_cli_foreman/api/interactive_basic_auth.rb

@@ -1,68 +1,9 @@
+require 'hammer_cli_foreman/api/basic_auth'
+
 module HammerCLIForeman
   module Api
     class InteractiveBasicAuth < ApipieBindings::Authenticators::BasicAuth
-      def authenticate(request, args)
-        if HammerCLI.interactive?
-          get_user
-          get_password
-        end
-        super
-      end
-
-      def error(ex)
-        if ex.is_a?(RestClient::Unauthorized)
-          self.clear
-          message = _('Invalid username or password.')
-          begin
-            message = JSON.parse(ex.response.body)['error']['message']
-          rescue
-          end
-          UnauthorizedError.new(message)
-        end
-      end
-
-      def status
-        unless @user.nil? || @password.nil?
-          _("Using configured credentials for user '%s'.") % @user
-        else
-          _("Credentials are not configured.")
-        end
-      end
-
-      def user(ask=nil)
-        @user ||= ask && get_user
-      end
-
-      def password(ask=nil)
-        @password ||= ask && get_password
-      end
-
-      def set_credentials(user, password)
-        @user = user
-        @password = password
-      end
-
-      def clear
-        set_credentials(nil, nil)
-      end
-
-      private
-
-      def get_user
-        @user ||= ask_user(_("[Foreman] Username:%s") % " ")
-      end
-
-      def get_password
-        @password ||= ask_user(_("[Foreman] Password for %{user}:%{wsp}") % {:user => @user, :wsp => " "}, true)
-      end
-
-      def ask_user(prompt, silent=false)
-        if silent
-          HammerCLI.interactive_output.ask(prompt) { |q| q.echo = false }
-        else
-          HammerCLI.interactive_output.ask(prompt)
-        end
-      end
+      include HammerCLIForeman::Api::BasicAuth
     end
   end
 end

data/lib/hammer_cli_foreman/api/interactive_basic_auth_external.rb

@@ -0,0 +1,17 @@
+require 'hammer_cli_foreman/api/basic_auth'
+
+module HammerCLIForeman
+  module Api
+    class InteractiveBasicAuthExternal < ApipieBindings::Authenticators::BasicAuthExternal
+      include HammerCLIForeman::Api::BasicAuth
+
+      def initialize(user, password, foreman_url)
+        super(user, password, "#{foreman_url}/api/users/extlogin", HammerCLI::SSLOptions.new.get_options(foreman_url))
+      end
+
+      def session_id
+        auth_cookie&.delete_prefix('_session_id=')
+      end
+    end
+  end
+end

data/lib/hammer_cli_foreman/api/negotiate_auth.rb

@@ -2,7 +2,7 @@ module HammerCLIForeman
   module Api
     class NegotiateAuth < ApipieBindings::Authenticators::Negotiate
       def initialize(foreman_url, **options)
-        super("#{foreman_url}/users/extlogin", HammerCLI::SSLOptions.new.get_options(foreman_url).merge(options))
+        super("#{foreman_url}/api/users/extlogin", HammerCLI::SSLOptions.new.get_options(foreman_url).merge(options))
       end
 
       def user

data/lib/hammer_cli_foreman/api/session_authenticator_wrapper.rb

@@ -80,7 +80,7 @@ module HammerCLIForeman
 
       def user(ask=nil)
         return unless @authenticator.respond_to?(:user)
-        if @auth_type == AUTH_TYPES[:basic_auth]
+        if [AUTH_TYPES[:basic_auth], AUTH_TYPES[:basic_auth_external]].include?(@auth_type)
           @authenticator.user(ask)
         elsif @auth_type == AUTH_TYPES[:oauth_authentication_code_grant] ||
               @auth_type = AUTH_TYPES[:oauth_password_grant]
@@ -93,7 +93,7 @@ module HammerCLIForeman
       end
 
       def set_auth_params(*args)
-        if @auth_type == AUTH_TYPES[:basic_auth]
+        if [AUTH_TYPES[:basic_auth], AUTH_TYPES[:basic_auth_external]].include?(@auth_type)
           @authenticator.set_credentials(*args)
         elsif @auth_type == AUTH_TYPES[:oauth_authentication_code_grant] ||
               @auth_type == AUTH_TYPES[:oauth_password_grant]

data/lib/hammer_cli_foreman/auth.rb

@@ -28,6 +28,27 @@ module HammerCLIForeman
         end
       end
 
+      class BasicExternal < HammerCLI::AbstractCommand
+        extend HammerCLIForeman::Authenticate::Login
+
+        command_name 'basic-external'
+        desc _('Authenticate against external source (IPA/PAM) with credentials')
+
+        option ['-u', '--username'], 'USERNAME', _('Username to access the remote system')
+        option ['-p', '--password'], 'PASSWORD', _('Password to access the remote system')
+
+        def execute
+          Basic.execute_with_params(
+            AUTH_TYPES[:basic_auth_external],
+            option_username || HammerCLI::Settings.get('_params', 'username'),
+            option_password || HammerCLI::Settings.get('_params', 'password')
+          )
+          logged_user = HammerCLIForeman.foreman_api_connection.authenticator.user
+          print_message(_("Successfully logged in as '%s'.") % logged_user)
+          HammerCLI::EX_OK
+        end
+      end
+
       class Negotiate < HammerCLI::AbstractCommand
         extend HammerCLIForeman::Authenticate::Login
 

data/lib/hammer_cli_foreman/command_extensions/compute_resource_subcommand.rb

@@ -0,0 +1,14 @@
+module HammerCLIForeman
+  module CommandExtensions
+    class ComputeResourceSubcommand < HammerCLI::CommandExtensions
+      option '--cluster-id', 'ID', _('Cluster ID'),
+             deprecated: _('Use --cluster-name instead')
+      option '--cluster-name', 'NAME', _('Cluster name or path to search by'),
+             attribute_name: :option_cluster_id
+
+      request_params do |params|
+        params['cluster_id'] = params['cluster_id'].gsub('/', '%2F') if params['cluster_id']
+      end
+    end
+  end
+end

data/lib/hammer_cli_foreman/command_extensions.rb

@@ -7,3 +7,4 @@ require 'hammer_cli_foreman/command_extensions/status'
 require 'hammer_cli_foreman/command_extensions/user'
 require 'hammer_cli_foreman/command_extensions/subnet'
 require 'hammer_cli_foreman/command_extensions/domain'
+require 'hammer_cli_foreman/command_extensions/compute_resource_subcommand'

data/lib/hammer_cli_foreman/compute_resource/ovirt.rb

@@ -40,7 +40,7 @@ module HammerCLIForeman
           ['bootable',       _('Boolean, set 1 for bootable, only one volume can be bootable')],
           ['preallocate',    _('Boolean, set 1 to preallocate')],
           ['wipe_after_delete', _('Boolean, set 1 to wipe disk after delete')],
-          ['interface', _('Disk interface name, must be ide, virto or virto_scsi')]
+          ['interface', _('Disk interface name, must be ide, virtio or virtio_scsi')]
         ]
       end
 

data/lib/hammer_cli_foreman/compute_resource/register_compute_resources.rb

@@ -10,7 +10,6 @@ module HammerCLIForeman
 
   require 'hammer_cli_foreman/compute_resource/base'
   require 'hammer_cli_foreman/compute_resource/ec2.rb'
-  require 'hammer_cli_foreman/compute_resource/gce.rb'
   require 'hammer_cli_foreman/compute_resource/libvirt.rb'
   require 'hammer_cli_foreman/compute_resource/openstack.rb'
   require 'hammer_cli_foreman/compute_resource/ovirt.rb'

data/lib/hammer_cli_foreman/compute_resource/vmware.rb

@@ -64,7 +64,9 @@ module HammerCLIForeman
       def provider_specific_fields
         super + [
           Fields::Field.new(:label => _('Datacenter'), :path => [:datacenter]),
-          Fields::Field.new(:label => _('Server'), :path => [:server])
+          Fields::Field.new(:label => _('Server'), :path => [:server]),
+          Fields::Boolean.new(:label => _('Console password set'), :path => [:set_console_password]),
+          Fields::Boolean.new(:label => _('Caching enabled'), :path => [:caching_enabled])
         ]
       end
 

data/lib/hammer_cli_foreman/compute_resource.rb

@@ -121,6 +121,9 @@ module HammerCLIForeman
       output do
         field :id, _('Id')
         field :name, _('Name')
+        field :datacenter, _('Datacenter')
+        field :num_host, _('Hosts')
+        field :full_path, _('Cluster path')
       end
 
       build_options
@@ -133,9 +136,13 @@ module HammerCLIForeman
       output do
         field :id, _('Id'), Fields::Field, :max_width => 200, :hide_blank => true
         field :name, _('Name')
+        field :datacenter, _('Datacenter')
+        field :virtualswitch, _('Virtual switch')
+        field :vlanid, _('VLAN ID')
       end
 
-      build_options
+      build_options without: :cluster_id
+      extend_with(HammerCLIForeman::CommandExtensions::ComputeResourceSubcommand.new(only: %i[option request_params]))
     end
 
     class AvailableVnicProfilesCommand < HammerCLIForeman::ListCommand
@@ -158,6 +165,7 @@ module HammerCLIForeman
       output do
         field :uuid, _('Uuid')
         field :name, _('Name')
+        field :path, _('Path'), Fields::Field, :hide_blank => true
       end
 
       build_options
@@ -182,6 +190,10 @@ module HammerCLIForeman
       output do
         field :id, _('Id')
         field :name, _('Name')
+        field :parent, _('Parent')
+        field :datacenter, _('Datacenter')
+        field :path, _('Path'), Fields::Field, :max_width => 50
+        field :type, _('Type')
       end
 
       build_options
@@ -206,9 +218,12 @@ module HammerCLIForeman
       output do
         field :id, _('Id')
         field :name, _('Name')
+        field :cluster, _('Cluster')
+        field :datacenter, _('Datacenter')
       end
 
-      build_options
+      build_options without: :cluster_id
+      extend_with(HammerCLIForeman::CommandExtensions::ComputeResourceSubcommand.new(only: %i[option request_params]))
     end
 
     class AvailableStorageDomainsCommand < HammerCLIForeman::ListCommand
@@ -220,7 +235,8 @@ module HammerCLIForeman
         field :name, _('Name')
       end
 
-      build_options
+      build_options without: :cluster_id
+      extend_with(HammerCLIForeman::CommandExtensions::ComputeResourceSubcommand.new(only: %i[option request_params]))
     end
 
     class AvailableStoragePodsCommand < HammerCLIForeman::ListCommand
@@ -230,9 +246,11 @@ module HammerCLIForeman
       output do
         field :id, _('Id')
         field :name, _('Name')
+        field :datacenter, _('Datacenter')
       end
 
-      build_options
+      build_options without: :cluster_id
+      extend_with(HammerCLIForeman::CommandExtensions::ComputeResourceSubcommand.new(only: %i[option request_params]))
     end
 
     class AvailableSecurityGroupsCommand < HammerCLIForeman::ListCommand
@@ -252,8 +270,10 @@ module HammerCLIForeman
       command_name 'virtual-machines'
 
       output do
-        field :id, _("Id")
-        field :name, _("Name")
+        field :id, _('Id')
+        field :name, _('Name')
+        field :path, _('Path'), Fields::Field, :max_width => 50
+        field :state, _('State')
       end
 
       build_options

data/lib/hammer_cli_foreman/config_report.rb

@@ -45,7 +45,7 @@ module HammerCLIForeman
         label _("Report metrics") do
           from "metrics" do
             from "time" do
-              field :config_retrieval, _("config_retrieval")
+              field :config_retrieval, _("config retrieval")
               field :exec, _("exec")
               field :file, _("file")
               field :package, _("package")

data/lib/hammer_cli_foreman/smart_proxy.rb

@@ -26,7 +26,7 @@ module HammerCLIForeman
     class InfoCommand < HammerCLIForeman::InfoCommand
       output ListCommand.output_definition do
         field :version, _("Version")
-        field :hosts_count, _("Host_count")
+        field :hosts_count, _("Host count")
         collection :features, _("Features") do
           field :name, _('Name')
           field :version, _('Version')

data/lib/hammer_cli_foreman/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIForeman
   def self.version
-    @version ||= Gem::Version.new "3.4.0"
+    @version ||= Gem::Version.new "3.6.0"
   end
 end

data/lib/hammer_cli_foreman/virtual_machine.rb

@@ -9,7 +9,6 @@ module HammerCLIForeman
     class PowerVmCommand < HammerCLIForeman::Command
       action :power_vm
       command_name 'power'
-      option "--vm-id", "VM-ID", _("Virtual machine id, for gce use virtual machine name")
 
       success_message _("Virtual machine is powering.")
       failure_message _("Could not power the virtual machine")
@@ -19,7 +18,6 @@ module HammerCLIForeman
 
     class InfoCommand < HammerCLIForeman::InfoCommand
       action :show_vm
-      option "--vm-id", "VM-ID", _("Virtual machine id, for gce use virtual machine name")
 
       output do
         field :id, _("Id")
@@ -39,8 +37,6 @@ module HammerCLIForeman
 
     class DeleteCommand < HammerCLIForeman::DeleteCommand
       action :destroy_vm
-      option "--vm-id", "VM-ID", _("Virtual machine id, for gce use virtual machine name")
-
 
       success_message _("Virtual machine deleted.")
       failure_message _("Could not delete the virtual machine")

data/test/functional/compute_resource_test.rb

@@ -355,10 +355,31 @@ end
         ]
       )
       expected_result = success_result(output)
+      expected_result.expected_err = "Warning: Option --cluster-id is deprecated. Use --cluster-name instead\n"
 
       result = run_cmd(cmd + params)
       assert_cmd(expected_result, result)
     end
+
+    it 'lists available resource_pools for a compute resource with updated cluster_name param' do
+      api_expects(:compute_resources, :available_resource_pools, 'resource-pools').with_params(
+        'id' => '1', 'cluster_id' => 'test%2Ftest1'
+      ).returns(index_response(resource_pools))
+
+      cluster_param = base_params + ['--cluster-name=test/test1']
+
+      output = IndexMatcher.new(
+        [
+          %w[ID NAME],
+          %w[1 resource_pool1],
+          %w[2 resource_pool2]
+        ]
+      )
+      expected_result = success_result(output)
+
+      result = run_cmd(cmd + cluster_param)
+      assert_cmd(expected_result, result)
+    end
   end
 
   describe 'storage_domains' do

data/test/unit/api/interactive_basic_auth_test.rb

@@ -105,8 +105,9 @@ describe HammerCLIForeman::Api::InteractiveBasicAuth do
       response.stubs(:body).returns('{"error": {"message": "Unable to authenticate user admin"}}')
       ex.response = response
       new_ex = auth.error(ex)
+      expected = "Unable to authenticate user admin\nInvalid username or password."
 
-      assert_equal 'Unable to authenticate user admin', new_ex.message
+      assert_equal expected, new_ex.message
     end
   end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_foreman
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.6.0
 platform: ruby
 authors:
 - Tomáš Strachota
 - Martin Bačovský
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-09 00:00:00.000000000 Z
+date: 2023-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: apipie-bindings
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -75,19 +75,19 @@ dependencies:
         version: 2.2.1
 description: 'Foreman commands for Hammer CLI
 
-  '
+'
 email: tstracho@redhat.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- doc/name_id_resolution.md
-- doc/option_builder.md
-- doc/using_hammer_cli_foreman_command.md
+- doc/configuration.md
 - doc/developer_docs.md
 - doc/host_create.md
+- doc/name_id_resolution.md
+- doc/option_builder.md
 - doc/plugin.md
 - doc/testing.md
-- doc/configuration.md
+- doc/using_hammer_cli_foreman_command.md
 - doc/release_notes.md
 - README.md
 files:
@@ -106,8 +106,10 @@ files:
 - lib/hammer_cli_foreman.rb
 - lib/hammer_cli_foreman/api.rb
 - lib/hammer_cli_foreman/api/authenticator.rb
+- lib/hammer_cli_foreman/api/basic_auth.rb
 - lib/hammer_cli_foreman/api/connection.rb
 - lib/hammer_cli_foreman/api/interactive_basic_auth.rb
+- lib/hammer_cli_foreman/api/interactive_basic_auth_external.rb
 - lib/hammer_cli_foreman/api/negotiate_auth.rb
 - lib/hammer_cli_foreman/api/oauth/authentication_code_grant.rb
 - lib/hammer_cli_foreman/api/oauth/password_grant.rb
@@ -124,6 +126,7 @@ files:
 - lib/hammer_cli_foreman/bookmark.rb
 - lib/hammer_cli_foreman/combination.rb
 - lib/hammer_cli_foreman/command_extensions.rb
+- lib/hammer_cli_foreman/command_extensions/compute_resource_subcommand.rb
 - lib/hammer_cli_foreman/command_extensions/domain.rb
 - lib/hammer_cli_foreman/command_extensions/fields.rb
 - lib/hammer_cli_foreman/command_extensions/hosts.rb
@@ -143,7 +146,6 @@ files:
 - lib/hammer_cli_foreman/compute_resource.rb
 - lib/hammer_cli_foreman/compute_resource/base.rb
 - lib/hammer_cli_foreman/compute_resource/ec2.rb
-- lib/hammer_cli_foreman/compute_resource/gce.rb
 - lib/hammer_cli_foreman/compute_resource/libvirt.rb
 - lib/hammer_cli_foreman/compute_resource/openstack.rb
 - lib/hammer_cli_foreman/compute_resource/ovirt.rb
@@ -350,7 +352,7 @@ homepage: https://github.com/theforeman/hammer-cli-foreman
 licenses:
 - GPL-3.0+
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -365,8 +367,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Foreman commands for Hammer
 test_files:
@@ -384,106 +386,106 @@ test_files:
 - test/data/1.24/foreman_api.json
 - test/data/2.0/foreman_api.json
 - test/data/2.1/foreman_api.json
-- test/data/README.md
 - test/data/2.4/foreman_api.json
 - test/data/2.5/foreman_api.json
 - test/data/3.1/foreman_api.json
 - test/data/3.4/foreman_api.json
+- test/data/README.md
+- test/functional/architecture_test.rb
+- test/functional/associating_commands_test.rb
+- test/functional/audit_test.rb
 - test/functional/auth_source_test.rb
+- test/functional/bookmark_test.rb
 - test/functional/commands/list_test.rb
-- test/functional/hostgroup/create_test.rb
-- test/functional/hostgroup/update_test.rb
-- test/functional/architecture_test.rb
 - test/functional/compute_attribute_test.rb
-- test/functional/ping_test.rb
-- test/functional/user_test.rb
-- test/functional/ssh_keys_test.rb
-- test/functional/subnet/update_test.rb
-- test/functional/subnet/create_test.rb
-- test/functional/test_helper.rb
-- test/functional/location_test.rb
-- test/functional/media_test.rb
-- test/functional/partition_table_test.rb
-- test/functional/personal_access_token_test.rb
-- test/functional/report_template_test.rb
-- test/functional/settings_test.rb
-- test/functional/status_test.rb
-- test/functional/user_mail_notification_test.rb
 - test/functional/compute_profile_test.rb
-- test/functional/realm_test.rb
-- test/functional/usergroup_test.rb
-- test/functional/organization_test.rb
-- test/functional/virtual_machine_test.rb
 - test/functional/compute_resource_test.rb
 - test/functional/domain/create_test.rb
 - test/functional/domain/update_test.rb
 - test/functional/filter_test.rb
 - test/functional/host_test.rb
+- test/functional/hostgroup/create_test.rb
+- test/functional/hostgroup/update_test.rb
 - test/functional/http_proxy_test.rb
+- test/functional/location_test.rb
 - test/functional/mail_notification_test.rb
-- test/functional/operating_system_test.rb
-- test/functional/template_test.rb
-- test/functional/associating_commands_test.rb
-- test/functional/audit_test.rb
-- test/functional/role_test.rb
-- test/functional/bookmark_test.rb
+- test/functional/media_test.rb
 - test/functional/model_test.rb
+- test/functional/operating_system_test.rb
+- test/functional/organization_test.rb
+- test/functional/partition_table_test.rb
+- test/functional/personal_access_token_test.rb
+- test/functional/ping_test.rb
+- test/functional/realm_test.rb
 - test/functional/registration_test.rb
+- test/functional/report_template_test.rb
+- test/functional/role_test.rb
+- test/functional/settings_test.rb
+- test/functional/ssh_keys_test.rb
+- test/functional/status_test.rb
+- test/functional/subnet/create_test.rb
+- test/functional/subnet/update_test.rb
 - test/functional/table_preference_test.rb
-- test/unit/api/void_auth_test.rb
-- test/unit/api/interactive_basic_auth_test.rb
+- test/functional/template_test.rb
+- test/functional/test_helper.rb
+- test/functional/user_mail_notification_test.rb
+- test/functional/user_test.rb
+- test/functional/usergroup_test.rb
+- test/functional/virtual_machine_test.rb
+- test/test_helper.rb
 - test/unit/api/oauth/oauth_authentication_code_grant_test.rb
 - test/unit/api/oauth/oauth_password_grant_test.rb
 - test/unit/api/session_authenticator_wrapper_test.rb
-- test/unit/test_output_adapter.rb
-- test/unit/host_test.rb
+- test/unit/api/void_auth_test.rb
+- test/unit/api/interactive_basic_auth_test.rb
+- test/unit/api_test.rb
+- test/unit/apipie_resource_mock.rb
+- test/unit/architecture_test.rb
+- test/unit/audit_test.rb
+- test/unit/auth_source_external.rb
 - test/unit/auth_source_ldap_test.rb
-- test/unit/config_report_test.rb
+- test/unit/bookmark_test.rb
+- test/unit/commands_test.rb
+- test/unit/common_parameter_test.rb
+- test/unit/compute_profile_test.rb
 - test/unit/compute_resource_test.rb
+- test/unit/config_report_test.rb
 - test/unit/data/test_api.json
 - test/unit/defaults_test.rb
-- test/unit/id_resolver_test.rb
+- test/unit/dependency_resolver_test.rb
+- test/unit/domain_test.rb
+- test/unit/exception_handler_test.rb
 - test/unit/external_usergroup_test.rb
 - test/unit/fact_test.rb
+- test/unit/filter_test.rb
+- test/unit/helpers/command.rb
 - test/unit/helpers/fake_searchables.rb
 - test/unit/helpers/resource_disabled.rb
-- test/unit/helpers/command.rb
+- test/unit/host_test.rb
+- test/unit/hostgroup_test.rb
+- test/unit/id_resolver_test.rb
 - test/unit/image_test.rb
 - test/unit/location_test.rb
-- test/unit/messages_test.rb
 - test/unit/mail_notification_test.rb
+- test/unit/media_test.rb
+- test/unit/messages_test.rb
+- test/unit/model_test.rb
+- test/unit/operating_system_test.rb
+- test/unit/option_builders_test.rb
 - test/unit/option_sources/id_params_test.rb
 - test/unit/option_sources/ids_params_test.rb
 - test/unit/organization_test.rb
 - test/unit/output/formatters_test.rb
-- test/unit/common_parameter_test.rb
+- test/unit/param_filters_test.rb
+- test/unit/partition_table_test.rb
 - test/unit/realm_test.rb
+- test/unit/role_test.rb
+- test/unit/sessions_test.rb
 - test/unit/settings_test.rb
-- test/unit/usergroup_test.rb
+- test/unit/smart_proxy_test.rb
 - test/unit/subnet_test.rb
+- test/unit/template_test.rb
 - test/unit/test_helper.rb
+- test/unit/test_output_adapter.rb
 - test/unit/user_test.rb
-- test/unit/param_filters_test.rb
-- test/unit/role_test.rb
-- test/unit/model_test.rb
-- test/unit/operating_system_test.rb
-- test/unit/option_builders_test.rb
-- test/unit/architecture_test.rb
-- test/unit/commands_test.rb
-- test/unit/audit_test.rb
-- test/unit/auth_source_external.rb
-- test/unit/dependency_resolver_test.rb
-- test/unit/exception_handler_test.rb
-- test/unit/filter_test.rb
-- test/unit/media_test.rb
-- test/unit/sessions_test.rb
-- test/unit/bookmark_test.rb
-- test/unit/hostgroup_test.rb
-- test/unit/api_test.rb
-- test/unit/apipie_resource_mock.rb
-- test/unit/compute_profile_test.rb
-- test/unit/partition_table_test.rb
-- test/unit/template_test.rb
-- test/unit/smart_proxy_test.rb
-- test/unit/domain_test.rb
-- test/test_helper.rb
+- test/unit/usergroup_test.rb

data/lib/hammer_cli_foreman/compute_resource/gce.rb

@@ -1,47 +0,0 @@
-module HammerCLIForeman
-  module ComputeResources
-    class GCE < Base
-      def name
-        'GCE'
-      end
-
-      def compute_attributes
-        %w[machine_type network associate_external_ip]
-      end
-
-      def interfaces_attrs_name
-        'network_interfaces_nics_attributes'
-      end
-
-      def volume_attributes
-        [
-          ['size_gb', _('Volume size in GB, integer value')]
-        ]
-      end
-
-      def provider_specific_fields
-        [
-          Fields::Field.new(:label => _('Project'), :path => [:project]),
-          Fields::Field.new(:label => _('Email'), :path => [:email]),
-          Fields::Field.new(:label => _('Key Path'), :path => [:key_path]),
-          Fields::Field.new(:label => _('Zone'), :path => [:zone])
-        ]
-      end
-
-      def provider_vm_specific_fields
-        [
-          Fields::Field.new(:label => _('Machine Type'), :path => [:machine_type]),
-          Fields::Field.new(:label => _('Status'), :path => [:status]),
-          Fields::Field.new(:label => _('Description'), :path => [:description]),
-          Fields::Field.new(:label => _('Zone'), :path => [:zone])
-        ]
-      end
-
-      def mandatory_resource_options
-        super + %I{project key_path zone}
-      end
-    end
-
-    HammerCLIForeman.register_compute_resource('gce', GCE.new)
-  end
-end