nomade 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f417cfcbfde5d25bf03f10ee5f0a5832ee74358b171bfa7230a5e77757a0955
-  data.tar.gz: 9e43abc5bd6857d1af142a01d5249c5cc147412ec0654c1b267a3e60796e836c
+  metadata.gz: 85557a8305dae1d56eaf0f9d8497948f928f270b8f43d28860836a1ad1fb0b3e
+  data.tar.gz: 92e9afd8c92efb363edf7daf7c3f04f40dd71ca243c58dddfd9d4cd71925bd65
 SHA512:
-  metadata.gz: 4d8764150d3e60daea51632f0c7e4ca84517eecff94c0f1f3a1cf4cf7ec298a357f40980cd7fb4da23a3826f9b8fc6800f883b1b1e128b63f70cc56d9d6b9bde
-  data.tar.gz: 62f526842c5e5f2bf227b0200936522f1e3dcce0b305f26a9bcfb4b7f224c3930f23c3af6f216da20ae2b950ca9619c73ce4405ee7aeaea2e3fc05ca4661d0d2
+  metadata.gz: 0f33f910a59f67c4dcf63ba394a4d4a6d3e48ea555a562d73f5ee2d0dc59e98489270b9502a5e3dc8a2f56398a4d605e0ee11a135d26332a74a5186e3b162d44
+  data.tar.gz: 172af74987917d6a0b2cea45d2e461991a5bc7af46de64a738edd220ecd0e829a25293013fcc45e864c1e7e4eeb74cbcc4da813b86188403a57016bb3f813266

data/lib/nomade/deployer.rb

@@ -8,31 +8,53 @@ module Nomade
       @nomad_endpoint = nomad_endpoint
       @http = Nomade::Http.new(@nomad_endpoint)
       @logger = opts.fetch(:logger, Nomade.logger)
+
+      @on_success = opts.fetch(:on_success, [])
+      @on_failure = opts.fetch(:on_failure, [])
+      @on_failure << method(:print_errors)
     end
 
     def deploy!
+      plan
       deploy
     rescue Nomade::NoModificationsError => e
-      @logger.warn "No modifications to make, exiting!"
+      call_failure_handlers ["No modifications to make, exiting!"]
       exit(0)
     rescue Nomade::GeneralError => e
-      @logger.warn e.message
-      @logger.warn "GeneralError hit, exiting!"
+      call_failure_handlers [e.message, "GeneralError hit, exiting!"]
       exit(1)
     rescue Nomade::PlanningError => e
-      @logger.warn "Couldn't make a plan, maybe a bad connection to Nomad server, exiting!"
+      call_failure_handlers ["Couldn't make a plan, maybe a bad connection to Nomad server, exiting!"]
       exit(2)
     rescue Nomade::AllocationFailedError => e
-      @logger.warn "Allocation failed with errors, exiting!"
+      call_failure_handlers ["Allocation failed with errors, exiting!"]
       exit(3)
     rescue Nomade::UnsupportedDeploymentMode => e
-      @logger.warn e.message
-      @logger.warn "Deployment failed with errors, exiting!"
+      call_failure_handlers [e.message, "Deployment failed with errors, exiting!"]
       exit(4)
+    rescue Nomade::FailedTaskGroupPlan => e
+      call_failure_handlers [e.message, "Couldn't plan correctly, exiting!"]
+      exit(5)
     end
 
     private
 
+    def call_failure_handlers(messages)
+      @on_failure.each do |failure_handler|
+        failure_handler.call(messages)
+      end
+    end
+
+    def print_errors(errors)
+      errors.each do |error|
+        @logger.warn(error)
+      end
+    end
+
+    def plan
+      @http.capacity_plan_job(@nomad_job)
+    end
+
     def deploy
       @logger.info "Deploying #{@nomad_job.job_name} (#{@nomad_job.job_type}) with #{@nomad_job.image_name_and_version}"
       @logger.info "URL: #{@nomad_endpoint}/ui/jobs/#{@nomad_job.job_name}"
@@ -207,7 +229,7 @@ module Nomade
           end
         end
 
-        sleep 10 if succesful_deployment == nil
+        sleep 5 if succesful_deployment == nil
       end
 
       if succesful_deployment

data/lib/nomade/exceptions.rb

@@ -11,4 +11,5 @@ module Nomade
     attr_reader :evaluation_id, :allocations
   end
   class UnsupportedDeploymentMode < StandardError; end
+  class FailedTaskGroupPlan < StandardError; end
 end

data/lib/nomade/http.rb

@@ -222,8 +222,40 @@ module Nomade
       raise
     end
 
+    def capacity_plan_job(nomad_job)
+      uri = URI("#{@nomad_endpoint}/v1/job/#{nomad_job.job_name}/plan")
+
+      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 = nomad_job.configuration(:json)
+
+      res = http.request(req)
+      raise if res.code != "200"
+      raise if res.content_type != "application/json"
+
+      plan_output = JSON.parse(res.body)
+
+      if plan_output["FailedTGAllocs"]
+        raise Nomade::FailedTaskGroupPlan.new("Failed to plan groups: #{plan_output["FailedTGAllocs"].keys.join(",")}")
+      end
+
+      true
+    rescue Nomade::FailedTaskGroupPlan => e
+      raise
+    rescue StandardError => e
+      Nomade.logger.fatal "HTTP Request failed (#{e.message})"
+      raise
+    end
+
     def plan_job(nomad_job)
       rendered_template = nomad_job.configuration(:hcl)
+
       #   0: No allocations created or destroyed. Nothing to do.
       #   1: Allocations created or destroyed.
       # 255: Error determining plan results. Nothing to do.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nomade
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Kasper Grubbe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-29 00:00:00.000000000 Z
+date: 2020-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yell
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.12.2
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: nomade@kaspergrubbe.com
 executables: []