hammer_cli_katello 1.10.1 → 1.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c4a0b5242f1d0f3e87e8571ebe1c94b82bd6372cce01872180ae287f1ebf486
-  data.tar.gz: 47a56afed02b55e7dead1cbcadb47afcdfa6dc1715bf86d9b86c55d28674bd6f
+  metadata.gz: 9cf7344e6967145800645215edfbb673be76e52f474c0880a83fb8f6346dd856
+  data.tar.gz: 876e14fc10bee220dde7f7cdf8ed5328fd18aa7f37ef56e9e01a4c2c084bd412
 SHA512:
-  metadata.gz: f1e2109e465aaf6099bd7913bf2efb54d74e26bc4926796b0e232dbcb811e1169d16f40009394ede76e409c52c05607c2a77836ed512f98597e9949c32cdbf6f
-  data.tar.gz: 624c661b09f3ecbd747d13b35ea7caf3b5084ab9092ae771cdf15a3029419c23af6bd92ed2609d89ea57b60e52dd26c6e34c55b2e666a3717df571f4470abd97
+  metadata.gz: ead4ed548201aee32badbe54b9e69723bda16bbd5eddcc07c187789c8307945fc3ef1782950d51b5fbbb9a205d0b630d238b773a6235f5810e64676f41888f38
+  data.tar.gz: 6b97f0ce952c97ee347efe30c03ef0c87cc57f3edf805a6b6c315a90e1aba0f0f4c3a24d1889dd7503cbfd58b9dcb57a97eb267d1bcbdf8e92d8336973acc912

data/lib/hammer_cli_katello/capsule.rb

@@ -105,6 +105,22 @@ module HammerCLIKatello
         extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
       end
 
+      class UpdateCountsCommand < HammerCLIKatello::SingleResourceCommand
+        include HammerCLIForemanTasks::Async
+
+        resource :capsule_content, :update_counts
+        command_name "update-counts"
+
+        success_message _("Capsule content counts are being updated in task %{id}.")
+        failure_message _("Could not update capsule content counts")
+
+        option "--organization-id", "ID", _("Organization ID"),
+               :attribute_name => :option_organization_id
+        option "--organization", "NAME", _("Organization name"),
+               :attribute_name => :option_organization_name
+        build_options
+      end
+
       class SyncStatusCommand < HammerCLIKatello::InfoCommand
         resource :capsule_content, :sync_status
         command_name "synchronization-status"
@@ -170,21 +186,59 @@ module HammerCLIKatello
               field nil, _("Name"), Fields::Reference
               field :composite, _('Composite'), Fields::Boolean
               field :last_published, _('Last Published'), Fields::Date
-              label _('Content') do
-                from :counts do
-                  field :content_hosts, _('Hosts')
-                  field :products, _('Products')
-                  field :yum_repositories, _('Yum repos')
-                  field :docker_repositories, _('Container Image repos')
-                  field :packages, _('Packages')
-                  field :package_groups, _('Package groups')
-                  field :errata, _('Errata')
+              collection :repositories, _('Repositories') do
+                field :id, _("Repository ID")
+                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')
+                  end
                 end
               end
             end
           end
         end
 
+        private
+
+        def extend_data(data)
+          data["lifecycle_environments"].each do |lce|
+            lce["content_views"].each do |cv|
+              cv["repositories"].each do |repo|
+                if cv["up_to_date"]
+                  cvv_count_repos = data.dig("content_counts", "content_view_versions",
+                    cv["cvv_id"].to_s, "repositories")
+                  cvv_count_repos.each do |_repo_id, counts_and_metadata|
+                    if counts_and_metadata.
+                       dig("metadata", "library_instance_id") == repo["library_id"] &&
+                       counts_and_metadata.dig("metadata", "env_id") == lce["id"]
+                      repo["_content_counts"] = counts_and_metadata["counts"]
+                    end
+                  end
+                else
+                  repo["_content_counts"] = {}
+                  repo["_content_counts"]["warning"] =
+                    _("Content view must be synced to see content counts")
+                end
+              end
+            end
+          end
+          data
+        end
+
         build_options
       end
 

data/lib/hammer_cli_katello/option_sources/lifecycle_environment_params.rb

@@ -25,6 +25,9 @@ module HammerCLIKatello
           result['option_environment_id'] = @command.resolver.lifecycle_environment_id(
             @command.resolver.scoped_options(lifecycle_environment_resource_name, result, :single))
         end
+        if result['option_lifecycle_environment_id'] && result['option_environment_id'].nil?
+          result['option_environment_id'] = result['option_lifecycle_environment_id']
+        end
       end
 
       def legacy_option_ids(result)
@@ -32,6 +35,9 @@ module HammerCLIKatello
           result['option_environment_ids'] = @command.resolver.lifecycle_environment_ids(
             @command.resolver.scoped_options(lifecycle_environment_resource_name, result, :multi))
         end
+        if result['option_lifecycle_environment_ids'] && result['option_environment_ids'].nil?
+          result['option_environment_ids'] = result['option_lifecycle_environment_ids']
+        end
       end
 
       def ensure_option_id(result)

data/lib/hammer_cli_katello/organization.rb

@@ -76,6 +76,11 @@ module HammerCLIKatello
         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

data/lib/hammer_cli_katello/simple_content_access.rb

@@ -1,5 +1,7 @@
 module HammerCLIKatello
   class SimpleContentAccess < HammerCLIKatello::Command
+    resource :simple_content_access
+
     desc "Toggle simple content access mode across organization"
 
     module EligibleCheck
@@ -45,6 +47,11 @@ module HammerCLIKatello
       failure_message _("Could not disable Simple Content Access for this organization")
 
       build_options
+
+      def execute
+        warn _("Simple Content Access will be required for all organizations in the next release.")
+        super
+      end
     end
 
     autoload_subcommands

data/lib/hammer_cli_katello/version.rb

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

data/locale/bn/hammer-cli-katello.po

@@ -6,10 +6,12 @@
 # Translators:
 # Bryan Kearney <bryan.kearney@gmail.com>, 2022
 #
+#, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: hammer-cli-katello 1.10.0.pre.master\n"
+"Project-Id-Version: hammer-cli-katello 1.11.0.pre.master\n"
 "Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-07-12 17:04+0000\n"
 "PO-Revision-Date: 2017-09-11 13:28+0000\n"
 "Last-Translator: Bryan Kearney <bryan.kearney@gmail.com>, 2022\n"
 "Language-Team: Bengali (https://app.transifex.com/foreman/teams/114/bn/)\n"
@@ -452,8 +454,8 @@ msgid "Please provide --content-view-id"
 msgstr ""
 
 msgid ""
-"No such repository with name %{name}, in lifecycle environment %{environment_i"
-"d} and content view %{content_view_id}"
+"No such repository with name %{name}, in lifecycle environment "
+"%{environment_id} and content view %{content_view_id}"
 msgstr ""
 
 msgid "Use %s instead"
@@ -499,9 +501,9 @@ msgid "Could not delete the Content Credential"
 msgstr ""
 
 msgid ""
-"Writes export metadata to disk for use by the importing Katello. This command "
-"only needs to be used if the export was performed asynchronously or if the met"
-"adata was lost"
+"Writes export metadata to disk for use by the importing Katello. This "
+"command only needs to be used if the export was performed asynchronously or "
+"if the metadata was lost"
 msgstr ""
 
 msgid "Generate metadata based on output of the specified export task"
@@ -510,14 +512,15 @@ msgstr ""
 msgid "Generate metadata based on specified export history"
 msgstr ""
 
-msgid "No export history was found. Verify the value given for --task-id or --id"
+msgid ""
+"No export history was found. Verify the value given for --task-id or --id"
 msgstr ""
 
 msgid ""
-"Generates listing file on each directory of a syncable export. This command on"
-"ly needs to be used if the export was performed asynchronously or if the listi"
-"ng files were lost. Assumes the syncable export directory is accessible on dis"
-"k"
+"Generates listing file on each directory of a syncable export. This command "
+"only needs to be used if the export was performed asynchronously or if the "
+"listing files were lost. Assumes the syncable export directory is accessible "
+"on disk"
 msgstr ""
 
 msgid "Generate listing files for a syncable export task"
@@ -556,47 +559,50 @@ msgstr ""
 msgid "Could not fetch the export history"
 msgstr ""
 
-msgid "Once the task completes the listing files may be generated with the command:"
+msgid ""
+"Once the task completes the listing files may be generated with the command:"
 msgstr ""
 
 msgid ""
-"Once the task completes the export metadata must be generated with the command"
-":"
+"Once the task completes the export metadata must be generated with the "
+"command:"
 msgstr ""
 
 msgid "Can not fetch export history from an unfinished task"
 msgstr ""
 
 msgid ""
-"Cannot generate listing files for this export since it is not syncable. It was"
-" not generated with --format=syncable."
+"Cannot generate listing files for this export since it is not syncable. It "
+"was not generated with --format=syncable."
 msgstr ""
 
 msgid ""
-"Export History does not have the path specified. The task may have errored out"
-"."
+"Export History does not have the path specified. The task may have errored "
+"out."
 msgstr ""
 
 msgid ""
-"NOTE: Unable to fully export this version because it contains repositories wit"
-"hout the 'immediate' download policy. Update the download policy and sync affe"
-"cted repositories. Once synced republish the content view and export the gener"
-"ated version."
+"NOTE: Unable to fully export this version because it contains repositories "
+"without the 'immediate' download policy. Update the download policy and sync "
+"affected repositories. Once synced republish the content view and export the "
+"generated version."
 msgstr ""
 
 msgid ""
-"NOTE: Unable to fully export this repository because it does not have the 'imm"
-"ediate' download policy. Update the download policy, sync the repository and e"
-"xport."
+"NOTE: Unable to fully export this repository because it does not have the "
+"'immediate' download policy. Update the download policy, sync the repository "
+"and export."
 msgstr ""
 
 msgid ""
-"NOTE: Unable to fully export this organization's library because it contains r"
-"epositories without the 'immediate' download policy. Update the download polic"
-"y and sync affected repositories to include them in the export."
+"NOTE: Unable to fully export this organization's library because it contains "
+"repositories without the 'immediate' download policy. Update the download "
+"policy and sync affected repositories to include them in the export."
 msgstr ""
 
-msgid "Use the following command to update the download policy of these repositories."
+msgid ""
+"Use the following command to update the download policy of these "
+"repositories."
 msgstr ""
 
 msgid "Repository is being exported in task %{id}."
@@ -615,8 +621,8 @@ msgid "Could not export the library"
 msgstr ""
 
 msgid ""
-"Fails if any of the repositories belonging to this organization are unexportab"
-"le."
+"Fails if any of the repositories belonging to this organization are "
+"unexportable."
 msgstr ""
 
 msgid "Content view version is being exported in task %{id}."
@@ -625,7 +631,8 @@ msgstr ""
 msgid "Could not export the content view version"
 msgstr ""
 
-msgid "Fails if any of the repositories belonging to this version are unexportable."
+msgid ""
+"Fails if any of the repositories belonging to this version are unexportable."
 msgstr ""
 
 msgid "Filter versions by version number."
@@ -634,15 +641,16 @@ msgstr ""
 msgid "Performs an incremental export of a content view version"
 msgstr ""
 
-msgid "Performs an incremental export of the organization's library environment"
+msgid ""
+"Performs an incremental export of the organization's library environment"
 msgstr ""
 
 msgid "Performs an incremental export of a repository"
 msgstr ""
 
 msgid ""
-"Location of the metadata.json file. This is not required if the metadata.json "
-"file is already in the archive directory."
+"Location of the metadata.json file. This is not required if the metadata."
+"json file is already in the archive directory."
 msgstr ""
 
 msgid "Archive is being imported in task %{id}."
@@ -654,7 +662,8 @@ msgstr ""
 msgid "Imports a content archive to a content view version"
 msgstr ""
 
-msgid "Imports a content archive to an organization's library lifecycle environment"
+msgid ""
+"Imports a content archive to an organization's library lifecycle environment"
 msgstr ""
 
 msgid "Imports a repository"
@@ -804,7 +813,8 @@ msgstr ""
 msgid "Could not remove version"
 msgstr ""
 
-msgid "Content View identifier of the component who's latest version is desired"
+msgid ""
+"Content View identifier of the component who's latest version is desired"
 msgstr ""
 
 msgid "Content View name of the component who's latest version is desired"
@@ -814,8 +824,8 @@ msgid "Content View Version identifier of the component"
 msgstr ""
 
 msgid ""
-"Content View Version number of the component. Either use this or --component-c"
-"ontent-view-version-id option"
+"Content View Version number of the component. Either use this or --component-"
+"content-view-version-id option"
 msgstr ""
 
 msgid "Select the latest version of the components content view is desired"
@@ -825,8 +835,8 @@ msgid "Please provide --component-content-view-id"
 msgstr ""
 
 msgid ""
-"Please provide --component-content-view-version-id or --component-content-view"
-"-version or --latest for the latest version"
+"Please provide --component-content-view-version-id or --component-content-"
+"view-version or --latest for the latest version"
 msgstr ""
 
 msgid "Content View Id"
@@ -860,13 +870,13 @@ msgid "Could not update the content view component"
 msgstr ""
 
 msgid ""
-"Array of component content view names to remove. Comma separated list of value"
-"s"
+"Array of component content view names to remove. Comma separated list of "
+"values"
 msgstr ""
 
 msgid ""
-"Array of component content view identfiers to remove. Comma separated list of "
-"values"
+"Array of component content view identfiers to remove. Comma separated list "
+"of values"
 msgstr ""
 
 msgid "Components removed from content view."
@@ -891,8 +901,8 @@ msgid "No versions to delete."
 msgstr ""
 
 msgid ""
-"Version '%{version}' of content view '%{view}' scheduled for deletion in task "
-"'%{task_id}'."
+"Version '%{version}' of content view '%{view}' scheduled for deletion in "
+"task '%{task_id}'."
 msgstr ""
 
 msgid "Version '%{version}' of content view '%{view}' deleted."
@@ -928,7 +938,8 @@ msgstr ""
 msgid "Could not promote the content view"
 msgstr ""
 
-msgid "force content view promotion and bypass lifecycle environment restriction"
+msgid ""
+"force content view promotion and bypass lifecycle environment restriction"
 msgstr ""
 
 msgid "Name of the target environment"
@@ -938,8 +949,8 @@ msgid "Id of the target environment"
 msgstr ""
 
 msgid ""
-"Environment name from where to promote its version from (if version is unknown"
-")"
+"Environment name from where to promote its version from (if version is "
+"unknown)"
 msgstr ""
 
 msgid "Id of the environment from where to promote its version "
@@ -960,7 +971,8 @@ msgstr ""
 msgid "list of lifecycle environment IDs to update the content view version in"
 msgstr ""
 
-msgid "list of lifecycle environment names to update the content view version in"
+msgid ""
+"list of lifecycle environment names to update the content view version in"
 msgstr ""
 
 msgid "Organization name for resolving lifecycle environment names"
@@ -970,8 +982,8 @@ msgid "Organization id for resolving lifecycle environment names"
 msgstr ""
 
 msgid ""
-"Update all editable and applicable hosts within the specified Content View and"
-" \\\n"
+"Update all editable and applicable hosts within the specified Content View "
+"and \\\n"
 "               Lifecycle Environments"
 msgstr ""
 
@@ -1245,7 +1257,8 @@ msgstr ""
 msgid "comma-separated list of package-groups to install"
 msgstr ""
 
-msgid "Install package-groups on content hosts contained within a host collection"
+msgid ""
+"Install package-groups on content hosts contained within a host collection"
 msgstr ""
 
 msgid "Successfully scheduled installation of package-group(s)."
@@ -1254,7 +1267,8 @@ msgstr ""
 msgid "Could not schedule installation of package-group(s)"
 msgstr ""
 
-msgid "Update package-groups on content hosts contained within a host collection"
+msgid ""
+"Update package-groups on content hosts contained within a host collection"
 msgstr ""
 
 msgid "Successfully scheduled update of package-groups(s)."
@@ -1263,7 +1277,8 @@ msgstr ""
 msgid "Could not schedule update of package-group(s)"
 msgstr ""
 
-msgid "Remove package-groups on content hosts contained within a host collection"
+msgid ""
+"Remove package-groups on content hosts contained within a host collection"
 msgstr ""
 
 msgid "Successfully scheduled removal of package-groups(s)."
@@ -1377,7 +1392,8 @@ msgstr ""
 msgid "Failed to remove subscriptions from the host"
 msgstr ""
 
-msgid "Remove the first instance of a subscription with matching id and quantity"
+msgid ""
+"Remove the first instance of a subscription with matching id and quantity"
 msgstr ""
 
 msgid "Content View id"
@@ -1756,8 +1772,8 @@ msgid "Location of the ansible collections requirements.yml file. "
 msgstr ""
 
 msgid ""
-"Limit the repository type to return. View available types with \"hammer reposit"
-"ory types\""
+"Limit the repository type to return. View available types with \"hammer "
+"repository types\""
 msgstr ""
 
 msgid "Red Hat Repository"
@@ -1878,8 +1894,8 @@ msgid "Could not create the repository"
 msgstr ""
 
 msgid ""
-"Type of repository to create. View available types with \"hammer repository typ"
-"es\""
+"Type of repository to create. View available types with \"hammer repository "
+"types\""
 msgstr ""
 
 msgid "Repository updated."
@@ -1928,8 +1944,8 @@ msgid "Indexed?"
 msgstr ""
 
 msgid ""
-"The type of content unit to upload (srpm, file, etc.). View uploadable types w"
-"ith \"hammer repository types\""
+"The type of content unit to upload (srpm, file, etc.). View uploadable types "
+"with \"hammer repository types\""
 msgstr ""
 
 msgid "Could not find any files matching PATH"
@@ -1951,8 +1967,8 @@ msgid "Name of OSTree repository in archive."
 msgstr ""
 
 msgid ""
-"Upload file, directory of files, or glob of files as content for a repository."
-"\n"
+"Upload file, directory of files, or glob of files as content for a "
+"repository.\n"
 "Globs must be escaped by single or double quotes"
 msgstr ""
 
@@ -1975,8 +1991,8 @@ msgid "Could not remove content"
 msgstr ""
 
 msgid ""
-"The type of content unit to remove (srpm, docker_manifest, etc.). View removab"
-"le types with \"hammer repository types\""
+"The type of content unit to remove (srpm, docker_manifest, etc.). View "
+"removable types with \"hammer repository types\""
 msgstr ""
 
 msgid "Forces a republish of the specified repository."
@@ -2094,8 +2110,8 @@ msgid "set this when interval is custom cron"
 msgstr ""
 
 msgid ""
-"Start date and time for the sync plan.Time is optional, if kept blank current "
-"system time will be considered"
+"Start date and time for the sync plan.Time is optional, if kept blank "
+"current system time will be considered"
 msgstr ""
 
 msgid "Sync plan created."
@@ -2118,3 +2134,96 @@ msgstr ""
 
 msgid "Could not destroy the sync plan"
 msgstr ""
+
+msgid "Refresh all alternate content sources"
+msgstr ""
+
+msgid "Successfully refreshed all alternate content sources"
+msgstr ""
+
+msgid "Could not refresh all alternate content sources"
+msgstr ""
+
+msgid "Refresh alternate content sources"
+msgstr ""
+
+msgid "Successfully refreshed specified alternate content sources"
+msgstr ""
+
+msgid "Could not refresh the specified alternate content sources"
+msgstr ""
+
+msgid "Destroy alternate content sources"
+msgstr ""
+
+msgid "Sucessfully destroyed specified alternate content sources"
+msgstr ""
+
+msgid "Could not destroy the specified alternate content sources"
+msgstr ""
+
+msgid "Capsule reclaim space has been started in task %{id}."
+msgstr ""
+
+msgid "Capsule reclaim space was unsuccessful."
+msgstr ""
+
+msgid "Capsule content counts are being updated in task %{id}."
+msgstr ""
+
+msgid "Could not update capsule content counts"
+msgstr ""
+
+msgid "SRPMs"
+msgstr ""
+
+msgid "Debian Packages"
+msgstr ""
+
+msgid "Container Tags"
+msgstr ""
+
+msgid "Container Manifests"
+msgstr ""
+
+msgid "Container Manifest Lists"
+msgstr ""
+
+msgid "Ansible Collections"
+msgstr ""
+
+msgid "OSTree Refs"
+msgstr ""
+
+msgid "Python Packages"
+msgstr ""
+
+msgid "Content view must be synced to see content counts"
+msgstr ""
+
+msgid "Original packages"
+msgstr ""
+
+msgid "Original module streams"
+msgstr ""
+
+msgid "UUID"
+msgstr ""
+
+msgid "Module stream Id"
+msgstr ""
+
+msgid "Content view filter Id"
+msgstr ""
+
+msgid "Errata Id"
+msgstr ""
+
+msgid "Date type"
+msgstr ""
+
+msgid "Start date"
+msgstr ""
+
+msgid "End date"
+msgstr ""