hammer_cli_katello 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ec840ea7e9516ce7268b7d2ddce6bebce2a4b4a71ac4963c475fc472a6e5dab
-  data.tar.gz: 2388188ed12e64cc36d20192ccd1d70c2e53547efef35a5f40b02d1a190fcb77
+  metadata.gz: 70bd64a3e1a162fa1c50c097a5f6c60cff91f6764a91aa715f575387bc02406c
+  data.tar.gz: 9b75290d2868faa302f15f23022bf310ca7f091ec819da5eba988abb17adda4d
 SHA512:
-  metadata.gz: 190ede71c0bb873d5ded32b884de84137da2a367d987f055505fcfde3995a3419fd1e5c919630569b18266bba2efd5c5a496b471803de659f63dd547299c67e1
-  data.tar.gz: 3f96f683fb9a0ab6f0f92c6451aa528dd6929c6a16172dd1a4dfbfc63c7dcb6f1d7b2b0f49dc1fff72f039a08aaa5374d31d122a7222e053d985c78755f44e97
+  metadata.gz: 0b5ab6e3272b3336bb11ca0b0e200fab63654f90bdafc5c213807fb9928da84e377132a408f826a58b8b58d2d55d9fa5f8b142284ff8f0f310b74b72cfd18ec7
+  data.tar.gz: a114e7f127f3418cadf0a7f9e06a728a6837013eac2245fe4ca49836441486cb7599146a027f22559376fa0ecaf3f44ecd1a5a587f97a9bc0e19b44e62bc8465

data/lib/hammer_cli_katello/command_extensions/content_source.rb

@@ -0,0 +1,32 @@
+module HammerCLIKatello
+  module CommandExtensions
+    class ContentSource < HammerCLI::CommandExtensions
+      option_family associate: 'content_source' do
+        child '--content-source', 'CONTENT_SOURCE_NAME', _('Content Source name'),
+              attribute_name: :option_content_source,
+              referenced_resource: :smart_proxy
+      end
+
+      request_params do |params, cmd_obj|
+        begin
+          resource_name = cmd_obj.resource.singular_name
+          if cmd_obj.option_content_source && !cmd_obj.option_content_source_id
+            resource_hash = if resource_name == 'hostgroup'
+                              params[resource_name]
+                            else
+                              params[resource_name]['content_facet_attributes']
+                            end
+
+            proxy_options = {
+              HammerCLI.option_accessor_name('name') => cmd_obj.option_content_source
+            }
+            resource_hash['content_source_id'] = cmd_obj.resolver.smart_proxy_id(proxy_options)
+          end
+        rescue HammerCLIForeman::ResolverError => e
+          e.message.gsub!('smart_proxy', _('Content Source'))
+          raise e
+        end
+      end
+    end
+  end
+end

data/lib/hammer_cli_katello/command_extensions/kickstart_repository.rb

@@ -0,0 +1,50 @@
+module HammerCLIKatello
+  module CommandExtensions
+    class KickstartRepository < HammerCLI::CommandExtensions
+      option_family associate: 'kickstart_repository' do
+        child '--kickstart-repository', 'REPOSITORY_NAME', _('Kickstart repository name'),
+              attribute_name: :option_kickstart_repository
+      end
+
+      request_params do |params, cmd_obj|
+        resource_name = cmd_obj.resource.singular_name
+        if cmd_obj.option_kickstart_repository && !cmd_obj.option_kickstart_repository_id
+          resource_hash = if resource_name == 'hostgroup'
+                            params[resource_name]
+                          else
+                            params[resource_name]['content_facet_attributes']
+                          end
+
+          resource_hash ||= {}
+
+          env_id = resource_hash['lifecycle_environment_id']
+          cv_id = resource_hash['content_view_id']
+
+          raise _('Please provide --lifecycle-environment-id') unless env_id
+
+          raise _('Please provide --content-view-id') unless cv_id
+          # rubocop:disable LineLength
+          resource_hash['kickstart_repository_id'] = HammerCLIKatello::CommandExtensions::KickstartRepository.fetch_repo_id(
+            cv_id, env_id, cmd_obj.option_kickstart_repository
+          )
+          # rubocop:enable LineLength
+        end
+      end
+
+      def self.fetch_repo_id(cv_id, env_id, repo_name)
+        repo_resource = HammerCLIForeman.foreman_resource(:repositories)
+        index_options = {
+          content_view_id: cv_id,
+          environment_id: env_id,
+          name: repo_name
+        }
+        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)
+        end
+        repos.first['id']
+      end
+    end
+  end
+end

data/lib/hammer_cli_katello/command_extensions/lifecycle_environment.rb

@@ -13,6 +13,18 @@ module HammerCLIKatello
                attribute_name: :option_environment_id
       end
 
+      # Add explicitly defined options since option builder won't be
+      # able to create options automatically in case there is missing resource
+      # in API docs or if the resource name is different
+      # (e.g. environment instead of lifecycle_environment)
+      # This can happen if API docs contain a param which cannot be mapped
+      # via param_name to resource_name mapping
+      option_family associate: 'lifecycle_environment' do
+        child '--lifecycle-environment', 'ENVIRONMENT_NAME',
+              _('Lifecycle environment name to search by'),
+              attribute_name: :option_environment_name
+      end
+
       option_sources do |sources, command|
         sources.find_by_name('IdResolution').insert_relative(
           :after,

data/lib/hammer_cli_katello/command_extensions.rb

@@ -3,3 +3,5 @@
 require 'hammer_cli_katello/command_extensions/lifecycle_environment'
 require 'hammer_cli_katello/command_extensions/lifecycle_environments'
 require 'hammer_cli_katello/command_extensions/ping'
+require 'hammer_cli_katello/command_extensions/content_source'
+require 'hammer_cli_katello/command_extensions/kickstart_repository'

data/lib/hammer_cli_katello/commands.rb

@@ -36,7 +36,7 @@ module HammerCLIKatello
       end
 
       def resource_name_mapping
-        HammerCLIKatello::RESOURCE_NAME_MAPPING.dup
+        super.merge(HammerCLIKatello::RESOURCE_NAME_MAPPING.dup)
       end
     end
   end

data/lib/hammer_cli_katello/content_export_helper.rb

@@ -162,14 +162,18 @@ module HammerCLIKatello
                  :required => false
 
       base.build_options do |o|
-        o.expand(:all).including(:content_views, :organizations, :environments)
+        o.expand(:all).including(:content_views, :organizations, :lifecycle_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
-          any(:option_version, :option_environment_id, :option_environment_name).required
+          any(
+            :option_version,
+            :option_lifecycle_environment_id,
+            :option_lifecycle_environment_name
+          ).required
           unless option(:option_content_view_id).exist?
             any(:option_organization_id, :option_organization_name, \
                                 :option_organization_label).required

data/lib/hammer_cli_katello/content_view.rb

@@ -197,6 +197,17 @@ module HammerCLIKatello
       failure_message _("Could not publish the content view")
 
       build_options
+
+      option_family associate: 'lifecycle_environment' do
+        child '--lifecycle-environments', 'LIFECYCLE_ENVIRONMENT_NAMES',
+              _('Names for Lifecycle Environment'),
+              format: HammerCLI::Options::Normalizers::List.new,
+              attribute_name: :option_environment_names
+      end
+
+      extend_with(
+        HammerCLIKatello::CommandExtensions::LifecycleEnvironments.new(only: :option_sources)
+      )
     end
 
     class RemoveFromEnvironmentCommand < HammerCLIKatello::SingleResourceCommand

data/lib/hammer_cli_katello/content_view_version.rb

@@ -60,7 +60,7 @@ module HammerCLIKatello
       end
 
       build_options do |o|
-        o.expand(:all).including(:environments, :content_views, :organizations)
+        o.expand(:all).including(:lifecycle_environments, :content_views, :organizations)
       end
 
       extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
@@ -143,7 +143,7 @@ module HammerCLIKatello
       failure_message _("Could not delete the content view")
 
       build_options do |o|
-        o.expand(:all).including(:environments, :content_views, :organizations)
+        o.expand(:all).including(:lifecycle_environments, :content_views, :organizations)
       end
 
       extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
@@ -157,7 +157,7 @@ module HammerCLIKatello
       failure_message _("Could not update the content view version")
 
       build_options do |o|
-        o.expand(:all).including(:environments, :content_views, :organizations)
+        o.expand(:all).including(:lifecycle_environments, :content_views, :organizations)
       end
 
       extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)

data/lib/hammer_cli_katello/host_errata.rb

@@ -46,10 +46,9 @@ module HammerCLIKatello
     end
 
     class RecalculateCommand < HammerCLIKatello::SingleResourceCommand
-      include HammerCLIForemanTasks::Async
       resource :host_errata, :applicability
       command_name "recalculate"
-      success_message _("Errata recalculated with task %{id}.")
+      success_message _("Errata recalculation started.")
       failure_message _("Could not recalculate errata")
 
       build_options

data/lib/hammer_cli_katello/host_extensions.rb

@@ -3,23 +3,25 @@ require 'hammer_cli_katello/host_errata'
 require 'hammer_cli_katello/host_subscription'
 require 'hammer_cli_katello/host_package'
 require 'hammer_cli_katello/host_package_group'
-require 'hammer_cli_katello/host_kickstart_repository_options'
-require 'hammer_cli_katello/host_content_source_options'
 require 'hammer_cli_katello/host_traces'
 
 module HammerCLIKatello
   module HostExtensions
     ::HammerCLIForeman::Host::CreateCommand.instance_eval do
       include HammerCLIKatello::ResolverCommons
-      include HammerCLIKatello::HostContentSourceOptions
-      include ::HammerCLIKatello::HostKickstartRepositoryOptions
     end
+    ::HammerCLIForeman::Host::CreateCommand.extend_with(
+      HammerCLIKatello::CommandExtensions::ContentSource.new,
+      HammerCLIKatello::CommandExtensions::KickstartRepository.new
+    )
 
     ::HammerCLIForeman::Host::UpdateCommand.instance_eval do
       include HammerCLIKatello::ResolverCommons
-      include HammerCLIKatello::HostContentSourceOptions
-      include ::HammerCLIKatello::HostKickstartRepositoryOptions
     end
+    ::HammerCLIForeman::Host::UpdateCommand.extend_with(
+      HammerCLIKatello::CommandExtensions::ContentSource.new,
+      HammerCLIKatello::CommandExtensions::KickstartRepository.new
+    )
 
     ::HammerCLIForeman::Host::ListCommand.instance_eval do
       output do

data/lib/hammer_cli_katello/hostgroup_extensions.rb

@@ -1,16 +1,19 @@
 require 'hammer_cli_foreman/hostgroup'
-require 'hammer_cli_katello/host_kickstart_repository_options'
-require 'hammer_cli_katello/host_content_source_options'
 
 module HammerCLIKatello
   module QueryOrganizationOptions
     def self.included(base)
-      base.option '--query-organization-id', 'ORGANIZATION_ID',
-        _('Organization ID to search by'), attribute_name: :option_organization_id
-      base.option '--query-organization', 'ORGANIZATION_NAME',
-        _('Organization name to search by'), attribute_name: :option_organization_name
-      base.option '--query-organization-label', 'ORGANIZATION_LABEL',
-        _('Organization label to search by'), attribute_name: :option_organization_label
+      base.option_family do
+        parent '--query-organization-id', 'ORGANIZATION_ID',
+               _('Organization ID to search by'),
+               attribute_name: :option_organization_id
+        child '--query-organization', 'ORGANIZATION_NAME',
+              _('Organization name to search by'),
+              attribute_name: :option_organization_name
+        child '--query-organization-label', 'ORGANIZATION_LABEL',
+              _('Organization label to search by'),
+              attribute_name: :option_organization_label
+      end
 
       base.validate_options :before, 'IdResolution' do
         organization_options = [
@@ -30,17 +33,21 @@ module HammerCLIKatello
       include HammerCLIKatello::ResolverCommons
       include HammerCLIKatello::ContentViewNameResolvable
       include HammerCLIKatello::QueryOrganizationOptions
-      include HammerCLIKatello::HostContentSourceOptions
-      include HammerCLIKatello::HostKickstartRepositoryOptions
     end
+    ::HammerCLIForeman::Hostgroup::CreateCommand.extend_with(
+      HammerCLIKatello::CommandExtensions::ContentSource.new,
+      HammerCLIKatello::CommandExtensions::KickstartRepository.new
+    )
 
     ::HammerCLIForeman::Hostgroup::UpdateCommand.instance_eval do
       include HammerCLIKatello::ResolverCommons
       include HammerCLIKatello::ContentViewNameResolvable
       include HammerCLIKatello::QueryOrganizationOptions
-      include HammerCLIKatello::HostContentSourceOptions
-      include HammerCLIKatello::HostKickstartRepositoryOptions
     end
+    ::HammerCLIForeman::Hostgroup::UpdateCommand.extend_with(
+      HammerCLIKatello::CommandExtensions::ContentSource.new,
+      HammerCLIKatello::CommandExtensions::KickstartRepository.new
+    )
 
     ::HammerCLIForeman::Hostgroup::InfoCommand.instance_eval do
       output do

data/lib/hammer_cli_katello/id_resolver.rb

@@ -74,12 +74,15 @@ module HammerCLIKatello
         return options['option_lifecycle_environment_ids']
       end
 
-      key_names = HammerCLI.option_accessor_name 'lifecycle_environment_names'
+      names = options[HammerCLI.option_accessor_name('lifecycle_environment_names')] ||
+              options[HammerCLI.option_accessor_name('environment_names')] ||
+              options[HammerCLI.option_accessor_name('names')]
       key_organization_id = HammerCLI.option_accessor_name 'organization_id'
       options[key_organization_id] ||= organization_id(scoped_options('organization', options))
 
+      options['option_lifecycle_environment_names'] = names
       find_resources(:lifecycle_environments, options)
-        .select { |repo| options[key_names].include? repo['name'] }.map { |repo| repo['id'] }
+        .select { |repo| names.include? repo['name'] }.map { |repo| repo['id'] }
     end
 
     def repository_id(options)

data/lib/hammer_cli_katello/option_sources/lifecycle_environment_params.rb

@@ -6,15 +6,52 @@ module HammerCLIKatello
       end
 
       def get_options(_defined_options, result)
+        legacy_option_id(result)
+        legacy_option_ids(result)
+        ensure_option_id(result)
+        ensure_option_ids(result)
+        result
+      end
+
+      private
+
+      def lifecycle_environment_resource_name
+        (HammerCLIForeman.param_to_resource('environment') ||
+          HammerCLIForeman.param_to_resource('lifecycle_environment')).singular_name
+      end
+
+      def legacy_option_id(result)
         if result['option_environment_name'] && result['option_environment_id'].nil?
           result['option_environment_id'] = @command.resolver.lifecycle_environment_id(
-            @command.resolver.scoped_options('environment', result, :single))
+            @command.resolver.scoped_options(lifecycle_environment_resource_name, result, :single))
         end
+      end
+
+      def legacy_option_ids(result)
         if result['option_environment_names'] && result['option_environment_ids'].nil?
           result['option_environment_ids'] = @command.resolver.lifecycle_environment_ids(
-            @command.resolver.scoped_options('environment', result, :multi))
+            @command.resolver.scoped_options(lifecycle_environment_resource_name, result, :multi))
+        end
+      end
+
+      def ensure_option_id(result)
+        if result['option_environment_id'].nil? && result['option_lifecycle_environment_name']
+          id = @command.resolver.lifecycle_environment_id(
+            @command.resolver.scoped_options(lifecycle_environment_resource_name, result, :single)
+          )
+          result['option_environment_id'] = id
+          result['option_lifecycle_environment_id'] = id
+        end
+      end
+
+      def ensure_option_ids(result)
+        if result['option_environment_ids'].nil? && result['option_lifecycle_environment_names']
+          ids = @command.resolver.lifecycle_environment_ids(
+            @command.resolver.scoped_options(lifecycle_environment_resource_name, result, :multi)
+          )
+          result['option_environment_ids'] = ids
+          result['option_lifecycle_environment_ids'] = ids
         end
-        result
       end
     end
   end

data/lib/hammer_cli_katello/organization.rb

@@ -20,9 +20,17 @@ module HammerCLIKatello
       output do
         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
+        from :cdn_configuration do
+          label "CDN configuration", hide_blank: true do
+            field :url, _("URL"), Fields::Field, hide_blank: true
+            field :upstream_organization_label, _("Upstream Organization"),
+                                               Fields::Field, hide_blank: true
+            field :username, _("Username"), Fields::Field, hide_blank: true
+            field :ssl_ca_credential_id, _("SSL CA Credential ID"), Fields::Field, hide_blank: true
+          end
+        end
       end
 
       def extend_data(data)
@@ -44,7 +52,9 @@ module HammerCLIKatello
       success_message _("Organization updated.")
       failure_message _("Could not update the organization")
 
-      build_options
+      build_options do |o|
+        o.expand(:all).except(:environments)
+      end
     end
 
     class CreateCommand < HammerCLIForeman::Organization::CreateCommand
@@ -54,7 +64,9 @@ module HammerCLIKatello
       success_message _("Organization created.")
       failure_message _("Could not create the organization")
 
-      build_options
+      build_options do |o|
+        o.expand(:all).except(:environments)
+      end
     end
 
     class DeleteCommand < HammerCLIForeman::Organization::DeleteCommand
@@ -68,6 +80,19 @@ module HammerCLIKatello
       build_options
     end
 
+    class ConfigureCdnCommand < HammerCLIKatello::SingleResourceCommand
+      include HammerCLIKatello::ResolverCommons
+      resource :organizations, :cdn_configuration
+      command_name "configure-cdn"
+      success_message _("Updated CDN configuration.")
+      failure_message _("Could not update CDN configuration.")
+
+      build_options do |o|
+        o.expand(:all).except(:organizations, :locations)
+        o.without(:organization_id, :location_id)
+      end
+    end
+
     autoload_subcommands
   end
 end

data/lib/hammer_cli_katello/package.rb

@@ -3,7 +3,6 @@ module HammerCLIKatello
     resource :packages
 
     class ListCommand < HammerCLIKatello::ListCommand
-      extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
       include LifecycleEnvironmentNameMapping
 
       output do
@@ -40,6 +39,8 @@ module HammerCLIKatello
       build_options do |o|
         o.expand.including(:products, :content_views)
       end
+
+      extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
     end
 
     class InfoCommand < HammerCLIKatello::InfoCommand

data/lib/hammer_cli_katello/ping.rb

@@ -51,6 +51,13 @@ module HammerCLIKatello
           end
         end
 
+        label "pulp3_content", :hide_blank => true do
+          from "pulp3_content" do
+            field "status", _("Status"), Fields::Field, :hide_blank => true
+            field "_response", _("Server Response"), Fields::Field, :hide_blank => true
+          end
+        end
+
         label "foreman_tasks" do
           from "foreman_tasks" do
             field "status", _("Status")

data/lib/hammer_cli_katello/repository.rb

@@ -62,10 +62,6 @@ module HammerCLIKatello
         field :full_path, _("Published At")
         field :relative_path, _("Relative Path")
         field :download_policy, _("Download Policy"), Fields::Field, :hide_blank => true
-        field :ostree_upstream_sync_policy, _("OSTree Upstream Sync Policy"),
-              Fields::Field, :hide_blank => true
-        field :_ostree_upstream_sync_depth, _("OSTree Upstream Sync Depth"),
-              Fields::Field, :hide_blank => true
         field :docker_upstream_name, _("Upstream Repository Name"),
               Fields::Field, :hide_blank => true
         field :docker_tags_whitelist, _("Container Image Tags Filter"),
@@ -403,6 +399,12 @@ module HammerCLIKatello
       build_options(:without => [:content]) do |o|
         o.expand.including(:products, :organizations)
       end
+
+      option "--ostree-repository-name", "OSTREE REPOSITORY NAME",
+        _("Name of OSTree repository in archive."),
+        :attribute_name => :option_ostree_repository_name,
+        :required => false
+
       option "--path", "PATH", _("Upload file, directory of files, or glob of files " \
                                  "as content for a repository.\n" \
                                  "Globs must be escaped by single or double quotes"),
@@ -423,6 +425,7 @@ module HammerCLIKatello
           repo_id = get_identifier
           update_content_upload(upload_id, repo_id, file)
         end
+        opts[:ostree_repository_name] = options["option_ostree_repository_name"]
         results = import_uploads([
           {
             id: upload_id,
@@ -479,6 +482,9 @@ module HammerCLIKatello
                   sync_capsule: sync_capsule
         }
         params[:content_type] = options["option_content_type"] if options["option_content_type"]
+        if options["option_ostree_repository_name"]
+          params[:ostree_repository_name] = options["option_ostree_repository_name"]
+        end
         resource.call(:import_uploads, params)
       end
 

data/lib/hammer_cli_katello/search_options_creators.rb

@@ -57,7 +57,8 @@ module HammerCLIKatello
     def create_lifecycle_environments_search_options(options, mode = nil)
       search_options = {}
       if mode != :multi
-        name = options[HammerCLI.option_accessor_name("name")]
+        name = options[HammerCLI.option_accessor_name("environment_name")] ||
+               options[HammerCLI.option_accessor_name("name")]
         search_options['name'] = name if name
       end
       organization_id = organization_id(scoped_options('organization', options, :single))

data/lib/hammer_cli_katello/srpm.rb

@@ -39,6 +39,8 @@ module HammerCLIKatello
       build_options do |o|
         o.expand.including(:products, :content_views)
       end
+
+      extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
     end
 
     class InfoCommand < HammerCLIKatello::InfoCommand

data/lib/hammer_cli_katello/version.rb

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