hammer_cli_katello 1.5.2 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 205cdd68504c1fc4b0111f38b2dde15896040933
-  data.tar.gz: bf97773c38919f14834c35e32906c19d3cd1b606
+SHA256:
+  metadata.gz: bfa4a96e3ec666332357da5f6741af1fb78360f60e3016060d8e0ba7a41a38c9
+  data.tar.gz: 2d6fafe5ea4d85dd1551f9274a57cc6e2c65e3155bbabd844a0f12d964c3e7d3
 SHA512:
-  metadata.gz: 59f72d7ce8ac083a712dfa10fa9038b636b57bb48b3dbfdbfa691dace6ff7b501495d9b56fb3d8b97e97d90645efa7396f4384afad83eee634270ceaa77274f9
-  data.tar.gz: 295e9ea4da56c338d39eb6b3bfb5e3bbab96661fd5d40770a033590e787339f4bb0353a3e49f906a918c253bb63b4c77c9fba1e826074ee84ec12dd50f6c5475
+  metadata.gz: e3c4c16ed1e4c64d5126810fef1c723490758c1019e820e7cde65f7b6caa663ada32072aa39dcac2964199c5a2a72b2c36f31e4d85dfc64f8b2c9d203154896b
+  data.tar.gz: eeefc161d8fb26803fae890ef79d94c74f1e6ca94d4f0780ba839018890fce56bc5405a932cbeee7edbaa5817bec3de0762d39bc0577ee6e647de673c7c6e5fe

data/lib/hammer_cli_katello/acs.rb

@@ -34,14 +34,17 @@ module HammerCLIKatello
           field nil, _('')
         end
 
+        collection :products, _('Products') do
+          field :id, _('Id')
+          field :organization_id, _('Organization ID')
+          field :name, _('Name')
+          field :label, _('Label')
+        end
+
         collection :smart_proxies, _('Smart proxies') do
           field :id, _('Id')
           field :name, _('Name')
           field :url, _('URL')
-          field :created_at, _('Created at')
-          field :updated_at, _('Updated at')
-          field :expired_logs, _('Expired logs')
-          field :puppet_path, _('Puppet path'), Fields::Field, :hide_blank => true
           field :download_policy, _('Download policy')
         end
       end

data/lib/hammer_cli_katello/content_export.rb

@@ -44,6 +44,45 @@ module HammerCLIKatello
       end
     end
 
+    class GenerateListingCommand < HammerCLIKatello::Command
+      desc _("Generates listing file on each directory of a syncable export. This command "\
+        + "only needs to be used if the export was performed asynchronously or "\
+        + "if the listing files were lost. "\
+        + "Assumes the syncable export directory is accessible on disk")
+
+      command_name 'generate-listing'
+
+      include ContentExportHelper
+
+      option "--task-id", "TASK_ID",
+             _("Generate listing files for a syncable export task"),
+             :attribute_name => :option_task_id,
+             :required => false
+
+      option "--id", "ID",
+             _("Generate listing files based on specified export history"),
+             :attribute_name => :option_export_id,
+             :required => false
+
+      def execute
+        export_history = if option_task_id
+                           export_task = reload_task(option_task_id)
+                           fetch_export_history_from_task(export_task)
+                         else
+                           fetch_export_history(option_export_id)
+                         end
+
+        unless export_history
+          raise _("No export history was found. Verify the value given for "\
+            + "--task-id or --id")
+        end
+
+        make_listing_files(export_history)
+
+        HammerCLI::EX_OK
+      end
+    end
+
     class ListCommand < HammerCLIKatello::ListCommand
       desc "View content view export histories"
       output do

data/lib/hammer_cli_katello/content_export_helper.rb

@@ -1,23 +1,23 @@
 require 'hammer_cli_katello/repository'
-
+require 'find'
 # rubocop:disable ModuleLength
 module HammerCLIKatello
   module ContentExportHelper
     include ApipieHelper
-
     def execute
       warn_unexportable_repositories
       response = super
       if option_async?
-        output.print_message _("Once the task completes the export metadata must be generated "\
-          + "with the command:")
-        output.print_message(" hammer content-export generate-metadata --task-id #{@task['id']}")
+        emit_async_info
         HammerCLI::EX_OK
       elsif response != HammerCLI::EX_OK
         response
       else
         export_history = fetch_export_history_from_task(reload_task(@task))
-        if export_history
+        if syncable?
+          make_listing_files(export_history)
+          HammerCLI::EX_OK
+        elsif export_history
           generate_metadata_json(export_history)
           HammerCLI::EX_OK
         else
@@ -27,6 +27,22 @@ module HammerCLIKatello
       end
     end
 
+    def emit_async_info
+      if syncable?
+        output.print_message _("Once the task completes the listing files may be generated "\
+            + "with the command:")
+        output.print_message(" hammer content-export generate-listing --task-id #{@task['id']}")
+      else
+        output.print_message _("Once the task completes the export metadata must be generated "\
+            + "with the command:")
+        output.print_message(" hammer content-export generate-metadata --task-id #{@task['id']}")
+      end
+    end
+
+    def syncable?
+      options.key?("option_format") && option_format == 'syncable'
+    end
+
     def send_request
       @task = super
     end
@@ -54,6 +70,48 @@ module HammerCLIKatello
       fetch_export_history(export_history_id)
     end
 
+    def check_export_history_syncable!(export_history)
+      unless export_history["metadata"]["format"] == "syncable"
+        raise _("Cannot generate listing files for this export since "\
+          + "it is not syncable. It was not generated with --format=syncable.")
+      end
+
+      raise _("Export History does not have the path specified."\
+        + " The task may have errored out.") unless export_history["path"]
+    end
+
+    def make_listing_files(export_history)
+      check_export_history_syncable!(export_history)
+      output.print_message _("Generated #{export_history['path']}")
+
+      return unless Dir.exist?("#{export_history['path']}/content")
+
+      begin
+        # export history path may look like
+        # "/var/lib/pulp/exports/export-12803/apple/3.0//2022-06-30T17-23-06-00-00"
+        # Generate listing files for all sub directories of
+        # /var/lib/pulp/exports/export-12803/apple/3.0/$date/$org/Library/
+        ignorables = Dir.glob("#{export_history['path']}/content/**/repodata").map do |path|
+          File.dirname(path)
+        end
+
+        paths = Find.find("#{export_history['path']}/content").select do |path|
+          File.directory?(path) &&
+            ignorables.none? { |ignorable| path.start_with?(ignorable) }
+        end
+
+        paths.each do |dir|
+          directories = Dir.chdir(dir) { Dir['*'] }
+          File.write("#{dir}/listing", directories.join("\n"))
+        end
+      rescue SystemCallError
+        output.print_message _("Unable to access/write listing files"\
+                               + " to '#{export_history['path']}'." \
+                               + " To generate listing files run the command below as a root user ")
+        output.print_message(" hammer content-export generate-listing --id #{export_history['id']}")
+      end
+    end
+
     def generate_metadata_json(export_history)
       metadata_json = export_history["metadata"].to_json
       begin

data/lib/hammer_cli_katello/host_subscription.rb

@@ -102,6 +102,38 @@ module HammerCLIKatello
       setup
     end
 
+    class EnabledRepositoriesCommand < HammerCLIKatello::ListCommand
+      resource :host_subscriptions, :enabled_repositories
+      command_name 'enabled-repositories'
+
+      output do
+        field :id, _('ID')
+        field :name, _('Name')
+        field :label, _('Label')
+        field :content_type, _('Content type')
+        field :checksum, _("Checksum")
+
+        from :content_view do
+          field :id, _('Content View id')
+          field :name, _("Content View name")
+        end
+
+        from :content_view_version do
+          field :name, _("Content View version")
+        end
+
+        from :kt_environment do
+          field :name, _("Environment name")
+        end
+
+        from :product do
+          field :name, _("Product name")
+        end
+      end
+
+      build_options
+    end
+
     class ContentOverrideCommand < ::HammerCLIKatello::ContentOverrideBase::ContentOverrideCommand
       resource :host_subscriptions, :content_override
       setup

data/lib/hammer_cli_katello/simple_content_access.rb

@@ -13,6 +13,16 @@ module HammerCLIKatello
       end
     end
 
+    class StatusCommand < HammerCLIKatello::ListCommand
+      resource :simple_content_access, :status
+      command_name "status"
+      output do
+        field :simple_content_access, _('Simple Content Access'), Fields::Boolean
+      end
+
+      build_options
+    end
+
     class EnableCommand < HammerCLIKatello::SingleResourceCommand
       include EligibleCheck
       include HammerCLIForemanTasks::Async

data/lib/hammer_cli_katello/version.rb

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

data/lib/hammer_cli_katello.rb

@@ -43,7 +43,7 @@ module HammerCLIKatello
                                           'hammer_cli_katello/organization'
                                          )
 
-  HammerCLI::MainCommand.lazy_subcommand!("alternate-content-sources", _("Manipulate alternate content sources"), # rubocop:disable LineLength
+  HammerCLI::MainCommand.lazy_subcommand!("alternate-content-source", _("Manipulate alternate content sources"), # rubocop:disable LineLength
                                          'HammerCLIKatello::AcsCommand',
                                          'hammer_cli_katello/acs'
                                          )