hammer_cli_foreman 0.19.5 → 0.19.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac2ca7b26bf726ecf4ca0ef5d63e2a4f39e3dc780b750aa72a38b94f0ebc29f0
-  data.tar.gz: b3c19dafdb2f486a14b01dc916679f924a2a800a2ed65c5a2301e5a41c0ca75f
+  metadata.gz: 044c402964ebc3448c879c6858be3d8726ad8be7bafcbd25cef6d8f1a3ca4e02
+  data.tar.gz: 672a8c5be95a59de4908dd982e87c454e9f84025a6aff7751934035857ad1508
 SHA512:
-  metadata.gz: db55041ba7a683e3a863f7683da073face647cd0252427b1f59c95860fe80c325fbc443d2e7ab44d3e681ee5999974fbbc462c8ac7bb8746ef5cc9435e241fca
-  data.tar.gz: 886c91a2dff4aef20c28e96ac78fdaab10ad6d7abc81c91c68a875b32c63aac84705de7861b976d0d3d22ac16868f5e553ee4c0f2929fda6e63d0dfb8625a2ec
+  metadata.gz: d033b74af20d792cd58ff42d631189cf36245f062e05c2180dc6529914e28c3ddbff0c70afaae43e168eba1adcb8e33a8e0a1b146b78cc201f06999d5266292c
+  data.tar.gz: 1d36643cfeb4f03a4a5a36a035156bd02655fff13b12145ec825e94ba45f3f8da071fa71aa6b6ca4c2c640d2e2fd38c084c0c16ef239bc72c126a8758a882447

data/doc/release_notes.md

@@ -1,5 +1,13 @@
 Release notes
 =============
+### 0.19.6 (2020-01-10)
+* Add auth source external command ([PR #480](https://github.com/theforeman/hammer-cli-foreman/pull/480)), [#28704](http://projects.theforeman.org/issues/28704)
+* Fix undefined method  on wrong oidc token endpoint ([PR #479](https://github.com/theforeman/hammer-cli-foreman/pull/479)), [#28196](http://projects.theforeman.org/issues/28196)
+* Fix unauthorized user error message ([PR #478](https://github.com/theforeman/hammer-cli-foreman/pull/478)), [#28646](http://projects.theforeman.org/issues/28646)
+* Add specific oidc option information ([PR #475](https://github.com/theforeman/hammer-cli-foreman/pull/475)), [#28628](http://projects.theforeman.org/issues/28628)
+* Remove url field from gce info ([PR #466](https://github.com/theforeman/hammer-cli-foreman/pull/466)) ([PR #481](https://github.com/theforeman/hammer-cli-foreman/pull/481)), [#28135](http://projects.theforeman.org/issues/28135)
+* Add images uuid to cr images ([PR #457](https://github.com/theforeman/hammer-cli-foreman/pull/457)) ([PR #482](https://github.com/theforeman/hammer-cli-foreman/pull/482)), [#28132](http://projects.theforeman.org/issues/28132)
+
 ### 0.19.5 (2019-12-31)
 * Restrict mocha to not use version > 1.9.0 ([PR #460](https://github.com/theforeman/hammer-cli-foreman/pull/460)), [#28417](http://projects.theforeman.org/issues/28417)
 * Increase id column width for available networks ([PR #468](https://github.com/theforeman/hammer-cli-foreman/pull/468)), [#28503](http://projects.theforeman.org/issues/28503)

data/lib/hammer_cli_foreman/api/session_authenticator_wrapper.rb

@@ -55,7 +55,7 @@ module HammerCLIForeman
       def error(ex)
         if ex.is_a?(RestClient::Unauthorized) && session.valid?
           if @user_changed
-            return UnauthorizedError.new(_("Invalid username or password, continuing with session for '%s'.") % session.user_name)
+            return UnauthorizedError.new(_("Invalid credentials, continuing with session for '%s'.") % session.user_name)
           else
             session.destroy
             return SessionExpired.new(_("Session has expired."))

data/lib/hammer_cli_foreman/auth.rb

@@ -37,10 +37,10 @@ module HammerCLIForeman
         option ["-u", "--username"], "USERNAME", _("Username to access the remote system")
         option ["-p", "--password"], "PASSWORD", _("Password to access the remote system")
         option ["-t", "--oidc-token-endpoint"], "OPENIDC-TOKEN-ENDPOINT", _("Openidc provider URL which issues access token")
-        option ["-a", "--oidc-authorization-endpoint"], "OPENIDC-AUTHORIZATION-ENDPOINT", _("Openidc provider URL which issues authentication code")
+        option ["-a", "--oidc-authorization-endpoint"], "OPENIDC-AUTHORIZATION-ENDPOINT", _("Openidc provider URL which issues authentication code (two factor only)")
         option ["-c", "--oidc-client-id"], "OPENIDC-CLIENT-ID", _("Client id used in the Openidc provider")
         option ["-f", "--two-factor"], :flag, _("Authenticate with two factor")
-        option ["-r", "--oidc-redirect-uri"], "OPENIDC-REDIRECT-URI", _("Redirect URI for the authencation code grant flow")
+        option ["-r", "--oidc-redirect-uri"], "OPENIDC-REDIRECT-URI", _("Redirect URI for the authentication code grant flow")
 
         def execute
           if option_two_factor?

data/lib/hammer_cli_foreman/auth_source.rb

@@ -1,10 +1,11 @@
 require 'hammer_cli_foreman/auth_source_ldap'
+require 'hammer_cli_foreman/auth_source_external'
 
 module HammerCLIForeman
-
   class AuthSource < HammerCLIForeman::Command
     resource :auth_sources
     subcommand 'ldap', HammerCLIForeman::AuthSourceLdap.desc, HammerCLIForeman::AuthSourceLdap
+    subcommand 'external', HammerCLIForeman::AuthSourceExternal.desc, HammerCLIForeman::AuthSourceExternal
 
     class ListCommand < HammerCLIForeman::ListCommand
       desc _('List all auth sources')
@@ -18,16 +19,6 @@ module HammerCLIForeman
       build_options
     end
 
-    class UpdateCommand < HammerCLIForeman::UpdateCommand
-      desc _('Update organization and location for Auth Source')
-      resource :auth_source_externals
-  
-      success_message _('Taxonomy updated.')
-      failure_message _('Taxonomy not changed. Please check if appropriate auth source exists')
-
-      build_options
-    end
-
     autoload_subcommands
   end
 end

data/lib/hammer_cli_foreman/auth_source_external.rb

@@ -0,0 +1,35 @@
+module HammerCLIForeman
+  class AuthSourceExternal < HammerCLIForeman::Command
+    resource :auth_source_externals
+    command_name 'external'
+    desc _('Manage external auth sources')
+
+    class ListCommand < HammerCLIForeman::ListCommand
+      output do
+        field :id, _('Id')
+        field :name, _('Name')
+      end
+
+      build_options
+    end
+
+    class InfoCommand < HammerCLIForeman::InfoCommand
+      output ListCommand.output_definition do
+        HammerCLIForeman::References.taxonomies(self)
+      end
+
+      build_options
+    end
+
+    class UpdateCommand < HammerCLIForeman::UpdateCommand
+      desc _('Update organization and location for Auth Source')
+
+      success_message _('Successfully updated the %{name} external auth source.')
+      failure_message _('Failed to update %{name} external auth source')
+
+      build_options
+    end
+
+    autoload_subcommands
+  end
+end

data/lib/hammer_cli_foreman/compute_resource.rb

@@ -31,7 +31,6 @@ module HammerCLIForeman
       include ProviderNameLegacy
 
       output ListCommand.output_definition do
-        field :url, _("Url")
         field :description, _("Description")
         field :user, _("User")
         HammerCLIForeman::References.taxonomies(self)
@@ -133,7 +132,7 @@ module HammerCLIForeman
       command_name 'images'
 
       output do
-        field :id, _('Id')
+        field :uuid, _('Uuid')
         field :name, _('Name')
       end
 

data/lib/hammer_cli_foreman/compute_resource/base.rb

@@ -7,7 +7,11 @@ module HammerCLIForeman
       def volume_attributes; []; end
       def interfaces_attrs_name; 'interfaces_attributes'; end
       def host_attributes; []; end
-      def provider_specific_fields; []; end
+      def provider_specific_fields
+        [
+          Fields::Field.new(label: _('Url'), path: [:url]) 
+        ]
+      end
       def mandatory_resource_options; %i[name provider]; end
     end
   end

data/lib/hammer_cli_foreman/compute_resource/ec2.rb

@@ -10,7 +10,7 @@ module HammerCLIForeman
       end
 
       def provider_specific_fields
-        [
+        super + [
           Fields::Field.new(:label => _('Region'), :path => [:region])
         ]
       end

data/lib/hammer_cli_foreman/compute_resource/openstack.rb

@@ -10,7 +10,7 @@ module HammerCLIForeman
       end
 
       def provider_specific_fields
-        [
+        super + [
           Fields::Field.new(:label => _('Tenant'), :path => [:tenant]),
           Fields::Field.new(:label => _('Project domain name'), :path => [:project_domain_name]),
           Fields::Field.new(:label => _('Project domain ID'), :path => [:project_domain_id])

data/lib/hammer_cli_foreman/compute_resource/ovirt.rb

@@ -40,7 +40,7 @@ module HammerCLIForeman
       end
 
       def provider_specific_fields
-        [
+        super + [
           Fields::Field.new(:label => _('Datacenter'), :path => [:datacenter])
         ]
       end

data/lib/hammer_cli_foreman/compute_resource/rackspace.rb

@@ -10,7 +10,7 @@ module HammerCLIForeman
       end
 
       def provider_specific_fields
-        [
+        super + [
           Fields::Field.new(:label => _('Region'), :path => [:region])
         ]
       end

data/lib/hammer_cli_foreman/compute_resource/vmware.rb

@@ -61,7 +61,7 @@ module HammerCLIForeman
       end
 
       def provider_specific_fields
-        [
+        super + [
           Fields::Field.new(:label => _('Datacenter'), :path => [:datacenter]),
           Fields::Field.new(:label => _('Server'), :path => [:server])
         ]

data/lib/hammer_cli_foreman/openid_connect.rb

@@ -9,6 +9,8 @@ module HammerCLIForeman
 
     def get_token(username, password)
       uri = URI.parse(@url)
+      return nil unless uri.respond_to?(:request_uri)
+
       request = Net::HTTP::Post.new(uri)
       request.content_type = 'application/x-www-form-urlencoded'
       request.set_form_data(

data/lib/hammer_cli_foreman/version.rb

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

data/test/functional/compute_resource_test.rb

@@ -200,8 +200,8 @@ end
 
   describe 'images' do
     let(:cmd) { base_cmd << 'images' }
-    let(:image1) { { id: 1, name: 'image1' } }
-    let(:image2) { { id: 2, name: 'image2' } }
+    let(:image1) { { uuid: 1, name: 'image1' } }
+    let(:image2) { { uuid: 2, name: 'image2' } }
     let(:images) { [image1, image2] }
 
     it 'lists available images for a compute resource' do
@@ -211,7 +211,7 @@ end
 
       output = IndexMatcher.new(
         [
-          %w[ID NAME],
+          %w[UUID NAME],
           %w[1 image1],
           %w[2 image2]
         ]

data/test/unit/api/session_authenticator_wrapper_test.rb

@@ -211,7 +211,7 @@ describe HammerCLIForeman::Api::SessionAuthenticatorWrapper do
             ex = RestClient::Unauthorized.new
             new_ex = auth.error(ex)
 
-            assert_equal "Invalid username or password, continuing with session for 'admin'.", new_ex.message
+            assert_equal "Invalid credentials, continuing with session for 'admin'.", new_ex.message
           end
         end
 

data/test/unit/apipie_resource_mock.rb

@@ -265,12 +265,33 @@ module ResourceMocks
 
   def self.auth_source_ldap_index
     ResourceMocks.mock_action_call(:auth_source_ldaps, :index, {
-      "results" => [{
-        "name" => "my LDAP",
-        "id" => 1,
-        "tls" => false,
-        "port" => 389,
-        "server_type" => "POSIX"
+      'results' => [{
+        'name' => 'my LDAP',
+        'id' => 1,
+        'tls' => false,
+        'port' => 389,
+        'server_type' => 'POSIX'
+      }]
+    })
+  end
+
+  def self.auth_source_external_index
+    ResourceMocks.mock_action_call(:auth_source_externals, :index, {
+      'results' => [{
+        'id' => 11,
+        'name' => 'External',
+        'locations' => [{
+          'id' => 2,
+          'name' => 'Default Location',
+          'title' => 'Default Location',
+          'description' => nil
+        }],
+        'organizations' => [{
+          'id' => 1,
+          'name' => 'Default Organization',
+          'title' => 'Default Organization',
+          'description' => nil
+        }]
       }]
     })
   end

data/test/unit/auth_source_external.rb

@@ -0,0 +1,40 @@
+require File.join(File.dirname(__FILE__), 'test_helper')
+require File.join(File.dirname(__FILE__), 'apipie_resource_mock')
+
+require 'hammer_cli_foreman/auth_source'
+
+describe HammerCLIForeman::AuthSourceExternal do
+
+  include CommandTestHelper
+
+  context 'ListCommand' do
+    before :each do
+      ResourceMocks.auth_source_external_index
+    end
+
+    let(:cmd) { HammerCLIForeman::AuthSourceExternal::ListCommand.new('', ctx) }
+
+    context 'parameters' do
+      it_should_accept 'no arguments'
+      it_should_accept 'per page', ['--per-page=1']
+      it_should_accept 'page', ['--page=2']
+    end
+
+    context 'output' do
+      let(:expected_record_count) { count_records(cmd.resource.call(:index)) }
+
+      it_should_print_n_records 1
+      it_should_print_column 'Name'
+      it_should_print_column 'Id'
+    end
+  end
+
+  context 'UpdateCommand' do
+    let(:cmd) { HammerCLIForeman::AuthSourceExternal::UpdateCommand.new('', ctx) }
+
+    context 'parameters' do
+      it_should_accept 'name', ['--name=External', '--new-name=auth-external-1']
+      it_should_accept 'id', ['--id=11', '--new-name=auth-external-2']
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_foreman
 version: !ruby/object:Gem::Version
-  version: 0.19.5
+  version: 0.19.6
 platform: ruby
 authors:
 - Tomáš Strachota
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-31 00:00:00.000000000 Z
+date: 2020-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli
@@ -80,14 +80,14 @@ email: tstracho@redhat.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- doc/host_create.md
-- doc/release_notes.md
 - doc/configuration.md
-- doc/name_id_resolution.md
 - doc/developer_docs.md
-- doc/using_hammer_cli_foreman_command.md
-- doc/testing.md
+- doc/name_id_resolution.md
 - doc/option_builder.md
+- doc/testing.md
+- doc/using_hammer_cli_foreman_command.md
+- doc/host_create.md
+- doc/release_notes.md
 - README.md
 files:
 - LICENSE
@@ -115,6 +115,7 @@ files:
 - lib/hammer_cli_foreman/audit.rb
 - lib/hammer_cli_foreman/auth.rb
 - lib/hammer_cli_foreman/auth_source.rb
+- lib/hammer_cli_foreman/auth_source_external.rb
 - lib/hammer_cli_foreman/auth_source_ldap.rb
 - lib/hammer_cli_foreman/authenticate/login.rb
 - lib/hammer_cli_foreman/combination.rb
@@ -270,6 +271,7 @@ files:
 - 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/commands_test.rb
 - test/unit/common_parameter_test.rb
@@ -337,107 +339,109 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubyforge_project: 
+rubygems_version: 2.7.10
 signing_key: 
 specification_version: 4
 summary: Foreman commands for Hammer
 test_files:
-- test/unit/image_test.rb
-- test/unit/helpers/resource_disabled.rb
-- test/unit/helpers/fake_searchables.rb
-- test/unit/helpers/command.rb
-- test/unit/messages_test.rb
-- test/unit/smart_variable_test.rb
-- test/unit/config_group_test.rb
-- test/unit/option_sources/id_params_test.rb
-- test/unit/option_sources/ids_params_test.rb
-- test/unit/exception_handler_test.rb
-- test/unit/user_test.rb
-- test/unit/api/session_authenticator_wrapper_test.rb
-- test/unit/api/interactive_basic_auth_test.rb
-- test/unit/api/oauth/oauth_authentication_code_grant_test.rb
-- test/unit/api/oauth/oauth_password_grant_test.rb
-- test/unit/api/void_auth_test.rb
-- test/unit/hostgroup_test.rb
-- test/unit/realm_test.rb
-- test/unit/data/test_api.json
-- test/unit/auth_source_ldap_test.rb
-- test/unit/audit_test.rb
-- test/unit/test_helper.rb
-- test/unit/smart_class_parameter_test.rb
-- test/unit/partition_table_test.rb
-- test/unit/operating_system_test.rb
-- test/unit/media_test.rb
-- test/unit/architecture_test.rb
-- test/unit/usergroup_test.rb
-- test/unit/role_test.rb
-- test/unit/location_test.rb
-- test/unit/param_filters_test.rb
-- test/unit/apipie_resource_mock.rb
-- test/unit/option_builders_test.rb
-- test/unit/api_test.rb
-- test/unit/test_output_adapter.rb
-- test/unit/sessions_test.rb
-- test/unit/organization_test.rb
-- test/unit/settings_test.rb
-- test/unit/template_test.rb
-- test/unit/dependency_resolver_test.rb
-- test/unit/smart_proxy_test.rb
-- test/unit/domain_test.rb
-- test/unit/defaults_test.rb
-- test/unit/model_test.rb
-- test/unit/puppet_class_test.rb
-- test/unit/compute_resource_test.rb
-- test/unit/id_resolver_test.rb
-- test/unit/filter_test.rb
-- test/unit/puppet_environment_test.rb
-- test/unit/output/formatters_test.rb
-- test/unit/host_test.rb
-- test/unit/config_report_test.rb
-- test/unit/fact_test.rb
-- test/unit/external_usergroup_test.rb
-- test/unit/commands_test.rb
-- test/unit/common_parameter_test.rb
-- test/unit/subnet_test.rb
-- test/data/1.24/foreman_api.json
-- test/data/1.18/foreman_api.json
-- test/data/1.11/foreman_api.json
 - test/data/1.10/foreman_api.json
-- test/data/1.17/foreman_api.json
-- test/data/1.15/foreman_api.json
+- test/data/1.11/foreman_api.json
 - test/data/1.14/_foreman_api.json
 - test/data/1.14/foreman_api.json
+- test/data/1.15/foreman_api.json
+- test/data/1.16/foreman_api.json
+- test/data/1.17/foreman_api.json
+- test/data/1.18/foreman_api.json
+- test/data/1.20/foreman_api.json
 - test/data/1.21/foreman_api.json
 - test/data/1.22/foreman_api.json
-- test/data/1.20/foreman_api.json
+- test/data/1.24/foreman_api.json
 - test/data/README.md
-- test/data/1.16/foreman_api.json
-- test/functional/http_proxy_test.rb
-- test/functional/commands/list_test.rb
-- test/functional/smart_variable_test.rb
-- test/functional/user_test.rb
-- test/functional/personal_access_token_test.rb
 - test/functional/audit_test.rb
-- test/functional/test_helper.rb
-- test/functional/ping_test.rb
-- test/functional/smart_class_parameter_test.rb
-- test/functional/role_test.rb
-- test/functional/location_test.rb
+- test/functional/auth_source_test.rb
+- test/functional/commands/list_test.rb
+- test/functional/compute_attribute_test.rb
+- test/functional/compute_profile_test.rb
+- test/functional/filter_test.rb
 - test/functional/hostgroup/create_test.rb
 - test/functional/hostgroup/update_test.rb
-- test/functional/subnet/create_test.rb
-- test/functional/subnet/update_test.rb
+- test/functional/location_test.rb
 - test/functional/organization_test.rb
-- test/functional/settings_test.rb
-- test/functional/template_test.rb
+- test/functional/personal_access_token_test.rb
 - test/functional/proxy_test.rb
-- test/functional/compute_resource_test.rb
-- test/functional/compute_attribute_test.rb
-- test/functional/filter_test.rb
-- test/functional/report_template_test.rb
-- test/functional/compute_profile_test.rb
-- test/functional/host_test.rb
+- test/functional/settings_test.rb
+- test/functional/smart_variable_test.rb
 - test/functional/ssh_keys_test.rb
+- test/functional/subnet/create_test.rb
+- test/functional/subnet/update_test.rb
+- test/functional/test_helper.rb
+- test/functional/user_test.rb
+- test/functional/ping_test.rb
 - test/functional/status_test.rb
-- test/functional/auth_source_test.rb
+- test/functional/compute_resource_test.rb
+- test/functional/host_test.rb
+- test/functional/http_proxy_test.rb
+- test/functional/report_template_test.rb
+- test/functional/role_test.rb
+- test/functional/smart_class_parameter_test.rb
+- test/functional/template_test.rb
+- test/unit/api/void_auth_test.rb
+- test/unit/api/interactive_basic_auth_test.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/api_test.rb
+- test/unit/architecture_test.rb
+- test/unit/audit_test.rb
+- test/unit/auth_source_ldap_test.rb
+- test/unit/commands_test.rb
+- test/unit/common_parameter_test.rb
+- test/unit/compute_resource_test.rb
+- test/unit/config_group_test.rb
+- test/unit/config_report_test.rb
+- test/unit/data/test_api.json
+- test/unit/defaults_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/hostgroup_test.rb
+- test/unit/id_resolver_test.rb
+- test/unit/image_test.rb
+- test/unit/location_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/param_filters_test.rb
+- test/unit/partition_table_test.rb
+- test/unit/puppet_class_test.rb
+- test/unit/puppet_environment_test.rb
+- test/unit/realm_test.rb
+- test/unit/role_test.rb
+- test/unit/settings_test.rb
+- test/unit/smart_proxy_test.rb
+- test/unit/smart_variable_test.rb
+- test/unit/subnet_test.rb
+- test/unit/test_helper.rb
+- test/unit/user_test.rb
+- test/unit/usergroup_test.rb
+- test/unit/sessions_test.rb
+- test/unit/host_test.rb
+- test/unit/smart_class_parameter_test.rb
+- test/unit/template_test.rb
+- test/unit/test_output_adapter.rb
+- test/unit/apipie_resource_mock.rb
+- test/unit/auth_source_external.rb
 - test/test_helper.rb