hammer_cli_katello 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfa4a96e3ec666332357da5f6741af1fb78360f60e3016060d8e0ba7a41a38c9
-  data.tar.gz: 2d6fafe5ea4d85dd1551f9274a57cc6e2c65e3155bbabd844a0f12d964c3e7d3
+  metadata.gz: 2708ed7f94bc63930cdbfbf1e6b6910224b9ac947a59beb6fd67325de8d13df5
+  data.tar.gz: 8e1658c27cab54ba5d45d68b9a2e9eea54df34db5be3316f090ef7bce073f7a3
 SHA512:
-  metadata.gz: e3c4c16ed1e4c64d5126810fef1c723490758c1019e820e7cde65f7b6caa663ada32072aa39dcac2964199c5a2a72b2c36f31e4d85dfc64f8b2c9d203154896b
-  data.tar.gz: eeefc161d8fb26803fae890ef79d94c74f1e6ca94d4f0780ba839018890fce56bc5405a932cbeee7edbaa5817bec3de0762d39bc0577ee6e647de673c7c6e5fe
+  metadata.gz: e69050801a50bef32379cce5b0f12b71a2308dac7bd6452a512f077e45b6fcd7e492cc75ed9eac8b425552884bd814857f3394c8aebd919553e54c10a9b5bb9b
+  data.tar.gz: cf6ca14b9f61a2f05d310084f2af7207a2a6aba887cd6a69c9a3ff1da1ce3670b450e45645a6d36affdabc9f2532d8a0baeda20e7f722bedfdbbd96fcc9ba086

data/lib/hammer_cli_katello/content_export.rb

@@ -78,7 +78,7 @@ module HammerCLIKatello
         end
 
         make_listing_files(export_history)
-
+        output.print_message _("Generated #{export_history['path']}")
         HammerCLI::EX_OK
       end
     end

data/lib/hammer_cli_katello/content_export_helper.rb

@@ -14,10 +14,9 @@ module HammerCLIKatello
         response
       else
         export_history = fetch_export_history_from_task(reload_task(@task))
-        if syncable?
-          make_listing_files(export_history)
-          HammerCLI::EX_OK
-        elsif export_history
+
+        if export_history
+          make_listing_files(export_history) if syncable?
           generate_metadata_json(export_history)
           HammerCLI::EX_OK
         else
@@ -82,8 +81,6 @@ module HammerCLIKatello
 
     def make_listing_files(export_history)
       check_export_history_syncable!(export_history)
-      output.print_message _("Generated #{export_history['path']}")
-
       return unless Dir.exist?("#{export_history['path']}/content")
 
       begin
@@ -138,7 +135,7 @@ module HammerCLIKatello
     def fetch_repositories
       if repository_command?
         resp = show(:repositories, id: resolver.repository_id(options))
-        return resp["download_policy"] == "immediate" ? [] : [resp]
+        return resp["content_type"] != "yum" || resp["download_policy"] == "immediate" ? [] : [resp]
       end
 
       repo_options = {

data/lib/hammer_cli_katello/content_import.rb

@@ -1,3 +1,4 @@
+require 'open-uri'
 module HammerCLIKatello
   class ContentImport < HammerCLIKatello::Command
     desc "Import content from a content archive"
@@ -18,10 +19,11 @@ module HammerCLIKatello
 
         base.validate_options do
           option(:option_path).required
-
           metadata_file = option(:option_metadata_file).value ||
                           File.join(option(:option_path).value, "metadata.json")
-          unless File.exist?(metadata_file)
+          begin
+            URI.open(metadata_file)
+          rescue Errno::ENOENT
             msg = _("Unable to find '#{metadata_file}'. "\
                      "If the metadata.json file is at a different location "\
                      "provide it to the --metadata-file option ")
@@ -32,10 +34,18 @@ module HammerCLIKatello
         base.failure_message _("Could not import the archive.")
       end
 
+      def fetch_metadata_from_url(metadata_file:, url:)
+        if metadata_file.nil?
+          metadata_file = "/tmp/metadata.json"
+          IO.copy_stream(URI.open(url), metadata_file)
+        end
+        metadata_file
+      end
+
       def request_params
         super.tap do |opts|
           metadata_file = option_metadata_file || File.join(option_path, "metadata.json")
-          opts["metadata"] = JSON.parse(File.read(metadata_file))
+          opts["metadata"] = JSON.parse(URI.open(metadata_file).read)
         end
       end
     end

data/lib/hammer_cli_katello/organization.rb

@@ -52,7 +52,8 @@ module HammerCLIKatello
         types = {
           'export_sync' => _("Export Sync"),
           'network_sync' => _("Network Sync"),
-          'redhat_cdn' => _("Red Hat CDN")
+          'redhat_cdn' => _("Red Hat CDN"),
+          'custom_cdn' => _("Custom CDN")
         }
         data["cdn_configuration"].merge!("type_label" => types[data["cdn_configuration"]["type"]])
       end

data/lib/hammer_cli_katello/repository.rb

@@ -34,6 +34,18 @@ module HammerCLIKatello
         field :url, _("Url")
       end
 
+      content_type_msg = _("Limit the repository type to return." \
+        " View available types with \"hammer repository types\"")
+      option "--content-type", "CONTENT TYPE",
+             content_type_msg,
+             :attribute_name => :option_content_type
+
+      with_content_msg = _("Limit the repository type to return." \
+        " View available types with \"hammer repository types\"")
+      option "--with-content", "WITH CONTENT",
+             with_content_msg,
+             :attribute_name => :option_with_content
+
       build_options
 
       extend_with(HammerCLIKatello::CommandExtensions::LifecycleEnvironment.new)
@@ -214,6 +226,12 @@ module HammerCLIKatello
              :attribute_name => :option_unprotected,
              :format => HammerCLI::Options::Normalizers::Bool.new
 
+      content_type_msg = _("Type of repository to create." \
+        " View available types with \"hammer repository types\"")
+      option "--content-type", "CONTENT TYPE",
+             content_type_msg,
+             :attribute_name => :option_content_type
+
       build_options :without => [:unprotected]
     end
 
@@ -321,6 +339,22 @@ module HammerCLIKatello
       end
     end
 
+    class RepositoryTypesCommand < HammerCLIKatello::InfoCommand
+      resource :repositories, :repository_types
+      command_name "types"
+
+      output do
+        field :name, _("Name")
+        collection :content_types, _('Content types') do
+          field :label, _('Type')
+          field :generic, _('Generic?')
+          field :removable, _('Removable?')
+          field :uploadable, _('Uploadable?')
+          field :indexed, _('Indexed?')
+        end
+      end
+    end
+
     # rubocop:disable ClassLength
     class UploadContentCommand < HammerCLIKatello::InfoCommand
       extend RepositoryScopedToProduct
@@ -331,6 +365,12 @@ module HammerCLIKatello
       command_name "upload-content"
       CONTENT_CHUNK_SIZE = 2_500_000 # bytes to make sure it's lower than django's default 2621440
 
+      content_type_msg = _("The type of content unit to upload (srpm, file, etc.)." \
+        " View uploadable types with \"hammer repository types\"")
+      option "--content-type", "CONTENT TYPE",
+             content_type_msg,
+             :attribute_name => :option_content_type
+
       class BinaryPath < HammerCLI::Options::Normalizers::File
         def format(path)
           fullpath = ::File.expand_path(path)
@@ -562,6 +602,12 @@ module HammerCLIKatello
         end
       end
 
+      content_type_msg = _("The type of content unit to remove (srpm, docker_manifest, etc.)." \
+        " View removable types with \"hammer repository types\"")
+      option "--content-type", "CONTENT TYPE",
+             content_type_msg,
+             :attribute_name => :option_content_type
+
       build_options do |o|
         o.expand.including(:products)
       end

data/lib/hammer_cli_katello/version.rb

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