hammer_cli_katello 0.24.1 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a90c77802499a72d618883d73162f061b8465d838be44c8df27e3d79d2fc316
-  data.tar.gz: d4cd08a9eb8fae1437bad8d9adaba03fb5a71cd2c770b5af6500312fb497283c
+  metadata.gz: 186183bd2337627828ad27578924b491161632034de3f51b2896a02312b68519
+  data.tar.gz: 903b7f9c68fdfcd7538739a1f98aa896e18924806f69d37576a85f935315f7e1
 SHA512:
-  metadata.gz: 3aa81078857f074f4c15104e67a31ca9b85ba05d95510b2805114df31955972acd4795078ae3128849568d2f1c3e1e19d274307ac97d7cc8391edc1f05cd44b9
-  data.tar.gz: ce940d980543120e2cf86a0374fb61e11c20ce37ee06c2ff381b98da2c5731c6adcb4cac0b59bd80d945233b2589d13889859097a910e838117403ee002137c5
+  metadata.gz: ae67f54e90820899048b453b5c6592d0e7ac36ee562d798c74c82365c82de577c158640259eeb222cfb9e5f8ab5e880fd1ce36dcba56eed3f67dadaf2430eef7
+  data.tar.gz: aae484692b57eb9405e01b2b2f6e01b8254e7903b53fdbe919e829366e0f28ab46e5184e61111fa637655d029cd000197639a1e5919cc5bc59c041ad93108eb0

data/lib/hammer_cli_katello.rb

@@ -44,15 +44,6 @@ module HammerCLIKatello
                                           'hammer_cli_katello/organization'
                                          )
 
-  HammerCLI::MainCommand.lazy_subcommand("gpg",
-                                         _("Manipulate GPG Key actions on the server"),
-                                         'HammerCLIKatello::GpgKeyCommand',
-                                         'hammer_cli_katello/gpg_key',
-                                         :warning =>
-  _('The gpg sub-command is deprecated and will be removed in one of the future versions.' \
-    ' Please use the content-credentials command instead.')
-                                        )
-
   HammerCLI::MainCommand.lazy_subcommand("content-credentials",
                                          _("Manipulate content credentials on the server"),
                                          'HammerCLIKatello::ContentCredentialCommand',
@@ -70,11 +61,6 @@ module HammerCLIKatello
                                          'hammer_cli_katello/product'
                                         )
 
-  HammerCLI::MainCommand.lazy_subcommand("puppet-module", _("View Puppet Module details"),
-                                         'HammerCLIKatello::PuppetModule',
-                                         'hammer_cli_katello/puppet_module'
-                                        )
-
   HammerCLI::MainCommand.lazy_subcommand("repository", _("Manipulate repositories"),
                                          'HammerCLIKatello::Repository',
                                          'hammer_cli_katello/repository'
@@ -164,6 +150,12 @@ 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'
+                                        )
+
   # subcommands to hammer_cli_foreman commands
   require 'hammer_cli_katello/host'
   require 'hammer_cli_katello/hostgroup'

data/lib/hammer_cli_katello/activation_key.rb

@@ -11,7 +11,7 @@ module HammerCLIKatello
       action :index
 
       output do
-        field :id, _("ID")
+        field :id, _("Id")
         field :name, _("Name")
         field :format_consumed, _("Host Limit")
         from :environment do
@@ -53,7 +53,7 @@ module HammerCLIKatello
 
       output do
         field :name, _("Name")
-        field :id, _("ID")
+        field :id, _("Id")
         field :description, _("Description")
         field :format_limit, _("Host Limit")
         field :auto_attach, _("Auto Attach")
@@ -67,7 +67,7 @@ module HammerCLIKatello
         end
 
         collection :host_collections, _("Host Collections") do
-          field :id, _("ID")
+          field :id, _("Id")
           field :name, _("Name")
         end
 
@@ -150,7 +150,7 @@ module HammerCLIKatello
       command_name "subscriptions"
 
       output do
-        field :id, _("ID")
+        field :id, _("Id")
         field :product_name, _("Name")
         field :format_consumed, _("Attached")
         field :quantity_attached, _("Quantity")
@@ -230,7 +230,7 @@ module HammerCLIKatello
       command_name "host-collections"
 
       output do
-        field :id, _("ID")
+        field :id, _("Id")
         field :name, _("Name")
       end
 

data/lib/hammer_cli_katello/capsule.rb

@@ -13,7 +13,7 @@ module HammerCLIKatello
         command_name 'lifecycle-environments'
 
         output do
-          field :id, _("ID")
+          field :id, _("Id")
           field :name, _("Name")
           from :organization do
             field :name, _("Organization")
@@ -28,7 +28,7 @@ module HammerCLIKatello
         command_name 'available-lifecycle-environments'
 
         output do
-          field :id, _("ID")
+          field :id, _("Id")
           field :name, _("Name")
           from :organization do
             field :name, _("Organization")
@@ -167,7 +167,6 @@ module HammerCLIKatello
                   field :packages, _('Packages')
                   field :package_groups, _('Package groups')
                   field :errata, _('Errata')
-                  field :puppet_modules, _('Puppet modules')
                 end
               end
             end

data/lib/hammer_cli_katello/command_extensions/lifecycle_environment.rb

@@ -2,13 +2,16 @@ module HammerCLIKatello
   module CommandExtensions
     class LifecycleEnvironment < HammerCLI::CommandExtensions
       # Remove when support of --environment options is ended.
-      option '--environment', 'ENVIRONMENT_NAME', _('Lifecycle environment name to search by'),
-             attribute_name: :option_environment_name,
-             deprecated: { '--environment' => _('Use --lifecycle-environment instead') }
-      option '--environment-id', 'ENVIRONMENT_ID', _(''),
-             format: HammerCLI::Options::Normalizers::Number.new,
-             attribute_name: :option_environment_id,
-             deprecated: { '--environment-id' => _('Use --lifecycle-environment-id instead') }
+      option_family(
+        deprecated: { '--environment' => _("Use %s instead") % '--lifecycle-environment',
+                      '--environment-id' => _("Use %s instead") % '--lifecycle-environment-id'}
+      ) do
+        child '--environment', 'ENVIRONMENT_NAME', _('Lifecycle environment name to search by'),
+              attribute_name: :option_environment_name
+        parent '--environment-id', 'ENVIRONMENT_ID', _(''),
+               format: HammerCLI::Options::Normalizers::Number.new,
+               attribute_name: :option_environment_id
+      end
 
       option_sources do |sources, command|
         sources.find_by_name('IdResolution').insert_relative(

data/lib/hammer_cli_katello/command_extensions/lifecycle_environments.rb

@@ -2,14 +2,17 @@ module HammerCLIKatello
   module CommandExtensions
     class LifecycleEnvironments < HammerCLI::CommandExtensions
       # Remove when support of --environments options is ended.
-      option '--environments', 'ENVIRONMENT_NAMES', _(''),
-             format: HammerCLI::Options::Normalizers::List.new,
-             attribute_name: :option_environment_names,
-             deprecated: { '--environments' => _('Use --lifecycle-environments instead') }
-      option '--environment-ids', 'ENVIRONMENT_IDS', _(''),
-             format: HammerCLI::Options::Normalizers::List.new,
-             attribute_name: :option_environment_ids,
-             deprecated: { '--environment-ids' => _('Use --lifecycle-environment-ids instead') }
+      option_family(
+        format: HammerCLI::Options::Normalizers::List.new,
+        deprecation: _("Use %s instead") % '--lifecycle-environment[s|-ids]',
+        deprecated: { '--environments' => _("Use %s instead") % '--lifecycle-environments',
+                      '--environment-ids' => _("Use %s instead") % '--lifecycle-environment-ids'}
+      ) do
+        parent '--environment-ids', 'ENVIRONMENT_IDS', _(''),
+               attribute_name: :option_environment_ids
+        child '--environments', 'ENVIRONMENT_NAMES', _(''),
+              attribute_name: :option_environment_names
+      end
 
       option_sources do |sources, command|
         sources.find_by_name('IdResolution').insert_relative(

data/lib/hammer_cli_katello/content_credential.rb

@@ -4,8 +4,9 @@ module HammerCLIKatello
 
     class ListCommand < HammerCLIKatello::ListCommand
       output do
-        field :id, _("ID")
-        field :name, _("Name")
+        field :id, _('Id')
+        field :name, _('Name')
+        field :content_type, _('Content Type')
       end
 
       build_options
@@ -13,51 +14,51 @@ module HammerCLIKatello
 
     class InfoCommand < HammerCLIKatello::InfoCommand
       output do
-        field :id, _("ID")
-        field :name, _("Name")
+        field :id, _('Id')
+        field :name, _('Name')
         from :organization do
-          field :name, _("Organization")
+          field :name, _('Organization')
         end
 
-        collection :repositories, "Repositories" do
-          field :id, _("ID")
-          field :name, _("Name")
-          field :content_type, _("Content Type")
+        collection :repositories, 'Repositories' do
+          field :id, _('Id')
+          field :name, _('Name')
+          field :content_type, _('Content Type')
           from :product do
-            field :name, _("Product")
+            field :name, _('Product')
           end
         end
 
-        field :content, _("Content"), Fields::LongText
+        field :content, _('Content'), Fields::LongText
       end
 
       build_options
     end
 
     class CreateCommand < HammerCLIKatello::CreateCommand
-      success_message _("Content credential created.")
-      failure_message _("Could not create GPG key")
+      success_message _('Content Credential created.')
+      failure_message _('Could not create Content Credential')
 
       build_options :without => [:content]
-      option "--key", "GPG_KEY_FILE", _("GPG Key file"),
+      option '--path', 'KEY_FILE', _('Key file'),
              :attribute_name => :option_content,
              :required => true,
              :format => HammerCLI::Options::Normalizers::File.new
     end
 
     class UpdateCommand < HammerCLIKatello::UpdateCommand
-      success_message _("GPG Key updated.")
-      failure_message _("Could not update GPG Key")
+      success_message _('Content Credential updated.')
+      failure_message _('Could not update Content Credential')
 
       build_options :without => [:content]
-      option "--key", "GPG_KEY_FILE", _("GPG Key file"),
+      option '--path', 'KEY_FILE', _('Key file'),
              :attribute_name => :option_content,
              :format => HammerCLI::Options::Normalizers::File.new
     end
 
     class DeleteCommand < HammerCLIKatello::DeleteCommand
-      success_message _("GPG Key deleted.")
-      failure_message _("Could not delete the GPG Key")
+      success_message _('Content Credential deleted.')
+      failure_message _('Could not delete the Content Credential')
 
       build_options
     end

data/lib/hammer_cli_katello/content_export.rb

@@ -50,6 +50,7 @@ module HammerCLIKatello
         field :id, _('ID')
         field :destination_server, _('Destination Server')
         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')

data/lib/hammer_cli_katello/content_export_helper.rb

@@ -40,7 +40,7 @@ module HammerCLIKatello
     end
 
     def fetch_export_history(export_history_id)
-      resource.call(:index, :id => export_history_id)["results"].first if export_history_id
+      index(:content_exports, :id => export_history_id).first if export_history_id
     end
 
     def fetch_export_history_from_task(task)
@@ -134,6 +134,25 @@ module HammerCLIKatello
 
     def self.setup_version(base)
       base.action(:version)
+      setup_version_options(base)
+      base.success_message _("Content view version is being exported in task %{id}.")
+      base.failure_message _("Could not export the content view version")
+
+      base.extend_with(
+        HammerCLIKatello::CommandExtensions::LifecycleEnvironments.new(only: :option_sources)
+      )
+      base.include(LifecycleEnvironmentNameMapping)
+
+      base.class_eval do
+        def request_params
+          super.tap do |opts|
+            opts["id"] = resolver.content_view_version_id(options)
+          end
+        end
+      end
+    end
+
+    def self.setup_version_options(base)
       base.option "--fail-on-missing-content", :flag,
                     _("Fails if any of the repositories belonging"\
                       " to this version are unexportable.")
@@ -143,30 +162,20 @@ module HammerCLIKatello
                  :required => false
 
       base.build_options do |o|
-        o.expand(:all).including(:content_views, :organizations)
+        o.expand(:all).including(:content_views, :organizations, :environments)
+        o.without(:environment_ids, :environment_id)
       end
 
       base.validate_options do
         unless option(:option_id).exist?
           any(:option_id, :option_content_view_name, :option_content_view_id).required
-          option(:option_version).required
+          any(:option_version, :option_environment_id, :option_environment_name).required
           unless option(:option_content_view_id).exist?
             any(:option_organization_id, :option_organization_name, \
                                 :option_organization_label).required
           end
         end
       end
-
-      base.success_message _("Content view version is being exported in task %{id}.")
-      base.failure_message _("Could not export the content view version")
-
-      base.class_eval do
-        def request_params
-          super.tap do |opts|
-            opts["id"] = resolver.content_view_version_id(options)
-          end
-        end
-      end
     end
   end
 end

data/lib/hammer_cli_katello/content_view.rb

@@ -1,4 +1,3 @@
-require 'hammer_cli_katello/content_view_puppet_module'
 require 'hammer_cli_katello/content_view_purge'
 require 'hammer_cli_katello/filter'
 require 'hammer_cli_katello/content_view_version'
@@ -29,13 +28,12 @@ module HammerCLIKatello
       include OrganizationOptions
 
       output do
-        field :id, _("ID")
+        field :id, _("Id")
         field :name, _("Name")
         field :label, _("Label")
         field :composite, _("Composite")
         field :description, _("Description")
         field :content_host_count, _("Content Host Count")
-        field :force_puppet_environment, _("Force Puppet")
         field :solve_dependencies, _("Solve Dependencies")
 
         from :organization do
@@ -43,43 +41,36 @@ module HammerCLIKatello
         end
 
         collection :_yum_repositories, _("Yum Repositories") do
-          field :id, _("ID")
+          field :id, _("Id")
           field :name, _("Name")
           field :label, _("Label")
         end
 
         collection :_docker_repositories, _("Container Image Repositories") do
-          field :id, _("ID")
+          field :id, _("Id")
           field :name, _("Name")
           field :label, _("Label")
         end
 
         collection :_ostree_repositories, _("OSTree Repositories") do
-          field :id, _("ID")
+          field :id, _("Id")
           field :name, _("Name")
           field :label, _("Label")
         end
 
-        collection :puppet_modules, _("Puppet Modules") do
-          field :id, _("ID")
-          field :uuid, _("UUID"), Fields::Field, :hide_blank => true
-          field :name, _("Name")
-          field :author, _("Author")
-        end
-
         collection :environments, _("Lifecycle Environments") do
-          field :id, _("ID")
+          field :id, _("Id")
           field :name, _("Name")
         end
 
         collection :versions, _("Versions") do
-          field :id, _("ID")
+          field :id, _("Id")
           field :version, _("Version")
           field :published, _("Published"), Fields::Date
         end
 
         collection :components, _("Components") do
-          field :id, _("ID")
+          field :id, _("Id")
           field :name, _("Name")
         end
 
@@ -246,13 +237,6 @@ module HammerCLIKatello
       action :remove
       command_name "remove"
 
-      option ["--content-view-version-ids"], "VERSION_IDS",
-             _("Version ids to remove"),
-            :format => HammerCLI::Options::Normalizers::List.new
-      option ["--lifecycle-environment-ids"], "LIFECYCLE_ENVIRONMENT_IDS",
-             _("Environment ids to remove"),
-            :format => HammerCLI::Options::Normalizers::List.new
-
       def option_sources
         sources = super
         sources.find_by_name('IdResolution').insert_relative(
@@ -285,10 +269,15 @@ 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
+      option_family do
+        parent "--content-view-id", "CONTENT_VIEW_ID",
+               _("Content view id to search by"),
+               attribute_name: :option_content_view_id,
+               format: HammerCLI::Options::Normalizers::Number.new
+        child "--content-view", "CONTENT_VIEW_NAME",
+              _("Content view name to search by"),
+              attribute_name: :option_content_view_name
+      end
 
       validate_options :before, 'IdResolution' do
         if option(:option_content_view_version_version).exist?
@@ -358,10 +347,6 @@ module HammerCLIKatello
 
     autoload_subcommands
 
-    subcommand 'puppet-module',
-               HammerCLIKatello::ContentViewPuppetModule.desc,
-               HammerCLIKatello::ContentViewPuppetModule
-
     subcommand HammerCLIKatello::Filter.command_name,
                HammerCLIKatello::Filter.desc,
                HammerCLIKatello::Filter

data/lib/hammer_cli_katello/content_view_version.rb

@@ -10,7 +10,7 @@ module HammerCLIKatello
       include LifecycleEnvironmentNameMapping
 
       output do
-        field :id, _("ID")
+        field :id, _("Id")
         field :name, _("Name")
         field :version, _("Version")
         field :description, _("Description")
@@ -35,7 +35,7 @@ module HammerCLIKatello
       resource :content_view_versions, :show
 
       output do
-        field :id, _("ID")
+        field :id, _("Id")
         field :name, _("Name")
         field :version, _("Version")
         field :description, _("Description")
@@ -47,23 +47,16 @@ module HammerCLIKatello
         end
 
         collection :environments, _("Lifecycle Environments") do
-          field :id, _("ID")
+          field :id, _("Id")
           field :name, _("Name")
           field :label, _("Label")
         end
 
         collection :repositories, _("Repositories") do
-          field :id, _("ID")
+          field :id, _("Id")
           field :name, _("Name")
           field :label, _("Label")
         end
-
-        collection :puppet_modules, _("Puppet Modules") do
-          field :id, _("ID")
-          field :name, _("Name")
-          field :author, _("Author")
-          field :version, _("Version")
-        end
       end
 
       build_options do |o|
@@ -281,6 +274,7 @@ module HammerCLIKatello
     class ExportDefaultCommand < HammerCLIForeman::Command
       include HammerCLIKatello::LocalHelper
       include HammerCLIKatello::ApipieHelper
+      include HammerCLIKatello::CVImportExportHelper
 
       PUBLISHED_REPOS_DIR = "/var/lib/pulp/published/yum/https/repos/".freeze
 
@@ -297,6 +291,7 @@ module HammerCLIKatello
       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)
@@ -314,6 +309,7 @@ module HammerCLIKatello
     class LegacyExportCommand < HammerCLIKatello::SingleResourceCommand
       include HammerCLIForemanTasks::Async
       include LifecycleEnvironmentNameMapping
+      include HammerCLIKatello::CVImportExportHelper
       desc _('Export a content view (legacy method)')
 
       action :export
@@ -321,12 +317,16 @@ module HammerCLIKatello
 
       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
@@ -357,6 +357,8 @@ module HammerCLIKatello
         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 }
@@ -452,6 +454,8 @@ module HammerCLIKatello
 
       # 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
@@ -494,7 +498,8 @@ module HammerCLIKatello
           library_repos = index(
             :repositories,
             'organization_id' => organization_id,
-            'library' => true
+            'library' => true,
+            'label' => repo['label']
           )
 
           library_repo = library_repos.select do |candidate_repo|