dendrite 0.3.4 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9df8cb99fab62bc29a5d0cc10e98ec3e836099a
-  data.tar.gz: 03e90f508ce70a2c353635d099443c625762e2d0
+  metadata.gz: 75ab8e520c89530e8855ee657590709d2e4ceaf4
+  data.tar.gz: 607f0d08f5dc040d93740df12feb6092e604e0df
 SHA512:
-  metadata.gz: 877b22c3b316d7f95b78217221174deb1be1721348f31d3dd98d87f1a8b57e59688cdd99f04f571de05231a647fecb2aae105e3c0d092f6e1b5014369c900a31
-  data.tar.gz: 18910d742a7380782d6f35b3f559ddc7819c4391023f6003672dde0b559a36c114acce7eebb8460c1790028c0c825dfed3958fe6ef8e38ff30b7216bf01ed0c7
+  metadata.gz: c72ead6e5303f23398df7da5d1d96061e36b35183edec8fad23dbb249c95ced2161154ccbd79ed9f57654219d58d996aaa152097e938c0ea7de26549755c3404
+  data.tar.gz: ec833d9b8f212131fa7c41e6421719dfddcab9ae1267f13e21643aa8ed1c0a58c05a72cdae5019d0eabda3852fc5bb3af6825893b4c26d2cd3f188d839496ad9

data/bin/add_proxy

@@ -0,0 +1,29 @@
+#!/usr/bin/env ruby
+require 'dendrite'
+require 'optparse'
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: proxy [options]"
+  opts.on("-s", "--service SERVICE_NAME", "service name") do |v|
+    options[:service_name] = v
+  end
+
+  opts.on("-c", "--config CONFIG_FILE", "config file") do |v|
+    options[:config] = v
+  end
+
+  opts.on("-p", "--port PORT", "port") do |v|
+    options[:port] = v.to_i
+  end
+end.parse!
+
+Dendrite::Config.load(source: options[:config])
+services = [options[:service_name]]
+graph = Dendrite::IO.load(source: Dendrite::Config.services_source)
+raise Dendrite::InvalidData unless graph.valid?
+raise Dendrite::UnknownService unless services.collect {|service_name| graph[service_name]}.all?
+
+Dendrite::Config.custom_frontend!(name: "custom_#{options[:service_name]}", port: options[:port], backend_name: options[:service_name])
+synapse = Dendrite::Generators::Synapse.new(graph: graph, service_names: services)
+Dendrite::IO.write(data: synapse.to_yaml, destination: Dendrite::Config.synapse_config_path)

data/bin/register

@@ -15,19 +15,19 @@ OptionParser.new do |opts|
 end.parse!
 
 Dendrite::Config.load(source: options[:config])
+graph = Dendrite::IO.load(source: Dendrite::Config.services_source)
+
 services = begin
   Dendrite::IO.read(source: Dendrite::Config.nerve_config_path)[:services].keys
 rescue
   []
 end.collect(&:to_s)
-graph = Dendrite::IO.load(source: Dendrite::Config.services_source)
+services += options[:service_name].split(',')
+services.uniq!
 
 raise Dendrite::InvalidData unless graph.valid?
 raise Dendrite::UnknownService unless services.collect {|service_name| graph[service_name]}.all?
-raise Dendrite::UnknownService unless options[:service_name].split(',').collect{|s| graph[s]}.all?
 
-services += options[:service_name].split(',')
-services.uniq!
 synapse = Dendrite::Generators::Synapse.new(graph: graph, service_names: services)
 Dendrite::IO.write(data: synapse.to_yaml, destination: Dendrite::Config.synapse_config_path)
 

data/conf/services/service.yml

@@ -1,8 +1,8 @@
 organization: sd
-namespace: cams
+component: cams
 lead_email: vp@foobar.com
 team_email: team@foobar.com
-services:
+subcomponents:
   - name: foobar
     type: tomcat
     deploy:
@@ -12,14 +12,14 @@ services:
       min_instance_count: 1
       max_instance_count: 5
     ports:
-      advertised_port: 8082
-      listening_port: 8080
+      loadbalancer_port: 8082
+      service_port: 8080
     dependencies:
-      - namespace: cams
-        name: cat
+      - component: cams
+        subcomponent: cat
         latency: foo
-      - namespace: cams
-        name: foobar
+      - component: cams
+        subcomponent: foobar
         latency: foo
   - name: cat
     type: tomcat
@@ -30,11 +30,11 @@ services:
       min_instance_count: 1
       max_instance_count: 5
     ports:
-      advertised_port: 8081
-      listening_port: 8080
+      loadbalancer_port: 8081
+      service_port: 8080
     dependencies:
-      - namespace: cams
-        name: foobar
+      - component: cams
+        subcomponent: foobar
         latency: foo
   - name: baz
     type: tomcat
@@ -45,6 +45,6 @@ services:
       min_instance_count: 1
       max_instance_count: 5
     ports:
-      advertised_port: 8083
-      listening_port: 8080
+      loadbalancer_port: 8083
+      service_port: 8080
     dependencies: []

data/lib/dendrite/generators/nerve.rb

@@ -4,11 +4,6 @@ module Dendrite
 
       def initialize(graph:, service_names:)
         super
-        @services.group_by { |service| service.listening_port }.each do |port, services|
-          if services.length > 1
-            raise PortCollision, "Port collission between #{services.collect(&:name).join(',')}"
-          end
-        end
         @services = @services.collect { |service| ServiceConfig.new(service)}
       end
 
@@ -26,13 +21,13 @@ module Dendrite
       ServiceConfig = Struct.new(:service) do
         extend Forwardable
         def_delegator :service, :name, :name
-        def_delegator :service, :namespace, :namespace
+        def_delegator :service, :component, :component
         def_delegator :service, :organization, :organization
 
         def to_h
           {
             host: Dendrite::Config.public_ip,
-            port: service.listening_port,
+            port: service.service_port,
             labels: {
               dc: Dendrite::Config.dc,
               env: Dendrite::Config.env
@@ -44,7 +39,7 @@ module Dendrite
           {
             reporter_type: 'zookeeper',
             zk_hosts: Dendrite::Config.zk_hosts,
-            zk_path: "/smartstack/services/#{organization}/#{namespace}/#{service.real_name}/instances"
+            zk_path: "/smartstack/services/#{organization}/#{component}/#{service.real_name}/instances"
           }
         end
       end

data/lib/dendrite/generators/synapse.rb

@@ -1,16 +1,18 @@
 module Dendrite
   module Generators
     class Synapse < Base
-      def initialize(graph:, service_names:)
-        super
-        dep = []
-        @services.each do |service|
-          service.dependencies.each do |_, dependency|
-            dep << dependency.service
+      def initialize(graph:, service_names:, proxy: false)
+        super(graph: graph, service_names: service_names)
+        unless proxy
+          dep = []
+          @services.each do |service|
+            service.dependencies.each do |_, dependency|
+              dep << dependency.service
+            end
           end
+          @services = dep.uniq
         end
-        @services = dep.uniq
-        @services.group_by { |service| service.advertised_port }.each do |port, services|
+        @services.group_by { |service| service.loadbalancer_port }.each do |port, services|
           if services.length > 1
             raise PortCollision, "Port collission between #{services.collect(&:name).join(',')}"
           end
@@ -37,7 +39,7 @@ module Dendrite
       ServiceConfig = Struct.new(:service) do
         extend Forwardable
         def_delegator :service, :name, :name
-        def_delegator :service, :namespace, :namespace
+        def_delegator :service, :component, :component
         def_delegator :service, :organization, :organization
 
         def to_h
@@ -49,7 +51,7 @@ module Dendrite
             discovery: {
               method: 'zookeeper',
               hosts: Dendrite::Config.zk_hosts,
-              path: "/smartstack/services/#{organization}/#{namespace}/#{service.real_name}/instances"
+              path: "/smartstack/services/#{organization}/#{component}/#{service.real_name}/instances"
             }
           }
         end
@@ -57,7 +59,7 @@ module Dendrite
         def haproxy_config
           {
             haproxy: {
-              port: service.advertised_port,
+              port: service.loadbalancer_port,
               server_options: 'check inter 2s rise 3 fall 2',
               listen: [
                 'mode tcp'

data/lib/dendrite/io.rb

@@ -15,13 +15,13 @@ module Dendrite
           node = ServiceNode.new(service)
           if service[:dependencies]
             service[:dependencies].each do |deps|
-              dependency_name = "#{service[:organization]}_#{deps[:namespace]}_#{deps[:name]}"
+              dependency_name = "#{service[:organization]}_#{deps[:component]}_#{deps[:subcomponent]}"
               graph[node.name].add_dependency(service: graph[dependency_name], latency: deps[:latency])
             end
           end
           if service[:dependancies]
             service[:dependancies].each do |deps|
-              dependency_name = "#{service[:organization]}_#{deps[:namespace]}_#{deps[:name]}"
+              dependency_name = "#{service[:organization]}_#{deps[:component]}_#{deps[:subcomponent]}"
               graph[node.name].add_dependency(service: graph[dependency_name], latency: deps[:latency])
             end
           end
@@ -43,9 +43,9 @@ module Dendrite
 
       def services_from_file(source:)
         data = read(source: source)
-        data[:services].collect do |service|
+        data[:subcomponents].collect do |service|
           service[:organization] = data[:organization]
-          service[:namespace]    = data[:namespace]
+          service[:component]    = data[:component]
           service[:lead_email]   = data[:lead_email]
           service[:team_email]   = data[:team_email]
           service

data/lib/dendrite/service_graph.rb

@@ -1,10 +1,14 @@
 module Dendrite
   class ServiceGraph
+    include ActiveModel::Validations
     extend Forwardable
 
     attr_reader :services
     def_delegators :services, :each, :each
 
+    validate :validate_nodes
+    validate :collisions
+
     def initialize
       @services = {}
     end
@@ -19,29 +23,19 @@ module Dendrite
       services.fetch(name)
     end
 
-    def valid?
-      services.values.collect(&:valid?).all? &&
-      services.values.group_by(&:advertised_port)
+    def collisions
+      services.values.group_by(&:loadbalancer_port)
                      .reject {|port, svc| port == nil}
-                     .all? do |port, svc|
-        svc.length == 1
+                     .select {|port, svc| svc.length > 1}
+                     .each do |port, svc|
+        errors.add("port_collisions_#{port}", "collision between #{svc.collect(&:name).join(',')}")
       end
     end
 
-    def errors
-      hash = services.inject({}) do |hash, (name, service)|
-        hash[name] = service.errors.messages if service.errors.messages.length > 0
-        hash
-      end
-      services.values.group_by(&:advertised_port)
-                     .reject {|port, svc| port == nil}
-                     .each do |port, svc|
-        if svc.length > 1
-          hash[:port_collisions] ||= {}
-          hash[:port_collisions][port] = svc.collect(&:name)
-        end
+    def validate_nodes
+      services.each do |name, service|
+        errors.add(name, service.errors.messages) unless service.valid?
       end
-      return hash
     end
   end
 end

data/lib/dendrite/service_node.rb

@@ -11,9 +11,9 @@ module Dendrite
         end
       end
 
-      ports.each do |depname, dep|
-        if dep.invalid?
-          dep.errors.each do |key, value|
+      ports.each do |name, prt|
+        if prt.invalid?
+          prt.errors.each do |key, value|
             errors.add "port_#{key}", value
           end
         end
@@ -75,15 +75,15 @@ module Dendrite
 
     VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-]+(\.[a-z]+)*\.[a-z]+\z/i
 
-    attr_reader :organization, :namespace, :lead_email, :team_email,
+    attr_reader :organization, :component, :lead_email, :team_email,
                 :type, :deploy, :scale, :ports, :dependencies
                 # :name is set but magically
 
-    validates_presence_of :organization, :namespace, :lead_email, :team_email,
+    validates_presence_of :organization, :component, :lead_email, :team_email,
                           :name, :type, :deploy, :scale
 
     validates :organization, format: { with: /\A[a-z]+\z/, message: "only allows lowercase letters" }
-    validates :namespace, format: { with: /\A[a-z]+\z/, message: "only allows lowercase letters" }
+    validates :component, format: { with: /\A[a-z]+\z/, message: "only allows lowercase letters" }
     validates :lead_email, format: { with: VALID_EMAIL_REGEX, message: "invalid email format" }
     validates :team_email, format: { with: VALID_EMAIL_REGEX, message: "invalid email format" }
     validates :name, format: { with: /\A[a-z_]+\z/, message: "only allows lowercase letters" }
@@ -113,15 +113,15 @@ module Dendrite
     end
 
     def name
-      "#{organization}_#{namespace}_#{@name}" if @name
+      "#{organization}_#{component}_#{@name}" if @name
     end
 
-    def listening_port
-      ports[:listening_port].port if ports[:listening_port]
+    def service_port
+      ports[:service_port].port if ports[:service_port]
     end
 
-    def advertised_port
-      ports[:advertised_port].port if ports[:advertised_port]
+    def loadbalancer_port
+      ports[:loadbalancer_port].port if ports[:loadbalancer_port]
     end
 
     def add_dependency(service:, latency:)

data/lib/dendrite/version.rb

@@ -1,3 +1,3 @@
 module Dendrite
-  VERSION = "0.3.4"
+  VERSION = "0.4.0"
 end

data/lib/dendrite.rb

@@ -46,6 +46,16 @@ module Dendrite
         @@data[:synapse][:haproxy]
       end
 
+      def custom_frontend!(name:, port:, backend_name:)
+        data = {
+          "frontend #{name}": [
+            "bind :#{port}",
+            "use_backend #{backend_name}"
+          ]
+        }
+        @@data[:synapse][:haproxy][:extra_sections] = @@data[:synapse][:haproxy][:extra_sections].merge(data)
+      end
+
       def valid_types
         @@data[:dendrite][:valid_app_types]
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dendrite
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.0
 platform: ruby
 authors:
 - Yagnik
@@ -84,9 +84,8 @@ description: Build config files for synapse and nerve of smartstack
 email:
 - yagnikkhanna@gmail.com
 executables:
-- console
+- add_proxy
 - register
-- setup
 extensions: []
 extra_rdoc_files: []
 files:
@@ -96,9 +95,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/console
+- bin/add_proxy
 - bin/register
-- bin/setup
 - conf/config.yaml
 - conf/services/service.yml
 - dendrite.gemspec
@@ -110,6 +108,8 @@ files:
 - lib/dendrite/service_graph.rb
 - lib/dendrite/service_node.rb
 - lib/dendrite/version.rb
+- script/console
+- script/setup
 homepage: https://github.com/yagnik/dendrite
 licenses:
 - MIT