hammer_cli_katello 1.5.2 → 1.6.0

data/test/functional/acs/create_test.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), '../test_helper')
 
 describe 'create content-credentials' do
   before do
-    @cmd = %w(alternate-content-sources create)
+    @cmd = %w(alternate-content-source create)
   end
 
   let(:name) { 'pizza' }

data/test/functional/acs/delete_test.rb

@@ -7,7 +7,7 @@ describe 'delete an acs' do
     api_expects(:alternate_content_sources, :destroy, 'delete acs').
       with_params('id' => id)
 
-    command = %W(alternate-content-sources delete --id #{id})
+    command = %W(alternate-content-source delete --id #{id})
     assert_equal(0, run_cmd(command).exit_code)
   end
 end

data/test/functional/acs/info_test.rb

@@ -3,7 +3,7 @@ require 'hammer_cli_katello/associating_commands'
 
 describe 'get acs info' do
   before do
-    @cmd = %w(alternate-content-sources info)
+    @cmd = %w(alternate-content-source info)
   end
 
   it 'shows acs info by id' do
@@ -14,20 +14,17 @@ describe 'get acs info' do
       'name' => 'Pizza ACS',
       'label' => 'Pizza ACS',
       'base_url' => 'https://proxy.example.com',
-      'alternate_content_source_type' => 'custom',
       'content_type' => 'yum',
+      'alternate_content_source_type' => 'custom',
+      'subpaths' => [
+        'test/repo1'
+      ],
       'smart_proxies' => {
         'id' => 1,
         'name' => 'centos7.example.com',
         'url' => 'https://centos7.example.com:9090',
-        'created_at' => '2022-05-09T17:40:21.007Z',
-        'updated_at' => '2022-05-09T17:40:21.007Z',
-        'expired_logs' => 0,
         'download_policy' => 'on_demand'
-      },
-      'subpaths' => [
-        'test/repo1'
-      ]
+      }
     )
     result = run_cmd(@cmd + params)
     # rubocop:disable Style/WordArray
@@ -35,18 +32,60 @@ describe 'get acs info' do
                        ['Name', 'Pizza ACS'],
                        ['Label', 'Pizza ACS'],
                        ['Base URL', 'https://proxy.example.com'],
+                       ['Content type', 'yum'],
                        ['Alternate content source type', 'custom'],
+                       ['Subpaths', ''],
+                       ['', 'test/repo1'],
+                       ['Smart proxies', ''],
+                       ['Id', '1'],
+                       ['Name', 'centos7.example.com'],
+                       ['URL', 'https://centos7.example.com:9090'],
+                       ['Download policy', 'on_demand']]
+
+    # rubocop:enable Style/WordArray
+    expected_results = expected_fields.map { |field| success_result(FieldMatcher.new(*field)) }
+    expected_results.each { |expected|  assert_cmd(expected, result) }
+  end
+
+  it 'shows simplified acs info by id' do
+    params = ['--id=2']
+    ex = api_expects(:alternate_content_sources, :show, 'Get info')
+    ex.returns(
+      'id' => 2,
+      'name' => 'Pizza ACS',
+      'label' => 'Pizza ACS',
+      'content_type' => 'yum',
+      'alternate_content_source_type' => 'simplified',
+      'products' => {
+        'id' => 999,
+        'organization_id' => 9,
+        'name' => 'Buttermilk Biscuits',
+        'label' => 'Buttermilk_Biscuits'
+      },
+      'smart_proxies' => {
+        'id' => 1,
+        'name' => 'centos7.example.com',
+        'url' => 'https://centos7.example.com:9090',
+        'download_policy' => 'on_demand'
+      }
+    )
+    result = run_cmd(@cmd + params)
+    # rubocop:disable Style/WordArray
+    expected_fields = [['ID', '2'],
+                       ['Name', 'Pizza ACS'],
+                       ['Label', 'Pizza ACS'],
                        ['Content type', 'yum'],
+                       ['Alternate content source type', 'simplified'],
+                       ['Products', ''],
+                       ['Id', '999'],
+                       ['Organization ID', '9'],
+                       ['Name', 'Buttermilk Biscuits'],
+                       ['Label', 'Buttermilk_Biscuits'],
                        ['Smart proxies', ''],
                        ['Id', '1'],
                        ['Name', 'centos7.example.com'],
                        ['URL', 'https://centos7.example.com:9090'],
-                       ['Created at', '2022-05-09T17:40:21.007Z'],
-                       ['Updated at', '2022-05-09T17:40:21.007Z'],
-                       ['Expired logs', '0'],
-                       ['Download policy', 'on_demand'],
-                       ['Subpaths', ''],
-                       ['', 'test/repo1']]
+                       ['Download policy', 'on_demand']]
 
     # rubocop:enable Style/WordArray
     expected_results = expected_fields.map { |field| success_result(FieldMatcher.new(*field)) }

data/test/functional/acs/list_test.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), '../test_helper')
 
 describe 'listing acs' do
   before do
-    @cmd = %w(alternate-content-sources list)
+    @cmd = %w(alternate-content-source list)
   end
 
   let(:empty_response) do

data/test/functional/acs/update_test.rb

@@ -2,7 +2,7 @@ require File.join(File.dirname(__FILE__), '../test_helper')
 
 describe 'listing acs' do
   before do
-    @cmd = %w(alternate-content-sources update)
+    @cmd = %w(alternate-content-source update)
   end
 
   let(:id) { 1 }

data/test/functional/content_export/complete/version_test.rb

@@ -27,9 +27,9 @@ describe 'content-export complete version' do
 
   let(:export_history) do
     {
-      "id": 1000,
-      "path": "/tmp",
-      "metadata": {}
+      "id" => 1000,
+      "path" =>  "/tmp",
+      "metadata" => {}
     }
   end
 
@@ -57,6 +57,24 @@ describe 'content-export complete version' do
     assert_equal(HammerCLI::EX_OK, result.exit_code)
   end
 
+  it "performs export with required options and async for syncable format" do
+    params = [
+      "--id=#{content_view_version_id}",
+      '--format=syncable',
+      '--async'
+    ]
+    expects_repositories_in_version(content_view_version_id)
+    ex = api_expects(:content_exports, :version)
+    ex.returns(response)
+
+    result = run_cmd(@cmd + params)
+
+    assert_equal("Content view version is being exported in task #{task_id}.\n"\
+      + "Once the task completes the listing files may be generated with the command:"\
+      + "\n hammer content-export generate-listing --task-id #{task_id}\n", result.out)
+    assert_equal(HammerCLI::EX_OK, result.exit_code)
+  end
+
   it "performs export with required options" do
     params = [
       "--id=#{content_view_version_id}",
@@ -78,6 +96,33 @@ describe 'content-export complete version' do
     assert_equal(HammerCLI::EX_OK, result.exit_code)
   end
 
+  it "performs export with format" do
+    params = [
+      "--id=#{content_view_version_id}",
+      '--format=syncable'
+    ]
+    expects_repositories_in_version(content_view_version_id)
+    ex = api_expects(:content_exports, :version)
+    ex.returns(response)
+
+    expect_foreman_task(task_id).at_least_once
+    path = "/foo/bar"
+    syncable_export_history = {
+      "id" => 1000,
+      "path" => path,
+      "metadata" => {"format" => "syncable"}
+    }
+    HammerCLIKatello::ContentExportComplete::VersionCommand.
+      any_instance.
+      expects(:fetch_export_history).
+      returns(syncable_export_history)
+
+    result = run_cmd(@cmd + params)
+    assert_match(/Generated/, result.out)
+    assert_match(path, result.out)
+    assert_equal(HammerCLI::EX_OK, result.exit_code)
+  end
+
   it 'fails on missing required params' do
     params = [
       '--boo-id=2'

data/test/functional/content_export/generate_listing_test.rb

@@ -0,0 +1,62 @@
+require File.join(File.dirname(__FILE__), '../../test_helper')
+require 'hammer_cli_katello/content_export'
+
+describe('content-export generate-listing') do
+  include ForemanTaskHelpers
+
+  before do
+    @cmd = %w(content-export generate-listing)
+    @params = []
+    @export_history_id = 100
+    @path = '/tmp'
+    @export_history = {
+      'id' => @export_history_id,
+      'path' => @path,
+      'metadata' => {'format' => 'syncable'}
+    }
+    @task_id = SecureRandom.uuid
+  end
+
+  let(:cmd) { @cmd + @params }
+  let(:result) { run_cmd(cmd) }
+
+  describe('given an export history id') do
+    it('loads export history by id') do
+      @params = ["--id=#{@export_history_id}"]
+
+      HammerCLIKatello::ContentExport::GenerateListingCommand.
+        any_instance.
+        expects(:fetch_export_history).
+        returns(@export_history)
+      assert_match(/Generated/, result.out)
+      assert_match(@path, result.out)
+    end
+  end
+
+  describe('given a task id') do
+    it('loads export history based on the task') do
+      @params = ["--task-id=#{@task_id}"]
+
+      HammerCLIKatello::ContentExport::GenerateListingCommand.
+        any_instance.
+        expects(:reload_task).
+        returns('id' => 'taskid')
+
+      HammerCLIKatello::ContentExport::GenerateListingCommand.
+        any_instance.
+        expects(:fetch_export_history).
+        returns(@export_history)
+
+      assert_match(/Generated/, result.out)
+      assert_match(@path, result.out)
+    end
+  end
+
+  describe('given no arguments') do
+    it('tells the user to verify the arguments') do
+      expected = "Error: No export history was found. Verify the value given for "\
+        + "--task-id or --id\n"
+      assert_equal(expected, result.err)
+    end
+  end
+end

data/test/functional/host/subscription/enabled_repositories_test.rb

@@ -0,0 +1,39 @@
+require File.join(File.dirname(__FILE__), '../../test_helper')
+
+describe 'host enabled-repositories listing' do
+  before do
+    @cmd = %w(host subscription enabled-repositories)
+  end
+
+  let(:host_id) { 1 }
+  let(:empty_response) do
+    {
+      "total" => 0,
+      "subtotal" => 0,
+      "page" => "1",
+      "per_page" => "1000",
+      "error" => nil,
+      "search" => nil,
+      "sort" => {
+        "by" => nil,
+        "order" => nil
+      },
+      "results" => []
+    }
+  end
+
+  it 'allows listing by host' do
+    params = ["--host-id=#{host_id}"]
+    ex = api_expects(:host_subscriptions,
+                     :enabled_repositories, 'host subscription enabled-repositories')
+    ex.returns(empty_response)
+    # rubocop:disable Layout/LineLength
+    expected_result = success_result("---|------|-------|--------------|----------|-----------------|-------------------|----------------------|------------------|-------------
+ID | NAME | LABEL | CONTENT TYPE | CHECKSUM | CONTENT VIEW ID | CONTENT VIEW NAME | CONTENT VIEW VERSION | ENVIRONMENT NAME | PRODUCT NAME
+---|------|-------|--------------|----------|-----------------|-------------------|----------------------|------------------|-------------
+")
+    # rubocop:enable Layout/LineLength
+    result = run_cmd(@cmd + params)
+    assert_cmd(expected_result, result)
+  end
+end

data/test/functional/simple_content_access/status_test.rb

@@ -0,0 +1,29 @@
+require File.join(File.dirname(__FILE__), '../../test_helper')
+
+describe 'simple-content-access status' do
+  before do
+    @cmd = %w(simple-content-access status)
+  end
+
+  let(:organization_id) { 3 }
+
+  it 'list status with required options' do
+    params = ["--organization-id=#{organization_id}"]
+    api_expects(:simple_content_access, :status).
+      with_params('organization_id' => organization_id).
+      returns('simple_content_access' => true)
+
+    run_cmd(@cmd + params)
+  end
+
+  it 'fails on missing required params' do
+    params = []
+    result = run_cmd(@cmd + params)
+    # rubocop:disable Layout/LineLength
+    expected_error = 'Could not find organization, please set one of options --organization-id, --organization, --organization-title, --organization-label.'
+    # rubocop:enable Layout/LineLength
+
+    assert_equal(result.exit_code, HammerCLI::EX_SOFTWARE)
+    assert_equal(result.err[/#{expected_error}/], expected_error)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_katello
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.6.0
 platform: ruby
 authors:
 - Adam Price
@@ -35,62 +35,62 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-06 00:00:00.000000000 Z
+date: 2022-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman
   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_tasks
   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
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -111,56 +111,56 @@ dependencies:
   name: minitest-spec-context
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -181,14 +181,14 @@ dependencies:
   name: rubocop-checkstyle_formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Hammer-CLI-Katello is a plugin for Hammer to provide connectivity to
@@ -360,6 +360,7 @@ files:
 - test/functional/content_export/complete/repository_test.rb
 - test/functional/content_export/complete/version_test.rb
 - test/functional/content_export/content_export_helpers.rb
+- test/functional/content_export/generate_listing_test.rb
 - test/functional/content_export/generate_metadata_test.rb
 - test/functional/content_export/incremental/library_test.rb
 - test/functional/content_export/incremental/repository_test.rb
@@ -423,6 +424,7 @@ files:
 - test/functional/host/subscription/attach_test.rb
 - test/functional/host/subscription/auto_attach_test.rb
 - test/functional/host/subscription/content_override_test.rb
+- test/functional/host/subscription/enabled_repositories_test.rb
 - test/functional/host/subscription/product_content_test.rb
 - test/functional/host/subscription/register_test.rb
 - test/functional/host/subscription/remove_test.rb
@@ -489,6 +491,7 @@ files:
 - test/functional/search_helpers.rb
 - test/functional/simple_content_access/disable_test.rb
 - test/functional/simple_content_access/enable_test.rb
+- test/functional/simple_content_access/status_test.rb
 - test/functional/srpm/list_test.rb
 - test/functional/subscription/list_test.rb
 - test/functional/sync_plan/create_test.rb
@@ -514,17 +517,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Katello commands for Hammer
@@ -592,6 +594,7 @@ test_files:
 - test/functional/content_export/complete/repository_test.rb
 - test/functional/content_export/complete/version_test.rb
 - test/functional/content_export/content_export_helpers.rb
+- test/functional/content_export/generate_listing_test.rb
 - test/functional/content_export/generate_metadata_test.rb
 - test/functional/content_export/incremental/library_test.rb
 - test/functional/content_export/incremental/repository_test.rb
@@ -655,6 +658,7 @@ test_files:
 - test/functional/host/subscription/attach_test.rb
 - test/functional/host/subscription/auto_attach_test.rb
 - test/functional/host/subscription/content_override_test.rb
+- test/functional/host/subscription/enabled_repositories_test.rb
 - test/functional/host/subscription/product_content_test.rb
 - test/functional/host/subscription/register_test.rb
 - test/functional/host/subscription/remove_test.rb
@@ -721,6 +725,7 @@ test_files:
 - test/functional/search_helpers.rb
 - test/functional/simple_content_access/disable_test.rb
 - test/functional/simple_content_access/enable_test.rb
+- test/functional/simple_content_access/status_test.rb
 - test/functional/srpm/list_test.rb
 - test/functional/subscription/list_test.rb
 - test/functional/sync_plan/create_test.rb