dendrite 0.4.9 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6feed9c5792fbbd6d6804e7d32e22dc98e0d174c
-  data.tar.gz: bd9df0cc2f920831f5e2dc710089cd2d5f32ad7b
+  metadata.gz: 25e1151220355a93c5ea94be65e31f3a287fb287
+  data.tar.gz: 55550e682e1632b91ff3ac2a7fcc3345b27fe26b
 SHA512:
-  metadata.gz: cfd2ce95a4a1eda939f295f47c3a8dc1fde511abacb793975d090e187da4095b117d4cf283c66653ddcd29984efa960b1eaa6e86aa28516ef1d25c4165b8a49e
-  data.tar.gz: c9638f886814e3b2010527afd275f2e734ce90b6a32852f4a624101637c78f581209c63f11810fbd5ddaed71f62ca28a9f63b5f8ef5b6c9b1ebabfcb9b5dc5ef
+  metadata.gz: ed661d13ec78fde86266ae46fd665f21ef7b9257fb0289de972680c851e4849ca30e2ed1fcbb2feff9002bfabf1b31d14f14ba4389c6771b305180cffd9aaf6c
+  data.tar.gz: 644975f47dda7346f6039c18c188e8c3e98e6b89d9ce6b0ff51d1f8169afa22d36b3f83e4527a45e37587229c2a4cfafac049854e02d200f5ab1f516f29c8529

data/conf/services/service.yml

@@ -2,9 +2,15 @@ organization: sd
 component: cams
 lead_email: vp@foobar.com
 team_email: team@foobar.com
+users: &users
+  name1:
+  name2:
 subcomponents:
   - name: foobar
     type: tomcat
+    users:
+      <<: *users
+      name3:
     deploy:
       repository: git@github.com:yagnik/dendrite
       package: dendrite
@@ -28,9 +34,13 @@ subcomponents:
       - component: cams
         subcomponent: cat
         latency: foo
+        identifier: barbaz
       - component: cams
         subcomponent: foobar
         latency: foo
+        identifier: barbas3
+    metadata:
+      foo: bar
   - name: cat
     type: tomcat
     deploy:

data/lib/dendrite/generators/synapse.rb

@@ -79,14 +79,33 @@ module Dendrite
           {
             haproxy: {
               port: service.loadbalancer_port,
-              bind_address: '127.0.0.1',
+              bind_address: bind_address,
               server_options: 'check inter 2s rise 3 fall 2',
-              listen: [
-                'mode tcp'
-              ]
+              listen: mode
             }
           }
         end
+
+        def mode
+          if metadata && metadata.sticky_session
+            [
+              'mode http',
+              'stick-table type string len 200 size 500m expire 30m',
+              "stick store-response res.cook(#{metadata.sticky_session})",
+              "stick match req.cook(#{metadata.sticky_session})"
+            ]
+          else
+            ['mode tcp']
+          end
+        end
+
+        def bind_address
+          if metadata && metadata.bind_address
+            metadata.bind_address
+          else
+            '127.0.0.1'
+          end
+        end
       end
     end
   end

data/lib/dendrite/io.rb

@@ -16,7 +16,7 @@ module Dendrite
           if service[:dependencies]
             service[:dependencies].each do |deps|
               dependency_name = "#{service[:organization]}_#{deps[:component]}_#{deps[:subcomponent]}"
-              graph[node.name].add_dependency(service: graph[dependency_name], latency: deps[:latency])
+              graph[node.name].add_dependency(service: graph[dependency_name], latency: deps[:latency], identifier: deps[:identifier])
             end
           end
         end
@@ -47,7 +47,7 @@ module Dendrite
       end
 
       def services_from_folder(source:)
-        Dir["#{source}/*.yml"].collect {|file| services_from_file(source: file)}
+        Dir["#{source}/**/*.yml"].collect {|file| services_from_file(source: file)}
                               .flatten
       end
     end

data/lib/dendrite/service_graph.rb

@@ -5,6 +5,8 @@ module Dendrite
 
     attr_reader :services
     def_delegators :services, :each, :each
+    def_delegators :services, :keys, :keys
+    def_delegators :services, :values, :values
 
     validate :validate_nodes
     validate :collisions
@@ -15,7 +17,7 @@ module Dendrite
 
     def <<(service)
       raise KeyError unless service.name
-      raise DuplicateService if services.keys.include?(service.name)
+      raise DuplicateService, service.name if services.keys.include?(service.name)
       services[service.name] = service
     end
 

data/lib/dendrite/service_node.rb

@@ -79,7 +79,7 @@ module Dendrite
       validates :port, numericality: { only_integer: true }
     end
 
-    Dependency = Struct.new(:service, :latency) do
+    Dependency = Struct.new(:service, :latency, :identifier) do
       include ActiveModel::Validations
       validates_presence_of :service
       validates_presence_of :latency
@@ -92,12 +92,15 @@ module Dendrite
       end
     end
 
-    Scale = Struct.new(:max_instance_count, :min_instance_count) do
+    Scale = Struct.new(:max_instance_count, :min_instance_count, :min_memory, :min_cpu) do
       include ActiveModel::Validations
       validates_presence_of :max_instance_count
       validates_presence_of :min_instance_count
+      # @TODO add validation for max and min
       validates :max_instance_count, numericality: { only_integer: true }
       validates :min_instance_count, numericality: { only_integer: true }
+      # validates :min_memory, numericality: { only_integer: true }
+      # validates :min_cpu, numericality: { only_integer: true }
     end
 
     Deploy = Struct.new(:repository, :package) do
@@ -106,9 +109,11 @@ module Dendrite
       validates_presence_of :package
     end
 
+    Metadata = OpenStruct
+
     attr_reader :organization, :component, :lead_email, :team_email,
                 :type, :deploy, :scale, :ports, :dependencies, :telemetry,
-                :default_servers
+                :default_servers, :metadata, :users
                 # :name is set but magically
 
     validates_presence_of :organization, :component, :lead_email, :team_email,
@@ -134,7 +139,7 @@ module Dendrite
         when :deploy
           @deploy = Deploy.new(v[:repository], v[:package]) if v != nil
         when :scale
-          @scale = Scale.new(v[:max_instance_count], v[:min_instance_count]) if v != nil
+          @scale = Scale.new(v[:max_instance_count], v[:min_instance_count], v[:min_memory], v[:min_cpu]) if v != nil
         when :telemetry
           @telemetry = Telemetry.new(v[:health_url], v[:notification_email]) if v != nil
         when :default_servers
@@ -142,6 +147,10 @@ module Dendrite
             @default_servers[node[:environment]] ||= []
             @default_servers[node[:environment]] << DefaultServer.new(node[:environment], node[:host], node[:port])
           end
+        when :metadata
+          @metadata = Metadata.new(v)
+        when :users
+          @users = v.keys
         else
           instance_variable_set("@#{k}", v)
         end
@@ -165,8 +174,8 @@ module Dendrite
       ports[:loadbalancer_port].port if ports[:loadbalancer_port]
     end
 
-    def add_dependency(service:, latency:)
-      @dependencies[service.name] = Dependency.new(service, latency)
+    def add_dependency(service:, latency:, identifier:)
+      @dependencies[service.name] = Dependency.new(service, latency, identifier)
     end
 
     def to_h

data/lib/dendrite/version.rb

@@ -1,3 +1,3 @@
 module Dendrite
-  VERSION = "0.4.9"
+  VERSION = "0.5.0"
 end

data/lib/dendrite.rb

@@ -3,6 +3,7 @@ require 'json'
 require 'active_model'
 require 'socket'
 require 'forwardable'
+require 'ostruct'
 require 'dendrite/version'
 
 module Dendrite

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dendrite
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.5.0
 platform: ruby
 authors:
 - Yagnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2016-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -99,7 +99,7 @@ files:
 - bin/add_proxy
 - bin/metadata
 - bin/register
-- conf/config.yaml
+- conf/config.yml
 - conf/services/service.yml
 - dendrite.gemspec
 - lib/dendrite.rb