hammer_cli_katello 1.1.3 → 1.4.0

data/lib/hammer_cli_katello/repository.rb

@@ -62,10 +62,6 @@ module HammerCLIKatello
         field :full_path, _("Published At")
         field :relative_path, _("Relative Path")
         field :download_policy, _("Download Policy"), Fields::Field, :hide_blank => true
-        field :ostree_upstream_sync_policy, _("OSTree Upstream Sync Policy"),
-              Fields::Field, :hide_blank => true
-        field :_ostree_upstream_sync_depth, _("OSTree Upstream Sync Depth"),
-              Fields::Field, :hide_blank => true
         field :docker_upstream_name, _("Upstream Repository Name"),
               Fields::Field, :hide_blank => true
         field :docker_tags_whitelist, _("Container Image Tags Filter"),
@@ -114,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
@@ -163,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"),
@@ -403,6 +388,14 @@ module HammerCLIKatello
       build_options(:without => [:content]) do |o|
         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,
+        :required => false
+
       option "--path", "PATH", _("Upload file, directory of files, or glob of files " \
                                  "as content for a repository.\n" \
                                  "Globs must be escaped by single or double quotes"),
@@ -423,6 +416,8 @@ module HammerCLIKatello
           repo_id = get_identifier
           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,
@@ -431,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)
@@ -476,32 +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"]
-        resource.call(:import_uploads, params)
+        if options["option_ostree_repository_name"]
+          params[:ostree_repository_name] = options["option_ostree_repository_name"]
+        end
+        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
@@ -541,33 +558,6 @@ module HammerCLIKatello
       end
     end
 
-    class ExportCommand < HammerCLIKatello::SingleResourceCommand
-      include HammerCLIForemanTasks::Async
-      include OrganizationOptions
-      extend RepositoryScopedToProduct
-
-      validate_repo_name_requires_product_options
-      action :export
-      command_name "export"
-      desc _("Export content from a repository to the configured directory")
-
-      success_message _("Repository is being exported in task %{id}.")
-      failure_message _("Could not export 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
-
     autoload_subcommands
   end
 end

data/lib/hammer_cli_katello/search_options_creators.rb

@@ -57,7 +57,8 @@ module HammerCLIKatello
     def create_lifecycle_environments_search_options(options, mode = nil)
       search_options = {}
       if mode != :multi
-        name = options[HammerCLI.option_accessor_name("name")]
+        name = options[HammerCLI.option_accessor_name("environment_name")] ||
+               options[HammerCLI.option_accessor_name("name")]
         search_options['name'] = name if name
       end
       organization_id = organization_id(scoped_options('organization', options, :single))

data/lib/hammer_cli_katello/srpm.rb

@@ -39,6 +39,8 @@ module HammerCLIKatello
       build_options do |o|
         o.expand.including(:products, :content_views)
       end
+
+      extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
     end
 
     class InfoCommand < HammerCLIKatello::InfoCommand

data/lib/hammer_cli_katello/version.rb

@@ -1,5 +1,5 @@
 module HammerCLIKatello
   def self.version
-    @version ||= Gem::Version.new('1.1.3')
+    @version ||= Gem::Version.new('1.4.0')
   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',