hammer_cli_katello 0.24.1 → 1.0.1

data/test/functional/repository/list_test.rb

@@ -1,8 +1,6 @@
 require File.join(File.dirname(__FILE__), '../test_helper')
 require File.join(File.dirname(__FILE__), '../lifecycle_environment/lifecycle_environment_helpers')
 
-require 'hammer_cli_katello/content_view_puppet_module'
-
 describe 'listing repositories' do
   include LifecycleEnvironmentHelpers
 

data/test/functional/search_helpers.rb

@@ -3,4 +3,15 @@ module SearchHelpers
     ex = api_expects(resource, :index, "Find the #{resource}").with_params(args[:params])
     ex.returns(index_response([args[:returns]]))
   end
+
+  def expect_lenient_search(resource, params:, returns:)
+    ex = api_expects(resource, :index, "Find the #{resource}") do |p|
+      params.each do |key, expected|
+        actual = p[key] || p[key.to_sym] || p[key.to_s]
+        assert_equal expected.to_s, actual.to_s, "key: '#{key}', resource: #{resource}"
+      end
+    end
+    returns = [returns] unless returns.is_a? Array
+    ex.returns(index_response(returns))
+  end
 end

data/test/functional/simple_content_access/disable_test.rb

@@ -0,0 +1,48 @@
+require File.join(File.dirname(__FILE__), '../../test_helper')
+
+describe 'simple-content-access disable' do
+  before do
+    @cmd = %w(simple-content-access disable)
+  end
+
+  let(:organization_id) { 3 }
+
+  it "disables with required options" do
+    params = ["--organization-id=#{organization_id}"]
+
+    api_expects(:simple_content_access, :eligible).
+      with_params('organization_id' => organization_id).
+      returns("simple_content_access_eligible" => true)
+
+    api_expects(:simple_content_access, :disable)
+      .with_params('organization_id' => organization_id)
+    run_cmd(@cmd + params)
+  end
+
+  it 'fails on missing required params' do
+    params = []
+
+    result = run_cmd(@cmd + params)
+    expected_error = "Could not disable Simple Content Access for this organization"
+
+    assert_equal(result.exit_code, HammerCLI::EX_SOFTWARE)
+    assert_equal(result.err[/#{expected_error}/], expected_error)
+  end
+
+  it 'fails on non eligible org' do
+    params = ["--organization-id=#{organization_id}"]
+
+    api_expects(:simple_content_access, :eligible).
+      with_params('organization_id' => organization_id).
+      returns("simple_content_access_eligible" => false)
+
+    api_expects(:simple_content_access, :disable)
+      .with_params('organization_id' => organization_id).never
+    result = run_cmd(@cmd + params)
+
+    expected_error = "Could not disable Simple Content Access for this organization"
+
+    assert_equal(result.exit_code, HammerCLI::EX_SOFTWARE)
+    assert_equal(result.err[/#{expected_error}/], expected_error)
+  end
+end

data/test/functional/simple_content_access/enable_test.rb

@@ -0,0 +1,46 @@
+require File.join(File.dirname(__FILE__), '../../test_helper')
+
+describe 'simple-content-access enable' do
+  before do
+    @cmd = %w(simple-content-access enable)
+  end
+
+  let(:organization_id) { 3 }
+
+  it "enables with required options" do
+    params = ["--organization-id=#{organization_id}"]
+    api_expects(:simple_content_access, :eligible).
+      with_params('organization_id' => organization_id).
+      returns("simple_content_access_eligible" => true)
+
+    api_expects(:simple_content_access, :enable)
+      .with_params('organization_id' => organization_id)
+    run_cmd(@cmd + params)
+  end
+
+  it 'fails on missing required params' do
+    params = []
+    result = run_cmd(@cmd + params)
+    expected_error = "Could not enable Simple Content Access for this organization"
+
+    assert_equal(result.exit_code, HammerCLI::EX_SOFTWARE)
+    assert_equal(result.err[/#{expected_error}/], expected_error)
+  end
+
+  it 'fails on non eligible org' do
+    params = ["--organization-id=#{organization_id}"]
+
+    api_expects(:simple_content_access, :eligible).
+      with_params('organization_id' => organization_id).
+      returns("simple_content_access_eligible" => false)
+
+    api_expects(:simple_content_access, :enable)
+      .with_params('organization_id' => organization_id).never
+    result = run_cmd(@cmd + params)
+
+    expected_error = "Could not enable Simple Content Access for this organization"
+
+    assert_equal(result.exit_code, HammerCLI::EX_SOFTWARE)
+    assert_equal(result.err[/#{expected_error}/], expected_error)
+  end
+end

data/test/test_helper.rb

@@ -17,7 +17,7 @@ require 'minitest/spec'
 require 'mocha/minitest'
 require 'hammer_cli'
 
-KATELLO_VERSION = Gem::Version.new(ENV['TEST_API_VERSION'] || '3.18')
+KATELLO_VERSION = Gem::Version.new(ENV['TEST_API_VERSION'] || '4.0')
 
 if HammerCLI.context[:api_connection]
   HammerCLI.context[:api_connection].create('foreman') do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_katello
 version: !ruby/object:Gem::Version
-  version: 0.24.1
+  version: 1.0.1
 platform: ruby
 authors:
 - Adam Price
@@ -35,7 +35,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-09 00:00:00.000000000 Z
+date: 2021-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman
@@ -249,7 +249,6 @@ files:
 - lib/hammer_cli_katello/content_view.rb
 - lib/hammer_cli_katello/content_view_component.rb
 - lib/hammer_cli_katello/content_view_name_resolvable.rb
-- lib/hammer_cli_katello/content_view_puppet_module.rb
 - lib/hammer_cli_katello/content_view_purge.rb
 - lib/hammer_cli_katello/content_view_version.rb
 - lib/hammer_cli_katello/cv_import_export_helper.rb
@@ -261,7 +260,6 @@ files:
 - lib/hammer_cli_katello/filter.rb
 - lib/hammer_cli_katello/filter_rule.rb
 - lib/hammer_cli_katello/foreman_search_options_creators.rb
-- lib/hammer_cli_katello/gpg_key.rb
 - lib/hammer_cli_katello/host.rb
 - lib/hammer_cli_katello/host_collection.rb
 - lib/hammer_cli_katello/host_collection_erratum.rb
@@ -298,11 +296,11 @@ files:
 - lib/hammer_cli_katello/ping.rb
 - lib/hammer_cli_katello/product.rb
 - lib/hammer_cli_katello/product_content.rb
-- lib/hammer_cli_katello/puppet_module.rb
 - lib/hammer_cli_katello/repository.rb
 - lib/hammer_cli_katello/repository_scoped_to_product.rb
 - lib/hammer_cli_katello/repository_set.rb
 - lib/hammer_cli_katello/search_options_creators.rb
+- lib/hammer_cli_katello/simple_content_access.rb
 - lib/hammer_cli_katello/srpm.rb
 - lib/hammer_cli_katello/status.rb
 - lib/hammer_cli_katello/subscription.rb
@@ -335,6 +333,7 @@ files:
 - test/data/3.16/foreman_api.json
 - test/data/3.17/foreman_api.json
 - test/data/3.18/foreman_api.json
+- test/data/3.19/foreman_api.json
 - test/data/3.2/foreman_api.json
 - test/data/3.4/foreman_api.json
 - test/data/3.5/foreman_api.json
@@ -342,6 +341,7 @@ files:
 - test/data/3.7/foreman_api.json
 - test/data/3.8/foreman_api.json
 - test/data/3.9/foreman_api.json
+- test/data/4.0/foreman_api.json
 - test/data/Readme.md
 - test/functional/activation_key/add_host_collection_test.rb
 - test/functional/activation_key/content_override_test.rb
@@ -367,6 +367,8 @@ files:
 - test/functional/capsule/content/synchronization_status_test.rb
 - test/functional/capsule/info_test.rb
 - test/functional/capsule/list_test.rb
+- test/functional/content_credentials/create_test.rb
+- test/functional/content_credentials/data/test_cert.json
 - test/functional/content_credentials/info_test.rb
 - test/functional/content_credentials/list_test.rb
 - test/functional/content_export/complete/library_test.rb
@@ -396,12 +398,11 @@ files:
 - test/functional/content_view/filter/update_test.rb
 - test/functional/content_view/list_test.rb
 - test/functional/content_view/publish_test.rb
-- test/functional/content_view/puppet_module/add_test.rb
-- test/functional/content_view/puppet_module/remove_test.rb
 - test/functional/content_view/purge_test.rb
 - test/functional/content_view/remove_content_view_version_test.rb
 - test/functional/content_view/remove_test.rb
 - test/functional/content_view/update_test.rb
+- test/functional/content_view/version/cv_import_export_helper_test.rb
 - test/functional/content_view/version/default_export_test.rb
 - test/functional/content_view/version/export_test.rb
 - test/functional/content_view/version/import_test.rb
@@ -422,7 +423,6 @@ files:
 - test/functional/filter_rule/info_test.rb
 - test/functional/filter_rule/list_test.rb
 - test/functional/filter_rule/update_test.rb
-- test/functional/gpg_test.rb
 - test/functional/host/errata/apply_test.rb
 - test/functional/host/errata/info_test.rb
 - test/functional/host/errata/list_test.rb
@@ -482,9 +482,6 @@ files:
 - test/functional/product/update_proxy.rb
 - test/functional/product/update_test.rb
 - test/functional/repository/create_test.rb
-- test/functional/repository/data/test_ca.json
-- test/functional/repository/data/test_cert.json
-- test/functional/repository/data/test_key.json
 - test/functional/repository/delete_test.rb
 - test/functional/repository/export_test.rb
 - test/functional/repository/info_test.rb
@@ -501,6 +498,8 @@ files:
 - test/functional/repository_set/list_test.rb
 - test/functional/repository_set/repository_set_helpers.rb
 - test/functional/search_helpers.rb
+- test/functional/simple_content_access/disable_test.rb
+- test/functional/simple_content_access/enable_test.rb
 - test/functional/srpm/list_test.rb
 - test/functional/subscription/list_test.rb
 - test/functional/sync_plan/create_test.rb
@@ -535,7 +534,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Katello commands for Hammer
@@ -551,6 +550,7 @@ test_files:
 - test/data/3.16/foreman_api.json
 - test/data/3.17/foreman_api.json
 - test/data/3.18/foreman_api.json
+- test/data/3.19/foreman_api.json
 - test/data/3.2/foreman_api.json
 - test/data/3.4/foreman_api.json
 - test/data/3.5/foreman_api.json
@@ -558,6 +558,7 @@ test_files:
 - test/data/3.7/foreman_api.json
 - test/data/3.8/foreman_api.json
 - test/data/3.9/foreman_api.json
+- test/data/4.0/foreman_api.json
 - test/data/Readme.md
 - test/functional/activation_key/add_host_collection_test.rb
 - test/functional/activation_key/content_override_test.rb
@@ -583,6 +584,8 @@ test_files:
 - test/functional/capsule/content/synchronization_status_test.rb
 - test/functional/capsule/info_test.rb
 - test/functional/capsule/list_test.rb
+- test/functional/content_credentials/create_test.rb
+- test/functional/content_credentials/data/test_cert.json
 - test/functional/content_credentials/info_test.rb
 - test/functional/content_credentials/list_test.rb
 - test/functional/content_export/complete/library_test.rb
@@ -612,12 +615,11 @@ test_files:
 - test/functional/content_view/filter/update_test.rb
 - test/functional/content_view/list_test.rb
 - test/functional/content_view/publish_test.rb
-- test/functional/content_view/puppet_module/add_test.rb
-- test/functional/content_view/puppet_module/remove_test.rb
 - test/functional/content_view/purge_test.rb
 - test/functional/content_view/remove_content_view_version_test.rb
 - test/functional/content_view/remove_test.rb
 - test/functional/content_view/update_test.rb
+- test/functional/content_view/version/cv_import_export_helper_test.rb
 - test/functional/content_view/version/default_export_test.rb
 - test/functional/content_view/version/export_test.rb
 - test/functional/content_view/version/import_test.rb
@@ -638,7 +640,6 @@ test_files:
 - test/functional/filter_rule/info_test.rb
 - test/functional/filter_rule/list_test.rb
 - test/functional/filter_rule/update_test.rb
-- test/functional/gpg_test.rb
 - test/functional/host/errata/apply_test.rb
 - test/functional/host/errata/info_test.rb
 - test/functional/host/errata/list_test.rb
@@ -698,9 +699,6 @@ test_files:
 - test/functional/product/update_proxy.rb
 - test/functional/product/update_test.rb
 - test/functional/repository/create_test.rb
-- test/functional/repository/data/test_ca.json
-- test/functional/repository/data/test_cert.json
-- test/functional/repository/data/test_key.json
 - test/functional/repository/delete_test.rb
 - test/functional/repository/export_test.rb
 - test/functional/repository/info_test.rb
@@ -717,6 +715,8 @@ test_files:
 - test/functional/repository_set/list_test.rb
 - test/functional/repository_set/repository_set_helpers.rb
 - test/functional/search_helpers.rb
+- test/functional/simple_content_access/disable_test.rb
+- test/functional/simple_content_access/enable_test.rb
 - test/functional/srpm/list_test.rb
 - test/functional/subscription/list_test.rb
 - test/functional/sync_plan/create_test.rb

data/lib/hammer_cli_katello/content_view_puppet_module.rb

@@ -1,60 +0,0 @@
-module HammerCLIKatello
-  class ContentViewPuppetModule < HammerCLIKatello::Command
-    resource :content_view_puppet_modules
-    command_name 'puppet-module'
-    desc 'View and manage puppet modules'
-
-    class ListCommand < HammerCLIKatello::ListCommand
-      include OrganizationOptions
-
-      output do
-        field :uuid, _("UUID")
-        field :name, _("Name")
-        field :author, _("Author")
-        field :version, _("Version")
-      end
-
-      def extend_data(mod)
-        mod['version'] = if mod['uuid']
-                           mod['computed_version']
-                         else
-                           _("Latest(Currently %s)") % mod['computed_version']
-                         end
-        mod
-      end
-
-      build_options
-    end
-
-    class CreateCommand < HammerCLIKatello::CreateCommand
-      include OrganizationOptions
-
-      command_name "add"
-
-      success_message _("Puppet module added to content view.")
-      failure_message _("Could not add the puppet module")
-
-      build_options
-
-      def get_identifier(*)
-        # This will intentionally disable the id resolver.  Without it, if the user were to
-        # execute the 'add' command specifying a 'name', the id resolver will attempt to
-        # translate the 'name' to an 'id'.  That is not desirable for this command.
-        nil
-      end
-    end
-
-    class DeleteCommand < HammerCLIKatello::DeleteCommand
-      include OrganizationOptions
-
-      command_name "remove"
-
-      success_message _("Puppet module removed from content view.")
-      failure_message _("Couldn't remove puppet module from the content view")
-
-      build_options
-    end
-
-    autoload_subcommands
-  end
-end

data/lib/hammer_cli_katello/gpg_key.rb

@@ -1,67 +0,0 @@
-module HammerCLIKatello
-  class GpgKeyCommand < HammerCLIForeman::Command
-    resource :gpg_keys
-
-    class ListCommand < HammerCLIKatello::ListCommand
-      output do
-        field :id, _("ID")
-        field :name, _("Name")
-      end
-
-      build_options
-    end
-
-    class InfoCommand < HammerCLIKatello::InfoCommand
-      output do
-        field :id, _("ID")
-        field :name, _("Name")
-        from :organization do
-          field :name, _("Organization")
-        end
-
-        collection :repositories, "Repositories" do
-          field :id, _("ID")
-          field :name, _("Name")
-          field :content_type, _("Content Type")
-          from :product do
-            field :name, _("Product")
-          end
-        end
-
-        field :content, _("Content"), Fields::LongText
-      end
-
-      build_options
-    end
-
-    class CreateCommand < HammerCLIKatello::CreateCommand
-      success_message _("GPG Key created.")
-      failure_message _("Could not create GPG Key")
-
-      build_options :without => [:content]
-      option "--key", "GPG_KEY_FILE", _("GPG 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")
-
-      build_options :without => [:content]
-      option "--key", "GPG_KEY_FILE", _("GPG 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")
-
-      build_options
-    end
-
-    autoload_subcommands
-  end
-end

data/lib/hammer_cli_katello/puppet_module.rb

@@ -1,59 +0,0 @@
-module HammerCLIKatello
-  class PuppetModule < HammerCLIKatello::Command
-    resource :puppet_modules
-
-    class ListCommand < HammerCLIKatello::ListCommand
-      extend RepositoryScopedToProduct
-
-      validate_repo_name_requires_product_options(:option_repository_name)
-
-      output do
-        field :id, _("ID")
-        field :name, _("Name")
-        field :author, _("Author")
-        field :version, _("Version")
-        field :uuid, _("Uuid")
-      end
-
-      build_options do |o|
-        o.expand(:all).including(:organizations, :products, :content_views)
-      end
-    end
-
-    class InfoCommand < HammerCLIKatello::InfoCommand
-      output do
-        field :id, _("ID")
-        field :name, _("Name")
-        field :version, _("Version")
-        field :author, _("Author")
-        field :uuid, _("Uuid")
-
-        field :summary, _("Summary")
-        field :description, _("Description")
-        field :license, _("License")
-        field :project_page, _("Project Page")
-        field :source, _("Source")
-
-        collection :dependencies, _("Dependencies"), :numbered => false do
-          field nil, nil, HammerCLIKatello::Output::Fields::Dependency
-        end
-        collection :checksums, _("File checksums"), :numbered => false do
-          field nil, nil, HammerCLIKatello::Output::Fields::ChecksumFilePair
-        end
-
-        field :tag_list, _("Tag List"), Fields::List
-
-        collection :repositories, _("Repositories") do
-          field :id, _("Id")
-          field :name, _("Name")
-        end
-      end
-
-      build_options do |o|
-        o.expand(:all).including(:organizations)
-      end
-    end
-
-    autoload_subcommands
-  end
-end