morpheus-cli 3.4.1.4 → 3.4.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e36f51274524a0ee48ba3f6c51e224d29bc42118
-  data.tar.gz: dadbf3df8aa4ff8fd29d28ffc1b3407d22e2d02b
+SHA256:
+  metadata.gz: 1733b5ed349e532113b94d11eea6d9f5f04c1e3b7395077192225a7c017dcc95
+  data.tar.gz: ae7c082eb787c6c2a360e571589bd804bedd482a2cccc0046d830c0f4692d15e
 SHA512:
-  metadata.gz: 9e526f9adc5da2b3cadd57ea97ffa63ad89052383e8e0ecbe373edf6dd948503d078a0c302186365af8e07c1f769fdbf1b7c24dd441f0024ff97c4cad1de66fb
-  data.tar.gz: 1ccc01cfd9fbc9a5785b41dc5ce294cc3b0b27a9e3e875777aa60db2f68d64594f3a6371154ecfce61bdc6b3c4db144271caeecb262b50864ac21086b2155e00
+  metadata.gz: 18e3085b2ebd404ad6b5b0094866fc129034c5e975ad652e42f3f175bba87bdf2793eb208fac00bbfefb317ca252498d67afbbfaee51655dbf126cd6289b63d6
+  data.tar.gz: 7a0aa9d880ad260ca43f1596db41d1b4997ced25818772aca2f7cdfd1490039878af574b1d340aeab6955e78e682dec1bce7c13dcfec9baae6d24da7f5c7fa53

data/lib/morpheus/api/virtual_images_interface.rb

@@ -1,4 +1,7 @@
 require 'morpheus/api/api_client'
+require 'http'
+require 'zlib'
+require 'forwardable'
 
 class Morpheus::VirtualImagesInterface < Morpheus::APIClient
   def initialize(access_token, refresh_token,expires_at = nil, base_url=nil) 
@@ -65,14 +68,87 @@ class Morpheus::VirtualImagesInterface < Morpheus::APIClient
   #   execute(method: :post, url: url, headers: headers, payload: payload)
   # end
 
+  # wrapper class for input stream so that HTTP doesn't blow up when using it 
+  # ie. calling size() and rewind()
+  class BodyIO
+    extend Forwardable
+
+    def initialize(io)
+      @io = io
+    end
+
+    def size
+      0
+    end
+
+    def rewind
+      nil
+    end
+
+    def_delegators :@io, :read, :readpartial, :write
+    
+  end
+
   # no multipart
-  def upload(id, image_file, filename=nil)
+  def upload(id, image_file, filename=nil, do_gzip=false)
     filename = filename || File.basename(image_file)
     url = "#{@base_url}/api/virtual-images/#{id}/upload"
     headers = { :params => {}, :authorization => "Bearer #{@access_token}", 'Content-Type' => 'application/octet-stream'}
     headers[:params][:filename] = filename
     payload = image_file
-    execute(method: :post, url: url, headers: headers, payload: payload, timeout: 36000)
+    #execute(method: :post, url: url, headers: headers, payload: payload, timeout: 36000)
+    
+    # Using http.rb instead of RestClient
+    # todo: execute() should support :driver
+    
+    
+    http_opts = {}
+    if @verify_ssl == false
+      ctx = OpenSSL::SSL::SSLContext.new
+      ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      http_opts[:ssl_context] = ctx
+      # opts[:verify_ssl] = OpenSSL::SSL::VERIFY_NONE
+    end
+    
+    start_time = Time.now
+    query_params = headers.delete(:params) || {}
+    if do_gzip
+      # http = http.use(:auto_deflate)
+      headers['Content-Encoding'] = 'gzip'
+      headers['Content-Type'] = 'application/gzip'
+      headers['Content-Length'] = image_file.size
+      #headers['Transfer-Encoding'] = 'Chunked'
+      query_params['extractedContentLength'] = image_file.size
+      if @dry_run
+        return {method: :post, url: url, headers: headers, params: query_params, payload: payload}
+      end
+      http = HTTP.headers(headers)
+      http_opts[:params] = query_params
+      
+      rd, wr = IO.pipe
+      Thread.new {
+         gz = Zlib::GzipWriter.new(wr)
+         File.open(payload) do |fp|
+           while chunk = fp.read(10 * 1024 * 1024) do
+             gz.write chunk
+           end
+         end
+         gz.close
+      }
+      http_opts[:body] = BodyIO.new(rd)
+      response = http.post(url, http_opts)
+    else
+      if @dry_run
+        return {method: :post, url: url, headers: headers, params: query_params, payload: payload}
+      end
+      http = HTTP.headers(headers)
+      http_opts[:params] = query_params
+      http_opts[:body] = payload
+      response = http.post(url, http_opts)
+    end
+    # puts "Took #{Time.now.to_i - start_time.to_i}"
+    # return response
+    return JSON.parse(response.body.to_s)
   end
 
   def upload_by_url(id, file_url, filename=nil)

data/lib/morpheus/cli/mixins/print_helper.rb

@@ -103,7 +103,7 @@ module Morpheus::Cli::PrintHelper
       url = "#{url}?#{query_string}"
     end
     request_string = "#{http_method.to_s.upcase} #{url}".strip
-    payload = opts[:payload]
+    payload = opts[:payload] || opts[:body]
     if command_string
       print_h1 "DRY RUN > #{command_string}"
     else

data/lib/morpheus/cli/version.rb

@@ -1,6 +1,6 @@
 
 module Morpheus
   module Cli
-    VERSION = "3.4.1.4"
+    VERSION = "3.4.1.5"
   end
 end

data/lib/morpheus/cli/virtual_images.rb

@@ -458,6 +458,7 @@ class Morpheus::Cli::VirtualImages
   def add_file(args)
     file_url = nil
     file_name = nil
+    do_gzip = false
     options = {}
     optparse = Morpheus::Cli::OptionParser.new do |opts|
       opts.banner = subcommand_usage("[name] [filepath]")
@@ -467,6 +468,9 @@ class Morpheus::Cli::VirtualImages
       opts.on( '-U', '--url URL', "Image File URL. This can be used instead of [filepath]" ) do |val|
         file_url = val
       end
+      opts.on( nil, '--gzip', "Compress uploaded file" ) do
+        do_gzip = true
+      end
       build_common_options(opts, options, [:json, :dry_run, :quiet, :remote])
       opts.footer = "Upload a virtual image file." + "\n" +
                     "[name] is required. This is the name or id of a virtual image." + "\n" +
@@ -511,13 +515,13 @@ class Morpheus::Cli::VirtualImages
       else
         image_file = File.new(filepath, 'rb')
         if options[:dry_run]
-          print_dry_run @virtual_images_interface.dry.upload(image['id'], image_file, file_name)
+          print_dry_run @virtual_images_interface.dry.upload(image['id'], image_file, file_name, do_gzip)
           return
         end
         unless options[:quiet]
           print cyan, "Uploading file #{filepath} ...", reset, "\n"
         end
-        json_response = @virtual_images_interface.upload(image['id'], image_file, file_name)
+        json_response = @virtual_images_interface.upload(image['id'], image_file, file_name, do_gzip)
         if options[:json]
           print JSON.pretty_generate(json_response)
         elsif !options[:quiet]

data/morpheus-cli.gemspec

@@ -18,6 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version = '>= 2.3' # according to http.rb doc
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_dependency 'term-ansicolor', '~> 1.3.0'
@@ -26,4 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency "filesize"
   spec.add_dependency 'mime-types'
   spec.add_dependency "table_print"
+  spec.add_dependency "http"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: morpheus-cli
 version: !ruby/object:Gem::Version
-  version: 3.4.1.4
+  version: 3.4.1.5
 platform: ruby
 authors:
 - David Estes
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-11 00:00:00.000000000 Z
+date: 2018-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -125,6 +125,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Infrastructure agnostic cloud application management & orchestration
   CLI for Morpheus. Easily manage and orchestrate VMS on private or public infrastructure
   and containerized architectures.
@@ -321,7 +335,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -329,7 +343,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Provides CLI Interface to the Morpheus Public/Private Cloud Appliance