hammer_cli_katello 0.23.0 → 0.23.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc749f1a2a12052143301452900c4026c90428dd29919a6c96ecf7c89e3f1380
-  data.tar.gz: 6ac74bbf497f7c2ba59c9e0be56b6c6485ec0dee0e81f4757a32e786ab2c1aaf
+  metadata.gz: 39b7d013b69ccff473c384efe07fbc1c1574033c074e685be65723f5e3d79156
+  data.tar.gz: 9ba014e8f0a515eddfbb66d507483fa8f81b8873c5e670eca78755989bc1f40d
 SHA512:
-  metadata.gz: 235309cc66731f8b9b140e60e822782e455eb26080114dc2757d6e4fc2f8f630ed4fc564d6e0aef22f42097c570f118229bc530f2663f8d9606059ce2d90a9fb
-  data.tar.gz: cabc9b945a49e80ba5712e417d8b621d9fb7a5abd692f933e26b50c404d03356351bb9ae6f6c18e053293f3e06f1c56a43066f2b310b20bb84d9574cfd53f357
+  metadata.gz: 32c3e1f7dc2aa8fa32ceba935d7229c7b628bdf9429f6ed1fa036e818d3cca44bfa47d5d2319e7b8b16354688302f6743168fca59aa62c4a956f9ba4206fe74c
+  data.tar.gz: d270942a73c21fa9e996f1e0457d82b8e4abc866ddeed5d201d017febfbf9272640144aeacc260387550e8e8e22b36fac80b33b2e7b3d93fad87ff98ee465886

data/lib/hammer_cli_katello/repository.rb

@@ -249,6 +249,13 @@ module HammerCLIKatello
         if option(:option_product_name).exist?
           any(*organization_options).required
         end
+
+        if option(:option_docker_tag).exist? != option(:option_docker_digest).exist?
+          option(:option_docker_tag).rejected(
+            :msg => _('--docker-digest required with --docker-tag'))
+          option(:option_docker_digest).rejected(
+            :msg => _('--docker-tag required with --docker-digest'))
+        end
       end
 
       build_options(:without => [:unprotected]) do |o|
@@ -257,12 +264,63 @@ module HammerCLIKatello
       option "--publish-via-http", "ENABLE", _("Publish Via HTTP"),
              :attribute_name => :option_unprotected,
              :format => HammerCLI::Options::Normalizers::Bool.new
+      option "--docker-tag", "TAG", _("Container Image tag")
+      option "--docker-digest", "DIGEST", _("Container Image manifest digest")
 
       def execute
         @failure = false
-        super
+
+        if option_docker_tag
+          upload_tag(option_docker_tag, option_docker_digest)
+        else
+          super
+        end
+
         @failure ? HammerCLI::EX_DATAERR : HammerCLI::EX_OK
       end
+
+      def content_upload_resource
+        ::HammerCLIForeman.foreman_resource(:content_uploads)
+      end
+
+      def upload_tag(tag, digest)
+        upload_id = create_content_upload
+        import_uploads([
+          {
+            id: upload_id,
+            name: tag,
+            digest: digest
+          }
+        ], last_file: true)
+        print_message _("Repository updated")
+      rescue => e
+        @failure = true
+        logger.error e
+        output.print_error _("Failed to upload tag '%s' to repository.") % tag
+      ensure
+        content_upload_resource.call(:destroy, :repository_id => get_identifier, :id => upload_id)
+      end
+
+      def create_content_upload
+        response = content_upload_resource.call(:create,
+                                                :repository_id => get_identifier,
+                                                :size => 0
+                                               )
+
+        response["upload_id"]
+      end
+
+      def import_uploads(uploads, opts = {})
+        publish_repository = opts.fetch(:last_file, false)
+        sync_capsule = opts.fetch(:last_file, false)
+        params = {:id => get_identifier,
+                  :uploads => uploads,
+                  publish_repository: publish_repository,
+                  sync_capsule: sync_capsule,
+                  content_type: "docker_tag"
+        }
+        resource.call(:import_uploads, params)
+      end
     end
 
     class DeleteCommand < HammerCLIKatello::DeleteCommand

data/lib/hammer_cli_katello/version.rb

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

data/test/functional/repository/update_test.rb

@@ -2,7 +2,7 @@ require_relative '../test_helper'
 require_relative '../organization/organization_helpers'
 require 'hammer_cli_katello/repository'
 
-module HammerCLIKatello
+module HammerCLIKatello # rubocop:disable Metrics/ModuleLength
   describe Repository::UpdateCommand do
     include OrganizationHelpers
 
@@ -14,6 +14,46 @@ module HammerCLIKatello
       run_cmd(%w(repository update --id 1 --new-name rep1))
     end
 
+    describe 'tags docker images' do
+      let(:repo_id) { 3 }
+      let(:tag_name) { "latest" }
+      let(:digest) { "sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" }
+      let(:upload_id) { "1234" }
+      let(:_href) { "/pulp/api/v2/content/uploads/#{upload_id}" }
+      let(:upload_response) do
+        {
+          "upload_id" => upload_id,
+          "_href" => _href
+        }
+      end
+      it "adds a tag to an image" do
+        ex = api_expects(:content_uploads, :create)
+             .with_params('repository_id' => repo_id, :size => 0)
+
+        ex.returns(upload_response)
+        ex2 = api_expects(:repositories, :import_uploads, 'Take in an upload')
+              .with_params(:id => repo_id, :sync_capsule => true, :publish_repository => true,
+                           :uploads => [{
+                             :id => '1234',
+                             :name => tag_name,
+                             :digest => digest
+                           }],
+                           :content_type => "docker_tag"
+                          )
+
+        ex2.returns("")
+
+        ex3 = api_expects(:content_uploads, :destroy, "Delete the upload")
+              .with_params('id' => upload_id, 'repository_id' => repo_id)
+
+        ex3.returns("")
+        # rubocop:disable LineLength
+        result = run_cmd(%W(repository update --id #{repo_id} --docker-tag #{tag_name} --docker-digest #{digest}))
+        # rubocop:enable LineLength
+        assert_equal(result.exit_code, 0)
+      end
+    end
+
     describe 'resolves repository ID' do
       it 'by requiring product' do
         api_expects_no_call

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hammer_cli_katello
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.23.1
 platform: ruby
 authors:
 - Adam Price
@@ -35,7 +35,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-02 00:00:00.000000000 Z
+date: 2020-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hammer_cli_foreman
@@ -518,7 +518,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Katello commands for Hammer