hammer_cli_katello 1.12.0 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 936408aa397006b59a92dd92461475e03e1ba588790a0a9f50bb136f5f141993
-  data.tar.gz: eb40d197392ffd95dbc19edfaf6b648253c75741c58b223cc65009fbfcc6e3f6
+  metadata.gz: a7536aa9077d22fd3ed9c677b0d8c15509ee0076d7aba70dbbc6422be6434a7f
+  data.tar.gz: a0cfb58ff5e1b4fa732e4d57bfb5393a5f145e9a173044597e2f337c6fe545da
 SHA512:
-  metadata.gz: 7a2a6f4839415e6e31fe98137e5f0b510a9e8da96dd8c91884818ad141b168d3f3e6b8a87e53dd1eeeda4b265db40f62381709a25298db5985e282513d3de2d1
-  data.tar.gz: 82299345b01f3cd5336d5b74407393aefdf9755c7aefc04cf72581f2bb85b922e71c07e150b896d4f41eca6c83eaec3d3afcfa5c2fb78cba132309d1821c5ea1
+  metadata.gz: 6a0bd15aa2bc96d97ab6ec79686b38449566a9d7c85dc15a3b3751c873e2a336f05b79e3c3cd147fbf54ffcb54ffec5c187eb087aae3725fd9f89be797a3b432
+  data.tar.gz: bdfa75b6d35e99f0590a7df20e8024b02756b86ec7701455ff8030671a0cd07ca698af12740be55cead555eda6163a32910eae5c1725c91c8175501d37095444

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"

data/lib/hammer_cli_katello/content_view.rb

@@ -100,9 +100,12 @@ module HammerCLIKatello
           field :published, _("Published"), Fields::Date
         end
 
-        collection :components, _("Components"), hide_blank: true, hide_empty: true 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"), hide_blank: true, hide_empty: true do
@@ -117,6 +120,18 @@ module HammerCLIKatello
           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
 

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

@@ -22,16 +22,27 @@ module HammerCLIKatello
       validate_options :before, 'IdResolution' do
         organization_options = [:option_organization_id, :option_organization_name, \
                                 :option_organization_label]
+        content_view_options = [:option_content_view_id, :option_content_view_name]
 
-        if option(:option_product_name).exist?
+        if option(:option_product_name).exist? || option(:option_content_view_name).exist?
           any(*organization_options).required
         end
+
+        if option(:option_content_view_version_version).exist?
+          any(*content_view_options).required
+        end
+
+        if any(*content_view_options).exist?
+          any(:option_content_view_version_id,
+              :option_content_view_version_version,
+              :option_environment_id,
+              :option_environment_name).required
+        end
       end
 
       build_options do |o|
         o.expand.including(:products, :organizations, :content_views)
       end
-
       extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
     end
 

data/lib/hammer_cli_katello/id_resolver.rb

@@ -119,6 +119,9 @@ module HammerCLIKatello
     end
 
     # rubocop:disable Style/EmptyElse
+    # rubocop:disable Metrics/AbcSize
+    # rubocop:disable Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/PerceivedComplexity
     def content_view_version_id(options)
       key_id = HammerCLI.option_accessor_name("id")
       key_content_view_id = HammerCLI.option_accessor_name("content_view_id")
@@ -128,7 +131,16 @@ module HammerCLIKatello
 
       options[key_content_view_id] ||= search_and_rescue(:content_view_id, "content_view", options)
 
+      if options[key_content_view_id] && options['option_environment_name'] &&
+         options['option_environment_id'].nil?
+        lifecycle_environment_resource_name = (HammerCLIForeman.param_to_resource('environment') ||
+         HammerCLIForeman.param_to_resource('lifecycle_environment')).singular_name
+        options['option_environment_id'] = lifecycle_environment_id(
+          scoped_options(lifecycle_environment_resource_name, options, :single))
+      end
+
       results = find_resources(:content_view_versions, options)
+
       options[from_environment_id] ||= from_lifecycle_environment_id(options)
 
       return pick_result(results, @api.resource(:content_view_versions))['id'] if results.size == 1
@@ -145,6 +157,9 @@ module HammerCLIKatello
       end
     end
     # rubocop:enable Style/EmptyElse
+    # rubocop:enable Metrics/AbcSize
+    # rubocop:enable Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/PerceivedComplexity
 
     private
 

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
@@ -156,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)
@@ -163,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")
@@ -564,7 +578,6 @@ 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
@@ -589,7 +602,6 @@ module HammerCLIKatello
           print_message _("Could not upload the content.")
         end
       end
-      # rubocop:enable CyclomaticComplexity
       # rubocop:enable PerceivedComplexity
 
       def silence_warnings
@@ -662,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/version.rb

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