nomade 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6c3684724566430b8c0af280a5be1e03be57a5c7bcac2298c22d14d03098565
-  data.tar.gz: ae59d84da529ab3e4041d52a9216f0cf4e68cd7cd39751d895907d05f52b19cf
+  metadata.gz: 57489957cb990a28ffbd23c94b9d655ec517a43cd4e8f2101d7e7cddb17bfcf7
+  data.tar.gz: 305ac1c39551b472ad16c3553fb4f5965b4eebfb08ea51b2557ff26cd8153af8
 SHA512:
-  metadata.gz: 1fb1d40654d23c00694ca29e9423050e3e829dd543dd293b5655c7def2885fa0c73593bc06a35a7f3c7f53869b3f4afc470077d9e9613cb8b0d113d1328ee49f
-  data.tar.gz: be3a100801b40b10a38f162095a86f3f36e386b9ff17e46ee7597e7ab37c373e059c8472acbfa6262bd56d37743252d5bb7780925812cfef6227a7f18c63d54f
+  metadata.gz: 17a0f1d1cb4e15de6ec6fedea6f5d0d4675e72628596f0fba951c3143699ac79eaeed36138d7b6d1f895f2689b3f187c839e67c782a6c201f7ce57ba34dfbd53
+  data.tar.gz: 5ca41d3f6f53e5e670512575b256ef06688d3ce54303303b0075ab2ba9e1088fbe0f3fe856fe3e2568d958e6938323e0333195ee7eab54de7df4557d37b96a99

data/lib/nomade/http.rb

@@ -13,92 +13,34 @@ module Nomade
       else
         ""
       end
-      uri = URI("#{@nomad_endpoint}/v1/jobs#{search_prefix}")
-
-      http = Net::HTTP.new(uri.host, uri.port)
-      if @nomad_endpoint.include?("https://")
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-      end
-
-      req = Net::HTTP::Get.new(uri)
-      req.add_field "Content-Type", "application/json"
-
-      res = http.request(req)
-
-      raise if res.code != "200"
-      raise if res.content_type != "application/json"
-
-      return JSON.parse(res.body)
+      path = "/v1/jobs#{search_prefix}"
+      res_body = _request(:get, path, total_retries: 3)
+      return JSON.parse(res_body)
     rescue StandardError => e
       Nomade.logger.fatal "HTTP Request failed (#{e.message})"
       raise
     end
 
     def evaluation_request(evaluation_id)
-      uri = URI("#{@nomad_endpoint}/v1/evaluation/#{evaluation_id}")
-
-      http = Net::HTTP.new(uri.host, uri.port)
-      if @nomad_endpoint.include?("https://")
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-      end
-
-      req = Net::HTTP::Get.new(uri)
-      req.add_field "Content-Type", "application/json"
-
-      res = http.request(req)
-
-      raise if res.code != "200"
-      raise if res.content_type != "application/json"
-
-      return JSON.parse(res.body)
+      res_body = _request(:get, "/v1/evaluation/#{evaluation_id}", total_retries: 3)
+      return JSON.parse(res_body)
     rescue StandardError => e
       Nomade.logger.fatal "HTTP Request failed (#{e.message})"
       raise
     end
 
     def allocations_from_evaluation_request(evaluation_id)
-      uri = URI("#{@nomad_endpoint}/v1/evaluation/#{evaluation_id}/allocations")
-
-      http = Net::HTTP.new(uri.host, uri.port)
-      if @nomad_endpoint.include?("https://")
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-      end
-
-      req = Net::HTTP::Get.new(uri)
-      req.add_field "Content-Type", "application/json"
-
-      res = http.request(req)
-
-      raise if res.code != "200"
-      raise if res.content_type != "application/json"
-
-      return JSON.parse(res.body)
+      res_body = _request(:get, "/v1/evaluation/#{evaluation_id}/allocations", total_retries: 3)
+      return JSON.parse(res_body)
     rescue StandardError => e
       Nomade.logger.fatal "HTTP Request failed (#{e.message})"
       raise
     end
 
     def deployment_request(deployment_id)
-      uri = URI("#{@nomad_endpoint}/v1/deployment/#{deployment_id}")
+      res_body = _request(:get, "/v1/deployment/#{deployment_id}", total_retries: 3)
 
-      http = Net::HTTP.new(uri.host, uri.port)
-      if @nomad_endpoint.include?("https://")
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-      end
-
-      req = Net::HTTP::Get.new(uri)
-      req.add_field "Content-Type", "application/json"
-
-      res = http.request(req)
-
-      raise if res.code != "200"
-      raise if res.content_type != "application/json"
-
-      return JSON.parse(res.body)
+      return JSON.parse(res_body)
     rescue StandardError => e
       Nomade.logger.fatal "HTTP Request failed (#{e.message})"
       raise
@@ -110,98 +52,45 @@ module Nomade
     end
 
     def create_job(nomad_job)
-      uri = URI("#{@nomad_endpoint}/v1/jobs")
-
-      http = Net::HTTP.new(uri.host, uri.port)
-      if @nomad_endpoint.include?("https://")
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-      end
-
-      req = Net::HTTP::Post.new(uri)
-      req.add_field "Content-Type", "application/json"
-      req.body = JSON.generate({"Job" => nomad_job.configuration(:hash)})
-
-      res = http.request(req)
+      req_body = JSON.generate({"Job" => nomad_job.configuration(:hash)})
+      res_body = _request(:post, "/v1/jobs", body: req_body)
 
-      raise if res.code != "200"
-      raise if res.content_type != "application/json"
-
-      return JSON.parse(res.body)["EvalID"]
+      return JSON.parse(res_body)["EvalID"]
     rescue StandardError => e
       Nomade.logger.fatal "HTTP Request failed (#{e.message})"
       raise
     end
 
     def update_job(nomad_job)
-      uri = URI("#{@nomad_endpoint}/v1/job/#{nomad_job.job_name}")
-
-      http = Net::HTTP.new(uri.host, uri.port)
-      if @nomad_endpoint.include?("https://")
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-      end
-
-      req = Net::HTTP::Post.new(uri)
-      req.add_field "Content-Type", "application/json"
-      req.body = JSON.generate({"Job" => nomad_job.configuration(:hash)})
-
-      res = http.request(req)
-
-      raise if res.code != "200"
-      raise if res.content_type != "application/json"
+      req_body = JSON.generate({"Job" => nomad_job.configuration(:hash)})
+      res_body = _request(:post, "/v1/job/#{nomad_job.job_name}", body: req_body)
 
-      return JSON.parse(res.body)["EvalID"]
+      return JSON.parse(res_body)["EvalID"]
     rescue StandardError => e
       Nomade.logger.fatal "HTTP Request failed (#{e.message})"
       raise
     end
 
     def stop_job(nomad_job, purge = false)
-      uri = if purge
-        URI("#{@nomad_endpoint}/v1/job/#{nomad_job.job_name}?purge=true")
+      path = if purge
+        "/v1/job/#{nomad_job.job_name}?purge=true"
       else
-        URI("#{@nomad_endpoint}/v1/job/#{nomad_job.job_name}")
+        "/v1/job/#{nomad_job.job_name}"
       end
 
-      http = Net::HTTP.new(uri.host, uri.port)
-      if @nomad_endpoint.include?("https://")
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-      end
-
-      req = Net::HTTP::Delete.new(uri)
-      req.add_field "Content-Type", "application/json"
-
-      res = http.request(req)
-      raise if res.code != "200"
-      raise if res.content_type != "application/json"
-
-      return JSON.parse(res.body)["EvalID"]
+      res_body = _request(:delete, path)
+      return JSON.parse(res_body)["EvalID"]
     rescue StandardError => e
       Nomade.logger.fatal "HTTP Request failed (#{e.message})"
       raise
     end
 
     def promote_deployment(deployment_id)
-      uri = URI("#{@nomad_endpoint}/v1/deployment/promote/#{deployment_id}")
-
-      http = Net::HTTP.new(uri.host, uri.port)
-      if @nomad_endpoint.include?("https://")
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-      end
-
-      req = Net::HTTP::Post.new(uri)
-      req.add_field "Content-Type", "application/json"
-      req.body = {
+      req_body = {
         "DeploymentID" => deployment_id,
         "All" => true,
       }.to_json
-
-      res = http.request(req)
-      raise if res.code != "200"
-      raise if res.content_type != "application/json"
+      res_body = _request(:post, "/v1/deployment/promote/#{deployment_id}", body: req_body)
 
       return true
     rescue StandardError => e
@@ -210,21 +99,7 @@ module Nomade
     end
 
     def fail_deployment(deployment_id)
-      uri = URI("#{@nomad_endpoint}/v1/deployment/fail/#{deployment_id}")
-
-      http = Net::HTTP.new(uri.host, uri.port)
-      if @nomad_endpoint.include?("https://")
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-      end
-
-      req = Net::HTTP::Post.new(uri)
-      req.add_field "Content-Type", "application/json"
-
-      res = http.request(req)
-      raise if res.code != "200"
-      raise if res.content_type != "application/json"
-
+      res_body = _request(:post, "/v1/deployment/fail/#{deployment_id}")
       return true
     rescue StandardError => e
       Nomade.logger.fatal "HTTP Request failed (#{e.message})"
@@ -232,19 +107,11 @@ module Nomade
     end
 
     def get_allocation_logs(allocation_id, task_name, logtype)
-      uri = URI("#{@nomad_endpoint}/v1/client/fs/logs/#{allocation_id}?task=#{task_name}&type=#{logtype}&plain=true&origin=end")
-
-      http = Net::HTTP.new(uri.host, uri.port)
-      if @nomad_endpoint.include?("https://")
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-      end
-
-      req = Net::HTTP::Get.new(uri)
-      res = http.request(req)
-      raise if res.code != "200"
-
-      return res.body.gsub(/\e\[\d+m/, '')
+      res_body = _request(:get, "/v1/client/fs/logs/#{allocation_id}?task=#{task_name}&type=#{logtype}&plain=true&origin=end",
+        total_retries: 3,
+        expected_content_type: "text/plain",
+      )
+      return res_body.gsub(/\e\[\d+m/, '')
     rescue StandardError => e
       Nomade.logger.fatal "HTTP Request failed (#{e.message})"
       raise
@@ -266,34 +133,31 @@ module Nomade
     end
 
     def convert_hcl_to_json(job_hcl)
-      uri = URI("#{@nomad_endpoint}/v1/jobs/parse")
-
-      http = Net::HTTP.new(uri.host, uri.port)
-      if @nomad_endpoint.include?("https://")
-        http.use_ssl = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-      end
-
-      req = Net::HTTP::Post.new(uri)
-      req.add_field "Content-Type", "application/json"
-
-      req.body = JSON.generate({
+      req_body = JSON.generate({
         "JobHCL": job_hcl,
         "Canonicalize": false,
       })
+      res_body = _request(:post, "/v1/jobs/parse", body: req_body, total_retries: 3)
+      res_body
+    rescue StandardError => e
+      Nomade.logger.fatal "HTTP Request failed (#{e.message})"
+      raise
+    end
 
-      res = http.request(req)
-      raise if res.code != "200"
-      raise if res.content_type != "application/json"
+    def plan_job(nomad_job)
+      req_body = JSON.generate({"Job" => nomad_job.configuration(:hash)})
+      res_body = _request(:post, "/v1/job/#{nomad_job.job_name}/plan", body: req_body)
 
-      res.body
+      JSON.parse(res_body)
     rescue StandardError => e
       Nomade.logger.fatal "HTTP Request failed (#{e.message})"
       raise
     end
 
-    def plan_job(nomad_job)
-      uri = URI("#{@nomad_endpoint}/v1/job/#{nomad_job.job_name}/plan")
+    private
+
+    def _request(request_type, path, body: nil, total_retries: 0, expected_content_type: "application/json")
+      uri = URI("#{@nomad_endpoint}#{path}")
 
       http = Net::HTTP.new(uri.host, uri.port)
       if @nomad_endpoint.include?("https://")
@@ -301,19 +165,44 @@ module Nomade
         http.verify_mode = OpenSSL::SSL::VERIFY_PEER
       end
 
-      req = Net::HTTP::Post.new(uri)
+      req = case request_type
+      when :get
+        Net::HTTP::Get.new(uri)
+      when :post
+        Net::HTTP::Post.new(uri)
+      when :delete
+        Net::HTTP::Delete.new(uri)
+      else
+        raise "#{request_type} not supported"
+      end
       req.add_field "Content-Type", "application/json"
-      req.body = JSON.generate({"Job" => nomad_job.configuration(:hash)})
-
-      res = http.request(req)
+      req.body = body if body
+
+      res = begin
+        retries ||= 0
+        http.request(req)
+      rescue Timeout::Error, Errno::ETIMEDOUT, Errno::EINVAL, Errno::ECONNRESET, EOFError, Net::HTTPBadResponse, Net::HTTPHeaderSyntaxError, Net::ProtocolError, SocketError
+        if retries < total_retries
+          retries += 1
+          sleep 1
+          retry
+        else
+          raise
+        end
+      end
 
       raise if res.code != "200"
-      raise if res.content_type != "application/json"
+      if res.content_type != expected_content_type
+        # Sometimes the log endpoint doesn't set content_type on no content
+        # https://github.com/hashicorp/nomad/issues/7264
+        if res.content_type == nil && expected_content_type == "text/plain"
+          # don't raise
+        else
+          raise
+        end
+      end
 
-      JSON.parse(res.body)
-    rescue StandardError => e
-      Nomade.logger.fatal "HTTP Request failed (#{e.message})"
-      raise
+      res.body
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nomade
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Kasper Grubbe