orch 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92d6e7c901a8497b6b574287ef7060ee8f9a178f
-  data.tar.gz: 0c4ca4a8ef6895df3f06b5e6e05b9458c4102f8b
+  metadata.gz: 04fbdee432700312da01a5a00e9e87ba6ebf9fe5
+  data.tar.gz: a143d1aebe861e1795ba378197550690880cbca2
 SHA512:
-  metadata.gz: 27ae0267fff9f2c200760596168ff9268a66bdafdfcf4b2079b0262b9db765157e0e3cff27617bd143aec194e2436da87459cbd1e310bc0c645fc8600066976c
-  data.tar.gz: 5bb49d8171aa924f015c048b2bb40bb472ac3ea786a9579c8c61e7d7bf5bcc29692809fff2fcdf8ae6367b65890abcda7753afbf9286c9c662ecc293f39e37e1
+  metadata.gz: d204d5456449f9998875804e7b45be9b1845d9a4cfd5e38999cb8790ffb1ad0ba5059f161e44a3dc0a6def3b979cae096176f4e54b9e5e64d8974c863f5d5ca2
+  data.tar.gz: 35eee1a4a9d6fe8b1c955fc0f8431a55064706592653427b7bf5fb037b43903e288b1046a268e696615965951107e5f962ce72eeda4730c0d501c74121fbbed0

data/README.md

@@ -180,6 +180,8 @@ A url in the config section would apply to all applications in the specification
 
 Finally, you can also pass --chronos_url or --marathon_url options to the "orch deploy" command to override all other specifications.  You may want to use this option in automated deployment scenerios where you want to manage were things get deployed in another system.
 
+In more robust implementations you may have a list of redundant frameworks you can deploy to.  All of these configurations support passing a semi-colon seperated list of URLs.  If network related errors occur Orch will attempt to call additional specified URLs.  Also, if your framework has basic auth credentials required you may specify those credentials in the config like this:  http://user:password@myframework.mycompany.com
+
 ## Examples
 
 The examples directory contains various examples of the features of orch.  

data/examples/env-marathon.yml

@@ -24,11 +24,15 @@ deploy_vars:
     - dev
     - test
     - prod
+  COLO:
+    - west
+    - east
 env:
   DEBUG_FLAG: true
 applications:
   - <<: *DEFAULT_JOB
     DEPLOY_ENV: dev
+    COLO: west
     marathon_spec:
       <<: *DEFAULT_SPEC
       container:
@@ -38,7 +42,16 @@ applications:
           forcePullImage: true
   - <<: *DEFAULT_JOB
     DEPLOY_ENV: test
+    COLO: west
   - <<: *DEFAULT_JOB
     DEPLOY_ENV: prod
+    COLO: west
+    marathon_url: http://admin:m%40rA4h0n@ypec-prod1-mesos1.wc1.yellowpages.com:8080;http://ypec-prod1-mesos1.wc1.yellowpages.com:8080;http://ypec-prod1-mesos2.wc1.yellowpages.com:8080;http://ypec-prod1-mesos3.wc1.yellowpages.com:8080;http://ypec-prod1-mesos4.wc1.yellowpages.com:8080
+    env:
+      DEBUG_FLAG: false
+  - <<: *DEFAULT_JOB
+    DEPLOY_ENV: prod
+    COLO: east
+    marathon_url: http://admin:m%40rA4h0n@ypec-prod1-mesos1.ev1.yellowpages.com:8080;http://ypec-prod1-mesos2.ev1.yellowpages.com:8080;http://ypec-prod1-mesos3.ev1.yellowpages.com:8080;http://ypec-prod1-mesos4.ev1.yellowpages.com:8080
     env:
       DEBUG_FLAG: false

data/lib/bamboo.rb

@@ -16,15 +16,11 @@ module Orch
     def initialize(options)
     end
 
-    def deploy(url, app_id, bamboo_spec)
-      if url.nil?
+    def deploy(url_list, app_id, bamboo_spec)
+      if url_list.nil?
         exit_with_msg "bamboo_url not defined"
       end
 
-      uri = URI(url)
-      json_headers = {"Content-Type" => "application/json",
-                "Accept" => "application/json"}
-
       # Create the real json 
       bamboo_json = {}
       bamboo_json["id"] = (app_id[0] == '/') ? app_id : ("/" + app_id)
@@ -32,12 +28,7 @@ module Orch
 
   # curl -i -X PUT -d '{"id":"/ExampleAppGroup/app1", "acl":"path_beg -i /group/app-1"}' http://localhost:8000/api/services//ExampleAppGroup/app1
 # {"/adam-web-dev":{"Id":"/adam-web-dev","Acl":"hdr(host) -i adam-web-dev.ypec.int.yp.com"
-      http = Net::HTTP.new(uri.host, uri.port)
-      begin
-        response = http.put("/api/services/#{app_id}", bamboo_json.to_json, json_headers)
-      rescue *HTTP_ERRORS => error
-        http_fault(error)
-      end
+      response = http_put(url_list, "/api/services/#{app_id}", bamboo_json.to_json, JSON_HEADERS)
 
       if response.code == 200.to_s
         puts "successfully created bamboo spec for marathon job: #{app_id}"
@@ -48,22 +39,12 @@ module Orch
       return response
     end
 
-    def delete(url, app_id)
-      if url.nil?
+    def delete(url_list, app_id)
+      if url_list.nil?
         exit_with_msg "bamboo_url not defined"
       end
 
-      uri = URI(url)
-      json_headers = {"Content-Type" => "application/json",
-                "Accept" => "application/json"}
-
-      puts "curl -i -X DELETE #{uri}/api/services/#{app_id}"
-      http = Net::HTTP.new(uri.host, uri.port)
-      begin
-        response = http.delete("/api/services/#{app_id}", json_headers)
-      rescue *HTTP_ERRORS => error
-        http_fault(error)
-      end
+      response = http_delete(url_list, "/api/services/#{app_id}", JSON_HEADERS)
 
       if response.code != 200.to_s
         puts "Response #{response.code} #{response.message}: #{response.body}"
@@ -72,23 +53,14 @@ module Orch
       return response
     end
 
-    def verify(url, app_id, spec)
-      if url.nil?
+    def verify(url_list, app_id, spec)
+      if url_list.nil?
         puts "no bamboo_url - can not verify with server"
         return
       end
 
-      uri = URI(url)
-      json_headers = {"Content-Type" => "application/json",
-                "Accept" => "application/json"}
-
       # TODO: will this work or do I need to parse through all services like chronos
-      http = Net::HTTP.new(uri.host, uri.port)
-      begin
-        response = http.get("/api/services", json_headers)
-      rescue *HTTP_ERRORS => error
-        http_fault(error)
-      end
+      response = http_get(url_list, "/api/services", JSON_HEADERS)
 
       if response.code != 200.to_s
         puts "Response #{response.code} #{response.message}: #{response.body}"

data/lib/chronos.rb

@@ -16,15 +16,11 @@ module Orch
     def initialize(options)
     end
 
-    def deploy(url, json_payload)
-      if url.nil?
+    def deploy(url_list, json_payload)
+      if url_list.nil?
         exit_with_msg "chronos_url not defined"
       end
 
-      uri = URI(url)
-      json_headers = {"Content-Type" => "application/json",
-                "Accept" => "application/json"}
-
       path = nil
       path = "/scheduler/iso8601" unless json_payload["schedule"].nil?
       path = "/scheduler/dependency" unless json_payload["parents"].nil?
@@ -32,12 +28,7 @@ module Orch
         exit_with_msg "neither schedule nor parents fields defined for Chronos job"
       end
 
-      http = Net::HTTP.new(uri.host, uri.port)
-      begin
-        response = http.post(path, json_payload, json_headers)
-      rescue *HTTP_ERRORS => error
-        http_fault(error)
-      end
+      response = http_post(url_list, path, json_payload, JSON_HEADERS)
 
       if response.code != 204.to_s
         puts "Response #{response.code} #{response.message}: #{response.body}"
@@ -46,22 +37,13 @@ module Orch
       return response
     end
 
-    def delete(url, name)
-      if url.nil?
+    def delete(url_list, name)
+      if url_list.nil?
         exit_with_msg "chronos_url not defined"
       end
 
-      uri = URI(url)
-      json_headers = {"Content-Type" => "application/json",
-                "Accept" => "application/json"}
-
       # curl -L -X DELETE chronos-node:8080/scheduler/job/request_event_counter_hourly
-      http = Net::HTTP.new(uri.host, uri.port)
-      begin
-        response = http.delete("/scheduler/job/#{name}", json_headers)
-      rescue *HTTP_ERRORS => error
-        http_fault(error)
-      end
+      response = http_delete(url_list, "/scheduler/job/#{name}", JSON_HEADERS)
 
       if response.code != 204.to_s
         puts "Response #{response.code} #{response.message}: #{response.body}"
@@ -70,24 +52,15 @@ module Orch
       return response
     end
 
-    def verify(url, json_payload)
-      if url.nil?
+    def verify(url_list, json_payload)
+      if url_list.nil?
         puts "no chronos_url - can not verify with server"
         return
       end
 
       spec = Hashie::Mash.new(JSON.parse(json_payload))
 
-      uri = URI(url)
-      json_headers = {"Content-Type" => "application/json",
-                "Accept" => "application/json"}
-
-      http = Net::HTTP.new(uri.host, uri.port)
-      begin
-        response = http.get("/scheduler/jobs/search?name=#{spec.name}", json_headers)
-      rescue *HTTP_ERRORS => error
-        http_fault(error)
-      end
+      response = http_get(url_list, "/scheduler/jobs/search?name=#{spec.name}", JSON_HEADERS)
 
       if response.code != 200.to_s
         puts "Response #{response.code} #{response.message}: #{response.body}"

data/lib/config.rb

@@ -17,74 +17,40 @@ module Orch
     end
 
     def chronos_url(spec, app)
-      if @options.has_key?("chronos_url")
-        url = @options["chronos_url"]
-        return url
-      end
-
-      if !app.chronos_url.nil?
-        return app.chronos_url
-      end
-
-      if !spec.config.nil?
-        if !spec.config.chronos_url.nil?
-          return spec.config.chronos_url
-        end
-      end
-
-      if !@APP_CONFIG.nil?
-        if !@APP_CONFIG["chronos_url"].nil?
-          return @APP_CONFIG["chronos_url"]
-        end
-      end
-
-      return nil
+      return key_search("chronos_url", spec, app)
     end
 
     def marathon_url(spec, app)
-      if @options.has_key?("marathon_url")
-        url = @options["marathon_url"]
-        return url
-      end
-
-      if !app.marathon_url.nil?
-        return app.marathon_url
-      end
-
-      if !spec.config.nil?
-        if !spec.config.marathon_url.nil?
-          return spec.config.marathon_url
-        end
-      end
-
-      if !@APP_CONFIG.nil?
-        if !@APP_CONFIG["marathon_url"].nil?
-          return @APP_CONFIG["marathon_url"]
-        end
-      end
-
-      return nil
+      return key_search("marathon_url", spec, app)
     end
 
     def bamboo_url(spec, app)
-      if @options.has_key?("bamboo_url")
-        url = @options["bamboo_url"]
+      return key_search("bamboo_url", spec, app)
+    end
+
+    def key_search(key, spec, app)
+      # First look if key was passed in as option
+      if @options.has_key?(key)
+        url = @options[key]
         return url
       end
 
-      if !app.bamboo_url.nil?
-        return app.bamboo_url
+      # Second look in the application level spec
+      if !app[key].nil?
+        return app[key]
       end
 
+      # Third look in the config portion of the spec
       if !spec.config.nil?
-        if !spec.config.bamboo_url.nil?
-          return spec.config.bamboo_url
+        if !spec.config[key].nil?
+          return spec.config[key]
         end
       end
 
+      # Forth look in the config file
       if !@APP_CONFIG.nil?
-        if !@APP_CONFIG["bamboo_url"].nil?
-          return @APP_CONFIG["bamboo_url"]
+        if !@APP_CONFIG[key].nil?
+          return @APP_CONFIG[key]
         end
       end
 

data/lib/marathon.rb

@@ -16,27 +16,21 @@ module Orch
     def initialize(options)
     end
 
-    def deploy(url, app_id, json_payload)
-      if url.nil?
+    def deploy(url_list, app_id, json_payload)
+      if url_list.nil?
         exit_with_msg "marathon_url not defined"
       end
 
-      uri = URI(url)
-      json_headers = {"Content-Type" => "application/json",
-                "Accept" => "application/json"}
-
-      http = Net::HTTP.new(uri.host, uri.port)
-      begin
-        response = http.put("/v2/apps/#{app_id}", json_payload, json_headers)
-      rescue *HTTP_ERRORS => error
-        http_fault(error)
-      end
+      response = http_put(url_list, "/v2/apps/#{app_id}", json_payload, JSON_HEADERS)
 
       # TODO: should we do anyting with version or deploymentId that gets returned?
       if response.code == 201.to_s
         puts "successfully created marathon job: #{app_id}"
       elsif response.code == 200.to_s
         puts "successfully updated marathon job: #{app_id}"
+      elsif response.code == 401.to_s
+        puts "Authentication required"
+        exit 1
       else
         puts "Response #{response.code} #{response.message}: #{response.body}"
       end
@@ -44,21 +38,12 @@ module Orch
       return response
     end
 
-    def delete(url, id)
-      if url.nil?
+    def delete(url_list, id)
+      if url_list.nil?
         exit_with_msg "marathon_url not defined"
       end
 
-      uri = URI(url)
-      json_headers = {"Content-Type" => "application/json",
-                "Accept" => "application/json"}
-
-      http = Net::HTTP.new(uri.host, uri.port)
-      begin
-        response = http.delete("/v2/apps/#{id}", json_headers)
-      rescue *HTTP_ERRORS => error
-        http_fault(error)
-      end
+      response = http_delete(url_list, "/v2/apps/#{id}", JSON_HEADERS)
 
       if response.code == 200.to_s
         puts "successfully deleted #{id}"
@@ -71,28 +56,22 @@ module Orch
       return response
     end
 
-    def verify(url, json_payload)
-      if url.nil?
+    def verify(url_list, json_payload)
+      if url_list.nil?
         puts "no marathon_url - can not verify with server"
         return
       end
 
       spec = Hashie::Mash.new(JSON.parse(json_payload))
 
-      uri = URI(url)
-      json_headers = {"Content-Type" => "application/json",
-                "Accept" => "application/json"}
-
-      http = Net::HTTP.new(uri.host, uri.port)
-      begin
-        response = http.get("/v2/apps/#{spec.id}", json_headers)
-      rescue *HTTP_ERRORS => error
-        http_fault(error)
-      end
+      response = http_get(url_list, "/v2/apps/#{spec.id}", JSON_HEADERS)
 
       if response.code == 200.to_s
         job = Hashie::Mash.new(JSON.parse(response.body))
         foundDiffs = find_diffs(spec, job.app)
+      elsif response.code == 401.to_s
+        puts "Authentication required"
+        exit 1
       elsif response.code == 404.to_s
         puts "job: #{spec.id} - not defined in Marathon"
         foundDiffs = true 
@@ -104,23 +83,13 @@ module Orch
       return foundDiffs
     end
 
-    def restart(url, app_id)
-      if url.nil?
+    def restart(url_list, app_id)
+      if url_list.nil?
         exit_with_msg "marathon_url not defined"
       end
 
-      uri = URI(url)
-
       # POST /v2/apps/{appId}/restart: Rolling restart of all tasks of the given app
-      json_headers = {"Content-Type" => "application/json",
-                "Accept" => "application/json"}
-
-      http = Net::HTTP.new(uri.host, uri.port)
-      begin
-        response = http.post("/v2/apps/#{app_id}/restart", {}.to_json, json_headers)
-      rescue *HTTP_ERRORS => error
-        http_fault(error)
-      end
+      response = http_post(url_list, "/v2/apps/#{app_id}/restart", {}.to_json, JSON_HEADERS)
 
       if response.code == 200.to_s
         puts "success"

data/lib/orch/version.rb

@@ -1,3 +1,3 @@
 module Orch
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/util.rb

@@ -1,4 +1,5 @@
 require 'net/http'
+require 'uri'
 
 HTTP_ERRORS = [
   EOFError,
@@ -8,15 +9,125 @@ HTTP_ERRORS = [
   Net::HTTPHeaderSyntaxError,
   Net::ProtocolError,
   Timeout::Error,
-  Errno::ECONNREFUSED
+  Errno::ECONNREFUSED,
+  Errno::ETIMEDOUT
 ]
 
+JSON_HEADERS = {"Content-Type" => "application/json",
+                "Accept" => "application/json"}
+
+def http_post(url_list, path, body, headers)
+  lastErr = nil
+
+  url_list.split(';').each do |url|
+    uri = URI(url)
+
+    http = Net::HTTP.new(uri.host, uri.port)
+    request = Net::HTTP::Post.new(path, headers)
+    request.body = body
+    if uri.user
+      request.basic_auth URI.unescape(uri.user), URI.unescape(uri.password)
+    end
+    begin
+      #response = http.post(path, body, headers)
+      response = http.start {|http| http.request(request) }
+    rescue *HTTP_ERRORS => error
+      STDERR.puts "Failed http_post to #{url}: #{error} (#{error.class})"
+      lastErr = error
+      next
+    end
+
+    return response    
+  end
+
+  http_fault(lastErr)
+end
+
+def http_put(url_list, path, body, headers)
+  lastErr = nil
+
+  url_list.split(';').each do |url|
+    uri = URI(url)
+
+    http = Net::HTTP.new(uri.host, uri.port)
+    request = Net::HTTP::Put.new(path, headers)
+    request.body = body
+    if uri.user
+      request.basic_auth URI.unescape(uri.user), URI.unescape(uri.password)
+    end
+    begin
+      #response = http.put(path, body, headers)
+      response = http.start {|http| http.request(request) }
+    rescue *HTTP_ERRORS => error
+      STDERR.puts "Failed http_put to #{url}: #{error} (#{error.class})"
+      lastErr = error
+      next
+    end
+
+    return response    
+  end
+
+  http_fault(lastErr)
+end
+
+def http_get(url_list, path, headers)
+  lastErr = nil
+
+  url_list.split(';').each do |url|
+    uri = URI(url)
+
+    http = Net::HTTP.new(uri.host, uri.port)
+    request = Net::HTTP::Get.new(path, headers)
+    if uri.user
+      request.basic_auth URI.unescape(uri.user), URI.unescape(uri.password)
+    end
+    begin
+      #response = http.get(path, headers)
+      response = http.start {|http| http.request(request) }
+    rescue *HTTP_ERRORS => error
+      STDERR.puts "Failed http_get to #{url}: #{error} (#{error.class})"
+      lastErr = error
+      next
+    end
+
+    return response    
+  end
+
+  http_fault(lastErr)
+end
+
+def http_delete(url_list, path, headers)
+  lastErr = nil
+
+  url_list.split(';').each do |url|
+    uri = URI(url)
+
+    http = Net::HTTP.new(uri.host, uri.port)
+    request = Net::HTTP::Delete.new(path, headers)
+    if uri.user
+      request.basic_auth URI.unescape(uri.user), URI.unescape(uri.password)
+    end
+    begin
+      # response = http.delete(path, headers)
+      response = http.start {|http| http.request(request) }
+    rescue *HTTP_ERRORS => error
+      STDERR.puts "Failed http_delete to #{url}: #{error} (#{error.class})"
+      lastErr = error
+      next
+    end
+
+    return response    
+  end
+
+  http_fault(lastErr)
+end
+
 def http_fault(error)
-  puts "Networking error talking to framework: #{error.to_s}"
+  STDERR.puts "Fatal networking error talking to framework: #{error.to_s}"
   exit 1
 end
 
 def exit_with_msg(err_msg)
-  puts err_msg
+  STDERR.puts err_msg
   exit 1
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: orch
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Ray Johnson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2015-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler