hammer_cli_katello 0.3.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2935135ce7a735329312a4941a262cf9dfd4d0ce
-  data.tar.gz: 22c93056f82485f36df800e2d7654be414d8de02
+  metadata.gz: b724181082827487def5bd163bd3ede79f92d898
+  data.tar.gz: c479307f8e19564413bb8e0b29da2582e98b4625
 SHA512:
-  metadata.gz: ea5a8007be9c13b7b891fe6618982ce6012ed69b8645cd88c17efdce82a7cb66f313247c9057133620327e0af3549fa810094aeafe5aa942922e85609ea2ebb9
-  data.tar.gz: cba3aa8b3fe0bf3cfaf65b39791601d513c4f3115fb7cc8965c4ccc79ce009fcbc259772f030df5e5a35ed93fdf398ad78545965e07a0f830320da308bc1c110
+  metadata.gz: 6ff728a57e711d064752fc75f721fc283634f4cb0cc50df4b80813e9d01b11099c6654ab3b9c440610511023c49892c6fb1dbfff04e9dbf41bb318ece1978efa
+  data.tar.gz: 99dc2f0ba6c14a6e1cf1388d6b4c9f7712b2db6089f3295e24bc196efa7d60657e276a62ace84d15b5f2630d6a3205d30a94dacf83d2d2e75d5cce45336086b8

data/lib/hammer_cli_katello.rb

@@ -23,7 +23,6 @@ module HammerCLIKatello
   require "hammer_cli_katello/version"
   require "hammer_cli_katello/exception_handler"
   require 'hammer_cli_katello/i18n'
-  require "hammer_cli_katello/version"
   require 'hammer_cli_katello/id_resolver'
   require 'hammer_cli_katello/capsule'
   require 'hammer_cli_katello/id_name_options_validator'

data/lib/hammer_cli_katello/activation_key.rb

@@ -1,3 +1,6 @@
+require 'hammer_cli_katello/content_override'
+require 'hammer_cli_katello/product_content'
+
 module HammerCLIKatello
   class ActivationKeyCommand < HammerCLIKatello::Command
     resource :activation_keys
@@ -191,38 +194,18 @@ module HammerCLIKatello
       failure_message _("Could not remove subscription from activation key")
     end
 
-    class ProductContentCommand < HammerCLIKatello::ListCommand
-      action :product_content
-
-      desc _("List associated products")
-      command_name "product-content"
-
-      output do
-        from :content do
-          field :id, _("ID")
-          field :name, _("Name")
-          field :type, _("Type")
-          field :contentUrl, _("URL")
-          field :gpgUrl, _("GPG Key")
-          field :label, _("Label")
-        end
-        field :enabled, _("Enabled?"), Fields::Boolean
-        field :override, _("Override")
-      end
-
-      build_options
+    class ProductContentCommand < HammerCLIKatello::ProductContentBase::ProductContentCommand
+      resource :activation_keys, :product_content
+      setup
     end
 
-    class ContentOverrideCommand < HammerCLIKatello::SingleResourceCommand
-      action :content_override
+    class ContentOverrideCommand < ::HammerCLIKatello::ContentOverrideBase::ContentOverrideCommand
+      resource :activation_keys, :content_override
+      setup
 
-      desc _("Override product content defaults")
-      command_name "content-override"
-
-      build_options
-
-      success_message _("Updated content override")
-      failure_message _("Could not update content override")
+      build_options do |o|
+        o.without(:content_overrides)
+      end
     end
 
     class HostCollectionsCommand < HammerCLIKatello::ListCommand

data/lib/hammer_cli_katello/composite_content_view_name_resolvable.rb

@@ -10,15 +10,13 @@ module HammerCLIKatello
       }
     end
 
-    def all_options
-      result = super.clone
-      if result['option_composite_content_view_name'] &&
-         result['option_composite_content_view_id'].nil?
-        options = composite_content_view_resolve_options(result)
-        result['option_composite_content_view_id'] = resolver.content_view_id(options)
-        @all_options = result
+    def options
+      if super['option_composite_content_view_name'] &&
+         super['option_composite_content_view_id'].nil?
+        options = composite_content_view_resolve_options(super)
+        super['option_composite_content_view_id'] = resolver.content_view_id(options)
       end
-      result
+      super
     end
 
     def self.included(base)

data/lib/hammer_cli_katello/content_override.rb

@@ -0,0 +1,48 @@
+module HammerCLIKatello
+  module ContentOverrideBase
+    class ContentOverrideCommand < HammerCLIKatello::SingleResourceCommand
+      def self.setup
+        desc _("Override product content defaults")
+        command_name "content-override"
+
+        success_message _("Updated content override")
+        failure_message _("Could not update content override")
+
+        option "--content-label", "CONTENT_LABEL", _("Label of the content"),
+               :attribute_name => :option_content_label, :required => true
+
+        option "--name", "NAME", _("Name/Key to override. " \
+                                   "To enable or disable a repo select 'enabled'." \
+                                   "Default value: enabled"),
+               :attribute_name => :option_name, :default => "enabled"
+
+        option "--value", "VALUE", _("Override value. " \
+                                     "Note for repo enablement you can use a boolean value"),
+               :attribute_name => :option_value, :required => false
+
+        option ["--remove"], :flag, _("Remove a content override")
+
+        validate_options do
+          any(:option_remove, :option_value).required
+
+          if option(:option_remove).exist?
+            option(:option_value).rejected
+          elsif option(:option_value).exist?
+            option(:option_remove).rejected
+          end
+        end
+      end
+
+      def request_params
+        super.tap do |opts|
+          opts.delete('content_override')
+          override = { 'content_label' => option_content_label }
+          override['value'] = option_value if option_value
+          override['remove'] = true if option_remove?
+          override['name'] = option_name
+          opts['content_overrides'] = [override]
+        end
+      end
+    end
+  end
+end

data/lib/hammer_cli_katello/content_view.rb

@@ -1,4 +1,5 @@
 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'
 require 'hammer_cli_katello/content_view_component'
@@ -125,12 +126,32 @@ module HammerCLIKatello
     end
 
     class CopyCommand < HammerCLIKatello::CreateCommand
+      include OrganizationOptions
+
       action :copy
 
       desc _("Copy a content view")
       command_name "copy"
 
-      option "--name", "NAME", _("New content view name"), :attribute_name => :option_name
+      option "--name", "NAME", _("Content view name to search by"), :attribute_name => :option_name
+      option "--new-name", "NEW_NAME", _("New content view name"),
+             :attribute_name => :option_new_name
+
+      validate_options do
+        organization_options = [:option_organization_id, :option_organization_name, \
+                                :option_organization_label]
+
+        if option(:option_name).exist?
+          any(*organization_options).required
+        end
+      end
+
+      def request_params
+        super.tap do |opts|
+          opts['name'] = option_new_name
+        end
+      end
+
       build_options
 
       success_message _("Content view copied")
@@ -138,14 +159,26 @@ module HammerCLIKatello
     end
 
     class UpdateCommand < HammerCLIKatello::UpdateCommand
+      include OrganizationOptions
+
       success_message _("Content view updated")
       failure_message _("Could not update the content view")
 
+      validate_options do
+        organization_options = [:option_organization_id, :option_organization_name, \
+                                :option_organization_label]
+
+        if option(:option_name).exist?
+          any(*organization_options).required
+        end
+      end
+
       build_options
     end
 
     class DeleteCommand < HammerCLIKatello::DeleteCommand
       include HammerCLIForemanTasks::Async
+      include OrganizationOptions
 
       action :destroy
       command_name "delete"
@@ -153,6 +186,15 @@ module HammerCLIKatello
       success_message _("Content view is being deleted with task %{id}")
       failure_message _("Could not delete the content view")
 
+      validate_options do
+        organization_options = [:option_organization_id, :option_organization_name, \
+                                :option_organization_label]
+
+        if option(:option_name).exist?
+          any(*organization_options).required
+        end
+      end
+
       build_options
     end
 
@@ -197,10 +239,17 @@ module HammerCLIKatello
       option ["--environment-ids"], "ENVIRONMENT_IDS",
              _("Comma separated list of environment ids to remove")
 
+      def all_options
+        opts = super
+        opts['option_content_view_id'] = option_id
+        opts['option_lifecycle_environment_names'] = opts['option_environment_names']
+        opts
+      end
+
       def request_params
         super.tap do |opts|
           %w(content_view_version_ids environment_ids).each do |key|
-            opts[key] = opts[key].split(",") if opts[key]
+            opts[key] = opts[key].split(",") if opts[key] && opts[key].respond_to?(:split)
           end
         end
       end
@@ -208,34 +257,74 @@ module HammerCLIKatello
       success_message _("Content view objects are being removed task %{id}")
       failure_message _("Could not remove objects from content view")
 
-      build_options :without => %w(content_view_version_ids environment_ids)
+      build_options
     end
 
     class AddContentViewVersionCommand < HammerCLIKatello::AddAssociatedCommand
+      include OrganizationOptions
+
       command_name 'add-version'
       desc _('Add a content view version to a composite view')
 
+      validate_options do
+        if option(:option_content_view_version_version).exist?
+          any(:option_content_view_id, :option_content_view_name).required
+        end
+      end
+
       def association_name(plural = false)
         plural ? "components" : "component"
       end
 
+      validate_options do
+        organization_options = [:option_organization_id, :option_organization_name, \
+                                :option_organization_label]
+
+        if option(:option_name).exist?
+          any(*organization_options).required
+        end
+      end
+
       associated_resource :content_view_versions
-      build_options
+
+      build_options do |o|
+        o.expand.including(:content_views)
+      end
 
       success_message _("The component version has been added")
       failure_message _("Could not add version")
     end
 
     class RemoveContentViewVersionCommand < HammerCLIKatello::RemoveAssociatedCommand
+      include OrganizationOptions
+
       command_name 'remove-version'
       desc _('Remove a content view version from a composite view')
 
+      validate_options do
+        if option(:option_content_view_version_version).exist?
+          any(:option_content_view_id, :option_content_view_name).required
+        end
+      end
+
       def association_name(plural = false)
         plural ? "components" : "component"
       end
 
+      validate_options do
+        organization_options = [:option_organization_id, :option_organization_name, \
+                                :option_organization_label]
+
+        if option(:option_name).exist?
+          any(*organization_options).required
+        end
+      end
+
       associated_resource :content_view_versions
-      build_options
+
+      build_options do |o|
+        o.expand.including(:content_views)
+      end
 
       success_message _("The component version has been removed")
       failure_message _("Could not remove version")
@@ -260,5 +349,9 @@ module HammerCLIKatello
     subcommand HammerCLIKatello::ContentViewComponent.command_name,
                HammerCLIKatello::ContentViewComponent.desc,
                HammerCLIKatello::ContentViewComponent
+
+    subcommand HammerCLIKatello::ContentViewPurgeCommand.command_name,
+               HammerCLIKatello::ContentViewPurgeCommand.desc,
+               HammerCLIKatello::ContentViewPurgeCommand
   end
 end

data/lib/hammer_cli_katello/content_view_name_resolvable.rb

@@ -9,13 +9,11 @@ module HammerCLIKatello
     end
 
     def all_options
-      result = super.clone
-      if result['option_content_view_name'] && result['option_content_view_id'].nil?
-        result['option_content_view_id'] = resolver.content_view_id(
-          content_view_resolve_options(result))
-        @all_options = result
+      if super['option_content_view_name'] && super['option_content_view_id'].nil?
+        super['option_content_view_id'] = resolver.content_view_id(
+          content_view_resolve_options(super))
       end
-      result
+      super
     end
   end
 end

data/lib/hammer_cli_katello/content_view_purge.rb

@@ -0,0 +1,92 @@
+module HammerCLIKatello
+  class ContentViewPurgeCommand < HammerCLIKatello::Command
+    include HammerCLIForemanTasks::Async
+    include OrganizationOptions
+
+    command_name "purge"
+    desc "Delete old versions of a content view"
+
+    option "--id", "ID", _("Content View numeric identifier")
+    option "--name", "NAME", _("Content View name")
+    option "--count", "COUNT", _("count of unused versions to keep"),
+           default: 3, format: HammerCLI::Options::Normalizers::Number.new
+
+    validate_options do
+      organization_options = [:option_organization_id, :option_organization_name, \
+                              :option_organization_label]
+
+      any(:option_name, :option_id).required
+
+      if option(:option_name).exist?
+        any(*organization_options).required
+      end
+    end
+
+    build_options
+
+    def resource_content_views
+      HammerCLIForeman.foreman_resource(:content_views)
+    end
+
+    def resource_content_view_versions
+      HammerCLIForeman.foreman_resource(:content_view_versions)
+    end
+
+    def all_options
+      if super['option_id'].nil? && super['option_name']
+        super['option_id'] = resolver.content_view_id(super)
+      end
+      super
+    end
+
+    def execute
+      if option_count < 0
+        output.print_error _("Invalid value for --count option: value must be 0 or greater.")
+        return HammerCLI::EX_USAGE
+      end
+
+      # Check if there is something to do
+      if option_count >= old_unused_versions.size
+        output.print_error _("No versions to delete.")
+        HammerCLI::EX_NOT_FOUND
+      else
+        versions_to_purge = old_unused_versions.slice(0, old_unused_versions.size - option_count)
+
+        versions_to_purge.each do |v|
+          purge_version(v)
+        end
+        HammerCLI::EX_OK
+      end
+    end
+
+    private def purge_version(v)
+      if option_async?
+        task = resource_content_view_versions.call(:destroy, 'id' => v["id"])
+        print_message _("Version '%{version}' of content view '%{view}' scheduled "\
+                        "for deletion in task '%{task_id}'.") %
+                      {version: v["version"], view: content_view["name"], task_id: task['id']}
+      else
+        task_progress(resource_content_view_versions.call(:destroy, 'id' => v["id"]))
+        print_message _("Version '%{version}' of content view '%{view}' deleted.") %
+                      {version: v["version"], view: content_view["name"]}
+      end
+    end
+
+    private def content_view
+      @content_view ||= resource_content_views.call(:show, 'id' => options['option_id'])
+    end
+
+    private def old_unused_versions
+      return @old_unused_versions if @old_unused_versions
+
+      all_versions = content_view['versions'].sort_by do |version|
+        [version[:major], version[:minor]]
+      end
+
+      # Keep only versions which are not used
+      @old_unused_versions = all_versions.select do |v|
+        v["environment_ids"].empty?
+      end
+    end
+  end
+end

data/lib/hammer_cli_katello/content_view_version.rb

@@ -62,6 +62,19 @@ module HammerCLIKatello
       end
     end
 
+    class RepublishRepositoriesCommand < HammerCLIKatello::SingleResourceCommand
+      include HammerCLIForemanTasks::Async
+
+      action :republish_repositories
+      command_name "republish-repositories"
+
+      success_message _("Content View Version is being republished with task %{id}")
+      failure_message _("Could not republish the Content View")
+      build_options do |o|
+        o.expand(:all).including(:content_views, :organizations)
+      end
+    end
+
     class PromoteCommand < HammerCLIKatello::SingleResourceCommand
       include HammerCLIForemanTasks::Async