hammer_cli_katello 0.24.2 → 0.24.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f913438c207c69774eadb286a20e8cb249c77eef5c64fec2b431d3d5bdfe11d
-  data.tar.gz: b00a4f7143e13ca251ee5ba533277c786c887f9211ed1273e35124f6006d83a5
+  metadata.gz: 3966349f8fac0df348af893168e4eb594d765834eeef7e973fe465cf78755331
+  data.tar.gz: 51541df551c787282da8367983c6a29543b529e20192c098169b5d0d1c1bc203
 SHA512:
-  metadata.gz: d555ffa3fe7daf61efc108c218646aa42e8923686b3e28a23fbf137354c2a7645de12ca0ab44ccaab524ae00690a143a783f0668fa8b998be8e12b17714f0400
-  data.tar.gz: ef7a75b53d2e1ed73f64156b77935e634042394b15edad9e4d28ed23350496d089359d4dc1b2a037a7aef42e48ca58cbada276e8e7fc03fd2391f68361f5677e
+  metadata.gz: 5ed98c8abdee101d12324fdc9605c568f9adff0e3dae32d59941ac1d5ec8ebfa2d50826297d7826cff39ca2fb9b47707b356eb5e09618b2dc971bd5852cc0c50
+  data.tar.gz: 1c4f11a142861744f6f4ee0c618927d460c84e581ece723d76dc18ea44b90949b8afd1aa53747aa5d3307311814ece3d6cdf8f2ba94cbb019d7f63f395b39d16

data/lib/hammer_cli_katello/id_resolver.rb

@@ -117,6 +117,7 @@ module HammerCLIKatello
       end
     end
 
+    # rubocop:disable Style/EmptyElse
     def content_view_version_id(options)
       key_id = HammerCLI.option_accessor_name("id")
       key_content_view_id = HammerCLI.option_accessor_name("content_view_id")
@@ -129,6 +130,8 @@ module HammerCLIKatello
       results = find_resources(:content_view_versions, options)
       options[from_environment_id] ||= from_lifecycle_environment_id(options)
 
+      return pick_result(results, @api.resource(:content_view_versions))['id'] if results.size == 1
+
       if results.size > 1 && options[from_environment_id]
         results_in_from_environment = results.select do |version|
           member_of_environment_ids = version['environments'].map { |env| env['id'].to_s }
@@ -137,9 +140,10 @@ module HammerCLIKatello
         results_in_from_environment
           .sort { |a, b| a['version'].to_f <=> b['version'].to_f }.last['id']
       else
-        pick_result(results, @api.resource(:content_view_versions))['id']
+        nil
       end
     end
+    # rubocop:enable Style/EmptyElse
 
     private
 

data/lib/hammer_cli_katello/version.rb

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

data/test/functional/content_export/list_test.rb

@@ -31,4 +31,34 @@ ID | DESTINATION SERVER | PATH | CONTENT VIEW VERSION | CONTENT VIEW VERSION ID
     result = run_cmd(%w(content-export list))
     assert_cmd(expected_result, result)
   end
+
+  it 'works with content-view-id only' do
+    api_expects(:content_view_versions, :index).returns(empty_response)
+
+    ex = api_expects(:content_exports, :index)
+
+    ex.returns(empty_response)
+    # rubocop:disable LineLength
+    expected_result = success_result('---|--------------------|------|----------------------|-------------------------|------------|-----------
+ID | DESTINATION SERVER | PATH | CONTENT VIEW VERSION | CONTENT VIEW VERSION ID | CREATED AT | UPDATED AT
+---|--------------------|------|----------------------|-------------------------|------------|-----------
+')
+    # rubocop:enable LineLength
+    result = run_cmd(%w(content-export list --content-view-id=1))
+    assert_cmd(expected_result, result)
+  end
+
+  it 'works with content-view-version-id only' do
+    ex = api_expects(:content_exports, :index)
+
+    ex.returns(empty_response)
+    # rubocop:disable LineLength
+    expected_result = success_result('---|--------------------|------|----------------------|-------------------------|------------|-----------
+ID | DESTINATION SERVER | PATH | CONTENT VIEW VERSION | CONTENT VIEW VERSION ID | CREATED AT | UPDATED AT
+---|--------------------|------|----------------------|-------------------------|------------|-----------
+')
+    # rubocop:enable LineLength
+    result = run_cmd(%w(content-export list --content-view-version-id=1))
+    assert_cmd(expected_result, result)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_katello
 version: !ruby/object:Gem::Version
-  version: 0.24.2
+  version: 0.24.3
 platform: ruby
 authors:
 - Adam Price
@@ -35,7 +35,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-05 00:00:00.000000000 Z
+date: 2021-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman