hammer_cli_katello 1.3.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9299bc667628d32e5cdabeb70fff4b381bd71664bb999abede682076e8b1b82a
-  data.tar.gz: 0b6db8c43b4a4994dd78063760bf57801c14cc1cc88fb727d6fffeb36085ed47
+  metadata.gz: f9402037812c97c98165fb0993f82063bafe1494644ce0e23f2302926e39eab9
+  data.tar.gz: 30ee3c5a4cecaa4822d3a2ec94630f8f26d22b5d643868fa76bd6d07286c10a9
 SHA512:
-  metadata.gz: 54ebe7f1d033e4d15a965d731947684e13fc52e74aa9838e5e4ed821ea76f724d02a0b8cf67b16198e563b2732b53ef2a75de0c20e4e69809de52b16994475d0
-  data.tar.gz: f53d1b937657cbcc786a868127d29a549a56bab4e76e484d141abd2aac0864b65dc76ca3b4cefb3ccd67ddca12e9f87f4318d537f6cd9f0ca3e0c9d879cea309
+  metadata.gz: 38efbc45b82eec60cfd40df5ae30051484aa0e2f1e8eb6877128ed6cef14d8bb801da8cea3704e2a3689b329ca86a89776a0a196226115cf313bd952214bd968
+  data.tar.gz: 4935236c67fac3f628e434492efcdf70341100d24c491aeb68dfc3aba5ddd5dbee93306d7c23a632e2c389bc0b055f1df59d8efddd28a27d4d44d93e14ce7602

data/lib/hammer_cli_katello/content_export_complete.rb

@@ -20,6 +20,14 @@ module HammerCLIKatello
       include ContentExportHelper
     end
 
+    class RepositoryCommand < HammerCLIKatello::SingleResourceCommand
+      desc _("Performs a full export of a repository")
+      command_name "repository"
+
+      include HammerCLIForemanTasks::Async
+      include ContentExportHelper
+    end
+
     autoload_subcommands
   end
 end

data/lib/hammer_cli_katello/content_export_helper.rb

@@ -1,4 +1,5 @@
 require 'hammer_cli_katello/repository'
+
 # rubocop:disable ModuleLength
 module HammerCLIKatello
   module ContentExportHelper
@@ -40,7 +41,8 @@ module HammerCLIKatello
     end
 
     def fetch_export_history(export_history_id)
-      index(:content_exports, :id => export_history_id).first if export_history_id
+      return unless export_history_id
+      index(:content_exports, :id => export_history_id).first
     end
 
     def fetch_export_history_from_task(task)
@@ -48,7 +50,6 @@ module HammerCLIKatello
       if %w(error warning).include?(task['result'])
         raise _("Can not fetch export history from an unfinished task")
       end
-
       export_history_id = task.dig('output', 'export_history_id')
       fetch_export_history(export_history_id)
     end
@@ -72,7 +73,16 @@ module HammerCLIKatello
       self.class.command_name.first.to_sym == :version
     end
 
+    def repository_command?
+      self.class.command_name.first.to_sym == :repository
+    end
+
     def fetch_repositories
+      if repository_command?
+        resp = show(:repositories, id: resolver.repository_id(options))
+        return resp["download_policy"] == "immediate" ? [] : [resp]
+      end
+
       repo_options = {
         library: true,
         content_type: 'yum',
@@ -95,6 +105,10 @@ module HammerCLIKatello
             " Update the download policy and sync affected repositories."\
             " Once synced republish the content view"\
             " and export the generated version.")
+        elsif repository_command?
+          output.print_message _("NOTE: Unable to fully export this repository because"\
+            " it does not have the 'immediate' download policy."\
+            " Update the download policy, sync the repository and export.")
         else
           output.print_message _("NOTE: Unable to fully export this organization's library because"\
             " it contains repositories without the 'immediate' download policy."\
@@ -107,7 +121,7 @@ module HammerCLIKatello
           "--download-policy='immediate'"
         output.print_message ""
         print_record(::HammerCLIKatello::Repository::ListCommand.output_definition, repos)
-        exit(HammerCLI::EX_SOFTWARE) if option_fail_on_missing_content?
+        exit(HammerCLI::EX_SOFTWARE) if repository_command? || option_fail_on_missing_content?
       end
     end
 
@@ -116,6 +130,44 @@ module HammerCLIKatello
         setup_version(base)
       elsif base.command_name.first.to_sym == :library
         setup_library(base)
+      elsif base.command_name.first.to_sym == :repository
+        setup_repository(base)
+      end
+    end
+
+    def self.setup_repository(base)
+      base.action(:repository)
+      base.success_message _("Repository is being exported in task %{id}.")
+      base.failure_message _("Could not export the repository")
+
+      base.option "--name", "NAME", _("Filter repositories by name."),
+                 :attribute_name => :option_name,
+                 :required => false
+
+      base.build_options do |o|
+        o.expand(:all).including(:products, :organizations)
+      end
+
+      base.validate_options do
+        any(:option_id, :option_name).required
+        unless option(:option_id).exist?
+          any(
+            :option_product_id,
+            :option_product_name
+          ).required
+          unless option(:option_product_id).exist?
+            any(:option_organization_id, :option_organization_name, \
+                                :option_organization_label).required
+          end
+        end
+      end
+
+      base.class_eval do
+        def request_params
+          super.tap do |opts|
+            opts["id"] = resolver.repository_id(options)
+          end
+        end
       end
     end
 

data/lib/hammer_cli_katello/content_export_incremental.rb

@@ -20,6 +20,14 @@ module HammerCLIKatello
       include ContentExportHelper
     end
 
+    class RepositoryCommand < HammerCLIKatello::SingleResourceCommand
+      desc _("Performs an incremental export of a repository")
+      command_name "repository"
+
+      include HammerCLIForemanTasks::Async
+      include ContentExportHelper
+    end
+
     autoload_subcommands
   end
 end

data/lib/hammer_cli_katello/content_import.rb

@@ -58,6 +58,15 @@ module HammerCLIKatello
       include ContentImportCommon
     end
 
+    class RepositoryCommand < HammerCLIKatello::SingleResourceCommand
+      desc _("Imports a repository")
+      action :repository
+      command_name "repository"
+
+      include HammerCLIForemanTasks::Async
+      include ContentImportCommon
+    end
+
     class ListCommand < HammerCLIKatello::ListCommand
       desc "View content view import histories"
       output do

data/lib/hammer_cli_katello/content_view_component.rb

@@ -84,16 +84,16 @@ module HammerCLIKatello
       include OrganizationOptions
       include CompositeContentViewNameResolvable
       output do
-        field :id, _("Id")
+        field :content_view_id, _("Content View Id")
         field :content_view_name, _("Name")
         field :version, _("Version")
+        field :id, _("Component Id")
         field :current_version, _("Current Version")
         field :version_id, _("Version Id")
       end
 
       def extend_data(mod)
         if mod['latest']
-          mod['content_view_name'] = mod["content_view"]["name"]
           mod['version'] = _("Latest")
           if mod['content_view_version']
             mod['current_version'] = mod['content_view_version']['version']
@@ -102,10 +102,11 @@ module HammerCLIKatello
             mod['current_version'] = _("No Published Version")
           end
         else
-          mod['content_view_name'] = mod["content_view"]["name"]
           mod['version'] = mod['content_view_version']['version']
           mod['version_id'] = mod['content_view_version']['id']
         end
+        mod['content_view_name'] = mod["content_view"]["name"]
+        mod['content_view_id'] = mod["content_view"]["id"]
         mod
       end
 

data/lib/hammer_cli_katello/host_collection.rb

@@ -143,6 +143,8 @@ module HammerCLIKatello
       success_message _("Host collection updated.")
       failure_message _("Could not update the the host collection")
 
+      option "--unlimited-hosts", :flag, "Set hosts max to unlimited"
+
       build_options { |o| o.expand(:all).including(:organizations) }
     end
 

data/lib/hammer_cli_katello/id_resolver.rb

@@ -29,8 +29,9 @@ module HammerCLIKatello
       :sync_plan =>             [s_name(_("Sync plan name to search by"))],
       :task =>                  [s_name(_("Task name to search by"))],
       :content_view_version => [s("version", _("Content view version number"))],
-      :content_export       => [],
-      :content_import       => []
+      :content_export => [],
+      :content_export_incremental => [],
+      :content_import => []
     }.freeze
 
     DEFAULT_SEARCHABLES = [s_name(_("Name to search by"))].freeze

data/lib/hammer_cli_katello/organization.rb

@@ -24,6 +24,7 @@ module HammerCLIKatello
         field :service_levels, _("Service Levels"), Fields::List
         from :cdn_configuration do
           label "CDN configuration", hide_blank: true do
+            field :type_label, _("Type"), Fields::Field
             field :url, _("URL"), Fields::Field, hide_blank: true
             field :upstream_organization_label, _("Upstream Organization"),
                                                Fields::Field, hide_blank: true
@@ -39,9 +40,19 @@ module HammerCLIKatello
                                               else
                                                 _("Disabled")
                                               end
+        setup_cdn_type(data)
         data
       end
 
+      def setup_cdn_type(data)
+        types = {
+          'export_sync' => _("Export Sync"),
+          'network_sync' => _("Network Sync"),
+          'redhat_cdn' => _("Red Hat CDN")
+        }
+        data["cdn_configuration"].merge!("type_label" => types[data["cdn_configuration"]["type"]])
+      end
+
       build_options
     end
 

data/lib/hammer_cli_katello/repository.rb

@@ -56,7 +56,7 @@ module HammerCLIKatello
         field :_redhat_repo, _("Red Hat Repository")
         field :content_type, _("Content Type")
         field :checksum_type, _("Checksum Type"), Fields::Field, :hide_blank => true
-        field :_mirror_on_sync, _("Mirror on Sync")
+        field :_mirroring_policy, _("Mirroring Policy"), Fields::Field, :hide_blank => true
         field :url, _("Url")
         field :_publish_via_http, _("Publish Via HTTP")
         field :full_path, _("Published At")
@@ -86,7 +86,7 @@ module HammerCLIKatello
         end
 
         label _("GPG Key") do
-          from :gpg_key do
+          from :content_credential do
             field :id, _("Id"), Fields::Field, :hide_blank => true
             field :name, _("Name"), Fields::Field, :hide_blank => true
           end
@@ -126,6 +126,7 @@ module HammerCLIKatello
 
         setup_sync_state(data)
         setup_booleans(data)
+        setup_mirroring_policy(data)
         setup_content_counts(data) if data["content_counts"]
         data
       end
@@ -133,7 +134,16 @@ module HammerCLIKatello
       def setup_booleans(data)
         data["_redhat_repo"] = data.dig("product", "redhat") ? _("yes") : _("no")
         data["_publish_via_http"] = data["unprotected"] ? _("yes") : _("no")
-        data["_mirror_on_sync"] = data["mirror_on_sync"] ? _("yes") : _("no")
+      end
+
+      def setup_mirroring_policy(data)
+        policies = {
+          'additive' => _("Additive"),
+          'mirror_content_only' => _("Content Only"),
+          'mirror_complete' => _("Complete Mirroring")
+        }
+        mirroring_policy = data["mirroring_policy"]
+        data["_mirroring_policy"] = policies[mirroring_policy]
       end
 
       def setup_sync_state(data)
@@ -389,6 +399,8 @@ module HammerCLIKatello
         o.expand.including(:products, :organizations)
       end
 
+      option "--async", :flag, _("Do not wait for the task.")
+
       option "--ostree-repository-name", "OSTREE REPOSITORY NAME",
         _("Name of OSTree repository in archive."),
         :attribute_name => :option_ostree_repository_name,
@@ -415,6 +427,7 @@ module HammerCLIKatello
           update_content_upload(upload_id, repo_id, file)
         end
         opts[:ostree_repository_name] = options["option_ostree_repository_name"]
+        opts[:filename] = filename
         results = import_uploads([
           {
             id: upload_id,
@@ -423,7 +436,7 @@ module HammerCLIKatello
             size: file.size,
             checksum: checksum
           }], opts)
-        print_results(filename, results)
+        print_results(filename, results, options["option_async"])
       ensure
         if upload_id
           content_upload_resource.call(:destroy, :repository_id => get_identifier, :id => upload_id)
@@ -468,35 +481,54 @@ module HammerCLIKatello
         params = {:id => get_identifier,
                   :uploads => uploads,
                   publish_repository: publish_repository,
-                  sync_capsule: sync_capsule
+                  sync_capsule: sync_capsule,
+                  async: true
         }
         params[:content_type] = options["option_content_type"] if options["option_content_type"]
         if options["option_ostree_repository_name"]
           params[:ostree_repository_name] = options["option_ostree_repository_name"]
         end
-        resource.call(:import_uploads, params)
+        results = if options["option_async"]
+                    resource.call(:import_uploads, params)
+                  else
+                    task_progress(resource.call(:import_uploads, params))
+                  end
+        results
       end
 
-      def print_results(name, results)
-        if results.empty? || results.dig('output', 'upload_results').empty?
-          print_message _("Successfully uploaded file '%{name}'") % {
-            :name => name
-          }
-        else
+      def task_progress(task_or_id)
+        super
+        task_id = task_or_id.is_a?(Hash) ? task_or_id['id'] : task_or_id
+        load_task(task_id)
+      end
+
+      # rubocop:disable CyclomaticComplexity
+      # rubocop:disable PerceivedComplexity
+      def print_results(name, results, async)
+        if !%w(error warning).include?(results) && !async # task successful && no async flag used
           upload_results = results.dig('output', 'upload_results') || []
-          upload_results.each do |result|
-            if result['type'] == 'docker_manifest'
-              print_message(
-                _("Successfully uploaded manifest file '%{name}' with digest '%{digest}'") % {
-                  :name => name, :digest => result['digest'] })
-            else
-              print_message _("Successfully uploaded file '%{name}'") % {
-                :name => name
-              }
+
+          if upload_results.empty?
+            print_message _("Successfully uploaded file %s" % name)
+          else
+            upload_results.each do |result|
+              if result['type'] == 'docker_manifest'
+                print_message(
+                  _("Successfully uploaded manifest file '%{name}' with digest '%{digest}'") % {
+                    :name => name, :digest => result['digest'] })
+              else
+                print_message _("Successfully uploaded file %s" % name)
+              end
             end
           end
+        elsif results&.dig('id') && async # async flag used
+          print_message _("Content is being uploaded in task #{results['id']}.")
+        else
+          print_message _("Could not upload the content.")
         end
       end
+      # rubocop:enable CyclomaticComplexity
+      # rubocop:enable PerceivedComplexity
 
       def silence_warnings
         original_verbose = $VERBOSE
@@ -508,7 +540,6 @@ module HammerCLIKatello
         end
       end
     end
-    # rubocop:enable ClassLength
 
     class RemoveContentCommand < HammerCLIKatello::SingleResourceCommand
       extend RepositoryScopedToProduct
@@ -536,6 +567,59 @@ module HammerCLIKatello
       end
     end
 
+    class RepublishCommand < HammerCLIKatello::SingleResourceCommand
+      extend RepositoryScopedToProduct
+      include HammerCLIForemanTasks::Async
+      include OrganizationOptions
+
+      validate_repo_name_requires_product_options
+      action :republish
+      command_name "republish"
+      desc _("Forces a republish of the specified repository.")
+
+      success_message _("Repository republished.")
+      failure_message _("Could not republish the repository.")
+
+      validate_options :before, 'IdResolution' do
+        organization_options = [:option_organization_id, :option_organization_name, \
+                                :option_organization_label]
+
+        if option(:option_product_name).exist?
+          any(*organization_options).required
+        end
+      end
+
+      build_options do |o|
+        o.expand.including(:products)
+      end
+    end
+
+    class ReclaimSpaceCommand < HammerCLIKatello::SingleResourceCommand
+      extend RepositoryScopedToProduct
+      include HammerCLIForemanTasks::Async
+      include OrganizationOptions
+      validate_repo_name_requires_product_options
+      action :reclaim_space
+      command_name "reclaim-space"
+      desc _("Reclaim space from an On Demand repository")
+
+      success_message _("Repository space reclaimed.")
+      failure_message _("Could not reclaim the repository")
+
+      validate_options :before, 'IdResolution' do
+        organization_options = [:option_organization_id, :option_organization_name, \
+                                :option_organization_label]
+
+        if option(:option_product_name).exist?
+          any(*organization_options).required
+        end
+      end
+
+      build_options do |o|
+        o.expand.including(:products)
+      end
+    end
+    # rubocop:enable ClassLength
     autoload_subcommands
   end
 end

data/lib/hammer_cli_katello/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIKatello
   def self.version
-    @version ||= Gem::Version.new('1.3.1')
+    @version ||= Gem::Version.new('1.5.0')
   end
 end