hammer_cli_katello 0.16.1 → 0.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 96b7e37c04cf182db80991f71900540b53c147a655bc003cffd000c6b6a43675
-  data.tar.gz: 9984c39d7276c1f39012290f6f4d04cf6630d97077096bdf55063cb9115d9265
+SHA1:
+  metadata.gz: 91526da6c7ebab95a7aba39558d81c0a47fbe074
+  data.tar.gz: 6c44980914fdd9a4e8d308863f65aeaac002f09a
 SHA512:
-  metadata.gz: 014c54b5130dfd01f28162635ef4fe95e7af4e88d1623cd65ac5a9fc33c1f5f2d351a2efef084d09346c86c07e26141438ca6a16f53763c561eba8bbf400379f
-  data.tar.gz: 97d8619b2048661b4a752cbe8680d1ed5f98d9a90af29b50eb5b330ac132292afc31e3ac6b7c0ffb122506f1d4780dcecaf77f4c67e51543c7f20f6ffdce5778
+  metadata.gz: 0b530c2a5f82758bd0e074f9988d7973be4134a9f832877c2afc4c336f73a6e5a172778d9bfeeb6bb53370787d896a2f08578048fe818a71a9f9e68657e1e595
+  data.tar.gz: c9b15e7566318c658abefb3a372405571fe2f0875666f1d9bdec6596159d95021baf62e704ca2af33c96ebfbdaf61e9b5d9716d65c2c6d3859903d3d745d429f

data/lib/hammer_cli_katello/activation_key.rb

@@ -90,7 +90,7 @@ module HammerCLIKatello
 
       option "--unlimited-hosts", :flag, "Set hosts max to unlimited"
 
-      validate_options do
+      validate_options :before, 'IdResolution' do
         all(:option_unlimited_hosts, :option_max_hosts).rejected
       end
 
@@ -165,7 +165,7 @@ module HammerCLIKatello
       option '--name', "ACTIVATION_KEY_NAME", _("Activation key name to search by"),
         attribute_name: :option_activation_key_name
 
-      validate_options do
+      validate_options :before, 'IdResolution' do
         any(:option_activation_key_id, :option_activation_key_name).required
       end
 
@@ -238,7 +238,7 @@ module HammerCLIKatello
       option "--name", "NAME", _("Name of activation key"),
              :attribute_name => :option_activation_key_name
 
-      validate_options do
+      validate_options :before, 'IdResolution' do
         any(:option_activation_key_id, :option_activation_key_name).required
       end
 

data/lib/hammer_cli_katello/content_view.rb

@@ -109,7 +109,7 @@ module HammerCLIKatello
         end
       end
 
-      validate_options do
+      validate_options :before, 'IdResolution' do
         product_options = [:option_product_id, :option_product_name]
         if option(:option_repository_ids).exist?
           any(*product_options).rejected
@@ -138,7 +138,7 @@ module HammerCLIKatello
       option "--new-name", "NEW_NAME", _("New content view name"),
              :attribute_name => :option_new_name
 
-      validate_options do
+      validate_options :before, 'IdResolution' do
         organization_options = [:option_organization_id, :option_organization_name, \
                                 :option_organization_label]
 
@@ -165,7 +165,7 @@ module HammerCLIKatello
       success_message _("Content view updated.")
       failure_message _("Could not update the content view")
 
-      validate_options do
+      validate_options :before, 'IdResolution' do
         organization_options = [:option_organization_id, :option_organization_name, \
                                 :option_organization_label]
 
@@ -187,7 +187,7 @@ module HammerCLIKatello
       success_message _("Content view is being deleted with task %{id}.")
       failure_message _("Could not delete the content view")
 
-      validate_options do
+      validate_options :before, 'IdResolution' do
         organization_options = [:option_organization_id, :option_organization_name, \
                                 :option_organization_label]
 
@@ -227,7 +227,7 @@ module HammerCLIKatello
       build_options
     end
 
-    class CVEnvParamsSource
+    class CVEnvParamsSource < HammerCLI::Options::Sources::Base
       def initialize(command)
         @command = command
       end
@@ -257,8 +257,11 @@ module HammerCLIKatello
 
       def option_sources
         sources = super
-        idx = sources.index { |s| s.class == HammerCLIForeman::OptionSources::IdParams }
-        sources.insert(idx, CVEnvParamsSource.new(self))
+        sources.find_by_name('IdResolution').insert_relative(
+          :after,
+          'IdParams',
+          CVEnvParamsSource.new(self)
+        )
         sources
       end
 
@@ -282,7 +285,7 @@ module HammerCLIKatello
       command_name 'add-version'
       desc _('Add a content view version to a composite view')
 
-      validate_options do
+      validate_options :before, 'IdResolution' do
         if option(:option_content_view_version_version).exist?
           any(:option_content_view_id, :option_content_view_name).required
         end
@@ -292,7 +295,7 @@ module HammerCLIKatello
         plural ? "components" : "component"
       end
 
-      validate_options do
+      validate_options :before, 'IdResolution' do
         organization_options = [:option_organization_id, :option_organization_name, \
                                 :option_organization_label]
 
@@ -317,7 +320,7 @@ module HammerCLIKatello
       command_name 'remove-version'
       desc _('Remove a content view version from a composite view')
 
-      validate_options do
+      validate_options :before, 'IdResolution' do
         if option(:option_content_view_version_version).exist?
           any(:option_content_view_id, :option_content_view_name).required
         end
@@ -327,7 +330,7 @@ module HammerCLIKatello
         plural ? "components" : "component"
       end
 
-      validate_options do
+      validate_options :before, 'IdResolution' do
         organization_options = [:option_organization_id, :option_organization_name, \
                                 :option_organization_label]
 

data/lib/hammer_cli_katello/content_view_name_resolvable.rb

@@ -1,6 +1,6 @@
 module HammerCLIKatello
   module ContentViewNameResolvable
-    class ContentViewParamSource
+    class ContentViewParamSource < HammerCLI::Options::Sources::Base
       def initialize(command)
         @command = command
       end
@@ -16,8 +16,11 @@ module HammerCLIKatello
 
     def option_sources
       sources = super
-      idx = sources.index { |s| s.class == HammerCLIForeman::OptionSources::IdParams }
-      sources.insert(idx, ContentViewParamSource.new(self))
+      sources.find_by_name('IdResolution').insert_relative(
+        :after,
+        'IdParams',
+        ContentViewParamSource.new(self)
+      )
       sources
     end
   end

data/lib/hammer_cli_katello/content_view_purge.rb

@@ -12,7 +12,7 @@ module HammerCLIKatello
     option "--count", "COUNT", _("count of unused versions to keep"),
            default: 3, format: HammerCLI::Options::Normalizers::Number.new
 
-    validate_options do
+    validate_options :before, 'IdResolution' do
       organization_options = [:option_organization_id, :option_organization_name, \
                               :option_organization_label]
 
@@ -25,7 +25,7 @@ module HammerCLIKatello
 
     build_options
 
-    class ContentViewIdParamSource
+    class ContentViewIdParamSource < HammerCLI::Options::Sources::Base
       def initialize(command)
         @command = command
       end
@@ -40,8 +40,11 @@ module HammerCLIKatello
 
     def option_sources
       sources = super
-      idx = sources.index { |s| s.class == HammerCLIForeman::OptionSources::IdParams }
-      sources.insert(idx, ContentViewIdParamSource.new(self))
+      sources.find_by_name('IdResolution').insert_relative(
+        :after,
+        'IdParams',
+        ContentViewIdParamSource.new(self)
+      )
       sources
     end
 

data/lib/hammer_cli_katello/content_view_version.rb

@@ -185,7 +185,7 @@ module HammerCLIKatello
              :format => HammerCLI::Options::Normalizers::List.new
             )
 
-      validate_options do
+      validate_options :before, 'IdResolution' do
         organization_options = [:option_organization_id, :option_organization_name]
 
         if option(:option_lifecycle_environment_ids).exist?
@@ -320,12 +320,13 @@ module HammerCLIKatello
         export_file = "#{export_prefix}.json"
         export_repos_tar = "#{export_prefix}-repos.tar"
         export_tar = "#{export_prefix}.tar"
+        export_dir = File.expand_path(options['option_export_dir'].to_s)
 
-        Dir.mkdir("#{options['option_export_dir']}/#{export_prefix}")
+        Dir.mkdir("#{export_dir}/#{export_prefix}")
 
         if repositories
           Dir.chdir(PUBLISHED_REPOS_DIR) do
-            repo_tar = "#{options['option_export_dir']}/#{export_prefix}/#{export_repos_tar}"
+            repo_tar = "#{export_dir}/#{export_prefix}/#{export_repos_tar}"
             repo_dirs = []
 
             repositories.each do |repo|
@@ -336,29 +337,29 @@ module HammerCLIKatello
           end
         end
 
-        Dir.chdir("#{options['option_export_dir']}/#{export_prefix}") do
+        Dir.chdir("#{export_dir}/#{export_prefix}") do
           File.open(export_file, 'w') do |file|
             file.write(JSON.pretty_generate(json))
           end
         end
 
-        Dir.chdir(options['option_export_dir']) do
+        Dir.chdir(export_dir) do
           `tar cf #{export_tar} #{export_prefix}`
           FileUtils.rm_rf(export_prefix)
         end
       end
 
       def check_repo_download_policy(repositories)
-        on_demand = repositories.select do |repo|
-          show(:repositories, 'id' => repo['library_instance_id'])['download_policy'] == 'on_demand'
+        non_immediate = repositories.select do |repo|
+          show(:repositories, 'id' => repo['library_instance_id'])['download_policy'] != 'immediate'
         end
-        return true if on_demand.empty?
+        return true if non_immediate.empty?
 
-        on_demand_names = repositories.collect { |repo| repo['name'] }
+        non_immediate_names = repositories.collect { |repo| repo['name'] }
         msg = <<~MSG
           All exported repositories must be set to an immediate download policy and re-synced.
           The following repositories need action:
-            #{on_demand_names.join('\n')}
+            #{non_immediate_names.join(', ')}
         MSG
         raise _(msg)
       end

data/lib/hammer_cli_katello/erratum.rb

@@ -1,3 +1,5 @@
+require 'hammer_cli_katello/erratum_info_command'
+
 module HammerCLIKatello
   class ErratumCommand < HammerCLIKatello::Command
     resource :errata
@@ -14,7 +16,7 @@ module HammerCLIKatello
         field :title, _("Title")
       end
 
-      validate_options do
+      validate_options :before, 'IdResolution' do
         organization_options = [:option_organization_id, :option_organization_name, \
                                 :option_organization_label]
 
@@ -28,20 +30,8 @@ module HammerCLIKatello
       end
     end
 
-    class InfoCommand < HammerCLIKatello::InfoCommand
-      output do
-        field :id, _("ID")
-        field :errata_id, _("Errata ID")
-        field :title, _("Title")
-        field :type, _("Type")
-        field :severity, _("Severity")
-        field :issued, _("Issued")
-        field :updated, _("Updated")
-        field :description, _("Description")
-        field :summary, _("Summary")
-        field :solution, _("Solution")
-      end
-
+    class InfoCommand < HammerCLIKatello::ErratumInfoCommand
+      resource :errata
       build_options
     end
 

data/lib/hammer_cli_katello/erratum_info_command.rb

@@ -0,0 +1,26 @@
+module HammerCLIKatello
+  class ErratumInfoCommand < HammerCLIKatello::InfoCommand
+    command_name "info"
+
+    output do
+      field :title, _("Title")
+      field :version, _("Version")
+      field :description, _("Description")
+      field :status, _("Status")
+      field :id, _("ID")
+      field :errata_id, _("Errata ID")
+      field :reboot_suggested, _("Reboot Suggested")
+      field :updated, _("Updated")
+      field :issued, _("Issued")
+      field :release, _("Release")
+      field :solution, _("Solution")
+      field :packages, _("Packages"), Fields::List, :hide_blank => true
+
+      collection :module_streams, _("Module Streams"), :hide_blank => true do
+        field :name, _("Name")
+        field :stream, _("Stream")
+        field :packages, _("Packages"), Fields::List
+      end
+    end
+  end
+end

data/lib/hammer_cli_katello/file.rb

@@ -13,7 +13,7 @@ module HammerCLIKatello
         field :path, _("Path")
       end
 
-      validate_options do
+      validate_options :before, 'IdResolution' do
         organization_options = [:option_organization_id, :option_organization_name,
                                 :option_organization_label]
         if any(:option_product_name, :option_content_view_name).exist?
@@ -35,7 +35,7 @@ module HammerCLIKatello
         field :checksum, _("Checksum")
       end
 
-      validate_options do
+      validate_options :before, 'IdResolution' do
         organization_options = [:option_organization_id, :option_organization_name,
                                 :option_organization_label]
         product_options = [:option_product_id, :option_product_name]

data/lib/hammer_cli_katello/filter.rb

@@ -64,7 +64,7 @@ module HammerCLIKatello
       success_message _("Filter created.")
       failure_message _("Could not create the filter")
 
-      validate_options do
+      validate_options :before, 'IdResolution' do
         organization_options = [:option_organization_id, :option_organization_name, \
                                 :option_organization_label]
         product_options = [:option_product_id, :option_product_name]

data/lib/hammer_cli_katello/foreman_search_options_creators.rb

@@ -76,6 +76,10 @@ module HammerCLIKatello
       create_search_options_without_katello_api(options, api.resource(:compute_resources), mode)
     end
 
+    def create_compute_profiles_search_options(options, mode = nil)
+      create_search_options_without_katello_api(options, api.resource(:compute_profiles), mode)
+    end
+
     def create_images_search_options(options, mode = nil)
       create_search_options_without_katello_api(options, api.resource(:images), mode)
     end

data/lib/hammer_cli_katello/host_collection.rb

@@ -73,7 +73,7 @@ module HammerCLIKatello
       option "--name", "HOST_COLLECTION_NAME", _("Host Collection Name"),
              :attribute_name => :option_host_collection_name
 
-      validate_options do
+      validate_options :before, 'IdResolution' do
         host_collection_options = [:option_host_collection_id, :option_host_collection_name]
         any(*host_collection_options).required
       end

data/lib/hammer_cli_katello/host_errata.rb

@@ -1,3 +1,5 @@
+require 'hammer_cli_katello/erratum_info_command'
+
 module HammerCLIKatello
   class HostErrata < HammerCLIKatello::Command
     desc "Manage errata on your hosts"
@@ -27,25 +29,8 @@ module HammerCLIKatello
       build_options
     end
 
-    class InfoCommand < HammerCLIKatello::InfoCommand
+    class InfoCommand < HammerCLIKatello::ErratumInfoCommand
       resource :host_errata, :show
-      command_name "info"
-
-      output do
-        field :title, _("Title")
-        field :version, _("Version")
-        field :description, _("Description")
-        field :status, _("Status")
-        field :id, _("ID")
-        field :errata_id, _("Errata ID")
-        field :reboot_suggested, _("Reboot Suggested")
-        field :updated, _("Updated")
-        field :issued, _("Issued")
-        field :release, _("Release")
-        field :solution, _("Solution")
-        field :packages, _("Packages"), Fields::List
-      end
-
       build_options
     end
 

data/lib/hammer_cli_katello/hostgroup_extensions.rb

@@ -13,7 +13,7 @@ module HammerCLIKatello
       base.option '--query-organization-label', 'ORGANIZATION_LABEL',
         _('Organization label to search by'), attribute_name: :option_organization_label
 
-      base.validate_options do
+      base.validate_options :before, 'IdResolution' do
         organization_options = [
           :option_organization_id, :option_organization_name, :option_organization_label
         ]

data/lib/hammer_cli_katello/id_name_options_validator.rb

@@ -18,7 +18,7 @@ module HammerCLIKatello
       child_options = IdNameOptionsValidator.build_child_options(record_name)
       parent_options = IdNameOptionsValidator.build_parent_options(parent)
 
-      validate_options do
+      validate_options :before, 'IdResolution' do
         any(*child_options).required if required
 
         if (name_option = child_options.detect { |opt| opt.end_with?('_name') }) &&

data/lib/hammer_cli_katello/lifecycle_environment.rb

@@ -9,7 +9,7 @@ module HammerCLIKatello
           "PRIOR",
           _("Name of the prior environment")
         )
-        base.validate_options do
+        base.validate_options :before, 'IdResolution' do
           any(:option_prior, :option_prior_id).required
         end
       end

data/lib/hammer_cli_katello/lifecycle_environment_name_resolvable.rb

@@ -1,6 +1,6 @@
 module HammerCLIKatello
   module LifecycleEnvironmentNameResolvable
-    class LifecycleEnvironmentParamSource
+    class LifecycleEnvironmentParamSource < HammerCLI::Options::Sources::Base
       def initialize(command)
         @command = command
       end
@@ -16,8 +16,11 @@ module HammerCLIKatello
 
     def option_sources
       sources = super
-      idx = sources.index { |s| s.class == HammerCLIForeman::OptionSources::IdParams }
-      sources.insert(idx, LifecycleEnvironmentParamSource.new(self))
+      sources.find_by_name('IdResolution').insert_relative(
+        :after,
+        'IdParams',
+        LifecycleEnvironmentParamSource.new(self)
+      )
       sources
     end
   end