hammer_cli_katello 0.24.1 → 0.24.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a90c77802499a72d618883d73162f061b8465d838be44c8df27e3d79d2fc316
-  data.tar.gz: d4cd08a9eb8fae1437bad8d9adaba03fb5a71cd2c770b5af6500312fb497283c
+  metadata.gz: 4f913438c207c69774eadb286a20e8cb249c77eef5c64fec2b431d3d5bdfe11d
+  data.tar.gz: b00a4f7143e13ca251ee5ba533277c786c887f9211ed1273e35124f6006d83a5
 SHA512:
-  metadata.gz: 3aa81078857f074f4c15104e67a31ca9b85ba05d95510b2805114df31955972acd4795078ae3128849568d2f1c3e1e19d274307ac97d7cc8391edc1f05cd44b9
-  data.tar.gz: ce940d980543120e2cf86a0374fb61e11c20ce37ee06c2ff381b98da2c5731c6adcb4cac0b59bd80d945233b2589d13889859097a910e838117403ee002137c5
+  metadata.gz: d555ffa3fe7daf61efc108c218646aa42e8923686b3e28a23fbf137354c2a7645de12ca0ab44ccaab524ae00690a143a783f0668fa8b998be8e12b17714f0400
+  data.tar.gz: ef7a75b53d2e1ed73f64156b77935e634042394b15edad9e4d28ed23350496d089359d4dc1b2a037a7aef42e48ca58cbada276e8e7fc03fd2391f68361f5677e

data/lib/hammer_cli_katello/content_export_helper.rb

@@ -134,6 +134,25 @@ module HammerCLIKatello
 
     def self.setup_version(base)
       base.action(:version)
+      setup_version_options(base)
+      base.success_message _("Content view version is being exported in task %{id}.")
+      base.failure_message _("Could not export the content view version")
+
+      base.extend_with(
+        HammerCLIKatello::CommandExtensions::LifecycleEnvironments.new(only: :option_sources)
+      )
+      base.include(LifecycleEnvironmentNameMapping)
+
+      base.class_eval do
+        def request_params
+          super.tap do |opts|
+            opts["id"] = resolver.content_view_version_id(options)
+          end
+        end
+      end
+    end
+
+    def self.setup_version_options(base)
       base.option "--fail-on-missing-content", :flag,
                     _("Fails if any of the repositories belonging"\
                       " to this version are unexportable.")
@@ -143,30 +162,20 @@ module HammerCLIKatello
                  :required => false
 
       base.build_options do |o|
-        o.expand(:all).including(:content_views, :organizations)
+        o.expand(:all).including(:content_views, :organizations, :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
-          option(:option_version).required
+          any(:option_version, :option_environment_id, :option_environment_name).required
           unless option(:option_content_view_id).exist?
             any(:option_organization_id, :option_organization_name, \
                                 :option_organization_label).required
           end
         end
       end
-
-      base.success_message _("Content view version is being exported in task %{id}.")
-      base.failure_message _("Could not export the content view version")
-
-      base.class_eval do
-        def request_params
-          super.tap do |opts|
-            opts["id"] = resolver.content_view_version_id(options)
-          end
-        end
-      end
     end
   end
 end

data/lib/hammer_cli_katello/version.rb

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

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

@@ -1,10 +1,14 @@
 require File.join(File.dirname(__FILE__), '../../../test_helper')
-require_relative '../content_export_helpers'
 require 'hammer_cli_katello/content_export_complete'
+require_relative '../../lifecycle_environment/lifecycle_environment_helpers'
+require_relative '../../content_view/content_view_helpers'
+require_relative '../content_export_helpers'
 
 describe 'content-export complete version' do
   include ForemanTaskHelpers
   include ContentExportHelpers
+  include ContentViewHelpers
+  include LifecycleEnvironmentHelpers
 
   before do
     @cmd = %w(content-export complete version)
@@ -30,7 +34,7 @@ describe 'content-export complete version' do
   end
 
   let(:content_view_id) { '77' }
-  let(:content_view_version_id) { '100' }
+  let(:content_view_version_id) { '1001' }
 
   let(:version) { '10.0' }
   let(:destination_server) { "dream.example.com" }
@@ -99,7 +103,7 @@ describe 'content-export complete version' do
   it 'fails on missing content-view version' do
     params = ["--content-view-id=2"]
     result = run_cmd(@cmd + params)
-    expected_error = "Option --version is required"
+    expected_error = "--version, --lifecycle-environment-id, --lifecycle-environment is required."
 
     assert_equal(result.exit_code, HammerCLI::EX_USAGE)
     assert_match(/#{expected_error}/, result.err)
@@ -182,4 +186,32 @@ describe 'content-export complete version' do
     assert_match(/Unable to fully export this version because/, result.out)
     assert_match(/200/, result.out)
   end
+
+  it 'should accept content view and lifecycle environment and get the right version' do
+    env = "foo"
+    org_id = '100'
+    env_id = '223'
+    params = ["--content-view-id=#{content_view_id}",
+              "--lifecycle-environment=#{env}",
+              "--organization-id=#{org_id}"]
+    expect_lifecycle_environment_search(org_id, env, env_id)
+    expect_content_view_version_search({'environment_id' => env_id,
+                                        'content_view_id' => content_view_id},
+                                       'id' => content_view_version_id).at_least_once
+
+    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
+
+    HammerCLIKatello::ContentExportComplete::VersionCommand.
+      any_instance.
+      expects(:fetch_export_history).
+      returns(export_history)
+
+    result = run_cmd(@cmd + params)
+    assert_match(/Generated .*metadata.*json/, result.out)
+    assert_equal(HammerCLI::EX_OK, result.exit_code)
+  end
 end

data/test/functional/content_export/content_export_helpers.rb

@@ -1,21 +1,26 @@
+require_relative '../search_helpers'
+
 module ContentExportHelpers
+  include SearchHelpers
   def expects_repositories_in_library(organization_id, returns = [])
-    export_task = api_expects(:repositories, :index) do |p|
-      assert_equal organization_id.to_s, p[:organization_id].to_s
-      assert p[:library]
-      assert_equal "download_policy != immediate", p[:search]
-      assert_equal "yum", p[:content_type]
-    end
-    export_task.returns(index_response(returns))
+    expect_lenient_search(:repositories,
+                          params: {
+                            organization_id: organization_id,
+                            library: true,
+                            search: "download_policy != immediate",
+                            content_type: 'yum'
+                          },
+                          returns: returns)
   end
 
   def expects_repositories_in_version(version_id, returns = [])
-    export_task = api_expects(:repositories, :index) do |p|
-      assert_equal version_id.to_s, p[:content_view_version_id].to_s
-      assert p[:library]
-      assert_equal "download_policy != immediate", p[:search]
-      assert_equal "yum", p[:content_type]
-    end
-    export_task.returns(index_response(returns))
+    expect_lenient_search(:repositories,
+                          params: {
+                            content_view_version_id: version_id,
+                            library: true,
+                            search: "download_policy != immediate",
+                            content_type: 'yum'
+                          },
+                          returns: returns)
   end
 end

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

@@ -1,10 +1,14 @@
-require File.join(File.dirname(__FILE__), '../../../test_helper')
-require_relative '../content_export_helpers'
+require_relative '../../test_helper'
 require 'hammer_cli_katello/content_export'
+require_relative '../../lifecycle_environment/lifecycle_environment_helpers'
+require_relative '../../content_view/content_view_helpers'
+require_relative '../content_export_helpers'
 
 describe 'content-export incremental version' do
   include ForemanTaskHelpers
   include ContentExportHelpers
+  include ContentViewHelpers
+  include LifecycleEnvironmentHelpers
 
   before do
     @cmd = %w(content-export incremental version)
@@ -151,8 +155,8 @@ describe 'content-export incremental version' do
   it 'fails on missing content-view version' do
     params = ["--content-view-id=2"]
     result = run_cmd(@cmd + params)
-    expected_error = "Option --version is required"
 
+    expected_error = "--version, --lifecycle-environment-id, --lifecycle-environment is required."
     assert_equal(result.exit_code, HammerCLI::EX_USAGE)
     assert_match(/#{expected_error}/, result.err)
   end
@@ -233,4 +237,32 @@ describe 'content-export incremental version' do
     assert_match(/Unable to fully export this version because/, result.out)
     assert_match(/200/, result.out)
   end
+
+  it 'should accept content view and lifecycle environment and get the right version' do
+    env = "foo"
+    org_id = '100'
+    env_id = '223'
+    params = ["--content-view-id=#{content_view_id}",
+              "--lifecycle-environment=#{env}",
+              "--organization-id=#{org_id}"]
+    expect_lifecycle_environment_search(org_id, env, env_id)
+    expect_content_view_version_search({'environment_id' => env_id,
+                                        'content_view_id' => content_view_id},
+                                       'id' => content_view_version_id).at_least_once
+
+    expects_repositories_in_version(content_view_version_id)
+    ex = api_expects(:content_export_incrementals, :version)
+    ex.returns(response)
+
+    expect_foreman_task(task_id).at_least_once
+
+    HammerCLIKatello::ContentExportIncremental::VersionCommand.
+      any_instance.
+      expects(:fetch_export_history).
+      returns(export_history)
+
+    result = run_cmd(@cmd + params)
+    assert_match(/Generated .*metadata.*json/, result.out)
+    assert_equal(HammerCLI::EX_OK, result.exit_code)
+  end
 end

data/test/functional/content_view/content_view_helpers.rb

@@ -13,6 +13,8 @@ module ContentViewHelpers
   end
 
   def expect_content_view_version_search(params, returns)
-    expect_generic_search(:content_view_versions, params: params, returns: returns)
+    expect_lenient_search(:content_view_versions,
+                          params: params,
+                          returns: returns)
   end
 end

data/test/functional/lifecycle_environment/lifecycle_environment_helpers.rb

@@ -4,7 +4,7 @@ module LifecycleEnvironmentHelpers
   include SearchHelpers
 
   def expect_lifecycle_environment_search(org_id, name, id)
-    expect_generic_search(:lifecycle_environments,
+    expect_lenient_search(:lifecycle_environments,
                           params: {'name' => name, 'organization_id' => org_id},
                           returns: {'id' => id})
   end

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_katello
 version: !ruby/object:Gem::Version
-  version: 0.24.1
+  version: 0.24.2
 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-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman