hammer_cli_foreman 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb9fbae8eb789656dd8557891ccafe9b1a29fcd1bc3d11707b69d548466734fc
-  data.tar.gz: 4a97eeabaa13b2b7b5b42f464684fee2e7d5f6d0e926e494610131612af7bdba
+  metadata.gz: 4db93fb25a95e818a8b0b9fdaab9ab8760cc7f42c2607661e99ec4bb990815d4
+  data.tar.gz: d2187c023afc8dd80ae0247b53475354913950f1416e5f8bc308a48388e807fe
 SHA512:
-  metadata.gz: de79bacffe1e4629244df7d1ba449bb05d9eff56e41035a85ed9e1f22e9cc53a9c5a1bd66f531c0582b18b8276894879fb12dcae7adbba571c414af92d553733
-  data.tar.gz: cb4707c53325b8103202faf2f28dec768f8f364c71113e694d2cc34ed7942ce3ae8e457aa3a1aa1f2053de7d9d529c1fbc60bc6f8400e52979a1a6d0a1f6cbc4
+  metadata.gz: ac00a2af523db5f7cf5c881273f715128fbc1df82604ecd01bf6c06b95a09963fac84e76c79260b77908925f38e4864ace72a8f3b31f4b1e60179b8b89b716d6
+  data.tar.gz: 5300260e5c63d59ba8971dd784bb5f1e23a18a2de5b1611be02204c8a6b670368678742d8fa60815118b0f3b50127a4db92c599fb797d4bf045deb6ed366d263

data/doc/developer_docs.md

@@ -10,6 +10,7 @@ Foreman plugin extends the Hammer Core in following areas:
  - [Building options](option_builder.md#option-builders)
  - [Automatic name resolution](name_id_resolution.md#name-to-id-resolution)
  - [Testing commands](testing.md#testing-hammer-commands)
+ - [Writing a plugin](plugin.md#writing-a-plugin)
 
 It's recommended that you set `:refresh_cache: true` in the plugin settings if
 engaging in API development to enable aggressive apidoc cache checking.

data/doc/plugin.md

@@ -0,0 +1,22 @@
+# Writing a plugin
+
+### Basic
+
+If you want to create a plugin for hammer-cli-foreman, you might want to create
+a simple draft at first.
+
+To do so, just run the following:
+```
+# You will need to checkout this repository first if you don't have it already
+$ git checkout https://github.com/theforeman/hammer-cli-foreman.git
+$ cd hammer-cli-foreman
+$ rake plugin:draft
+# fill prompts
+```
+This will create a directory called `hammer-cli-foreman-prompted-name` with
+basic structure where you can put your code afterwards. Please, don't forget to
+take a look at `TODO`s as there might be places you want to change or adjust to
+your needs first.
+
+For more information, please see: https://github.com/theforeman/hammer-cli/blob/master/doc/developer_docs.md
+as well as https://github.com/theforeman/hammer-cli-foreman/blob/master/doc/developer_docs.md

data/doc/release_notes.md

@@ -1,10 +1,26 @@
 Release notes
 =============
-### 2.0.2 (2020-03-24)
+### 2.1.0 (2020-05-14)
+* Bump hammer_cli to 2.1.0 ([PR #519](https://github.com/theforeman/hammer-cli-foreman/pull/519))
+* Ask for oauth code only when needed ([PR #517](https://github.com/theforeman/hammer-cli-foreman/pull/517)), [#29635](http://projects.theforeman.org/issues/29635)
+* Possibility to create ipv6 subnet, [#28760](http://projects.theforeman.org/issues/28760)
+* Add the ability to manage bookmarks ([PR #510](https://github.com/theforeman/hammer-cli-foreman/pull/510)), [#12845](http://projects.theforeman.org/issues/12845)
+* Add aliases for info/list/delete commands ([PR #512](https://github.com/theforeman/hammer-cli-foreman/pull/512)), [#29413](http://projects.theforeman.org/issues/29413)
+* Help contains squeezed options ([PR #489](https://github.com/theforeman/hammer-cli-foreman/pull/489)), [#28440](http://projects.theforeman.org/issues/28440)
+* Add cr to hostgroup info, [#29140](http://projects.theforeman.org/issues/29140)
+* Add rake task with plugin template
+* Added virtual machine command for compute resource ([PR #469](https://github.com/theforeman/hammer-cli-foreman/pull/469)), [#20451](http://projects.theforeman.org/issues/20451)
+* Add display options to host creation on ovirt ([PR #507](https://github.com/theforeman/hammer-cli-foreman/pull/507)), [#29254](http://projects.theforeman.org/issues/29254)
+* Add mail notification command ([PR #509](https://github.com/theforeman/hammer-cli-foreman/pull/509)), [#29326](http://projects.theforeman.org/issues/29326)
 * Use right param for os default template ([PR #508](https://github.com/theforeman/hammer-cli-foreman/pull/508)), [#29274](http://projects.theforeman.org/issues/29274)
-
-### 2.0.1 (2020-02-25)
-* Remove duplicate api requests on addassociatedcommand ([PR #503](https://github.com/theforeman/hammer-cli-foreman/pull/503)) ([PR #504](https://github.com/theforeman/hammer-cli-foreman/pull/504)), [#29096](http://projects.theforeman.org/issues/29096)
+* Update api docs to 2.1
+* Correct hot add options ([PR #505](https://github.com/theforeman/hammer-cli-foreman/pull/505)), [#29253](http://projects.theforeman.org/issues/29253)
+* Feature #28836 - allow multiple disassociating of provisioning templates ([PR #502](https://github.com/theforeman/hammer-cli-foreman/pull/502)), [#28836](http://projects.theforeman.org/issues/28836)
+* Fixed updating host owner when ownertype is usergroup ([PR #501](https://github.com/theforeman/hammer-cli-foreman/pull/501)), [#11279](http://projects.theforeman.org/issues/11279)
+* Remove duplicate api requests on addassociatedcommand ([PR #503](https://github.com/theforeman/hammer-cli-foreman/pull/503)), [#29096](http://projects.theforeman.org/issues/29096)
+* Fix help for ovirt boolean values, [#29026](http://projects.theforeman.org/issues/29026)
+* Deprecate --root-pass in host group, [#22573](http://projects.theforeman.org/issues/22573)
+* Bump to 2.1.0-develop
 
 ### 2.0.0 (2020-02-12)
 * Change the description of the scoped loc and org ([PR #494](https://github.com/theforeman/hammer-cli-foreman/pull/494)), [#28869](http://projects.theforeman.org/issues/28869)

data/lib/hammer_cli_foreman.rb

@@ -11,6 +11,7 @@ module HammerCLIForeman
   require 'hammer_cli_foreman/i18n'
 
   require 'hammer_cli_foreman/version'
+  require 'hammer_cli_foreman/task_helper'
   require 'hammer_cli_foreman/output'
   require 'hammer_cli_foreman/output/fields'
   require 'hammer_cli_foreman/exception_handler'
@@ -180,6 +181,13 @@ module HammerCLIForeman
     HammerCLI::MainCommand.lazy_subcommand('trend', _("Manage trends"),
                                            'HammerCLIForeman::Trend', 'hammer_cli_foreman/trend'
     )
+
+    HammerCLI::MainCommand.lazy_subcommand('mail-notification', _("Manage mail notifications"),
+                                           'HammerCLIForeman::MailNotification', 'hammer_cli_foreman/mail_notification'
+    )
+
+    HammerCLI::MainCommand.lazy_subcommand('bookmark', _("Manage bookmarks"),
+                                            'HammerCLIForeman::Bookmark', 'hammer_cli_foreman/bookmark')
   rescue => e
     handler = HammerCLIForeman::ExceptionHandler.new(:context => {}, :adapter => :base)
     handler.handle_exception(e)

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

@@ -5,19 +5,22 @@ module HammerCLIForeman
   module Api
     module Oauth
       class AuthenticationCodeGrant < ApipieBindings::Authenticators::TokenAuth
-        attr_accessor :oidc_token_endpoint, :oidc_authorization_endpoint, :oidc_client_id, :token, :oidc_redirect_uri
+        attr_accessor :oidc_token_endpoint, :oidc_authorization_endpoint,
+                      :oidc_client_id, :token, :oidc_redirect_uri
 
         def initialize(oidc_token_endpoint, oidc_authorization_endpoint, oidc_client_id, oidc_redirect_uri)
           @oidc_token_endpoint = oidc_token_endpoint
           @oidc_authorization_endpoint = oidc_authorization_endpoint
           @oidc_client_id = oidc_client_id
           @oidc_redirect_uri = oidc_redirect_uri
-          super set_token(oidc_token_endpoint, oidc_authorization_endpoint, oidc_client_id, oidc_redirect_uri)
+          super(nil)
         end
 
         def authenticate(request, token)
           if HammerCLI.interactive?
             set_token_interactively
+          else
+            set_token(oidc_token_endpoint, oidc_authorization_endpoint, oidc_client_id, oidc_redirect_uri)
           end
           super
         end
@@ -35,7 +38,7 @@ module HammerCLIForeman
           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
+            @code ||= get_code
             @token = HammerCLIForeman::OpenidConnect.new(
               @oidc_token_endpoint, @oidc_client_id).get_token_via_2fa(@code, @oidc_redirect_uri)
           end
@@ -68,7 +71,7 @@ module HammerCLIForeman
                         "&redirect_uri=#{@oidc_redirect_uri}"\
                         '&scope=openid'
           HammerCLI.interactive_output.say("Enter URL in browser: #{@token_url}")
-          @code ||= ask_user(_("Code:%s") % " ")
+          ask_user(_("Code:%s") % " ")
         end
 
         def get_oidc_authorization_endpoint

data/lib/hammer_cli_foreman/associating_commands.rb

@@ -245,6 +245,7 @@ module HammerCLIForeman
         def request_params
           params = super
 
+          template_ids = params['operatingsystem']['provisioning_template_ids']
           if options['option_provisioning_template_search']
             templates = HammerCLIForeman.collection_to_common_format(
               associated_resource.call(
@@ -255,10 +256,10 @@ module HammerCLIForeman
 
             templates.each do |template|
               template_id = template['id']
-              params['operatingsystem']['provisioning_template_ids'] << template_id.to_s
+              template_ids << template_id.to_s
             end
           end
-          params['operatingsystem']['provisioning_template_ids'] = params['operatingsystem']['provisioning_template_ids'].uniq
+          params['operatingsystem']['provisioning_template_ids'] = template_ids.uniq
           params
         end
 
@@ -269,10 +270,37 @@ module HammerCLIForeman
 
       class RemoveProvisioningTemplateCommand < HammerCLIForeman::RemoveAssociatedCommand
         associated_resource :provisioning_templates
-        desc _("Disassociate a provisioning template")
+        desc _("Disassociate provisioning templates")
 
-        success_message _("The provisioning template has been disassociated.")
-        failure_message _("Could not disassociate the provisioning template")
+        option "--provisioning-template-ids", "PROVISIONING_TEMPLATE_IDS", _("List of provisioning template ids"),
+               format: HammerCLI::Options::Normalizers::List.new
+        option "--provisioning-templates", "PROVISIONING_TEMPLATE_NAMES", _("List of provisioning template names"),
+               format: HammerCLI::Options::Normalizers::List.new, attribute_name: :option_provisioning_template_names
+        option "--provisioning-template-search", "PROVISIONING_TEMPLATE_SEARCH", _("Provisioning template name regex to search, all matching templates will be disassociated")
+
+        def request_params
+          params = super
+
+          template_ids = params['operatingsystem']['provisioning_template_ids']
+          if options['option_provisioning_template_search']
+            templates = HammerCLIForeman.collection_to_common_format(
+              associated_resource.call(
+                :index,
+                :search => "name ~ \"#{options['option_provisioning_template_search']}\"")
+            )
+            raise ResolverError.new(_("%s not found.") % associated_resource.singular_name, associated_resource) if templates.empty?
+
+            templates.each do |template|
+              template_id = template['id']
+              template_ids.delete(template_id.to_s)
+            end
+          end
+          params['operatingsystem']['provisioning_template_ids'] = template_ids.uniq
+          params
+        end
+
+        success_message _("The provisioning templates were disassociated.")
+        failure_message _("Could not disassociate the provisioning templates")
       end
     end
 

data/lib/hammer_cli_foreman/auth.rb

@@ -46,16 +46,16 @@ module HammerCLIForeman
           if option_two_factor?
             Oauth.execute_with_params(
               AUTH_TYPES[:oauth_authentication_code_grant],
-              option_oidc_token_endpoint,
-              option_oidc_authorization_endpoint,
-              option_oidc_client_id,
-              option_oidc_redirect_uri
+              option_oidc_token_endpoint || HammerCLI::Settings.get(:foreman, :oidc_token_endpoint),
+              option_oidc_authorization_endpoint || HammerCLI::Settings.get(:foreman, :oidc_authorization_endpoint),
+              option_oidc_client_id || HammerCLI::Settings.get(:foreman, :oidc_client_id),
+              option_oidc_redirect_uri || HammerCLI::Settings.get(:foreman, :oidc_redirect_uri)
             )
           else
             Oauth.execute_with_params(
               AUTH_TYPES[:oauth_password_grant],
-              option_oidc_token_endpoint,
-              option_oidc_client_id,
+              option_oidc_token_endpoint || HammerCLI::Settings.get(:foreman, :oidc_token_endpoint),
+              option_oidc_client_id || HammerCLI::Settings.get(:foreman, :oidc_client_id),
               option_username || HammerCLI::Settings.get('_params', 'username'),
               option_password || HammerCLI::Settings.get('_params', 'password')
             )

data/lib/hammer_cli_foreman/bookmark.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module HammerCLIForeman
+  class Bookmark < HammerCLIForeman::Command
+    resource :bookmarks
+
+    class ListCommand < HammerCLIForeman::ListCommand
+      output do
+        field :id, _('Id')
+        field :name, _('Name')
+        field :controller, _('Controller')
+        field :query, _('Search Query')
+        field :public, _('Public')
+        field :owner_id, _('Owner Id')
+        field :owner_type, _('Owner Type')
+      end
+
+      build_options
+    end
+
+    class InfoCommand < HammerCLIForeman::InfoCommand
+      output ListCommand.output_definition
+      
+      build_options
+    end
+
+    class CreateCommand < HammerCLIForeman::CreateCommand
+      success_message _('Bookmark %<name>s created.')
+      failure_message _('Failed to create %<name>s bookmark')
+
+      build_options
+    end
+
+    class UpdateCommand < HammerCLIForeman::UpdateCommand
+      success_message _('Bookmark %<name>s updated successfully.')
+      failure_message _('Failed to update %<name>s bookmark')
+
+      build_options
+    end
+
+    class DeleteCommand < HammerCLIForeman::DeleteCommand
+      success_message _('Bookmark deleted successfully.')
+      failure_message _('Failed to delete bookmark')
+
+      build_options
+    end
+
+    autoload_subcommands
+  end
+end

data/lib/hammer_cli_foreman/command_extensions.rb

@@ -5,3 +5,5 @@ require 'hammer_cli_foreman/command_extensions/option_sources'
 require 'hammer_cli_foreman/command_extensions/hosts'
 require 'hammer_cli_foreman/command_extensions/ping'
 require 'hammer_cli_foreman/command_extensions/status'
+require 'hammer_cli_foreman/command_extensions/user'
+require 'hammer_cli_foreman/command_extensions/subnet'

data/lib/hammer_cli_foreman/command_extensions/puppet_environment.rb

@@ -2,13 +2,19 @@ module HammerCLIForeman
   module CommandExtensions
     class PuppetEnvironment < HammerCLI::CommandExtensions
       # Remove when support of --environment options is ended.
-      option '--environment', 'ENVIRONMENT_NAME', _('Environment name'),
-             attribute_name: :option_environment_name,
-             deprecated: { '--environment' => _('Use --puppet-environment instead') }
-      option '--environment-id', 'ENVIRONMENT_ID', _(''),
-             format: HammerCLI::Options::Normalizers::Number.new,
-             attribute_name: :option_environment_id,
-             deprecated: { '--environment-id' => _('Use --puppet-environment-id instead') }
+      option_family(
+        aliased_resource: 'environment',
+        description: _('Puppet environment'),
+        deprecation: _("Use %s instead") % '--puppet-environment[-id]',
+        deprecated: { '--environment' => _("Use %s instead") % '--puppet-environment[-id]',
+                      '--environment-id' => _("Use %s instead") % '--puppet-environment[-id]'}
+      ) do
+        parent '--environment-id', 'ENVIRONMENT_ID', _(''),
+               format: HammerCLI::Options::Normalizers::Number.new,
+               attribute_name: :option_environment_id
+        child '--environment', 'ENVIRONMENT_NAME', _('Environment name'),
+              attribute_name: :option_environment_name
+      end
 
       option_sources do |sources, command|
         sources.find_by_name('IdResolution').insert_relative(

data/lib/hammer_cli_foreman/command_extensions/puppet_environments.rb

@@ -2,13 +2,19 @@ module HammerCLIForeman
   module CommandExtensions
     class PuppetEnvironments < HammerCLI::CommandExtensions
       # Remove when support of --environments options is ended.
-      option '--environments', 'ENVIRONMENT_NAMES', _(''),
-             attribute_name: :option_environment_names,
-             deprecated: { '--environments' => _('Use --puppet-environments instead') }
-      option '--environment-ids', 'ENVIRONMENT_IDS', _('Environment IDs'),
-             format: HammerCLI::Options::Normalizers::List.new,
-             attribute_name: :option_environment_ids,
-             deprecated: { '--environment-ids' => _('Use --puppet-environment-ids instead') }
+      option_family(
+        aliased_resource: 'environment',
+        description: _('Puppet environments'),
+        deprecation: _("Use %s instead") % '--puppet-environment[s|-ids]',
+        deprecated: { '--environments' => _("Use %s instead") % '--puppet-environment[s|-ids]',
+                      '--environment-ids' => _("Use %s instead") % '--puppet-environment[s|-ids]' }
+      ) do
+        parent '--environment-ids', 'ENVIRONMENT_IDS', _('Environment IDs'),
+               format: HammerCLI::Options::Normalizers::List.new,
+               attribute_name: :option_environment_ids
+        child '--environments', 'ENVIRONMENT_NAMES', _(''),
+              attribute_name: :option_environment_names
+      end
 
       option_sources do |sources, command|
         sources.find_by_name('IdResolution').insert_relative(

data/lib/hammer_cli_foreman/command_extensions/subnet.rb

@@ -0,0 +1,25 @@
+module HammerCLIForeman
+  module CommandExtensions
+    class Subnet < HammerCLI::CommandExtensions
+      option "--dns", "DNS_NAME", _("DNS Proxy to use within this subnet"),
+             attribute_name: :option_dns_name,
+             referenced_resource: :smart_proxy
+      option "--dhcp", "DHCP_NAME", _("DHCP Proxy to use within this subnet"),
+             attribute_name: :option_dhcp_name,
+             referenced_resource: :smart_proxy
+      option "--tftp", "TFTP_NAME", _("TFTP Proxy to use within this subnet"),
+             attribute_name: :option_tftp_name,
+             referenced_resource: :smart_proxy
+      option "--prefix", "PREFIX", _("Network prefix in CIDR notation (e.g. 64) for this subnet")
+
+      option_sources do |sources, command|
+        sources.find_by_name('IdResolution').insert_relative(
+          :after,
+          'IdParams',
+          HammerCLIForeman::OptionSources::ReferencedResourceIdParams.new(command)
+        )
+        sources
+      end
+    end
+  end
+end

data/lib/hammer_cli_foreman/command_extensions/user.rb

@@ -0,0 +1,17 @@
+module HammerCLIForeman
+  module CommandExtensions
+    class User < HammerCLI::CommandExtensions
+      option '--default-organization', 'DEFAULT_ORGANIZATION_NAME', _('Default organization name'),
+             aliased_resource: 'default_organization', referenced_resource: 'default_organization'
+      option '--default-location', 'DEFAULT_LOCATION_NAME', _('Default location name'),
+             aliased_resource: 'default_location', referenced_resource: 'default_location'
+
+      option '--ask-password', 'ASK_PW', ' ', format: HammerCLI::Options::Normalizers::Bool.new
+
+      option_sources do |sources, command|
+        sources << HammerCLIForeman::OptionSources::UserParams.new(command)
+        sources
+      end
+    end
+  end
+end

data/lib/hammer_cli_foreman/commands.rb

@@ -275,8 +275,8 @@ module HammerCLIForeman
       record
     end
 
-    def self.command_name(name=nil)
-      super(name) || "list"
+    def self.command_names(*names)
+      super(*names) || %w(list index)
     end
 
     def execute
@@ -502,8 +502,8 @@ module HammerCLIForeman
       end
     end
 
-    def self.command_name(name=nil)
-      super(name) || "info"
+    def self.command_names(*names)
+      super(*names) || %w(info show)
     end
 
     def send_request
@@ -565,8 +565,8 @@ module HammerCLIForeman
 
     action :destroy
 
-    def self.command_name(name=nil)
-      super(name) || "delete"
+    def self.command_names(*names)
+      super(*names) || %w(delete destroy)
     end
 
   end
@@ -687,7 +687,7 @@ module HammerCLIForeman
   class RemoveAssociatedCommand < AssociatedCommand
 
     def self.command_name(name=nil)
-      name = super(name) || (associated_resource ? "remove-"+associated_resource.singular_name : nil)
+      name = super(name) || (associated_resource ? "remove-" + associated_resource.singular_name : nil)
       name.respond_to?(:gsub) ? name.gsub('_', '-') : name
     end
 
@@ -698,9 +698,14 @@ module HammerCLIForeman
 
     def get_new_ids
       ids = get_current_ids.map(&:to_s)
-      required_id = get_associated_identifier.to_s
 
-      ids = ids.delete_if { |id| id == required_id }
+      associated_identifiers = get_associated_identifiers
+      associated_identifier = get_associated_identifier
+
+      required_ids = associated_identifiers.nil? ? [] : associated_identifiers.map(&:to_s)
+      required_ids << associated_identifier.to_s unless associated_identifier.nil?
+
+      ids = ids.delete_if { |id| required_ids.include? id }
       ids
     end