hammer_cli_katello 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9299bc667628d32e5cdabeb70fff4b381bd71664bb999abede682076e8b1b82a
-  data.tar.gz: 0b6db8c43b4a4994dd78063760bf57801c14cc1cc88fb727d6fffeb36085ed47
+  metadata.gz: 0a00c7f5dd067ab0cc8203da1989be46411dc15ed1079442b38bf27e4c1c5eef
+  data.tar.gz: 4088650b9e19e79031e912cfc1f3c49ec11ef448e41c5c97cb41820fe5474bcc
 SHA512:
-  metadata.gz: 54ebe7f1d033e4d15a965d731947684e13fc52e74aa9838e5e4ed821ea76f724d02a0b8cf67b16198e563b2732b53ef2a75de0c20e4e69809de52b16994475d0
-  data.tar.gz: f53d1b937657cbcc786a868127d29a549a56bab4e76e484d141abd2aac0864b65dc76ca3b4cefb3ccd67ddca12e9f87f4318d537f6cd9f0ca3e0c9d879cea309
+  metadata.gz: 0b638de29d5f9ebf39fa1962ec41d316f23579c64f9b0bd387bc3bd0323d447368fb9dacf283ea8e10d898e1d2bd4e6956c99f435080f38c835092c154e85f03
+  data.tar.gz: 8c59ab30460634b1098d74933284052ee98492897a04d17358166597fb2d53e2412e521228486b5df37c8d8cb2f254565eb79ccb3cc29e5dfd8cfc9b42b4e399

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

@@ -389,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,
@@ -415,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,
@@ -423,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)
@@ -468,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

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.4.0')
   end
 end

data/test/functional/repository/upload_test.rb

@@ -17,10 +17,16 @@ describe 'upload repository' do
   let(:path) { "./test.rpm" }
   let(:upload_id) { "1234" }
   let(:_href) { "/pulp/api/v2/content/uploads/#{upload_id}" }
+  let(:task_id) { "2ea4f" }
   let(:upload_response) do
     {
       "upload_id" => upload_id,
-      "_href" => _href
+      "href" => _href
+    }
+  end
+  let(:import_uploads_response) do
+    {
+      "id" => task_id
     }
   end
 
@@ -36,7 +42,7 @@ describe 'upload repository' do
 
     # rubocop:disable LineLength
     ex2 = api_expects(:repositories, :import_uploads, 'Take in an upload')
-          .with_params(:id => repo_id, :sync_capsule => true, :publish_repository => true,
+          .with_params(:id => repo_id, :sync_capsule => true, :publish_repository => true, :async => true,
                        :uploads => [{
                          :id => '1234',
                          :name => 'test.rpm',
@@ -47,14 +53,16 @@ describe 'upload repository' do
                       )
     # rubocop:enable LineLength
 
-    ex2.returns("")
+    ex2.returns(import_uploads_response)
+    expect_foreman_task(task_id)
+    expect_foreman_task(task_id)
 
     ex3 = api_expects(:content_uploads, :destroy, "Delete the upload")
           .with_params('id' => upload_id, 'repository_id' => repo_id)
 
     ex3.returns("")
-
     result = run_cmd(@cmd + params)
+
     assert_equal(result.exit_code, 0)
     File.delete("test.rpm")
   end
@@ -70,7 +78,7 @@ describe 'upload repository' do
 
     # rubocop:disable LineLength
     ex2 = api_expects(:repositories, :import_uploads, 'Take in an upload')
-          .with_params(:id => repo_id, :sync_capsule => true, :publish_repository => true, :content_type => 'srpm',
+          .with_params(:id => repo_id, :sync_capsule => true, :publish_repository => true, :content_type => 'srpm', :async => true,
                        :uploads => [{
                          :id => '1234',
                          :name => 'test.src.rpm',
@@ -79,9 +87,11 @@ describe 'upload repository' do
                          :checksum => 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855'
                        }]
                       )
-
     # rubocop:enable LineLength
-    ex2.returns("")
+
+    ex2.returns(import_uploads_response)
+    expect_foreman_task(task_id)
+    expect_foreman_task(task_id)
 
     ex3 = api_expects(:content_uploads, :destroy, "Delete the upload")
           .with_params(:id => upload_id, :repository_id => repo_id)
@@ -105,7 +115,7 @@ describe 'upload repository' do
 
     # rubocop:disable LineLength
     ex2 = api_expects(:repositories, :import_uploads, 'Take in an upload')
-          .with_params(:id => repo_id, :sync_capsule => true, :publish_repository => true,
+          .with_params(:id => repo_id, :sync_capsule => true, :publish_repository => true, :async => true,
                        :uploads => [{
                          :id => '1234',
                          :name => 'test.src.rpm',
@@ -140,7 +150,7 @@ describe 'upload repository' do
 
     # rubocop:disable LineLength
     ex2 = api_expects(:repositories, :import_uploads, 'Take in an upload')
-          .with_params(:id => repo_id, :sync_capsule => true, :publish_repository => true,
+          .with_params(:id => repo_id, :sync_capsule => true, :publish_repository => true, :async => true,
                        :uploads => [{
                          :id => '1234',
                          :name => 'test.rpm',
@@ -150,13 +160,20 @@ describe 'upload repository' do
                        }]
                       )
     # rubocop:enable LineLength
-    ex2.returns('output' => {'upload_results' => [{'type' => 'docker_manifest',
-                                                   'digest' => 'sha256:1234'}]})
 
-    ex3 = api_expects(:content_uploads, :destroy, "Delete the upload")
+    ex2.returns(import_uploads_response)
+    expect_foreman_task(task_id)
+
+    ex3 = api_expects(:foreman_tasks, :show, 'Show task')
+    ex3.returns('id' => task_id, 'state' => 'stopped', 'progress' => 1,
+                'humanized' => {'output' => {'upload_results' => [{'type' => 'docker_manifest',
+                                                                   'digest' => 'sha256:1234'}]},
+                                'errors' => ''})
+
+    ex4 = api_expects(:content_uploads, :destroy, "Delete the upload")
           .with_params(:id => upload_id, :repository_id => repo_id)
 
-    ex3.returns("")
+    ex4.returns("")
 
     result = run_cmd(@cmd + params)
     assert_equal(result.exit_code, 0)
@@ -180,7 +197,7 @@ describe 'upload repository' do
 
     # rubocop:disable LineLength
     ex2 = api_expects(:repositories, :import_uploads, 'Take in an upload')
-          .with_params(:id => repo_id, :sync_capsule => true, :publish_repository => true,
+          .with_params(:id => repo_id, :sync_capsule => true, :publish_repository => true, :async => true,
                        :uploads => [{
                          :id => '1234',
                          :name => 'test.rpm',
@@ -191,7 +208,9 @@ describe 'upload repository' do
                       )
     # rubocop:enable LineLength
 
-    ex2.returns("")
+    ex2.returns(import_uploads_response)
+    expect_foreman_task(task_id)
+    expect_foreman_task(task_id)
 
     ex3 = api_expects(:content_uploads, :destroy, "Delete the upload")
           .with_params(:id => upload_id, :repository_id => repo_id)
@@ -212,10 +231,9 @@ describe 'upload repository' do
          .with_params(:repository_id => repo_id, :size => file.size)
 
     ex.returns(upload_response)
-
     # rubocop:disable LineLength
     ex2 = api_expects(:repositories, :import_uploads, 'Take in an upload')
-          .with_params(:id => repo_id, :sync_capsule => true, :publish_repository => true,
+          .with_params(:id => repo_id, :sync_capsule => true, :publish_repository => true, :async => true,
                        :uploads => [{
                          :id => '1234',
                          :name => 'test.rpm',
@@ -225,8 +243,9 @@ describe 'upload repository' do
                        }]
                       )
     # rubocop:enable LineLength
-
-    ex2.returns("")
+    ex2.returns(import_uploads_response)
+    expect_foreman_task(task_id)
+    expect_foreman_task(task_id)
 
     ex3 = api_expects(:content_uploads, :destroy, "Delete the upload")
           .with_params(:id => upload_id, :repository_id => repo_id)
@@ -253,7 +272,7 @@ describe 'upload repository' do
 
     # rubocop:disable LineLength
     ex = api_expects(:repositories, :import_uploads, 'Take in an upload')
-         .with_params(:id => repo_id, :sync_capsule => false, :publish_repository => false,
+         .with_params(:id => repo_id, :sync_capsule => false, :publish_repository => false, :async => true,
                       :uploads => [{
                         :id => '1234',
                         :name => 'test1.rpm',
@@ -264,7 +283,9 @@ describe 'upload repository' do
                      )
     # rubocop:enable LineLength
 
-    ex.returns("")
+    ex.returns(import_uploads_response)
+    expect_foreman_task(task_id)
+    expect_foreman_task(task_id)
 
     ex = api_expects(:content_uploads, :destroy, "Delete the upload")
          .with_params(:id => upload_id, :repository_id => repo_id)
@@ -280,7 +301,7 @@ describe 'upload repository' do
 
     # rubocop:disable LineLength
     ex = api_expects(:repositories, :import_uploads, 'Take in an upload')
-         .with_params(:id => repo_id, :sync_capsule => true, :publish_repository => true,
+         .with_params(:id => repo_id, :sync_capsule => true, :publish_repository => true, :async => true,
                       :uploads => [{
                         :id => '1234',
                         :name => 'test2.rpm',
@@ -291,7 +312,9 @@ describe 'upload repository' do
                      )
     # rubocop:enable LineLength
 
-    ex.returns("")
+    ex.returns(import_uploads_response)
+    expect_foreman_task(task_id)
+    expect_foreman_task(task_id)
 
     ex = api_expects(:content_uploads, :destroy, "Delete the upload")
          .with_params(:id => upload_id, :repository_id => repo_id)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_katello
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Adam Price
@@ -35,7 +35,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-29 00:00:00.000000000 Z
+date: 2022-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman