elastic-util 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 101dd930f2901e53e2f0e3dd37b9a21ecee18265
-  data.tar.gz: ac928d8d5c722e947446b859f1ac10981783d1af
+SHA256:
+  metadata.gz: af7028b9a21af54dc8f66849ce7a22e9739dbf0a2b7d8d2fd4091144337b3fda
+  data.tar.gz: 8caf084b468de28607516b1c8d8643de9373732a5d1628db4618307f6b7dac64
 SHA512:
-  metadata.gz: d2eb13d33794f70d60a2dbec3186414ba5f5c2c51c0cebb7cf8b8220cd922102374de8e67c4e67bf6fb1738fb0dc1c36b6a80aaeff24c30a8d92fab70e4ca9e1
-  data.tar.gz: fbed8715e752f79c11b2eef136662ca43eef2bc5383cea70ea546877956a0f517a13a432b6c02e168c8c42399b624feaf3a34d04c1ff330616112933012b0421
+  metadata.gz: 07ce1c430cd062388456fc8d19717546457aba8bd20952a54697d17192a36e63367d66a37f78f8fc08d48d0feb89fd5c26c53fccc32a0f5df26e65e31278bc73
+  data.tar.gz: bb50a5ada50644ee7edaf831af2d1966d4610515d268310084a01c0d0f278c2679c3a6757fc62ee6c6863c5f53c03842a2190335ed807037c97d7cd2eb004a38

data/lib/elastic_util.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 require 'net/http'
+require 'openssl'
 require 'json'
 require 'fileutils'
 
@@ -12,7 +13,7 @@ require 'fileutils'
 #
 module ElasticUtil
 
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 
   # The name of the data directory, relative to the user provided backup directory.
   DUMP_DIR = "es_data"
@@ -53,19 +54,14 @@ module ElasticUtil
   #
   def self.backup(url, backup_dir, opts={})
     start_time = Time.now
+    url = url.strip.chomp("/")
     backup_dir = backup_dir.strip
     path = File.join(backup_dir.strip, DUMP_DIR)
     indices = []
-    
     # ping it first
+    response = nil
     uri = URI(url)
-    response = Net::HTTP.get_response(uri)
-    http = Net::HTTP.new(uri.host, uri.port)
-    http.read_timeout = (60*3)
-    http.open_timeout = 5
-    response = http.start() {|http|
-      http.get("/")
-    }
+    response = api_get(uri)
     if !response.is_a?(Net::HTTPSuccess)
       raise Error, "Unable to reach elasticsearch at url '#{url}'!\n#{response.inspect}\n#{response.body.to_s}"
     end
@@ -74,8 +70,9 @@ module ElasticUtil
     if opts[:indices]
       indices = opts[:indices]
     else
+      response = nil
       uri = URI(url + "/_cat/indices?format=json")
-      response = Net::HTTP.get_response(uri)
+      response = api_get(uri)
       if !response.is_a?(Net::HTTPSuccess)
         raise Error, "HTTP request failure!\n#{response.inspect}\n#{response.body.to_s}"
       end
@@ -124,7 +121,7 @@ module ElasticUtil
       }
       uri.query = URI.encode_www_form(params)
       # puts "HTTP REQUEST #{uri.inspect}"
-      response = Net::HTTP.get_response(uri)
+      response = api_get(uri)
       if !response.is_a?(Net::HTTPSuccess)
         raise Error, "HTTP request failure!\n#{response.inspect}\n#{response.body.to_s}"
       end
@@ -144,7 +141,7 @@ module ElasticUtil
         }
         uri.query = URI.encode_www_form(params)
         # puts "HTTP REQUEST #{uri.inspect}"
-        response = Net::HTTP.get_response(uri)
+        response = api_get(uri)
         if !response.is_a?(Net::HTTPSuccess)
           raise Error, "HTTP request failure!\n#{response.inspect}\n#{response.body.to_s}"
         end
@@ -187,14 +184,7 @@ module ElasticUtil
 
     # ping it first
     uri = URI(url)
-    response = Net::HTTP.get_response(uri)
-    http = Net::HTTP.new(uri.host, uri.port)
-    http.read_timeout = (60*3)
-    http.open_timeout = 5
-    response = http.start() {|http|
-      http.get("/")
-    }
-
+    response = api_get(uri)
     if !response.is_a?(Net::HTTPSuccess)
       raise Error, "Unable to reach elasticsearch at url '#{url}'!\n#{response.inspect}\n#{response.body.to_s}"
     end
@@ -211,9 +201,8 @@ module ElasticUtil
     found_files.each_with_index do |file, i|
       puts "(#{i+1}/#{found_files.size}) bulk importing file #{file}" unless opts[:quiet]
       payload = File.read(file)
-      # uri = URI(url)
-      http = Net::HTTP.new(uri.host, uri.port)
-      response = http.post("/_bulk", payload, {"Content-Type" => "application/x-ndjson"})
+      uri = URI(url + "/_bulk")
+      response = api_post(uri, payload, {:headers => {"Content-Type" => "application/x-ndjson"} })
       if !response.is_a?(Net::HTTPSuccess)
         raise Error, "HTTP request failure!\n#{response.inspect}\n#{response.body.to_s}"
       end
@@ -253,4 +242,51 @@ module ElasticUtil
     end
   end
 
+  def self.api_get(uri, opts={})
+    http = Net::HTTP.new(uri.host, uri.port)
+    if uri.scheme == 'https'
+      http.use_ssl = true
+      # todo: always ignore ssl errors for now, but this should be an option
+      # http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    end
+    http.read_timeout = opts[:read_timeout] || (60*15)
+    http.open_timeout = opts[:open_timeout] || 5
+    request = Net::HTTP::Get.new uri.request_uri
+    if opts[:headers]
+      opts[:headers].each do |k,v|
+        request[k] = v
+      end
+    end
+    if uri.user
+      request.basic_auth uri.user, uri.password
+    end
+    response = http.request(request)
+    return response
+  end
+
+  def self.api_post(uri, payload, opts={})
+    http = Net::HTTP.new(uri.host, uri.port)
+    if uri.scheme == 'https'
+      http.use_ssl = true
+      # todo: always ignore ssl errors for now, but this should be an option
+      # http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+    end
+    http.read_timeout = opts[:read_timeout] || (60*15)
+    http.open_timeout = opts[:open_timeout] || 5
+    request = Net::HTTP::Post.new uri.request_uri
+    if opts[:headers]
+      opts[:headers].each do |k,v|
+        request[k] = v
+      end
+    end
+    if uri.user
+      request.basic_auth uri.user, uri.password
+    end
+    request.body = payload
+    response = http.request(request)
+    return response
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic-util
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - James Dickson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-24 00:00:00.000000000 Z
+date: 2020-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,7 +75,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 backup and restore for ElasticSearch data