hammer_cli_foreman 0.19.1 → 0.19.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a05fd4bedcc468c977bef7bafd5bdbe7cdafb966ad2435a2c4ef3501db97d53
-  data.tar.gz: f819931de46c659607b94b4a4e5909ac9749221bd14f94c7cdfc86ea9e7b79c1
+  metadata.gz: 47cf21ecf7cd77a148ab586f7d81fc4e6377ca516d5a03717a1dc1167ced4d02
+  data.tar.gz: fcf4efd442f73297a86d2073da2d784e4506d7b9f381b805c1e586664a0d818a
 SHA512:
-  metadata.gz: 17e7e96c06e286cc62d2e085cd013f8b0f192d546312a2ada3239113e166abc629504f27a587bd683bb7a78c70ad768a7c631679a5a9d7f84d66fb89bb98a8a2
-  data.tar.gz: 4fb887133aa59f44aa7dbd76764a3ebfdfb5ec5bc6ab34d1d1f5640136ebe6f08dfa5f025357caa17687faa573b85768dc20f5121c2c962c5b0980b70caa4d79
+  metadata.gz: cc62264df55fce5594302365182c1ae8aeed28ae25bb56eb4ac5624bebd253643a1548832638f55dbccfb222594edcce88ce07623aed52c6f133b690d35c1f83
+  data.tar.gz: c67a781b13dd94ae6fd37c5b3b47e888cc19b65338fac891a941d47b2b1a4576e16f6e31aa4c95441c40f8ae99af7cb4a391ee48618d76a7cb113f1e08bcbb8f

data/doc/release_notes.md

@@ -1,5 +1,11 @@
 Release notes
 =============
+### 0.19.2 (2019-11-25)
+* Handle empty params for codegrant flow ([PR #456](https://github.com/theforeman/hammer-cli-foreman/pull/456)), [#28196](http://projects.theforeman.org/issues/28196)
+* Add http-proxy to hammer ([PR #454](https://github.com/theforeman/hammer-cli-foreman/pull/454)), [#28176](http://projects.theforeman.org/issues/28176)
+* Handle error when empty parameters are passed ([PR #453](https://github.com/theforeman/hammer-cli-foreman/pull/453)), [#28196](http://projects.theforeman.org/issues/28196)
+* Allow login in tty-less execution ([PR #452](https://github.com/theforeman/hammer-cli-foreman/pull/452)), [#28318](http://projects.theforeman.org/issues/28318)
+
 ### 0.19.1 (2019-11-18)
 * Fix method typo ([PR #450](https://github.com/theforeman/hammer-cli-foreman/pull/450)), [#27868](http://projects.theforeman.org/issues/27868)
 

data/lib/hammer_cli_foreman.rb

@@ -84,6 +84,10 @@ module HammerCLIForeman
       'HammerCLIForeman::Hostgroup', 'hammer_cli_foreman/hostgroup'
     )
 
+    HammerCLI::MainCommand.lazy_subcommand('http-proxy', _("Manipulate http proxies"),
+      'HammerCLIForeman::HttpProxy', 'hammer_cli_foreman/http_proxy'
+    )
+
     HammerCLI::MainCommand.lazy_subcommand('location', _("Manipulate locations"),
       'HammerCLIForeman::Location', 'hammer_cli_foreman/location'
     )

data/lib/hammer_cli_foreman/api/oauth/authentication_code_grant.rb

@@ -32,12 +32,12 @@ module HammerCLIForeman
           @oidc_client_id = input_oidc_client_id if input_oidc_client_id
           @oidc_redirect_uri = input_oidc_redirect_uri if input_oidc_redirect_uri
 
-          if @oidc_client_id && @oidc_authorization_endpoint && @oidc_redirect_uri && @oidc_token_endpoint
+          if @oidc_client_id.to_s.empty? || @oidc_authorization_endpoint.to_s.empty? || @oidc_redirect_uri.to_s.empty? || @oidc_token_endpoint.to_s.empty?
+            @token = nil
+          else
             get_code
             @token = HammerCLIForeman::OpenidConnect.new(
               @oidc_token_endpoint, @oidc_client_id).get_token_via_2fa(@code, @oidc_redirect_uri)
-          else
-            @token = nil
           end
         end
 

data/lib/hammer_cli_foreman/api/oauth/password_grant.rb

@@ -30,11 +30,11 @@ module HammerCLIForeman
           @user = input_user
           @password = input_password
           @oidc_client_id = input_oidc_client_id if input_oidc_client_id
-          if @user && @password && @oidc_token_endpoint && @oidc_client_id
+          if @user.to_s.empty? || @password.to_s.empty? || @oidc_token_endpoint.to_s.empty? || @oidc_client_id.to_s.empty?
+            @token = nil
+          else
             @token = HammerCLIForeman::OpenidConnect.new(
               @oidc_token_endpoint, @oidc_client_id).get_token(@user, @password)
-          else
-            @token = nil
           end
         end
 

data/lib/hammer_cli_foreman/auth.rb

@@ -22,6 +22,9 @@ module HammerCLIForeman
             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
 
@@ -57,6 +60,9 @@ module HammerCLIForeman
               option_password || HammerCLI::Settings.get('_params', 'password')
             )
           end
+          logged_user = HammerCLIForeman.foreman_api_connection.authenticator.user
+          print_message(_("Successfully logged in as '%s'.") % logged_user)
+          HammerCLI::EX_OK
         end
         autoload_subcommands
       end

data/lib/hammer_cli_foreman/authenticate/login.rb

@@ -4,17 +4,12 @@ module HammerCLIForeman
       def execute_with_params(auth_type, *args)
         connection = HammerCLIForeman.foreman_api_reconnect(auth_type)
         if !(connection.authenticator.is_a?(HammerCLIForeman::Api::SessionAuthenticatorWrapper))
-          HammerCLI.interactive_output.say(_("Can't perform login. Make sure sessions are enabled in hammer"\
-            " configuration file."))
-          return HammerCLI::EX_USAGE
+          raise ArgumentError, _("Can't perform login. Make sure sessions are enabled in hammer"\
+            " configuration file.")
         end
         connection.authenticator.set_auth_params(*args)
         connection.authenticator.force_user_change
         connection.login
-
-        HammerCLI.interactive_output.say(_("Successfully logged in as '%s'.") %
-          connection.authenticator.user)
-        HammerCLI::EX_OK
       end
     end
   end

data/lib/hammer_cli_foreman/http_proxy.rb

@@ -0,0 +1,49 @@
+module HammerCLIForeman
+
+    class HttpProxy < HammerCLIForeman::Command
+
+      resource :http_proxies
+
+      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
+          field :username, _("Username")
+          field :url, _("URL")
+        end
+
+        build_options
+      end
+
+      class CreateCommand < HammerCLIForeman::CreateCommand
+        success_message _("Http proxy created.")
+        failure_message _("Could not create the http proxy")
+
+        build_options
+      end
+
+      class DeleteCommand < HammerCLIForeman::DeleteCommand
+        success_message _("Http proxy deleted.")
+        failure_message _("Could not delete the http proxy")
+
+        build_options
+      end
+
+      class UpdateCommand < HammerCLIForeman::UpdateCommand
+        success_message _("Http proxy updated.")
+        failure_message _("Could not update the http proxy")
+
+        build_options
+      end
+
+      autoload_subcommands
+    end
+end

data/lib/hammer_cli_foreman/version.rb

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

data/test/functional/http_proxy_test.rb

@@ -0,0 +1,69 @@
+require File.join(File.dirname(__FILE__), 'test_helper')
+
+describe 'httpproxy' do
+  let(:http_proxy) do
+    {
+      :id => 1,
+      :name => 'proxy1',
+      :url => 'http://proxy.example.com',
+      :username => 'user'
+    }
+  end
+
+  it 'list a http proxy' do
+    api_expects(:http_proxies, :index, 'List').with_params(
+      'page' => 1, 'per_page' => 1000
+    ).returns(index_response([http_proxy]))
+
+    output = IndexMatcher.new([
+      ['ID', 'NAME'],
+      ['1',  'proxy1']
+    ])
+    expected_result = success_result(output)
+
+    result = run_cmd(%w(http-proxy list))
+    assert_cmd(expected_result, result)
+  end
+
+  it 'updates an http proxy' do
+    params = ['--id', http_proxy[:id],
+              '--password', 'katello']
+    api_expects(:http_proxies, :update, params)
+      .returns(http_proxy)
+
+    expected_result = success_result("Http proxy updated.\n")
+
+    result = run_cmd(%w(http-proxy update --id 1 --password katello))
+    assert_cmd(expected_result, result)
+  end
+
+  it 'shows info on an http proxy' do
+    params = ['--id', http_proxy[:id]]
+    api_expects(:http_proxies, :show, params)
+      .returns(http_proxy)
+    expected_result = success_result("Id:       1\nName:     proxy1\nUsername: user\nURL:      http://proxy.example.com\n\n")
+    result = run_cmd(%w(http-proxy info --id 1))
+    assert_cmd(expected_result, result)
+  end
+
+  it 'creates an http proxy' do
+    params = ['--url', http_proxy[:key],
+              '--name', http_proxy[:name],
+              '--password', 'foreman',
+              '--username', http_proxy[:username]]
+    api_expects(:http_proxies, :create, params)
+      .returns(http_proxy)
+
+    expected_result = success_result("Http proxy created.\n")
+
+    result = run_cmd(%w(http-proxy create --url "http://proxy.example.com" --name proxy1 --username user --password foreman))
+    assert_cmd(expected_result, result)
+  end
+
+  it 'deletes an http proxy' do
+    expected_result = success_result("Http proxy deleted.\n")
+
+    result = run_cmd(%w(http-proxy delete --id 1))
+    assert_cmd(expected_result, result)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_foreman
 version: !ruby/object:Gem::Version
-  version: 0.19.1
+  version: 0.19.2
 platform: ruby
 authors:
 - Tomáš Strachota
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-18 00:00:00.000000000 Z
+date: 2019-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli
@@ -157,6 +157,7 @@ files:
 - lib/hammer_cli_foreman/host.rb
 - lib/hammer_cli_foreman/hostgroup.rb
 - lib/hammer_cli_foreman/hosts/common_update_options.rb
+- lib/hammer_cli_foreman/http_proxy.rb
 - lib/hammer_cli_foreman/i18n.rb
 - lib/hammer_cli_foreman/id_resolver.rb
 - lib/hammer_cli_foreman/image.rb
@@ -241,6 +242,7 @@ files:
 - 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/organization_test.rb
 - test/functional/personal_access_token_test.rb
@@ -410,6 +412,7 @@ test_files:
 - test/data/1.20/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