hammer_cli_katello 1.11.2 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a0bb232e9b8a0584ba860f898664e6a36817703793cd4fabe1538c06e899efc
-  data.tar.gz: fbade16a47cee20fa65a9abbcfefb77b8811e0d091547d366bfe8a027531c819
+  metadata.gz: 259eec49a3c0e1fb35c8ac5333ef563235d500363c6502c3b1cba8b93a011a95
+  data.tar.gz: 982937c903bed8199e89f4e4375c0411dfbd67d36d677104737fab8b44cc2621
 SHA512:
-  metadata.gz: 6b535f374bfecfa675fe4dad827fc395eae0c013c829b1106b92776f71284cf06db6f5160330fe49e29345939670552b54de67c3ee2d481aa063c436a952d373
-  data.tar.gz: 42efbf0e089b7b1dad5b4d48104a0aa081c9afb731f8e34875262d3f6eabb57b90480ffbb106526a39a6d901d41631635b4f15521bfc54262e84edbf287eb364
+  metadata.gz: 2e6c290259d07d4b6cf983023d26f2588225b9f3d0e814dde9c64b5cbdae93d76269aa76410014ef2ddcb67d3ac6995918be63be17a68f9251bb94a49a137a29
+  data.tar.gz: bcc0aa004a258b7d3dca182d1a6428cbd09e591fff3c2dea65cd5363f900dbc58b11dd8323197c52543145b39937ecf0bfb69671549fa57eaddc856dc1b50af1

data/lib/hammer_cli_katello/capsule.rb

@@ -121,6 +121,26 @@ module HammerCLIKatello
         build_options
       end
 
+      class VerifyChecksumCommand < HammerCLIKatello::SingleResourceCommand
+        include HammerCLIForemanTasks::Async
+        include LifecycleEnvironmentNameMapping
+
+        resource :capsule_content, :verify_checksum
+        command_name "verify-checksum"
+
+        success_message _("Capsule content checksum is being verified in task %{id}.")
+        failure_message _("Could not verify capsule content checksum")
+
+        option "--organization-id", "ID", _("Organization ID"),
+               :attribute_name => :option_organization_id
+        option "--organization", "NAME", _("Organization name"),
+               :attribute_name => :option_organization_name
+
+        build_options
+
+        extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
+      end
+
       class SyncStatusCommand < HammerCLIKatello::InfoCommand
         resource :capsule_content, :sync_status
         command_name "synchronization-status"
@@ -191,20 +211,34 @@ module HammerCLIKatello
                 field :name, _("Repository Name")
                 label _('Content Counts') do
                   from :_content_counts do
-                    field :warning, _('Warning')
-                    field :rpm, _('Packages')
-                    field :srpm, _('SRPMs')
-                    field :module_stream, _('Module Streams')
-                    field :package_group, _('Package Groups')
-                    field :erratum, _('Errata')
-                    field :deb, _('Debian Packages')
-                    field :docker_tag, _('Container Tags')
-                    field :docker_manifest, _('Container Manifests')
-                    field :docker_manifest_list, _('Container Manifest Lists')
-                    field :file, _('Files')
-                    field :ansible_collection, _('Ansible Collections')
-                    field :ostree_ref, _('OSTree Refs')
-                    field :python_package, _('Python Packages')
+                    field :warning, _('Warning'), Fields::Field,
+                      :hide_blank => true
+                    field :rpm, _('Packages'), Fields::Field,
+                      :hide_blank => true
+                    field :srpm, _('SRPMs'), Fields::Field,
+                      :hide_blank => true
+                    field :module_stream, _('Module Streams'), Fields::Field,
+                      :hide_blank => true
+                    field :package_group, _('Package Groups'), Fields::Field,
+                      :hide_blank => true
+                    field :erratum, _('Errata'), Fields::Field,
+                      :hide_blank => true
+                    field :deb, _('Debian Packages'), Fields::Field,
+                      :hide_blank => true
+                    field :docker_tag, _('Container Tags'), Fields::Field,
+                      :hide_blank => true
+                    field :docker_manifest, _('Container Manifests'), Fields::Field,
+                      :hide_blank => true
+                    field :docker_manifest_list, _('Container Manifest Lists'), Fields::Field,
+                      :hide_blank => true
+                    field :file, _('Files'), Fields::Field,
+                      :hide_blank => true
+                    field :ansible_collection, _('Ansible Collections'), Fields::Field,
+                      :hide_blank => true
+                    field :ostree_ref, _('OSTree Refs'), Fields::Field,
+                      :hide_blank => true
+                    field :python_package, _('Python Packages'), Fields::Field,
+                      :hide_blank => true
                   end
                 end
               end

data/lib/hammer_cli_katello/command_extensions/kickstart_repository.rb

@@ -41,7 +41,7 @@ module HammerCLIKatello
         repos = repo_resource.call(:index, index_options)['results']
         if repos.empty?
           raise _("No such repository with name %{name}, in lifecycle environment"\
-                    " %{environment_id} and content view %{content_view_id}" % index_options)
+                    " %{environment_id} and content view %{content_view_id}") % index_options
         end
         repos.first['id']
       end

data/lib/hammer_cli_katello/content_view.rb

@@ -14,7 +14,7 @@ module HammerCLIKatello
         field :id, _("Content View ID")
         field :name, _("Name")
         field :label, _("Label")
-        field :composite, _("Composite")
+        field :composite, _("Composite"), Fields::Boolean
         field :last_published, _("Last Published"), Fields::Date, :hide_blank => true
         field :repository_ids, _("Repository IDs"), Fields::List, :max_width => 300
       end
@@ -26,33 +26,64 @@ module HammerCLIKatello
 
     class InfoCommand < HammerCLIKatello::InfoCommand
       include OrganizationOptions
+      # rubocop:disable Layout/LineLength
 
       output do
         field :id, _("Id")
         field :name, _("Name")
         field :label, _("Label")
-        field :composite, _("Composite")
+        field :composite, _("Composite"), Fields::Boolean
         field :description, _("Description")
         field :content_host_count, _("Content Host Count")
-        field :solve_dependencies, _("Solve Dependencies")
+        field :solve_dependencies, _("Solve Dependencies"), Fields::Boolean
 
         from :organization do
           field :name, _("Organization")
         end
 
-        collection :_yum_repositories, _("Yum Repositories") do
+        collection :_yum_repositories, _("Yum Repositories"), hide_blank: true, hide_empty: true do
           field :id, _("Id")
           field :name, _("Name")
           field :label, _("Label")
         end
 
-        collection :_docker_repositories, _("Container Image Repositories") do
+        collection :_file_repositories, _("File Repositories"), hide_blank: true, hide_empty: true do
           field :id, _("Id")
           field :name, _("Name")
           field :label, _("Label")
         end
 
-        collection :_ostree_repositories, _("OSTree Repositories") do
+        collection :_docker_repositories, _("Container Image Repositories"), hide_blank: true, hide_empty: true do
+          field :id, _("Id")
+          field :name, _("Name")
+          field :label, _("Label")
+        end
+
+        collection :_ostree_repositories, _("OSTree Repositories"), hide_blank: true, hide_empty: true do
+          field :id, _("Id")
+          field :name, _("Name")
+          field :label, _("Label")
+        end
+
+        collection :_ansible_collection_repositories, _("Ansible Repositories"), hide_blank: true, hide_empty: true do
+          field :id, _("Id")
+          field :name, _("Name")
+          field :label, _("Label")
+        end
+
+        collection :_file_repositories, _("File Repositories"), hide_blank: true, hide_empty: true do
+          field :id, _("Id")
+          field :name, _("Name")
+          field :label, _("Label")
+        end
+
+        collection :_deb_repositories, _("Debian Repositories"), hide_blank: true, hide_empty: true do
+          field :id, _("Id")
+          field :name, _("Name")
+          field :label, _("Label")
+        end
+
+        collection :_python_repositories, _("Python Repositories"), hide_blank: true, hide_empty: true do
           field :id, _("Id")
           field :name, _("Name")
           field :label, _("Label")
@@ -69,28 +100,44 @@ module HammerCLIKatello
           field :published, _("Published"), Fields::Date
         end
 
-        collection :components, _("Components") do
+        collection :cv_components, _("Components"), hide_blank: true, hide_empty: true do
           field :id, _("Id")
           field :name, _("Name")
+          field :latest, _("Latest version"), Fields::Boolean
+          field :unpublished, _("Not yet published"), Fields::Boolean
+          field :always_latest, _("Always update to the latest"), Fields::Boolean
         end
 
-        collection :activation_keys, _("Activation Keys") do
+        collection :activation_keys, _("Activation Keys"), hide_blank: true, hide_empty: true do
           custom_field Fields::Reference
         end
       end
 
       def extend_data(data)
-        %w(yum docker ostree).each do |content_type|
+        %w(yum docker ostree file deb ansible_collection python).each do |content_type|
           data["_#{content_type}_repositories"] = data["repositories"].select do |repo|
             repo["content_type"] == content_type
           end
         end
 
+        if data["composite"]
+          data["cv_components"] = data["content_view_components"]&.map do |component|
+            cv_latest = component.dig("content_view", "latest_version")
+            {
+              "id" => component.dig("content_view_version", "id"),
+              "name" => component.dig("content_view_version", "name") || component.dig("content_view", "name"),
+              "always_latest" => component["latest"],
+              "latest" => cv_latest == component.dig("content_view_version", "version"),
+              "unpublished" => component["content_view_version"].nil?
+            }
+          end
+        end
         data
       end
 
       build_options
     end
+    # rubocop:enable Layout/LineLength
 
     class CreateCommand < HammerCLIKatello::CreateCommand
       success_message _("Content view created.")

data/lib/hammer_cli_katello/content_view_version.rb

@@ -109,6 +109,19 @@ module HammerCLIKatello
       end
     end
 
+    class VerifyChecksum < HammerCLIKatello::SingleResourceCommand
+      include HammerCLIForemanTasks::Async
+
+      action :verify_checksum
+      command_name "verify-checksum"
+
+      success_message _("Verifying checksum of Content View Version repositories with task %{id}.")
+      failure_message _("Could not verify checksum of repositories in the Content View Version")
+      build_options do |o|
+        o.expand(:all).including(:content_views, :organizations)
+      end
+    end
+
     class PromoteCommand < HammerCLIKatello::SingleResourceCommand
       include HammerCLIForemanTasks::Async
       include LifecycleEnvironmentNameMapping

data/lib/hammer_cli_katello/host_extensions.rb

@@ -26,8 +26,12 @@ module HammerCLIKatello
     ::HammerCLIForeman::Host::ListCommand.instance_eval do
       output do
         from :content_facet_attributes do
-          field :content_view_name, _('Content View')
-          field :lifecycle_environment_name, _('Lifecycle Environment')
+          from :content_view do
+            field :name, _('Content View'), Fields::List
+          end
+          from :lifecycle_environment do
+            field :name, _('Lifecycle environment'), Fields::List
+          end
           from :errata_counts do
             field :security, _("Security"), nil, :sets => ['ALL']
             field :bugfix, _("Bugfix"), nil, :sets => ['ALL']

data/lib/hammer_cli_katello/organization.rb

@@ -20,7 +20,6 @@ module HammerCLIKatello
       output do
         field :label, _("Label")
         field :description, _("Description")
-        field :simple_content_access_label, _("Simple Content Access")
         field :service_levels, _("Service Levels"), Fields::List
         from :cdn_configuration do
           label "CDN configuration", hide_blank: true do
@@ -39,11 +38,6 @@ module HammerCLIKatello
       end
 
       def extend_data(data)
-        data["simple_content_access_label"] = if data["simple_content_access"]
-                                                _("Enabled")
-                                              else
-                                                _("Disabled")
-                                              end
         setup_cdn_type(data)
         data
       end
@@ -68,23 +62,6 @@ module HammerCLIKatello
       success_message _("Organization updated.")
       failure_message _("Could not update the organization")
 
-      def request_params
-        params = super
-        # This is so Hammer doesn't say "Nothing to update" when toggling SCA.
-        # (see hammer-cli-foreman)
-        # Rails will safely ignore the extra parameter.
-        if params.key?('simple_content_access')
-          params["organization"] = params.fetch('organization', {}).merge(
-            "_simple_content_access" => params['simple_content_access'])
-          unless params['simple_content_access']
-            warn(
-              _("Simple Content Access will be required for all organizations in the next release.")
-            )
-          end
-        end
-        params
-      end
-
       build_options do |o|
         o.expand(:all).except(:environments)
       end

data/lib/hammer_cli_katello/product.rb

@@ -78,6 +78,7 @@ module HammerCLIKatello
     end
 
     class UpdateProxyCommand < HammerCLIKatello::SingleResourceCommand
+      include HammerCLIForemanTasks::Async
       desc _("Updates an HTTP Proxy for a product")
       resource :products_bulk_actions, :update_http_proxy
       command_name 'update-proxy'
@@ -93,6 +94,22 @@ module HammerCLIKatello
       build_options
     end
 
+    class VerifyChecksumCommand < HammerCLIKatello::SingleResourceCommand
+      include HammerCLIForemanTasks::Async
+      desc _("Verify checksum for one or more products")
+      resource :products_bulk_actions, :verify_checksum_products
+      command_name 'verify-checksum'
+
+      success_message _("Verified checksum of product repositories with task %{id}.")
+      failure_message _("Could not verify checksum of repositories in the product")
+
+      validate_options do
+        option(:option_ids).required
+      end
+
+      build_options
+    end
+
     class DeleteCommand < HammerCLIKatello::DeleteCommand
       success_message _("Product destroyed.")
       failure_message _("Could not destroy the product")

data/lib/hammer_cli_katello/repository.rb

@@ -85,6 +85,11 @@ module HammerCLIKatello
               Fields::Field, :hide_blank => true
         field :ignorable_content, _("Ignorable Content Units"), Fields::List, :hide_blank => true
 
+        label _("Publish Settings") do
+          field :restrict_to_arch, _("Restrict to architecture")
+          field :restrict_to_os_versions, _("Restrict to OS Version")
+        end
+
         label _("HTTP Proxy") do
           from :http_proxy do
             field :id, _("Id"), Fields::Field, :hide_blank => true
@@ -116,17 +121,34 @@ module HammerCLIKatello
         field :updated_at, _("Updated"), Fields::Date
 
         label _("Content Counts") do
-          field :package_total, _("Packages"), Fields::Field, :hide_blank => true
-          field :srpm_total, _("Source RPMS"), Fields::Field, :hide_blank => true
-          field :package_group_total, _("Package Groups"), Fields::Field, :hide_blank => true
-          field :errata_total, _("Errata"), Fields::Field, :hide_blank => true
-          field :docker_manifest_list_total, _("Container Image Manifest Lists"),
-                                           Fields::Field, :hide_blank => true
-          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 :file_total, _("Files"), Fields::Field, :hide_blank => true
-          field :module_stream_total, _("Module Streams"), Fields::Field, :hide_blank => true
+          from :content_counts do
+            field :rpm, _('Packages'), Fields::Field,
+              :hide_blank => true
+            field :srpm, _('SRPMs'), Fields::Field,
+              :hide_blank => true
+            field :module_stream, _('Module Streams'), Fields::Field,
+              :hide_blank => true
+            field :package_group, _('Package Groups'), Fields::Field,
+              :hide_blank => true
+            field :erratum, _('Errata'), Fields::Field,
+              :hide_blank => true
+            field :deb, _('Debian Packages'), Fields::Field,
+              :hide_blank => true
+            field :docker_tag, _('Container Tags'), Fields::Field,
+              :hide_blank => true
+            field :docker_manifest, _('Container Manifests'), Fields::Field,
+              :hide_blank => true
+            field :docker_manifest_list, _('Container Manifest Lists'), Fields::Field,
+              :hide_blank => true
+            field :file, _('Files'), Fields::Field,
+              :hide_blank => true
+            field :ansible_collection, _('Ansible Collections'), Fields::Field,
+              :hide_blank => true
+            field :ostree_ref, _('OSTree Refs'), Fields::Field,
+              :hide_blank => true
+            field :python_package, _('Python Packages'), Fields::Field,
+              :hide_blank => true
+          end
         end
       end
 
@@ -139,6 +161,7 @@ module HammerCLIKatello
           data["gpg_key_name"] = data["gpg_key"]["name"]
         end
 
+        setup_arch_and_os(data)
         setup_sync_state(data)
         setup_booleans(data)
         setup_mirroring_policy(data)
@@ -146,6 +169,14 @@ module HammerCLIKatello
         data
       end
 
+      def setup_arch_and_os(data)
+        arch = data["arch"]
+        data["restrict_to_arch"] = arch == 'noarch' ? _('No restriction') : arch
+        os_versions = data["os_versions"] || []
+        data["restrict_to_os_versions"] = _('No restriction')
+        data["restrict_to_os_versions"] = os_versions.join(", ") unless os_versions.empty?
+      end
+
       def setup_booleans(data)
         data["_redhat_repo"] = data.dig("product", "redhat") ? _("yes") : _("no")
         data["_publish_via_http"] = data["unprotected"] ? _("yes") : _("no")
@@ -547,14 +578,13 @@ module HammerCLIKatello
         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') || []
 
           if upload_results.empty?
-            print_message _("Successfully uploaded file %s" % name)
+            print_message _("Successfully uploaded file %s") % name
           else
             upload_results.each do |result|
               if result['type'] == 'docker_manifest'
@@ -562,7 +592,7 @@ module HammerCLIKatello
                   _("Successfully uploaded manifest file '%{name}' with digest '%{digest}'") % {
                     :name => name, :digest => result['digest'] })
               else
-                print_message _("Successfully uploaded file %s" % name)
+                print_message _("Successfully uploaded file %s") % name
               end
             end
           end
@@ -572,7 +602,6 @@ module HammerCLIKatello
           print_message _("Could not upload the content.")
         end
       end
-      # rubocop:enable CyclomaticComplexity
       # rubocop:enable PerceivedComplexity
 
       def silence_warnings
@@ -645,6 +674,32 @@ module HammerCLIKatello
       end
     end
 
+    class VerifyChecksum < HammerCLIKatello::SingleResourceCommand
+      extend RepositoryScopedToProduct
+      include HammerCLIForemanTasks::Async
+      include OrganizationOptions
+
+      validate_repo_name_requires_product_options
+      action :verify_checksum
+      command_name "verify-checksum"
+
+      success_message _("Verified checksum of repository with task %{id}.")
+      failure_message _("Could not verify checksum of 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(:all).including(:products)
+      end
+    end
+
     class ReclaimSpaceCommand < HammerCLIKatello::SingleResourceCommand
       extend RepositoryScopedToProduct
       include HammerCLIForemanTasks::Async

data/lib/hammer_cli_katello/subscription.rb

@@ -32,9 +32,9 @@ module HammerCLIKatello
         if !data["virt_only"]
           _("Physical")
         elsif data["host"]
-          _("Guests of %s" % data['host']['name'])
+          _("Guests of %s") % data['host']['name']
         elsif data["hypervisor"]
-          _("Guests of %s" % data['hypervisor']['name'])
+          _("Guests of %s") % data['hypervisor']['name']
         elsif data["unmapper_guest"]
           _("Temporary")
         else

data/lib/hammer_cli_katello/version.rb

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

data/lib/hammer_cli_katello.rb

@@ -154,12 +154,6 @@ module HammerCLIKatello
                                         'hammer_cli_katello/srpm'
                                         )
 
-  HammerCLI::MainCommand.lazy_subcommand("simple-content-access",
-                                         _("Simple content access commands"),
-                                         'HammerCLIKatello::SimpleContentAccess',
-                                         'hammer_cli_katello/simple_content_access'
-                                        )
-
   HammerCLI::MainCommand.lazy_subcommand("docker", _("Manipulate docker content"),
                                          'HammerCLIKatello::DockerCommand',
                                          'hammer_cli_katello/docker'