hammer_cli_katello 0.19.2 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d2b30e958f929fc2fedbe5fe789e28cdeb4983a435a1321f824dd00cba28ddd
-  data.tar.gz: 544f0f8c49df77a184272d8a726af95a894807655861c4309478b8b709a6c46d
+  metadata.gz: a27a924ef525708ffb735aa5dd369d47da3f2832e935110b51786cb82f74cb96
+  data.tar.gz: 60964599cd0f257228da611d8de998e11213c98726120d1bb8a12d0f13b215a1
 SHA512:
-  metadata.gz: 861eea30b18630224089d34e3bc6a9131cfbe01c6f9dc172a7ab0dc4471d61ab780ebc97c4ef9ee8d084378f28cf84fa5da5e749de6a8db4cfcb3be058071c6f
-  data.tar.gz: e1fa7a8bb29701c48ed214254ae0e089fa1c4665af88ecfa523456b5b16af70edd05f95aed76dd124f3a58f29178af51ad4128d7ff8877ad18646ccb2db7587c
+  metadata.gz: 8fd3cc4a42fecbb77241beea5d9871bfcc7290473088dfb68741082dbe9d4dd96f450dac72c7151894652a3d85ce142365ab3a885add5b30d8c6da503e8574d5
+  data.tar.gz: c73dabc6e9676b5385f91668e9c0c74a2c48dc956ea24a8ba7cb12545ebdfdbfcf51f84498e76953f0c70b4adb6e05b9127cfa194fe47c8c0a66fe119e65707f

data/lib/hammer_cli_katello.rb

@@ -54,11 +54,6 @@ module HammerCLIKatello
                                          'hammer_cli_katello/lifecycle_environment'
                                         )
 
-  HammerCLI::MainCommand.lazy_subcommand("ping", _("Get the status of the server"),
-                                         'HammerCLIKatello::PingCommand',
-                                         'hammer_cli_katello/ping'
-                                        )
-
   HammerCLI::MainCommand.lazy_subcommand("product", _("Manipulate products"),
                                          'HammerCLIKatello::Product',
                                          'hammer_cli_katello/product'
@@ -144,5 +139,7 @@ module HammerCLIKatello
   # subcommands to hammer_cli_foreman commands
   require 'hammer_cli_katello/host'
   require 'hammer_cli_katello/hostgroup'
+  require 'hammer_cli_katello/ping'
+  require 'hammer_cli_katello/status'
 end
 # rubocop:enable Metrics/ModuleLength

data/lib/hammer_cli_katello/command_extensions.rb

@@ -2,3 +2,4 @@
 
 require 'hammer_cli_katello/command_extensions/lifecycle_environment'
 require 'hammer_cli_katello/command_extensions/lifecycle_environments'
+require 'hammer_cli_katello/command_extensions/ping'

data/lib/hammer_cli_katello/command_extensions/ping.rb

@@ -0,0 +1,26 @@
+module HammerCLIKatello
+  module CommandExtensions
+    class Ping < HammerCLI::CommandExtensions
+      before_print do |data|
+        unless data['results']['katello'].nil?
+          data['results']['katello']['services'].each do |_, service|
+            service['_response'] = get_server_response(service)
+          end
+          data['results'].merge!(data['results']['katello'])
+        end
+      end
+
+      output do |definition|
+        definition.append(HammerCLIKatello::PingCommand.output_definition.fields)
+      end
+
+      def self.get_server_response(service_hash)
+        if service_hash['duration_ms']
+          _("Duration: %sms") % service_hash['duration_ms']
+        elsif service_hash['message']
+          _("Message: %s") % service_hash['message']
+        end
+      end
+    end
+  end
+end

data/lib/hammer_cli_katello/commands.rb

@@ -1,5 +1,8 @@
 module HammerCLIKatello
-  RESOURCE_NAME_MAPPING = {}.freeze
+  RESOURCE_NAME_MAPPING = {
+    environment: :lifecycle_environment,
+    environments: :lifecycle_environments
+  }.freeze
 
   RESOURCE_ALIAS_NAME_MAPPING = {
     environment: :lifecycle_environment,

data/lib/hammer_cli_katello/content_view.rb

@@ -283,6 +283,11 @@ module HammerCLIKatello
       command_name 'add-version'
       desc _('Add a content view version to a composite view')
 
+      option "--content-view-id", "CONTENT_VIEW_ID",
+        _("Content view numeric identifier to search by"),
+        attribute_name: :option_content_view_id,
+        format: HammerCLI::Options::Normalizers::Number.new
+
       validate_options :before, 'IdResolution' do
         if option(:option_content_view_version_version).exist?
           any(:option_content_view_id, :option_content_view_name).required

data/lib/hammer_cli_katello/content_view_version.rb

@@ -372,10 +372,7 @@ module HammerCLIKatello
           end
           export_json_options[:repositories] = []
         else
-          repositories = fetch_cvv_repositories(cvv)
-          puppet_check(cvv)
-          check_repo_type(repositories)
-          check_repo_download_policy(repositories)
+          repositories = fetch_exportable_cvv_repositories(cvv)
           collect_packages(repositories)
 
           export_json_options[:repositories] = repositories
@@ -480,11 +477,14 @@ module HammerCLIKatello
           publish(cv['id'], export_json['major'], export_json['minor'])
         else
           sync_repositories(export_json['repositories'], options['option_organization_id'],
-                            import_tar_params)
-          publish(
-            cv['id'], export_json['major'],
-            export_json['minor'], repos_units(export_json['repositories'])
-          )
+            import_tar_params)
+
+          unless cv['default']
+            publish(
+              cv['id'], export_json['major'],
+              export_json['minor'], repos_units(export_json['repositories'])
+            )
+          end
         end
         return HammerCLI::EX_OK
       end
@@ -498,8 +498,7 @@ module HammerCLIKatello
           library_repos = index(
             :repositories,
             'organization_id' => organization_id,
-            'library' => true,
-            'label' => repo['label']
+            'library' => true
           )
 
           library_repo = library_repos.select do |candidate_repo|

data/lib/hammer_cli_katello/cv_import_export_helper.rb

@@ -3,10 +3,32 @@ module HammerCLIKatello
   module CVImportExportHelper
     PUBLISHED_REPOS_DIR = "/var/lib/pulp/published/yum/https/repos/".freeze
 
-    def fetch_cvv_repositories(cvv)
-      cvv['repositories'].collect do |repo|
-        show(:repositories, 'id' => repo['id'], :full_result => true)
+    def fetch_exportable_cvv_repositories(cvv)
+      immediate = []
+      non_immediate_names = []
+
+      cvv['repositories'].each do |repo|
+        next unless repo['content_type'] == 'yum'
+
+        api_repo = show(:repositories, 'id' => repo['id'], :full_result => true)
+
+        download_policy = if api_repo['library_instance_id']
+                            library = show(:repositories, 'id' => api_repo['library_instance_id'])
+                            library['download_policy']
+                          else
+                            api_repo['download_policy']
+                          end
+
+        if download_policy == 'immediate'
+          immediate << api_repo
+        else
+          non_immediate_names << api_repo['name']
+        end
       end
+
+      warn_repo_download_policy(non_immediate_names)
+
+      return immediate
     end
 
     def find_local_component_id(component_from_export)
@@ -23,41 +45,15 @@ module HammerCLIKatello
       found_composite_version.first['id']
     end
 
-    def puppet_check(cvv)
-      unless cvv['puppet_modules'].empty?
-        raise _("The Content View '#{cvv['content_view']['label']}'"\
-        " contains Puppet modules, this is not supported at this time."\
-        " Please remove the modules, publish a new version"\
-        " and try the export again.")
-      end
-    end
+    def warn_repo_download_policy(repository_names)
+      return if repository_names.empty?
 
-    def check_repo_type(repositories)
-      repositories.select do |repo|
-        if repo['content_type'] != 'yum'
-          raise _("The Repository '#{repo['name']}' is a non-yum repository."\
-          " Only Yum is supported at this time."\
-          " Please remove the repository from the Content View,"\
-          " republish and try the export again.")
-        end
-      end
-    end
-
-    def check_repo_download_policy(repositories)
-      non_immediate = repositories.select do |repo|
-        unless repo['library_instance_id'].nil?
-          show(:repositories, 'id' => repo['library_instance_id'])['download_policy'] != 'immediate'
-        end
-      end
-      unless non_immediate.empty?
-        non_immediate_names = non_immediate.collect { |repo| repo['name'] }
-        msg = <<~MSG
-          All exported repositories must be set to an immediate download policy and re-synced.
-          The following repositories need action:
-            #{non_immediate_names.join(', ')}
-        MSG
-        raise _(msg)
-      end
+      msg = <<~MSG
+        The following repositories could not be exported due to the download policy
+        not being set to 'immediate':
+          #{repository_names.join(', ')}
+      MSG
+      print_message msg
     end
 
     def collect_packages(repositories)
@@ -88,10 +84,12 @@ module HammerCLIKatello
         " please create the Content View and try the import again.")
       end
 
-      if import_cv['latest_version'].to_f >= version
-        raise _("The latest version (#{import_cv['latest_version']}) of"\
-        " the Content View '#{cv['name']}'"\
-        " is greater or equal to the version you are trying to import (#{version})")
+      unless import_cv['default']
+        if import_cv['latest_version'].to_f >= version
+          raise _("The latest version (#{import_cv['latest_version']}) of"\
+          " the Content View '#{cv['name']}'"\
+          " is greater or equal to the version you are trying to import (#{version})")
+        end
       end
 
       unless import_cv['repository_ids'].nil?

data/lib/hammer_cli_katello/filter_rule.rb

@@ -61,7 +61,10 @@ module HammerCLIKatello
         super
       end
 
-      build_options
+      build_options do |o|
+        o.expand.except(:module_streams)
+        o.without(:module_streams)
+      end
     end
 
     class UpdateCommand < HammerCLIKatello::UpdateCommand

data/lib/hammer_cli_katello/organization.rb

@@ -37,7 +37,8 @@ module HammerCLIKatello
       build_options
     end
 
-    class CreateCommand < HammerCLIKatello::CreateCommand
+    class CreateCommand < HammerCLIForeman::Organization::CreateCommand
+      include HammerCLIKatello::ResolverCommons
       resource :organizations, :create
 
       success_message _("Organization created.")

data/lib/hammer_cli_katello/output/formatters.rb

@@ -2,8 +2,8 @@ module HammerCLIKatello
   module Output
     module Formatters
       class ChecksumFormatter < HammerCLI::Output::Formatters::FieldFormatter
-        def tags
-          [:screen]
+        def required_features
+          [:rich_text]
         end
 
         def format(items, _ = {})

data/lib/hammer_cli_katello/ping.rb

@@ -1,3 +1,5 @@
+require 'hammer_cli_foreman/ping'
+
 module HammerCLIKatello
   class PingCommand < HammerCLIKatello::Command
     resource :ping, :index
@@ -54,24 +56,23 @@ module HammerCLIKatello
 
     def send_request
       super.tap do |data|
+        data['services'] ||= {}
         data['services'].each do |_, service|
-          service['_response'] = get_server_response(service)
+          service['_response'] =
+            HammerCLIKatello::CommandExtensions::Ping.get_server_response(service)
         end
       end
     end
 
-    private
-
-    def get_server_response(service_hash)
-      if service_hash['duration_ms']
-        _("Duration: %sms") % service_hash['duration_ms']
-      elsif service_hash['message']
-        _("Message: %s") % service_hash['message']
-      end
-    end
-
     def request_options
       { with_authentication: false }
     end
   end # class PingCommand
+
+  HammerCLIForeman::PingCommand.subcommand 'katello',
+                                            HammerCLIKatello::PingCommand.desc,
+                                            HammerCLIKatello::PingCommand
+  HammerCLIForeman::PingCommand::ForemanCommand.extend_with(
+    HammerCLIKatello::CommandExtensions::Ping.new
+  )
 end # module HammerCLIKatello

data/lib/hammer_cli_katello/repository.rb

@@ -212,13 +212,6 @@ module HammerCLIKatello
         if option(:option_product_name).exist?
           any(*organization_options).required
         end
-
-        if option(:option_docker_tag).exist? != option(:option_docker_digest).exist?
-          option(:option_docker_tag).rejected(
-            :msg => _('--docker-digest required with --docker-tag'))
-          option(:option_docker_digest).rejected(
-            :msg => _('--docker-tag required with --docker-digest'))
-        end
       end
 
       build_options(:without => [:unprotected]) do |o|
@@ -227,60 +220,12 @@ module HammerCLIKatello
       option "--publish-via-http", "ENABLE", _("Publish Via HTTP"),
              :attribute_name => :option_unprotected,
              :format => HammerCLI::Options::Normalizers::Bool.new
-      option "--docker-tag", "TAG",
-              _("Optional custom Container Image tag to specify the value of the Docker digest")
-      option "--docker-digest", "DIGEST", _("Container Image manifest digest")
 
       def execute
         @failure = false
-
-        if option_docker_tag
-          upload_tag(option_docker_tag, option_docker_digest)
-        else
-          super
-        end
-
+        super
         @failure ? HammerCLI::EX_DATAERR : HammerCLI::EX_OK
       end
-
-      def content_upload_resource
-        ::HammerCLIForeman.foreman_resource(:content_uploads)
-      end
-
-      def upload_tag(tag, digest)
-        upload_id = create_content_upload
-        import_uploads([
-          {
-            id: upload_id,
-            name: tag,
-            digest: digest
-          }
-        ], last_file: true)
-        print_message _("Repository updated")
-      rescue => e
-        @failure = true
-        logger.error e
-        output.print_error _("Failed to upload tag '%s' to repository.") % tag
-      ensure
-        content_upload_resource.call(:destroy, :repository_id => get_identifier, :id => upload_id)
-      end
-
-      def create_content_upload
-        response = content_upload_resource.call(:create, :repository_id => get_identifier)
-
-        response["upload_id"]
-      end
-
-      def import_uploads(uploads, opts = {})
-        publish_repository = opts.fetch(:last_file, false)
-        sync_capsule = opts.fetch(:last_file, false)
-        params = {:id => get_identifier,
-                  :uploads => uploads,
-                  publish_repository: publish_repository,
-                  sync_capsule: sync_capsule
-        }
-        resource.call(:import_uploads, params)
-      end
     end
 
     class DeleteCommand < HammerCLIKatello::DeleteCommand
@@ -382,38 +327,41 @@ module HammerCLIKatello
       private
 
       def upload_file(file, opts = {})
-        upload_id = create_content_upload
-        repo_id = get_identifier
+        total_size = File.size(file)
+        checksum = Digest::SHA256.hexdigest(File.read(file))
+        content_type = options["option_content_type"] ? options["option_content_type"] : nil
         filename = File.basename(file.path)
-
-        update_content_upload(upload_id, repo_id, file)
-
-        file.rewind
-        content = file.read
-
+        upload_create_response = create_content_upload(total_size, checksum, content_type)
+        upload_id = upload_create_response["upload_id"] || "duplicate"
+        content_unit_id = upload_create_response["content_unit_href"]
+        unless content_unit_id
+          repo_id = get_identifier
+          update_content_upload(upload_id, repo_id, file)
+        end
         results = import_uploads([
           {
             id: upload_id,
+            content_unit_id: content_unit_id,
             name: filename,
             size: file.size,
-            checksum: Digest::SHA256.hexdigest(content)
-          }
-        ], opts)
-
+            checksum: checksum
+          }], opts)
         print_results(filename, results)
-      rescue => e
-        @failure = true
-        logger.error e
-        output.print_error _("Failed to upload file '%s' to repository. Please check "\
-                             "the file and try again.") % filename
       ensure
-        content_upload_resource.call(:destroy, :repository_id => get_identifier, :id => upload_id)
+        if upload_id
+          content_upload_resource.call(:destroy, :repository_id => get_identifier, :id => upload_id)
+        end
       end
 
-      def create_content_upload
-        response = content_upload_resource.call(:create, :repository_id => get_identifier)
-
-        response["upload_id"]
+      def create_content_upload(size, checksum, content_type)
+        params = {
+          :repository_id => get_identifier,
+          :size => size,
+          :checksum => checksum,
+          :content_type => content_type
+        }
+        response = content_upload_resource.call(:create, params)
+        response
       end
 
       def update_content_upload(upload_id, repo_id, file)
@@ -424,10 +372,10 @@ module HammerCLIKatello
             :offset => offset,
             :id => upload_id,
             :content => content,
+            :size => file.size,
             :repository_id => repo_id,
             :multipart => true
           }
-
           # To workaround rest-client bug with false negative warnings,
           # see https://github.com/rest-client/rest-client/pull/670 for more details
           silence_warnings do
@@ -450,7 +398,7 @@ module HammerCLIKatello
       end
 
       def print_results(name, results)
-        if results.empty?
+        if results.empty? || results.dig('output', 'upload_results').empty?
           print_message _("Successfully uploaded file '%{name}'") % {
             :name => name
           }