hammer_cli_katello 1.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a4a20566a58ddf6462ecdc274f1d4f7e107c482ac79ab93b42db2ab11b6d45e
-  data.tar.gz: 6ad63b1d4e551613de6508c34f137f835934c34731e6dcbb18e69a20b51d421a
+  metadata.gz: 186183bd2337627828ad27578924b491161632034de3f51b2896a02312b68519
+  data.tar.gz: 903b7f9c68fdfcd7538739a1f98aa896e18924806f69d37576a85f935315f7e1
 SHA512:
-  metadata.gz: 179e73dd5c1186e82ff0265cb7eeb36f1a86daee9b2fe915d9cb3fe855ae62420601d2f7ca3adb153d70ffaadaa492be3086ecf129ed17b9435441d8727ac2e1
-  data.tar.gz: 8918cf5f6376226d4cecd99a70dbadd59d3a7ba2d029517a06849e3f89a9e94b0ea5a76ce46edb60847ceb64b2dcf0af0724a86530541231cf0ae22fa2d2c593
+  metadata.gz: ae67f54e90820899048b453b5c6592d0e7ac36ee562d798c74c82365c82de577c158640259eeb222cfb9e5f8ab5e880fd1ce36dcba56eed3f67dadaf2430eef7
+  data.tar.gz: aae484692b57eb9405e01b2b2f6e01b8254e7903b53fdbe919e829366e0f28ab46e5184e61111fa637655d029cd000197639a1e5919cc5bc59c041ad93108eb0

data/lib/hammer_cli_katello/content_view_version.rb

@@ -274,6 +274,7 @@ module HammerCLIKatello
     class ExportDefaultCommand < HammerCLIForeman::Command
       include HammerCLIKatello::LocalHelper
       include HammerCLIKatello::ApipieHelper
+      include HammerCLIKatello::CVImportExportHelper
 
       PUBLISHED_REPOS_DIR = "/var/lib/pulp/published/yum/https/repos/".freeze
 
@@ -290,6 +291,7 @@ module HammerCLIKatello
       build_options
 
       def execute
+        validate_pulp3_not_enabled(fail_msg_export)
         export_dir = options['option_export_dir']
 
         Dir.mkdir(export_dir) unless Dir.exist?(export_dir)
@@ -307,6 +309,7 @@ module HammerCLIKatello
     class LegacyExportCommand < HammerCLIKatello::SingleResourceCommand
       include HammerCLIForemanTasks::Async
       include LifecycleEnvironmentNameMapping
+      include HammerCLIKatello::CVImportExportHelper
       desc _('Export a content view (legacy method)')
 
       action :export
@@ -314,12 +317,16 @@ module HammerCLIKatello
 
       success_message _("Content view is being exported in task %{id}.")
       failure_message _("Could not export the content view")
-
       build_options do |o|
         o.expand(:all).including(:environments, :content_views, :organizations)
       end
 
       extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
+
+      def request_params
+        validate_pulp3_not_enabled(fail_msg_export)
+        super
+      end
     end
 
     class ExportCommand < HammerCLIForeman::Command
@@ -350,6 +357,8 @@ module HammerCLIKatello
         cvv = show(:content_view_versions, 'id' => options['option_id'])
         cv = show(:content_views, 'id' => cvv['content_view_id'])
 
+        validate_pulp3_not_enabled(fail_msg_export)
+
         composite = cv["composite"]
 
         export_json_options = { :cvv => cvv }
@@ -445,6 +454,8 @@ module HammerCLIKatello
 
       # rubocop:disable Metrics/AbcSize
       def execute
+        validate_pulp3_not_enabled(fail_msg_import)
+
         unless File.exist?(options['option_export_tar'])
           raise _("Export tar #{options['option_export_tar']} does not exist.")
         end
@@ -487,7 +498,8 @@ module HammerCLIKatello
           library_repos = index(
             :repositories,
             'organization_id' => organization_id,
-            'library' => true
+            'library' => true,
+            'label' => repo['label']
           )
 
           library_repo = library_repos.select do |candidate_repo|

data/lib/hammer_cli_katello/cv_import_export_helper.rb

@@ -162,5 +162,26 @@ module HammerCLIKatello
       end
       json
     end
+
+    def fail_msg_import
+      _("This command is not supported with Pulp 3. Use `hammer content-import` instead.")
+    end
+
+    def fail_msg_export
+      _("This command is not supported with Pulp 3. Use `hammer content-export` instead.")
+    end
+
+    def validate_pulp3_not_enabled(failure_message)
+      pulp3_enabled = HammerCLIForeman
+                      .foreman_api_connection
+                      .resource(:content_exports)
+                      .call(:api_status)['api_usable']
+      if pulp3_enabled
+        raise failure_message
+      end
+    rescue NoMethodError
+      # if the api endpoint isn't there, the validation passes
+      true
+    end
   end
 end

data/lib/hammer_cli_katello/version.rb

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

data/test/functional/content_view/version/cv_import_export_helper_test.rb

@@ -0,0 +1,20 @@
+require_relative '../../test_helper'
+describe 'CVImportExportHelper' do
+  describe 'validate_pulp3_not_enabled' do
+    include HammerCLIKatello::CVImportExportHelper
+    it 'returns true when the api endpoint does not return a value' do
+      api_expects(:content_exports, :api_status)
+      assert_equal true, validate_pulp3_not_enabled('fail_msg')
+    end
+
+    it 'raises error when the api reports Pulp 3 is enabled' do
+      api_expects(:content_exports, :api_status).returns('api_usable' => true)
+      assert_raises(RuntimeError, 'fail msg') { validate_pulp3_not_enabled('fail msg') }
+    end
+
+    it 'returns nil when the api reports Pulp 3 is not enabled' do
+      api_expects(:content_exports, :api_status).returns('api_usable' => false)
+      assert_equal nil, validate_pulp3_not_enabled('fail_msg')
+    end
+  end
+end

data/test/functional/content_view/version/export_test.rb

@@ -8,6 +8,10 @@ describe 'content-view version export' do
   end
 
   it "performs export" do
+    HammerCLIKatello::ContentViewVersion::ExportCommand
+      .any_instance
+      .expects(:validate_pulp3_not_enabled)
+      .returns(true)
     params = [
       '--id=5',
       '--export-dir=/tmp/exports'
@@ -65,6 +69,10 @@ describe 'content-view version export' do
   end
 
   it "performs composite export" do
+    HammerCLIKatello::ContentViewVersion::ExportCommand
+      .any_instance
+      .expects(:validate_pulp3_not_enabled)
+      .returns(true)
     params = [
       '--id=999',
       '--export-dir=/tmp/exports'
@@ -101,6 +109,10 @@ describe 'content-view version export' do
   end
 
   it "fails export if content view version has no repository" do
+    HammerCLIKatello::ContentViewVersion::ExportCommand
+      .any_instance
+      .expects(:validate_pulp3_not_enabled)
+      .returns(true)
     params = [
       '--id=5',
       '--export-dir=/tmp/exports'

data/test/functional/content_view/version/import_test.rb

@@ -8,6 +8,10 @@ describe 'content-view version import' do
   end
 
   it "performs import" do
+    HammerCLIKatello::ContentViewVersion::ImportCommand
+      .any_instance
+      .expects(:validate_pulp3_not_enabled)
+      .returns(true)
     params = [
       '--export-tar=/tmp/exports/export-2.tar',
       '--organization-id=1'
@@ -75,6 +79,10 @@ describe 'content-view version import' do
   end
 
   it "performs composite import" do
+    HammerCLIKatello::ContentViewVersion::ImportCommand
+      .any_instance
+      .expects(:validate_pulp3_not_enabled)
+      .returns(true)
     params = [
       '--export-tar=/tmp/exports/export-999.tar',
       '--organization-id=1'
@@ -135,6 +143,10 @@ describe 'content-view version import' do
   end
 
   it "performs composite import, component not found" do
+    HammerCLIKatello::ContentViewVersion::ImportCommand
+      .any_instance
+      .expects(:validate_pulp3_not_enabled)
+      .returns(true)
     params = [
       '--export-tar=/tmp/exports/export-999.tar',
       '--organization-id=1'
@@ -184,6 +196,10 @@ describe 'content-view version import' do
   end
 
   it "fails import if cv has not been created" do
+    HammerCLIKatello::ContentViewVersion::ImportCommand
+      .any_instance
+      .expects(:validate_pulp3_not_enabled)
+      .returns(true)
     params = [
       '--export-tar=/tmp/exports/export-2.tar',
       '--organization-id=1'
@@ -210,6 +226,10 @@ describe 'content-view version import' do
   end
 
   it "fails import if repo is set to mirror-on-sync" do
+    HammerCLIKatello::ContentViewVersion::ImportCommand
+      .any_instance
+      .expects(:validate_pulp3_not_enabled)
+      .returns(true)
     params = [
       '--export-tar=/tmp/exports/export-2.tar',
       '--organization-id=1'
@@ -244,6 +264,10 @@ describe 'content-view version import' do
   end
 
   it "fails import if cv version already exists" do
+    HammerCLIKatello::ContentViewVersion::ImportCommand
+      .any_instance
+      .expects(:validate_pulp3_not_enabled)
+      .returns(true)
     params = [
       '--export-tar=/tmp/exports/export-2.tar',
       '--organization-id=1'
@@ -278,6 +302,10 @@ describe 'content-view version import' do
   end
 
   it "fails import if any repository does not exist" do
+    HammerCLIKatello::ContentViewVersion::ImportCommand
+      .any_instance
+      .expects(:validate_pulp3_not_enabled)
+      .returns(true)
     params = [
       '--export-tar=/tmp/exports/export-2.tar',
       '--organization-id=1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_katello
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: 1.0.1
 platform: ruby
 authors:
 - Adam Price
@@ -35,7 +35,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-04 00:00:00.000000000 Z
+date: 2021-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman
@@ -402,6 +402,7 @@ files:
 - 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
@@ -533,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
@@ -618,6 +619,7 @@ test_files:
 - 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