uricp 0.0.29 → 0.0.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e24fdb3944db682f49ca90b6eb4639885389d689610e76cbcbf5d83e5619208
-  data.tar.gz: 99eeabde06d5f28aa9c33b1faa9306bf9fb65cba504c68359968388515061d8b
+  metadata.gz: a4895addf1e14cf9a918d89e471fe0f30e12189bd942303806590aff1368a294
+  data.tar.gz: 97be8b34f73e4e0070cd6a0f6878a5f7dd9db465d7b5fd236c4497e72f5b83cd
 SHA512:
-  metadata.gz: ef6450ea82fe52174ec0037e4e62711c35da6c2c746ecab02d123ec00df35f5bf3697f3b55b595c509274b9446e7a7446f2167401793d17a1f6c00c88cba6186
-  data.tar.gz: 7b9d798e540f9f3e4418e7c7facd08120c1c889320baf8b7d707464aafdd89ad2f492ec7c0233e4537e05027ff6de7eb25fe79444ce753a11600c610cb9a9682
+  metadata.gz: fb45da786826b356a2a95b0764eb7e3d117d0933da0f0729e3473ee4715266217fe642fbe819a87f7b7330809bded5d1f7a92cc39c5c27c8766776577bec19e8
+  data.tar.gz: edc045ffc50f615a1f40ef8d4700c541658095ecef4eee84bbf196071a1e233c165eab0f8dd5c237d56aacbfe30ca7722db8398fd45de5fb46a6718356229368

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    uricp (0.0.29)
+    uricp (0.0.31)
       childprocess (~> 1.0)
       filesize (= 0.0.2)
       methadone (~> 2.0.2)

data/almalinux8/Dockerfile

@@ -3,11 +3,11 @@ MAINTAINER support@brightbox.co.uk
 
 RUN echo "gem: --no-ri --no-rdoc" >> "$HOME/.gemrc"
 RUN dnf -y install dnf-plugins-core
-RUN dnf config-manager --add-repo https://repo.almalinux.org/almalinux/8.4/devel/almalinux-devel.repo
+RUN dnf config-manager --add-repo https://repo.almalinux.org/almalinux/8/devel/almalinux-devel.repo
+RUN echo "8-stream" > /etc/dnf/vars/stream
 RUN dnf -y update
 RUN dnf config-manager --set-enabled powertools,devel
 RUN dnf -y group install "Development Tools"
-RUN dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
 RUN dnf -y install https://www.rdoproject.org/repos/rdo-release.el8.rpm
 RUN dnf -y install \
     git \

data/features/rbd_access.feature

@@ -246,3 +246,55 @@ Feature: Manipulate file images in ceph
     """
     rbd snap protect --id libvirt 'servers/img-testy@base'
     """
+
+  Scenario: RBD export and upload to HTTPS
+    Given a correctly initialised cache at "/tmp/uricp"
+    When I successfully run `uricp  --dry-run --auth-token 'd75945e3b9159f1f14e91b2022bc53ea10481ed15e4a' --target-format 'raw' --compress --segment-size '1073741824B' --cache '/var/cache/domtrix' rbd:/servers/vol-yd63x https://orbit.gb1s.brightbox.com/v1/acc-8tgbq/images/img-cfwe0`
+    And the output should contain:
+    """
+    rbd snap create --id libvirt 'servers/vol-yd63x@uricp_snap'
+    """
+    And the output should contain:
+    """
+    rbd snap protect --id libvirt 'servers/vol-yd63x@uricp_snap'
+    """
+    And the output should not contain:
+    """
+    rbd snap unprotect --id libvirt 'servers/vol-yd63x@uricp_snap'
+    """
+    And the output should not contain:
+    """
+    rbd snap rm --id libvirt 'servers/vol-yd63x@uricp_snap'
+    """
+    And the output should not contain:
+    """
+    rbd export --no-progress --id libvirt 'servers/vol-yd63x@uricp_snap' -
+    """
+    And the output should contain:
+    """
+    rbd clone --id libvirt 'servers/vol-yd63x@uricp_snap' 'servers/img-cfwe0'
+    """
+    And the output should contain:
+    """
+    rbd export --no-progress --id libvirt 'servers/img-cfwe0@base' -
+    """
+    And the output should contain:
+    """
+    rbd snap create --id libvirt 'servers/img-cfwe0@base'
+    """
+    And the output should contain:
+    """
+    rbd snap protect --id libvirt 'servers/img-cfwe0@base'
+    """
+    And the output should contain:
+    """
+    rbd export --no-progress --id libvirt 'servers/img-cfwe0@base' -
+    """
+    And the output should contain:
+    """
+    lz4
+    """
+    And the output should contain:
+    """
+    segment_upload --segment-size '1073741824.00 B'  https://orbit.gb1s.brightbox.com/v1/acc-8tgbq/images/img-cfwe0
+    """

data/lib/uricp/curl_primitives.rb

@@ -24,22 +24,26 @@ module Uricp::CurlPrimitives
   end
 
   def authentication
-    "-H X-Auth-Token:#{options['authenticator'].call}" if http_authentication?
+    "-H 'X-Auth-Token:#{options['authenticator'].call}'" if http_authentication?
   end
 
   def http_authentication?
     options['authenticator']
   end
 
+  def temp_url?
+    from && from.query.to_s.include?('temp_url')
+  end
+
   def curl_upload_from(source, destination = to)
-    "#{curl_command} #{authentication} -T #{source} #{destination};"
+    "#{curl_command} #{authentication} -T '#{source}' '#{destination}';"
   end
 
   def curl_download_to_pipe
-    "#{curl_command} #{authentication} #{from} |"
+    "#{curl_command} #{authentication unless temp_url?} '#{from}' |"
   end
 
   def curl_manifest(object_manifest, destination = to)
-    "#{curl_command} #{authentication} -X PUT -H 'X-Object-Manifest: #{object_manifest}' #{destination} --data-binary ''"
+    "#{curl_command} #{authentication} -X PUT -H 'X-Object-Manifest: #{object_manifest}' '#{destination}' --data-binary ''"
   end
 end

data/lib/uricp/strategy/common.rb

@@ -6,6 +6,8 @@ module Uricp::Strategy
     include Uricp::CurlPrimitives
     include Methadone::SH
 
+    VOL_REGEX = /^(srv|vol)-.....$/
+
     def initialize(options)
       @options = options
       debug "#{self.class.name}: options are #{options.inspect}"
@@ -168,7 +170,7 @@ module Uricp::Strategy
     def rbd_cache_image_exists?(target)
       command = "rbd status --id #{rbd_id} --format json #{target} 2>/dev/null"
       if dry_run?
-        if options['dry-cache'] == :partial_rbd && options['cache_name'] !~ /srv-...../
+        if options['dry-cache'] == :partial_rbd && options['cache_name'] !~ VOL_REGEX
           command = 'exit 0'
         else
           command = 'exit 2'
@@ -193,7 +195,7 @@ module Uricp::Strategy
     def in_rbd_cache(target)
       result =
         if dry_run?
-          options['dry-cache'] == :rbd && options['cache_name'] !~ /srv-...../
+          options['dry-cache'] == :rbd && options['cache_name'] !~ VOL_REGEX
         else
           snap_check(target, rbd_base_name)
         end

data/lib/uricp/strategy/piped_rbd_get.rb

@@ -10,8 +10,10 @@ module Uricp::Strategy
       without_active_cache do
         if from.scheme == 'rbd' &&
            rbd_snapshot_spec?(from) &&
-           to.scheme != 'rbd'
-          return proposal unless sequence_complete?
+           to.scheme != 'rbd' &&
+           (!conversion_required? || raw_target?) &&
+           !sequence_complete?
+          return proposal
         end
       end
       debug "#{self.class.name}: not appropriate"
@@ -25,6 +27,7 @@ module Uricp::Strategy
     def proposal
       @proposed_options = options.dup
       @proposed_options['from_uri'] = PIPE_URI
+      @proposed_options.delete('target-format')
       self
     end
   end

data/lib/uricp/strategy/piped_remote_get.rb

@@ -75,7 +75,8 @@ module Uricp::Strategy
 
     def headers
       headers = { 'Range' => 'bytes=0-7' }
-      headers['X-Auth-Token'] = options['authenticator'].call if http_authentication?
+      return headers if !http_authentication? || temp_url?
+      headers['X-Auth-Token'] = options['authenticator'].call
       headers
     end
   end

data/lib/uricp/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Uricp
-  VERSION = '0.0.29'
+  VERSION = '0.0.31'
   DEFAULT_SEGMENT_SIZE = '5 GiB'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uricp
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.31
 platform: ruby
 authors:
 - Neil Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-11 00:00:00.000000000 Z
+date: 2022-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aruba