rake-proxmox 0.3.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 80a3a7211e9b18aef9d3400e0fdb054dbda38ea0
-  data.tar.gz: 11d14ecd46d0b780b773720cd424436738420bf3
+  metadata.gz: 9ab71dcb7672a751abb211bcf76ceb12917f6e90
+  data.tar.gz: 6df26683c2409298bed0c02c1a0d3fc9caa382ec
 SHA512:
-  metadata.gz: a4de0c41c9c6fc8a24100d48e077d7ba810080a755034f6eefe8bb1bfd09609f77372ca772357025cbcf26f8a0f032651a20a6f4c40fd9f3aae418bdd6c73afd
-  data.tar.gz: 84a61870ba2c749957b44a7b2907ecc64660b165720fc72921ee702e0163a703d89e87b67786a7091aec1b32dc2a8dda93b6c20d985f0872545d46e98388c560
+  metadata.gz: ec767c5c26b6ee8e088a483d43e234f23f4f71328c0f2c2cbe9ce010c8778d85bfdc13ca4f0ee1aaf3f4a4ee5b20e7c7e69d74ecf8364e9ff5c9a9569bc7c8a1
+  data.tar.gz: 7838419de10f662b8a6e6b134560504d1cf6e3aac62640c10afa3ae501d43155864a7c49f54fcdabe6d91a8cb0847da0a75d4499fdccafbd421fb2ee66bf4499

data/lib/rake/proxmox.rb

@@ -8,8 +8,9 @@ module Rake
     #
     class RakeTasks < ::Rake::TaskLib
       # @yield [self] gives itself to the block
-      def initialize(ssl_options = {})
-        unless ENV.include?('PROXMOX_PVE_CLUSTER')
+      def initialize(ssl_options = {}, logger = nil)
+        unless ENV.include?('PROXMOX_PVE_CLUSTER') &&
+               ENV.include?('PROXMOX_NODE')
           puts ''
           puts '# Proxmox Tasks are not available without correct environment'
           puts '#'
@@ -18,6 +19,8 @@ module Rake
           puts '# export PROXMOX_PVE_CLUSTER='\
             'https://pve1.example.com:8006/api2/json/'
           puts '# export PROXMOX_NODE=pve1'
+          puts '#'
+          puts '# optional add following variables if needed'
           puts '# export PROXMOX_REALM=pve'
           puts '# export PROXMOX_USERNAME=vagrant'
           puts '# export PROXMOX_PASSWORD=vagrant'
@@ -28,10 +31,11 @@ module Rake
         @proxmox = Rake::Proxmox::ProxmoxApi.new(
           ENV['PROXMOX_PVE_CLUSTER'],
           ENV['PROXMOX_NODE'],
-          ENV['PROXMOX_USERNAME'],
-          ENV['PROXMOX_PASSWORD'],
-          ENV['PROXMOX_REALM'],
-          ssl_options
+          ENV['PROXMOX_USERNAME'] ? ENV['PROXMOX_USERNAME'] : 'vagrant',
+          ENV['PROXMOX_PASSWORD'] ? ENV['PROXMOX_PASSWORD'] : 'vagrant',
+          ENV['PROXMOX_REALM'] ? ENV['PROXMOX_REALM'] : 'pve',
+          ssl_options,
+          logger
         )
 
         # container for current lxc status

data/lib/rake/proxmox/proxmox_api.rb

@@ -1,5 +1,8 @@
-require 'rest_client'
+require 'faraday'
+require 'faraday_middleware'
+require 'httpclient'
 require 'json'
+require 'logger'
 
 module Rake
   module Proxmox
@@ -24,8 +27,9 @@ module Rake
       #                        {verify_ssl: false})
       #
       # rubocop:disable Metrics/ParameterLists
+      # rubocop:disable Metrics/AbcSize
       def initialize(pve_cluster, node, username, password, realm,
-                     ssl_options = {})
+                     ssl_options = {}, logger = nil)
         @pve_cluster = pve_cluster
         @node = node
         @username = username
@@ -33,7 +37,33 @@ module Rake
         @realm = realm
         @ssl_options = ssl_options
         @connection_status = 'error'
-        @site = RestClient::Resource.new(@pve_cluster, @ssl_options)
+        use_default_logger = logger.nil?
+        logger ||= Logger.new STDERR
+        # set default loglevel
+        logger.level = Logger::WARN if use_default_logger
+        user_agent = "rake-proxmox #{Rake::Proxmox::VERSION}"
+        @site = Faraday.new(url: @pve_cluster, headers: {
+                              user_agent: user_agent
+                            }) do |conn|
+          # POST/PUT params encoders:
+          conn.request :multipart
+          conn.request :url_encoded
+
+          # allow Faraday to retry request
+          conn.request :retry, max: 3, interval: 0.05,
+                               interval_randomness: 0.5, backoff_factor: 2,
+                               exceptions: %w[HTTPClient::KeepAliveDisconnected
+                                              Timeout::Error]
+
+          conn.response :json, content_type: /\bjson$/
+          conn.response :logger, logger do |log|
+            log.filter(/(Csrfpreventiontoken:)\s+(.*)$/, '\1 "[REMOVED]"')
+            log.filter(/(Cookie:)\s+(.*)$/, '\1 "[REMOVED]"')
+          end
+
+          # Last middleware must be the adapter:
+          conn.adapter :httpclient
+        end
         @auth_params = create_ticket
       end
 
@@ -474,7 +504,7 @@ module Rake
         "Template #{filename} does not exist locally" unless File.file? filename
         data = {
           content: 'vztmpl',
-          filename: File.new(filename)
+          filename: Faraday::UploadIO.new(filename, 'application/gzip')
         }
         http_action_post("nodes/#{node}/storage/#{storage}/upload", data)
       end
@@ -484,18 +514,17 @@ module Rake
       # Methods manages auth
       def create_ticket
         post_param = { username: @username, realm: @realm, password: @password }
-        @site['access/ticket'].post post_param do |resp, _req, _res, &_block|
-          if resp.code == 200
-            extract_ticket resp
-          else
-            @connection_status = 'error'
-          end
+        resp = @site.post('access/ticket', post_param)
+        if resp.success?
+          extract_ticket resp
+        else
+          @connection_status = 'error'
         end
       end
 
       # Method create ticket
       def extract_ticket(response)
-        data = JSON.parse(response.body)
+        data = response.body
         ticket = data['data']['ticket']
         csrf_prevention_token = data['data']['CSRFPreventionToken']
         unless ticket.nil?
@@ -508,40 +537,52 @@ module Rake
         }
       end
 
+      def json_decode(response)
+        if response.headers.include?('Content-Type') &&
+           response.headers['Content-Type'] =~ /\bjson/
+          response.body
+        else
+          JSON.parse(response.body)
+        end
+      end
+
       # Extract data or return error
       def check_response(response)
-        if response.code == 200
-          JSON.parse(response.body)['data']
+        if response.success?
+          json_decode(response)['data']
         else
-          'NOK: error code = ' + response.code.to_s \
+          'NOK: error code = ' + response.status.to_s \
           + 'data = ' + response.body + "\n"
         end
       end
 
       # Methods manage http dialogs
-      def http_action_post(url, data = {})
-        # print "POST #{url}\n#{data}\n"
-        @site[url].post data, @auth_params do |resp, _req, _res, &_block|
-          check_response resp
+      def http_action_post(url, payload = {})
+        resp = @site.post(url, payload) do |req|
+          req.headers.merge!(@auth_params)
         end
+        check_response resp
       end
 
       def http_action_put(url, data = {})
-        @site[url].put data, @auth_params do |resp, _req, _res, &_block|
-          check_response resp
+        resp = @site.put(url, data) do |req|
+          req.headers.merge!(@auth_params)
         end
+        check_response resp
       end
 
       def http_action_get(url, data = {})
-        @site[url].get @auth_params.merge(data) do |resp, _req, _res, &_block|
-          check_response resp
+        resp = @site.get(url, data) do |req|
+          req.headers.merge!(@auth_params)
         end
+        check_response resp
       end
 
       def http_action_delete(url)
-        @site[url].delete @auth_params do |resp, _req, _res, &_block|
-          check_response resp
+        resp = @site.delete(url) do |req|
+          req.headers.merge!(@auth_params)
         end
+        check_response resp
       end
     end
   end

data/lib/rake/proxmox/version.rb

@@ -1,5 +1,5 @@
 module Rake
   module Proxmox
-    VERSION = "0.3.0"
+    VERSION = '0.5.0'.freeze
   end
 end

data/rake-proxmox.gemspec

@@ -33,7 +33,9 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'webmock', '~> 3.0'
-  
-  spec.add_runtime_dependency 'rest-client', '~> 2.0', '>= 2.0.2'
+
+  spec.add_runtime_dependency 'faraday', '~> 0.14.0'
+  spec.add_runtime_dependency 'faraday_middleware', '~> 0.12.2'
+  spec.add_runtime_dependency 'httpclient', '~> 2.8.3'
   spec.add_runtime_dependency 'json', '~> 2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake-proxmox
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Sebastian Lehn
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-21 00:00:00.000000000 Z
+date: 2018-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,25 +67,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rest-client
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
+        version: 0.14.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.14.0
+- !ruby/object:Gem::Dependency
+  name: faraday_middleware
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 0.12.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
-    - - ">="
+        version: 0.12.2
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.8.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.8.3
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement