hammer_cli_katello 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 186183bd2337627828ad27578924b491161632034de3f51b2896a02312b68519
-  data.tar.gz: 903b7f9c68fdfcd7538739a1f98aa896e18924806f69d37576a85f935315f7e1
+  metadata.gz: b5fa880828d3804a98b06e439b6ea10c6f0784102ac00d5ba686b3ff2e27ced6
+  data.tar.gz: 52650dc243f073826a2f47cbe69939a2c8af4e2dd8acf3f1843b0acf3dab4063
 SHA512:
-  metadata.gz: ae67f54e90820899048b453b5c6592d0e7ac36ee562d798c74c82365c82de577c158640259eeb222cfb9e5f8ab5e880fd1ce36dcba56eed3f67dadaf2430eef7
-  data.tar.gz: aae484692b57eb9405e01b2b2f6e01b8254e7903b53fdbe919e829366e0f28ab46e5184e61111fa637655d029cd000197639a1e5919cc5bc59c041ad93108eb0
+  metadata.gz: b782ea88258329a25f04d308d7f419328a931e2d8ed9d757da44bc7ce54fc37351635cea13d1d990de6d5a399ba6793c2aeecf5ed65f374dfb4d51a2fded2308
+  data.tar.gz: e7883bbd668c0eb608b2ad4dc31191f41f8e0837a4648003d2313a0fc13d425778f0f803a46c1343d25dcd25317c27d8ba2d6fc671be846b7bedeb9b60df0beb

data/lib/hammer_cli_katello/content_import.rb

@@ -13,7 +13,7 @@ module HammerCLIKatello
                  :required => false
 
         base.build_options do |o|
-          o.expand(:all).including(:content_views, :organizations).except(:metadata)
+          o.expand(:all).including(:organizations).except(:metadata)
         end
 
         base.validate_options do
@@ -58,6 +58,21 @@ module HammerCLIKatello
       include ContentImportCommon
     end
 
+    class ListCommand < HammerCLIKatello::ListCommand
+      desc "View content view import histories"
+      output do
+        field :id, _('ID')
+        field :path, _('Path')
+        field :type, _('Type')
+        field :content_view_version, _('Content View Version')
+        field :content_view_version_id, _('Content View Version ID')
+        field :created_at, _('Created at')
+        field :updated_at, _('Updated at'), Fields::Field, :hide_blank => true
+      end
+
+      build_options
+    end
+
     autoload_subcommands
   end
 end

data/lib/hammer_cli_katello/content_view_version.rb

@@ -271,279 +271,6 @@ module HammerCLIKatello
       end
     end
 
-    class ExportDefaultCommand < HammerCLIForeman::Command
-      include HammerCLIKatello::LocalHelper
-      include HammerCLIKatello::ApipieHelper
-      include HammerCLIKatello::CVImportExportHelper
-
-      PUBLISHED_REPOS_DIR = "/var/lib/pulp/published/yum/https/repos/".freeze
-
-      desc _('Export the library default content view')
-
-      command_name "export-default"
-
-      option '--export-dir', 'EXPORT_DIR', _("Directory to put content view version export into.")
-
-      validate_options do
-        option(:option_export_dir).required
-      end
-
-      build_options
-
-      def execute
-        validate_pulp3_not_enabled(fail_msg_export)
-        export_dir = options['option_export_dir']
-
-        Dir.mkdir(export_dir) unless Dir.exist?(export_dir)
-        result = Kernel.system("rsync -aL #{PUBLISHED_REPOS_DIR} #{export_dir}")
-        if result == true
-          output.print_message _("Default content view export is available at #{export_dir}")
-          HammerCLI::EX_OK
-        else
-          output.print_error _("Could not export the default content view at #{export_dir}")
-          HammerCLI::EX_CANTCREAT
-        end
-      end
-    end
-
-    class LegacyExportCommand < HammerCLIKatello::SingleResourceCommand
-      include HammerCLIForemanTasks::Async
-      include LifecycleEnvironmentNameMapping
-      include HammerCLIKatello::CVImportExportHelper
-      desc _('Export a content view (legacy method)')
-
-      action :export
-      command_name "export-legacy"
-
-      success_message _("Content view is being exported in task %{id}.")
-      failure_message _("Could not export the content view")
-      build_options do |o|
-        o.expand(:all).including(:environments, :content_views, :organizations)
-      end
-
-      extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
-
-      def request_params
-        validate_pulp3_not_enabled(fail_msg_export)
-        super
-      end
-    end
-
-    class ExportCommand < HammerCLIForeman::Command
-      include HammerCLIKatello::LocalHelper
-      include HammerCLIKatello::ApipieHelper
-      include HammerCLIKatello::CVImportExportHelper
-
-      PUBLISHED_REPOS_DIR = "/var/lib/pulp/published/yum/https/repos/".freeze
-
-      desc _('Export a content view version')
-
-      command_name "export"
-
-      success_message _("Content view export is available in %{directory}.")
-      failure_message _("Could not export the content view")
-
-      option "--id", "ID", _("Content View Version numeric identifier")
-      option '--export-dir', 'EXPORT_DIR', _("Directory to put content view version export into.")
-
-      validate_options do
-        option(:option_export_dir).required
-        option(:option_id).required
-      end
-
-      build_options
-
-      def execute
-        cvv = show(:content_view_versions, 'id' => options['option_id'])
-        cv = show(:content_views, 'id' => cvv['content_view_id'])
-
-        validate_pulp3_not_enabled(fail_msg_export)
-
-        composite = cv["composite"]
-
-        export_json_options = { :cvv => cvv }
-
-        if composite
-          components = cv['components']
-          export_json_options[:component_cvvs] = components.collect do |component|
-            component['name']
-          end
-          export_json_options[:repositories] = []
-        else
-          repositories = fetch_exportable_cvv_repositories(cvv)
-          collect_packages(repositories)
-
-          export_json_options[:repositories] = repositories
-        end
-
-        json = export_json(export_json_options)
-        if repositories&.any? || cv['composite']
-          create_tar(cv, cvv, repositories, json)
-        else
-          msg = <<~MSG
-            Ensure the content view version '#{cvv['name']}' has at least one repository.
-          MSG
-          raise _(msg)
-        end
-        return HammerCLI::EX_OK
-      end
-
-      def create_tar(cv, cvv, repositories, json)
-        export_prefix = "export-#{cv['label']}-#{cvv['major']}.#{cvv['minor']}"
-        export_file = "#{export_prefix}.json"
-        export_repos_tar = "#{export_prefix}-repos.tar"
-        export_tar = "#{export_prefix}.tar"
-        export_dir = File.expand_path(options['option_export_dir'].to_s)
-
-        Dir.mkdir("#{export_dir}/#{export_prefix}")
-
-        if repositories&.any?
-
-          Dir.chdir(PUBLISHED_REPOS_DIR) do
-            repo_tar = "#{export_dir}/#{export_prefix}/#{export_repos_tar}"
-            repo_dirs = []
-
-            repositories.each do |repo|
-              repo_dirs.push(repo['relative_path'])
-            end
-
-            `tar cvfh #{repo_tar} #{repo_dirs.join(" ")}`
-          end
-        end
-
-        Dir.chdir("#{export_dir}/#{export_prefix}") do
-          File.open(export_file, 'w') do |file|
-            file.write(JSON.pretty_generate(json))
-          end
-        end
-
-        Dir.chdir(export_dir) do
-          `tar cf #{export_tar} #{export_prefix}`
-          FileUtils.rm_rf(export_prefix)
-        end
-      end
-    end
-
-    class ImportCommand < HammerCLIForeman::Command
-      include HammerCLIForemanTasks::Async
-      include HammerCLIKatello::LocalHelper
-      include HammerCLIKatello::ApipieHelper
-      include HammerCLIKatello::CVImportExportHelper
-
-      attr_accessor :export_tar_dir, :export_tar_file, :export_tar_prefix
-
-      desc _('Import a content view version')
-
-      command_name "import"
-
-      success_message _("Content view imported.")
-      failure_message _("Could not import the content view")
-
-      option "--organization-id", "ORGANIZATION_ID", _("Organization numeric identifier")
-      option(
-        '--export-tar', 'EXPORT_TAR',
-        _("Location of export tar on disk")
-      )
-
-      validate_options do
-        option(:option_export_tar).required
-        option(:option_organization_id).required
-      end
-
-      build_options
-
-      # rubocop:disable Metrics/AbcSize
-      def execute
-        validate_pulp3_not_enabled(fail_msg_import)
-
-        unless File.exist?(options['option_export_tar'])
-          raise _("Export tar #{options['option_export_tar']} does not exist.")
-        end
-
-        import_tar_params = obtain_export_params(options['option_export_tar'])
-        untar_export(import_tar_params)
-
-        export_json = read_json(import_tar_params)
-        cv = content_view(export_json['name'], options['option_organization_id'])
-        major = export_json['major'].to_s
-        minor = export_json['minor'].to_s
-        import_checks(export_json, cv, major, minor)
-
-        if export_json['composite_components']
-          composite_version_ids = export_json['composite_components'].map do |component|
-            find_local_component_id(component)
-          end
-          update(:content_views, 'id' => cv['id'], 'component_ids' => composite_version_ids)
-          publish(cv['id'], export_json['major'], export_json['minor'])
-        else
-          sync_repositories(export_json['repositories'], options['option_organization_id'],
-            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
-      # rubocop:enable Metrics/AbcSize
-
-      def sync_repositories(repositories, organization_id, options)
-        export_tar_dir =  options[:dirname]
-        export_tar_prefix = options[:prefix]
-
-        repositories.each do |repo|
-          library_repos = index(
-            :repositories,
-            'organization_id' => organization_id,
-            'library' => true,
-            'label' => repo['label']
-          )
-
-          library_repo = library_repos.select do |candidate_repo|
-            candidate_repo['label'] == repo['label']
-          end
-
-          library_repo = library_repo.first
-
-          if library_repo.nil?
-            msg = _("Unable to sync repositories, no library repository found for %s")
-            raise msg % repo['label']
-          end
-
-          synchronize(
-            library_repo['id'],
-            "file://#{export_tar_dir}/#{export_tar_prefix}/#{repo['relative_path']}"
-          )
-        end
-      end
-
-      def repos_units(repositories)
-        repositories.collect do |repo|
-          {
-            'label' => repo['label'],
-            'rpm_filenames' => repo['rpm_filenames']
-          }
-        end
-      end
-
-      def content_view(name, organization_id)
-        index(:content_views, 'name' => name, 'organization_id' => organization_id).first
-      end
-
-      def synchronize(id, source_url)
-        task_progress(call(:sync, :repositories, 'id' => id, 'source_url' => source_url))
-      end
-
-      def publish(id, major, minor, repos_units = nil)
-        params = {'id' => id, 'major' => major, 'minor' => minor }
-        params['repos_units'] = repos_units if repos_units
-        task_progress(call(:publish, :content_views, params))
-      end
-    end
-
     autoload_subcommands
   end
 end

data/lib/hammer_cli_katello/docker.rb

@@ -0,0 +1,13 @@
+module HammerCLIKatello
+  class DockerCommand < HammerCLI::AbstractCommand
+    require 'hammer_cli_katello/docker_manifest'
+    subcommand 'manifest',
+               HammerCLIKatello::DockerManifestCommand.desc,
+               HammerCLIKatello::DockerManifestCommand
+
+    require 'hammer_cli_katello/docker_tag'
+    subcommand 'tag',
+               HammerCLIKatello::DockerTagCommand.desc,
+               HammerCLIKatello::DockerTagCommand
+  end
+end

data/lib/hammer_cli_katello/docker_manifest.rb

@@ -0,0 +1,53 @@
+module HammerCLIKatello
+  class DockerManifestCommand < HammerCLIForeman::Command
+    resource :docker_manifests
+    command_name 'manifest'
+    desc _('Manage docker manifests')
+
+    class ListCommand < HammerCLIKatello::ListCommand
+      include HammerCLIKatello::LifecycleEnvironmentNameMapping
+
+      output do
+        field :id, _("ID")
+        field :name, _("Name")
+        field :schema_version, _("Schema Version")
+        field :digest, _("Digest")
+        field :downloaded, _("Downloaded"), Fields::Boolean
+        field :_tags, _("Tags")
+      end
+
+      def extend_data(manifest)
+        manifest['_tags'] = manifest['tags'].map { |e| e["name"] }.join(", ")
+        manifest
+      end
+
+      build_options do |o|
+        o.expand.including(:products, :organizations, :content_views)
+      end
+
+      extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
+    end
+
+    class InfoCommand < HammerCLIKatello::InfoCommand
+      output do
+        field :id, _("ID")
+        field :name, _("Name")
+        field :schema_version, _("Schema Version")
+        field :digest, _("Digest")
+        field :downloaded, _("Downloaded"), Fields::Boolean
+        collection :tags, _("Tags") do
+          field :name, _("Name")
+        end
+      end
+
+      def extend_data(manifest)
+        manifest['_tags'] = manifest['tags'].map { |e| { name: e["name"] } }.join(", ")
+        manifest
+      end
+
+      build_options
+    end
+
+    autoload_subcommands
+  end
+end

data/lib/hammer_cli_katello/docker_tag.rb

@@ -0,0 +1,40 @@
+module HammerCLIKatello
+  class DockerTagCommand < HammerCLIForeman::Command
+    resource :docker_tags
+    command_name 'tag'
+    desc _('Manage docker tags')
+
+    class ListCommand < HammerCLIKatello::ListCommand
+      include HammerCLIKatello::LifecycleEnvironmentNameMapping
+
+      output do
+        field :id, _("ID")
+        field :name, _("Tag")
+        field :repository_id, _("Repository ID")
+      end
+
+      build_options do |o|
+        o.expand.including(:products, :organizations, :content_views)
+      end
+
+      extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
+    end
+
+    class InfoCommand < HammerCLIKatello::InfoCommand
+      output do
+        field :id, _("ID")
+        field :name, _("Tag")
+        field :repository_id, _("Repository ID")
+
+        from :manifest do
+          field :id, _("Docker Manifest ID")
+          field :name, _("Docker Manifest Name")
+        end
+      end
+
+      build_options
+    end
+
+    autoload_subcommands
+  end
+end

data/lib/hammer_cli_katello/id_resolver.rb

@@ -28,7 +28,9 @@ module HammerCLIKatello
       :subscription =>          [s_name(_("Subscription name to search by"))],
       :sync_plan =>             [s_name(_("Sync plan name to search by"))],
       :task =>                  [s_name(_("Task name to search by"))],
-      :content_view_version => [s("version", _("Content view version number"))]
+      :content_view_version => [s("version", _("Content view version number"))],
+      :content_export       => [],
+      :content_import       => []
     }.freeze
 
     DEFAULT_SEARCHABLES = [s_name(_("Name to search by"))].freeze

data/lib/hammer_cli_katello/organization.rb

@@ -21,9 +21,19 @@ module HammerCLIKatello
         field :label, _("Label")
         field :description, _("Description")
         field :redhat_repository_url, _("Red Hat Repository URL")
+        field :simple_content_access_label, _("Simple Content Access")
         field :service_levels, _("Service Levels"), Fields::List
       end
 
+      def extend_data(data)
+        data["simple_content_access_label"] = if data["simple_content_access"]
+                                                _("Enabled")
+                                              else
+                                                _("Disabled")
+                                              end
+        data
+      end
+
       build_options
     end
 

data/lib/hammer_cli_katello/ping.rb

@@ -6,6 +6,14 @@ module HammerCLIKatello
 
     output do
       from "services" do
+        label "katello_agent", hide_blank: true do
+          from "katello_agent" do
+            field "status", _("Status"), Fields::Field, hide_blank: true
+            field "message", _("message"), Fields::Field, hide_blank: true
+            field "_response", _("Server Response"), Fields::Field, hide_blank: true
+          end
+        end
+
         label "candlepin" do
           from "candlepin" do
             field "status", _("Status")
@@ -13,17 +21,17 @@ module HammerCLIKatello
           end
         end
 
-        label "candlepin_events" do
-          from "candlepin_events" do
+        label "candlepin_auth" do
+          from "candlepin_auth" do
             field "status", _("Status")
-            field "message", _("message")
             field "_response", _("Server Response")
           end
         end
 
-        label "candlepin_auth" do
-          from "candlepin_auth" do
+        label "candlepin_events" do
+          from "candlepin_events" do
             field "status", _("Status")
+            field "message", _("message")
             field "_response", _("Server Response")
           end
         end

data/lib/hammer_cli_katello/repository.rb

@@ -2,6 +2,25 @@ module HammerCLIKatello
   class Repository < HammerCLIKatello::Command
     resource :repositories
 
+    module AnsibleCollectionRequirementsHelper
+      def self.included(base)
+        base.option "--ansible-collection-requirements-file",
+                    "REQUIREMENTS_FILE", _("Location of the ansible collections "\
+                                         "requirements.yml file. "),
+                    :attribute_name => :option_ansible_collection_requirements_file,
+                    :required => false
+      end
+
+      def request_params
+        super.tap do |opts|
+          requirements_file = option_ansible_collection_requirements_file
+          if requirements_file
+            opts["ansible_collection_requirements"] = File.read(requirements_file)
+          end
+        end
+      end
+    end
+
     class ListCommand < HammerCLIKatello::ListCommand
       include LifecycleEnvironmentNameMapping
 
@@ -192,6 +211,7 @@ module HammerCLIKatello
     end
 
     class CreateCommand < HammerCLIKatello::CreateCommand
+      include AnsibleCollectionRequirementsHelper
       success_message _("Repository created.")
       failure_message _("Could not create the repository")
 
@@ -204,6 +224,7 @@ module HammerCLIKatello
 
     class UpdateCommand < HammerCLIKatello::UpdateCommand
       extend RepositoryScopedToProduct
+      include AnsibleCollectionRequirementsHelper
 
       validate_repo_name_requires_product_options
       include OrganizationOptions

data/lib/hammer_cli_katello/simple_content_access.rb

@@ -15,6 +15,7 @@ module HammerCLIKatello
 
     class EnableCommand < HammerCLIKatello::SingleResourceCommand
       include EligibleCheck
+      include HammerCLIForemanTasks::Async
       resource :simple_content_access, :enable
       command_name "enable"
 
@@ -26,6 +27,7 @@ module HammerCLIKatello
 
     class DisableCommand < HammerCLIKatello::SingleResourceCommand
       include EligibleCheck
+      include HammerCLIForemanTasks::Async
       resource :simple_content_access, :disable
       command_name "disable"
 

data/lib/hammer_cli_katello/version.rb

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

data/lib/hammer_cli_katello.rb

@@ -30,7 +30,6 @@ module HammerCLIKatello
   require 'hammer_cli_katello/id_name_options_validator'
   require 'hammer_cli_katello/local_helper'
   require 'hammer_cli_katello/apipie_helper'
-  require 'hammer_cli_katello/cv_import_export_helper'
   require 'hammer_cli_katello/content_export_helper'
 
   # commands
@@ -156,6 +155,11 @@ module HammerCLIKatello
                                          'hammer_cli_katello/simple_content_access'
                                         )
 
+  HammerCLI::MainCommand.lazy_subcommand("docker", _("Manipulate docker content"),
+                                         'HammerCLIKatello::DockerCommand',
+                                         'hammer_cli_katello/docker'
+                                        )
+
   # subcommands to hammer_cli_foreman commands
   require 'hammer_cli_katello/host'
   require 'hammer_cli_katello/hostgroup'

data/locale/hammer-cli-katello.pot

@@ -1195,31 +1195,6 @@ msgstr ""
 msgid "Unable to sync repositories, no library repository found for %s"
 msgstr ""
 
-#: ../lib/hammer_cli_katello/cv_import_export_helper.rb:19
-msgid ""
-"Unable to find CV version %{cvv} on system. Please ensure it is already import"
-"ed."
-msgstr ""
-
-#: ../lib/hammer_cli_katello/cv_import_export_helper.rb:29
-msgid ""
-"The Content View #{cv['name']} is not present on this server, please create th"
-"e Content View and try the import again."
-msgstr ""
-
-#: ../lib/hammer_cli_katello/cv_import_export_helper.rb:34
-msgid ""
-"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 (#{versi"
-"on})"
-msgstr ""
-
-#: ../lib/hammer_cli_katello/cv_import_export_helper.rb:45
-msgid ""
-"The Repository '#{repo['name']}' is set with Mirror-on-Sync to YES. Please cha"
-"nge Mirror-on-Sync to NO and try the import again."
-msgstr ""
-
 #: ../lib/hammer_cli_katello/erratum.rb:14
 #: ../lib/hammer_cli_katello/erratum_info_command.rb:11
 #: ../lib/hammer_cli_katello/filter.rb:47