hammer_cli_katello 1.3.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 70bd64a3e1a162fa1c50c097a5f6c60cff91f6764a91aa715f575387bc02406c
-  data.tar.gz: 9b75290d2868faa302f15f23022bf310ca7f091ec819da5eba988abb17adda4d
+  metadata.gz: d1ff46aa39c3547dea6343f671d10d5ae603ecee1d4e2c416ddea5b1884de3e0
+  data.tar.gz: 5c3a848bcf07dba7d725a882a8a5e667841327f08ec738c100375c910466bfef
 SHA512:
-  metadata.gz: 0b5ab6e3272b3336bb11ca0b0e200fab63654f90bdafc5c213807fb9928da84e377132a408f826a58b8b58d2d55d9fa5f8b142284ff8f0f310b74b72cfd18ec7
-  data.tar.gz: a114e7f127f3418cadf0a7f9e06a728a6837013eac2245fe4ca49836441486cb7599146a027f22559376fa0ecaf3f44ecd1a5a587f97a9bc0e19b44e62bc8465
+  metadata.gz: 2fe7eddfe5ec1ebb616afeadd16c57ccba45100997b00dd69912284c27fc94467d22bc2d0023685237e7c744f3eb257a2c8d92d31a5589eb520a3f2e5fb2c484
+  data.tar.gz: 615ed4f84b86117d9b78543c1d8b5a09b9e21240d4f2fa9d5c2899c5a0d229e4ea1da2d008b03095473c90f9ea5cb43a024d122168a0b29a3578affd0d62b040

data/lib/hammer_cli_katello/content_units.rb

@@ -0,0 +1,66 @@
+module HammerCLIKatello
+  class ContentUnitsCommand < HammerCLIKatello::Command
+    resource :generic_content_units
+
+    class ListCommand < HammerCLIKatello::ListCommand
+      extend RepositoryScopedToProduct
+
+      validate_repo_name_requires_product_options(:option_repository_name)
+
+      output do
+        field :id, _("Id")
+        field :name, _("Name")
+        field :version, _("Version")
+        field :filename, _("Filename"), Fields::Field, hide_blank: true
+      end
+
+      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?
+          any(*organization_options).required
+        end
+      end
+
+      build_options do |o|
+        o.expand.including(:products, :organizations, :content_views)
+      end
+    end
+
+    class InfoCommand < HammerCLIKatello::InfoCommand
+      output do
+        field :id, _("Id")
+        field :name, _("Name")
+        field :version, _("Version")
+        field :filename, _("Filename"), Fields::Field, hide_blank: true
+      end
+
+      validate_options :before, 'IdResolution' do
+        organization_options = [:option_organization_id, :option_organization_name,
+                                :option_organization_label]
+        product_options = [:option_product_id, :option_product_name]
+        repository_options = [:option_repository_id, :option_repository_name]
+        content_view_version_options = [:option_content_view_version_id,
+                                        :option_content_view_version_version]
+
+        if option(:option_product_name).exist?
+          any(*organization_options).required
+        end
+
+        if option(:option_repository_name).exist?
+          any(*product_options).required
+        end
+
+        if option(:option_name).exist?
+          any(*(repository_options + content_view_version_options)).required
+        end
+      end
+
+      build_options do |o|
+        o.expand.including(:products, :organizations, :content_views, :content_view_versions)
+      end
+    end
+
+    autoload_subcommands
+  end
+end

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/repository.rb

@@ -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
@@ -110,7 +110,6 @@ module HammerCLIKatello
           field :docker_manifest_total, _("Container Image Manifests"), Fields::Field,
                                            :hide_blank => true
           field :docker_tag_total, _("Container Image Tags"), Fields::Field, :hide_blank => true
-          field :ostree_branch_total, _("OSTree Branches"), Fields::Field, :hide_blank => true
           field :file_total, _("Files"), Fields::Field, :hide_blank => true
           field :module_stream_total, _("Module Streams"), Fields::Field, :hide_blank => true
         end
@@ -159,21 +158,11 @@ module HammerCLIKatello
           data["docker_manifest_list_total"] = content_counts["docker_manifest_list"]
           data["docker_manifest_total"] = content_counts["docker_manifest"]
           data["docker_tag_total"] = content_counts["docker_tag"]
-        when "ostree"
-          setup_ostree(data)
         when "file"
           data["file_total"] = content_counts["file"]
         end
       end
 
-      def setup_ostree(data)
-        content_counts = data["content_counts"]
-        data["ostree_branch_total"] = content_counts["ostree_branch"]
-        if data["ostree_upstream_sync_policy"] == "custom"
-          data["_ostree_upstream_sync_depth"] = data["ostree_upstream_sync_depth"]
-        end
-      end
-
       def get_sync_status(state)
         sync_states = {
           "failed" => _("Failed"), "success" => _("Success"), "finished" => _("Finished"),
@@ -400,6 +389,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,
@@ -426,6 +417,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,
@@ -434,7 +426,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)
@@ -479,35 +471,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
@@ -519,7 +530,6 @@ module HammerCLIKatello
         end
       end
     end
-    # rubocop:enable ClassLength
 
     class RemoveContentCommand < HammerCLIKatello::SingleResourceCommand
       extend RepositoryScopedToProduct
@@ -547,6 +557,32 @@ module HammerCLIKatello
       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.0')
+    @version ||= Gem::Version.new('1.4.1')
   end
 end

data/lib/hammer_cli_katello.rb

@@ -117,16 +117,16 @@ module HammerCLIKatello
                                          'hammer_cli_katello/erratum'
                                         )
 
-  HammerCLI::MainCommand.lazy_subcommand("ostree-branch", _("Manipulate ostree branches"),
-                                         'HammerCLIKatello::OstreeBranchCommand',
-                                         'hammer_cli_katello/ostree_branch'
-                                        )
-
   HammerCLI::MainCommand.lazy_subcommand("file", _("Manipulate files"),
                                          'HammerCLIKatello::FileCommand',
                                          'hammer_cli_katello/file'
                                         )
 
+  HammerCLI::MainCommand.lazy_subcommand("content-units", _("Manipulate content units"),
+                                         'HammerCLIKatello::ContentUnitsCommand',
+                                         'hammer_cli_katello/content_units'
+                                        )
+
   HammerCLI::MainCommand.lazy_subcommand("content-export",
                                           _("Prepare content for export to a disconnected Katello"),
                                          'HammerCLIKatello::ContentExport',