marathon-srv 0.2.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f715198df145818dbb69e69744f6a1afdf4f56d4
-  data.tar.gz: 33040bfa1df9d3590454b0d7c19debebca393959
+  metadata.gz: fa9a28d5862099feadc9a80ef60a903809befd1b
+  data.tar.gz: bbbe7c05380fb15a51ee1944fab7f1c6de10a4a6
 SHA512:
-  metadata.gz: 459686d8421eef8b2fc03312d8008c3bfe7e52bcef720c622f028f3593f34507fb51b98ad455955f0e3db7ed90ca81634f85366e7406c4bd07d3bbe53d5bc131
-  data.tar.gz: 52f66d636cdc2294e95ec5321207f2aa63a35fef81f1cc2ceea5597013ef685cbe6f692fe13c0541c7b6835596a0f026180678f2b07ea54262926ce0be2894d4
+  metadata.gz: 5d783c03cbfaa26adc93cad895769f9c9cdf10569a6d64ef6defb595b8da04adc5a231c09eaeb08980f0b2e7eee190580ff80a32ecc9a7a3eee7bd8ab57a9ef5
+  data.tar.gz: 2a8033b5cfd84d190d75d40c78f2b5d5a697ff583fb65dd7368ba4dd049d5e4ba5d2926963b1142aa4f0f179fb8b8e1fef32b6853bccaefc5e0a6d282b7b3c37

data/lib/marathon/srv/cli.rb

@@ -17,7 +17,7 @@ module Marathon
       option :marathon, :required => true, :desc => "Marathon API URL"
       option :app_id, :reqired => true, :desc => "Marathon application id"
       option :protocol, :default => "tcp"
-      option :container_port, :required => true, :desc => "Docker container-side port to translate"
+      option :container_port, :type => :numeric, :desc => "Docker container-side port to translate"
       option :username, :required => false
       option :password, :required => false
       option :healthy, :default => true, :desc => "Consider healthy application instances/tasks only"
@@ -26,25 +26,29 @@ module Marathon
         client = Marathon::Srv::Client.new options[:marathon], options[:username], options[:password], {:log_level => (options[:verbose] ? Logger::DEBUG : Logger::ERROR)}
         
         begin
-          hosts = client.get_bridged_port_array options[:app_id], (options[:healthy] ? true : falses)
+          apps = client.get_bridged_port_array options[:app_id], (options[:healthy] ? true : false), (options[:container_port] != nil ? [options[:container_port]] : [])
           
           if options[:json]
-            puts JSON hosts
+            puts JSON apps
           else
             
             lines=[]
-            hosts.each do |host|
+            apps.each do |app, hosts|
               
-              line=[]
-              line.push host[:host]
-              host[:services].each do |protocol, services|
-                line.push protocol
-                services.each do |port, host_port|
-                  line.push host_port
+              hosts.each do |host|
+                
+                host[:services].each do |protocol, services|
+                  services.each do |port, host_port|
+                  line=[]
+                  line.push app, host[:host], protocol, port, host_port
+                  lines.push line.join ","
+                  end
+                  
                 end
                 
+
               end
-              lines.push line.join ","
+              
               
             end
             

data/lib/marathon/srv/client.rb

@@ -18,7 +18,7 @@ module Marathon
       
       API_VERSION = "v2"
       
-      PATH_FIND_APP = "/#{API_VERSION}/apps/%s"
+      PATH_FIND_APP = "/#{API_VERSION}/apps?id=%s&embed=tasks"
       
       attr_reader :marathon_api
       
@@ -53,48 +53,55 @@ module Marathon
           # parse JSON
           begin
             @logger.debug "Parsing body #{response.body}"
-            app = (JSON response.body)["app"]
-            
-            @logger.debug "Retrieved app object #{app}"
-            
-            raise Marathon::Srv::NotDockerContainerizedApplicationError.new unless app["container"]["type"] == "DOCKER"
-            raise Marathon::Srv::NoRunningTasksFoundError.new unless app["tasks"].size > 0
-            raise Marathon::Srv::NoHealthChecksDefinedError.new unless app["healthChecks"] != nil && app["healthChecks"].size > 0
-            
-            # collect slave ports of (healthy) tasks
-            ports=[]
-            app["tasks"].each do |task|
+            apps = (JSON response.body)["apps"]
+            @logger.debug "Retrieved a total #{apps.size} app objects"
+            app_ports = {}
+            apps.each do |app|
+              
+              @logger.debug "Retrieved app object #{app}"
+              
+              raise Marathon::Srv::NotDockerContainerizedApplicationError.new unless app["container"]["type"] == "DOCKER"
+              raise Marathon::Srv::NoRunningTasksFoundError.new unless app["tasks"].size > 0
+              raise Marathon::Srv::NoHealthChecksDefinedError.new unless app["healthChecks"] != nil && app["healthChecks"].size > 0
               
-              if(healthy_tasks_only)
-                @logger.debug "Verifying health checks for task #{task}"
-                # all health checks must be passing
-                passing=true
-                task["healthCheckResults"].each do |health_check_result|
-                  (passing=false; @logger.debug "%s has failing health check, not considering it" % task; break) unless health_check_result["alive"] == true
+              # collect slave ports of (healthy) tasks
+              ports=[]
+              app["tasks"].each do |task|
+                
+                if(healthy_tasks_only)
+                  @logger.debug "Verifying health checks for task #{task}"
+                  # all health checks must be passing
+                  passing=true
+                  task["healthCheckResults"].each do |health_check_result|
+                    (passing=false; @logger.debug "%s has failing health check, not considering it" % task; break) unless health_check_result["alive"] == true
+                    
+                  end
+                  (@logger.debug "All health checks passing - filtering ports for task #{task}"; ports.push filter_ports(app, task, filter_ports)) if passing
+                  
+                else
+                  # just add task
+                  @logger.debug "Ignoring health checks - filtering ports for task #{task}"
+                  ports.push filter_ports(app, task, filter_ports)
                   
                 end
-                @logger.debug "All health checks passing - filtering ports for task #{task}"
-                ports.push filter_ports(app, task, filter_ports) if passing
-                
-              else
-                # just add task
-                @logger.debug "Ignoring health checks - filtering ports for task #{task}"
-                ports.push filter_ports(app, task, filter_ports)
                 
               end
               
+              # cleanup
+              ports.reject! do |host| 
+              
+                host[:services].reject! {|protocol, services| services.size == 0 }
+                host[:services].size == 0
+              
+              end
+              
+              @logger.debug "Collected ports #{ports} for #{app["id"]}"
+              app_ports[app["id"]] = ports
+              
             end
             
-            ports.reject! do |host| 
-            
-              host[:services].reject! {|protocol, services| services.size == 0 }
-              host[:services].size == 0
-            
-            end
-            
-            @logger.debug "Collected ports #{ports}"
-            ports
-  
+
+            app_ports
           rescue JSON::ParserError => e
             raise Marathon::Srv::InvalidJSONResponseError.new e
             
@@ -109,7 +116,7 @@ module Marathon
       def filter_ports(app, task, filter_ports=[])
         port = {:host => task["host"], :services => {}}
         app["container"]["docker"]["portMappings"].each_with_index do |port_mapping, port_i|
-          if (filter_ports.size == 0 || (filter_ports.member? port_mapping["containerPort"]))
+          if (filter_ports.size == 0 || (filter_ports.include? port_mapping["containerPort"]))
             port[:services][port_mapping["protocol"]] = {} unless port[:services].has_key? port_mapping["protocol"]
             port[:services][port_mapping["protocol"]][port_mapping["containerPort"]] = task["ports"][port_i]
           end

data/lib/marathon/srv/version.rb

@@ -1,5 +1,5 @@
 module Marathon
   module Srv
-    VERSION = "0.2.0"
+    VERSION = "1.0.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: marathon-srv
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Andras Szerdahelyi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-06 00:00:00.000000000 Z
+date: 2016-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor