hammer_cli_katello 0.24.0 → 1.1.0

data/test/functional/repository/create_test.rb

@@ -18,34 +18,4 @@ describe "create repository" do
 
     assert_equal(0, run_cmd(command).exit_code)
   end
-
-  it 'with ssl options by name' do
-    def stub_gpg_key(gpg_key_name)
-      gpg_key_index = api_expects(:gpg_keys, :index)
-                      .with_params(
-                        name: gpg_key_name.to_s,
-                        organization_id: 1,
-                        per_page: 1000,
-                        page: 1)
-      gpg_response = File.join(File.dirname(__FILE__), 'data', "#{gpg_key_name}.json")
-      gpg_key_index.returns(JSON.parse(File.read(gpg_response)))
-    end
-
-    api_expects(:repositories, :create)
-      .with_params(
-        name: name,
-        product_id: product_id,
-        ssl_ca_cert_id: 1,
-        ssl_client_cert_id: 2,
-        ssl_client_key_id: 3,
-        content_type: content_type)
-
-    %w(test_cert test_key test_ca).each { |cred| stub_gpg_key(cred) }
-
-    command = %W(repository create --organization-id #{org_id} --product-id #{product_id}
-                 --content-type #{content_type} --name #{name} --ssl-client-cert test_cert
-                 --ssl-client-key test_key --ssl-ca-cert test_ca)
-
-    assert_equal(0, run_cmd(command).exit_code)
-  end
 end

data/test/functional/repository/info_test.rb

@@ -46,7 +46,7 @@ describe "get repository info" do
     )
     result = run_cmd(@cmd + params)
     # rubocop:disable Style/WordArray
-    expected_fields = [['ID', '1'],
+    expected_fields = [['Id', '1'],
                        ['Name', 'Test Repo'],
                        ['Label', 'Test_Repo'],
                        ['Description', 'hammertime'],
@@ -59,7 +59,7 @@ describe "get repository info" do
                        ['Download Policy', 'immediate'],
                        ['HTTP Proxy', ''],
                        ['Product', ''],
-                       ['ID', '79'],
+                       ['Id', '79'],
                        ['Name', 'test'],
                        ['GPG Key', ''],
                        ['Sync', ''],
@@ -122,7 +122,7 @@ describe "get repository info" do
     )
     result = run_cmd(@cmd + params)
     # rubocop:disable Style/WordArray
-    expected_fields = [['ID', '1'],
+    expected_fields = [['Id', '1'],
                        ['Name', 'Test Repo'],
                        ['Label', 'Test_Repo'],
                        ['Description', 'hammertime'],
@@ -135,7 +135,7 @@ describe "get repository info" do
                        ['Download Policy', 'immediate'],
                        ['HTTP Proxy', ''],
                        ['Product', ''],
-                       ['ID', '79'],
+                       ['Id', '79'],
                        ['Name', 'Test_Product'],
                        ['GPG Key', ''],
                        ['Sync', ''],

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.1')
 
 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.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Adam Price
@@ -35,7 +35,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-02 00:00:00.000000000 Z
+date: 2021-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman
@@ -65,34 +65,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: hammer_cli_foreman_bootdisk
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: hammer_cli_foreman_docker
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -240,15 +212,21 @@ files:
 - lib/hammer_cli_katello/commands.rb
 - lib/hammer_cli_katello/composite_content_view_name_resolvable.rb
 - lib/hammer_cli_katello/content_credential.rb
+- lib/hammer_cli_katello/content_export.rb
+- lib/hammer_cli_katello/content_export_complete.rb
+- lib/hammer_cli_katello/content_export_helper.rb
+- lib/hammer_cli_katello/content_export_incremental.rb
+- lib/hammer_cli_katello/content_import.rb
 - lib/hammer_cli_katello/content_override.rb
 - 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
 - lib/hammer_cli_katello/deb_package.rb
+- lib/hammer_cli_katello/docker.rb
+- lib/hammer_cli_katello/docker_manifest.rb
+- lib/hammer_cli_katello/docker_tag.rb
 - lib/hammer_cli_katello/erratum.rb
 - lib/hammer_cli_katello/erratum_info_command.rb
 - lib/hammer_cli_katello/exception_handler.rb
@@ -256,7 +234,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
@@ -293,11 +270,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
@@ -330,6 +307,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
@@ -337,6 +315,8 @@ 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/4.1/foreman_api.json
 - test/data/Readme.md
 - test/functional/activation_key/add_host_collection_test.rb
 - test/functional/activation_key/content_override_test.rb
@@ -362,8 +342,21 @@ 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
+- test/functional/content_export/complete/version_test.rb
+- test/functional/content_export/content_export_helpers.rb
+- test/functional/content_export/generate_metadata_test.rb
+- test/functional/content_export/incremental/library_test.rb
+- test/functional/content_export/incremental/version_test.rb
+- test/functional/content_export/list_test.rb
+- test/functional/content_import/library_test.rb
+- test/functional/content_import/list_test.rb
+- test/functional/content_import/metadata.json
+- test/functional/content_import/version_test.rb
 - test/functional/content_view/add_content_view_version_test.rb
 - test/functional/content_view/add_repository_test.rb
 - test/functional/content_view/component/add_test.rb
@@ -381,16 +374,10 @@ 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/default_export_test.rb
-- test/functional/content_view/version/export_histories_test.rb
-- test/functional/content_view/version/export_test.rb
-- test/functional/content_view/version/import_test.rb
 - test/functional/content_view/version/incremental_update_test.rb
 - test/functional/content_view/version/list_test.rb
 - test/functional/content_view/version/promote_test.rb
@@ -408,7 +395,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
@@ -454,6 +440,7 @@ files:
 - test/functional/module_stream/info_test.rb
 - test/functional/module_stream/list_test.rb
 - test/functional/organization/delete_test.rb
+- test/functional/organization/info_test.rb
 - test/functional/organization/organization_helpers.rb
 - test/functional/package/list_test.rb
 - test/functional/package_group/list_test.rb
@@ -468,9 +455,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
@@ -487,6 +471,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
@@ -521,8 +507,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Katello commands for Hammer
@@ -538,6 +523,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
@@ -545,6 +531,8 @@ 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/4.1/foreman_api.json
 - test/data/Readme.md
 - test/functional/activation_key/add_host_collection_test.rb
 - test/functional/activation_key/content_override_test.rb
@@ -570,8 +558,21 @@ 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
+- test/functional/content_export/complete/version_test.rb
+- test/functional/content_export/content_export_helpers.rb
+- test/functional/content_export/generate_metadata_test.rb
+- test/functional/content_export/incremental/library_test.rb
+- test/functional/content_export/incremental/version_test.rb
+- test/functional/content_export/list_test.rb
+- test/functional/content_import/library_test.rb
+- test/functional/content_import/list_test.rb
+- test/functional/content_import/metadata.json
+- test/functional/content_import/version_test.rb
 - test/functional/content_view/add_content_view_version_test.rb
 - test/functional/content_view/add_repository_test.rb
 - test/functional/content_view/component/add_test.rb
@@ -589,16 +590,10 @@ 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/default_export_test.rb
-- test/functional/content_view/version/export_histories_test.rb
-- test/functional/content_view/version/export_test.rb
-- test/functional/content_view/version/import_test.rb
 - test/functional/content_view/version/incremental_update_test.rb
 - test/functional/content_view/version/list_test.rb
 - test/functional/content_view/version/promote_test.rb
@@ -616,7 +611,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
@@ -662,6 +656,7 @@ test_files:
 - test/functional/module_stream/info_test.rb
 - test/functional/module_stream/list_test.rb
 - test/functional/organization/delete_test.rb
+- test/functional/organization/info_test.rb
 - test/functional/organization/organization_helpers.rb
 - test/functional/package/list_test.rb
 - test/functional/package_group/list_test.rb
@@ -676,9 +671,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
@@ -695,6 +687,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