dendrite 0.0.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3df2a8393c2d49b666bf727b18dcca034788431c
-  data.tar.gz: 9955f2b4e9120c9a66cde66af40a8c0fe8fb5d9a
+  metadata.gz: e10396502c8af59086c5bf3f6d3b414679830200
+  data.tar.gz: f11e24cc3410edc382a309d4d66c5a2e4a902865
 SHA512:
-  metadata.gz: ee2ff24e85fac16745d0aa09f0f077f5630acbd7b83c1e6953335ee87832c66db771638dcacfb37e884840eb389ba84912048e648127117486205a7744f971a9
-  data.tar.gz: d159e46d349ed175838d05e3083bbfc008e4e5a3fdbb6f6b9551a519bdc27667963b0e13c53e9e0323054a666a6bbbf1371d135cfb86c13f18d10908cfa93969
+  metadata.gz: c20ba4b8a03ebf55457f9b650ea360687a8c679458b3a5aa1b27bec0e3574d5c67523c199966abe28eb8a2e2c79bcddc0bb8ebb6e4a6f288c3a30ce56ba69461
+  data.tar.gz: f30b865221e2e1f79c97362675df5c7fc1cc67e06f745a78651955415b94638670b64bcfced495eb78a6b429bf42fa5615fbfa1687241c20b3192837868c33a4

data/conf/config.yaml

@@ -1,11 +1,12 @@
 dendrite:
+  organization: sd
   dc: ggn1
   env: dev
   zk_hosts:
     - localhost:2181
   nerve_config_path: /opt/smartstack/conf/nerve.yml
   synapse_config_path: /opt/smartstack/conf/synapse.yml
-  services_source: ./conf/services
+  services_source: /vagrant/services/services/ 
 
 synapse:
   haproxy:

data/conf/services/service.yml

@@ -1,34 +1,48 @@
+dendrite_version: 1
+organization: sd
 namespace: cams
 lead_email: vp@foobar.com
 team_email: team@foobar.com
 services:
   - name: foobar
     type: tomcat
-    repo: git@github.com:yagnik/dendrite
-    package_name: dendrite
+    deploy:
+      repository: git@github.com:yagnik/dendrite
+      package: dendrite
+    scale:
+      min_instance_count: 1
+      max_instance_count: 5
     ports:
       advertised_port: 8081
-      running_port: 8080
+      listening_port: 8080
     dependancies:
-      - name: cat
+      - namespace: cams
+        name: cat
         latency: foo
   - name: cat
     type: tomcat
-    repo: git@github.com:yagnik/dendrite
-    package_name: dendrite
-    error_budget: None
+    deploy:
+      repository: git@github.com:yagnik/dendrite
+      package: dendrite
+    scale:
+      min_instance_count: 1
+      max_instance_count: 5
     ports:
       advertised_port: 8081
-      lb_port: 8080
+      listening_port: 8080
     dependancies:
-      - name: foobar
+      - namespace: cams
+        name: foobar
         latency: foo
   - name: baz
     type: tomcat
-    repo: git@github.com:yagnik/dendrite
-    package_name: dendrite
-    error_budget: None
+    deploy:
+      repository: git@github.com:yagnik/dendrite
+      package: dendrite
+    scale:
+      min_instance_count: 1
+      max_instance_count: 5
     ports:
       advertised_port: 8081
-      running_port: 8080
+      listening_port: 8080
     dependancies: []

data/lib/dendrite/generators/base.rb

@@ -7,6 +7,7 @@ module Dendrite
         @graph = graph
         @services = graph.services
                          .select { |service_name, service| service_names.include?(service_name) }
+                         .collect { |_, service| service }
       end
 
       def to_h

data/lib/dendrite/generators/nerve.rb

@@ -4,7 +4,7 @@ module Dendrite
 
       def initialize(graph:, service_names:)
         super
-        @services = @services.collect { |service_name, service| ServiceConfig.new(service)}
+        @services = @services.collect { |service| ServiceConfig.new(service)}
       end
 
       def to_h
@@ -22,6 +22,7 @@ module Dendrite
         extend Forwardable
         def_delegator :service, :name, :name
         def_delegator :service, :namespace, :namespace
+        def_delegator :service, :organization, :organization
 
         def to_h
           {
@@ -38,7 +39,7 @@ module Dendrite
           {
             reporter_type: 'zookeeper',
             zk_hosts: Dendrite::Config.zk_hosts,
-            zk_path: "/smartstack/services/#{service.namespace}/#{service.name}/instances"
+            zk_path: "/smartstack/services/#{organization}/#{namespace}/#{service.real_name}/instances"
           }
         end
       end

data/lib/dendrite/generators/synapse.rb

@@ -3,14 +3,14 @@ module Dendrite
     class Synapse < Base
       def initialize(graph:, service_names:)
         super
-        dep = {}
-        @services.each do |service_name, service|
-          service.dependancies.each do |dependancy_name, dependancy|
-            dep[dependancy_name] = dependancy.service
+        dep = []
+        @services.each do |service|
+          service.dependancies.each do |_, dependancy|
+            dep << dependancy.service
           end
         end
-        @services = dep
-        @services = @services.collect { |service_name, service| ServiceConfig.new(service)}
+        @services = dep.uniq
+        @services = @services.collect { |service| ServiceConfig.new(service)}
       end
 
       def to_h
@@ -33,6 +33,7 @@ module Dendrite
         extend Forwardable
         def_delegator :service, :name, :name
         def_delegator :service, :namespace, :namespace
+        def_delegator :service, :organization, :organization
 
         def to_h
           discovery_config.merge(haproxy_config)
@@ -43,7 +44,7 @@ module Dendrite
             discovery: {
               method: 'zookeeper',
               hosts: Dendrite::Config.zk_hosts,
-              path: "/smartstack/services/#{namespace}/#{name}/instances"
+              path: "/smartstack/services/#{organization}/#{namespace}/#{service.real_name}/instances"
             }
           }
         end

data/lib/dendrite/io.rb

@@ -12,8 +12,10 @@ module Dendrite
         end
 
         services.each do |service|
+          node = ServiceNode.new(service)
           service[:dependancies].each do |deps|
-            graph[service[:name]].add_dependancy(service: graph.fetch(deps[:name]), latency: deps[:latency])
+            dependancy_name = "#{service[:organization]}_#{deps[:namespace]}_#{deps[:name]}"
+            graph[node.name].add_dependancy(service: graph[dependancy_name], latency: deps[:latency])
           end
         end
 
@@ -34,9 +36,10 @@ module Dendrite
       def services_from_file(source:)
         data = read(source: source)
         data[:services].collect do |service|
-          service[:namespace] = data[:namespace]
-          service[:lead_email] = data[:lead_email]
-          service[:team_email] = data[:team_email]
+          service[:organization] = data[:organization]
+          service[:namespace]    = data[:namespace]
+          service[:lead_email]   = data[:lead_email]
+          service[:team_email]   = data[:team_email]
           service
         end
       end

data/lib/dendrite/service_graph.rb

@@ -11,24 +11,21 @@ module Dendrite
 
     def <<(service)
       raise KeyError unless service.name
-      @services[service.name] = service
+      raise DuplicateService if services.keys.include?(service.name)
+      services[service.name] = service
     end
 
     def [](name)
-      @services[name]
-    end
-
-    def fetch(name)
-      @services.fetch(name)
+      services.fetch(name)
     end
 
     def valid?
-      @services.values.collect(&:valid?).all?
+      services.values.collect(&:valid?).all?
     end
 
     def errors
-      @services.inject({}) do |hash, (name, service)|
-        hash[name] = service.errors.messages
+      services.inject({}) do |hash, (name, service)|
+        hash[name] = service.errors.messages if service.errors.messages.length > 0
         hash
       end
     end

data/lib/dendrite/service_node.rb

@@ -3,7 +3,7 @@ module Dendrite
     def valid?
       super
 
-      @dependancies.each do |depname, dep|
+      dependancies.each do |depname, dep|
         if dep.invalid?
           dep.errors.each do |key, value|
             errors.add "dependancy_#{key}", value
@@ -11,7 +11,7 @@ module Dendrite
         end
       end
 
-      @ports.each do |depname, dep|
+      ports.each do |depname, dep|
         if dep.invalid?
           dep.errors.each do |key, value|
             errors.add "port_#{key}", value
@@ -19,6 +19,18 @@ module Dendrite
         end
       end
 
+      if deploy && deploy.invalid?
+        deploy.errors.each do |key, value|
+          errors.add "deploy_#{key}", value
+        end
+      end
+
+      if scale && scale.invalid?
+        scale.errors.each do |key, value|
+          errors.add "scale_#{key}", value
+        end
+      end
+
       return errors.count == 0
     end
   end
@@ -38,6 +50,27 @@ module Dendrite
       include ActiveModel::Validations
       validates_presence_of :service
       validates_presence_of :latency
+      validate :service_type
+
+      def service_type
+        unless service.is_a?(ServiceNode)
+          errors.add(:service, "service has to be a Service Node")
+        end
+      end
+    end
+
+    Scale = Struct.new(:max_instance_count, :min_instance_count) do
+      include ActiveModel::Validations
+      validates_presence_of :max_instance_count
+      validates_presence_of :min_instance_count
+      validates :max_instance_count, numericality: { only_integer: true }
+      validates :min_instance_count, numericality: { only_integer: true }
+    end
+
+    Deploy = Struct.new(:repository, :package) do
+      include ActiveModel::Validations
+      validates_presence_of :repository
+      validates_presence_of :package
     end
 
     VALID_TYPE = %w(
@@ -48,24 +81,34 @@ module Dendrite
       cassandra
     )
 
-    attr_reader :namespace, :lead_email, :team_email,
-                :name, :type, :repo, :package_name,
-                :ports, :dependancies
+    VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-]+(\.[a-z]+)*\.[a-z]+\z/i
 
-    validates_presence_of :namespace, :lead_email, :team_email,
-                          :name, :type, :repo, :package_name
+    attr_reader :organization, :namespace, :lead_email, :team_email,
+                :type, :deploy, :scale, :ports, :dependancies
+                # :name is set but magically
 
-    validates :namespace, format: { with: /\A[a-z_]+\z/, message: "only allows lowercase letters" }
+    validates_presence_of :organization, :namespace, :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 :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" }
     validates :type, inclusion: { in: VALID_TYPE, message: "%{value} is not a valid type" }
 
     def initialize(**args)
       @ports = {}
       args.each do |k,v|
-        if k == :ports
+        case k
+        when :ports
           v.each do |name, port|
             @ports[name] = Port.new(name, port)
           end
+        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
         else
           instance_variable_set("@#{k}", v)
         end
@@ -73,12 +116,20 @@ module Dendrite
       @dependancies = {}
     end
 
+    def real_name
+      @name
+    end
+
+    def name
+      "#{organization}_#{namespace}_#{@name}" if @name
+    end
+
     def listening_port
-      ports[:advertised_port].port
+      ports[:listening_port].port if ports[:listening_port]
     end
 
     def advertised_port
-      ports[:advertised_port].port
+      ports[:advertised_port].port if ports[:advertised_port]
     end
 
     def add_dependancy(service:, latency:)

data/lib/dendrite/version.rb

@@ -1,3 +1,3 @@
 module Dendrite
-  VERSION = "0.0.1"
+  VERSION = "0.2.0"
 end

data/lib/dendrite.rb

@@ -14,6 +14,7 @@ module Dendrite
   Error = Class.new(StandardError)
   InvalidData = Class.new(Error)
   UnknownService = Class.new(Error)
+  DuplicateService = Class.new(Error)
 
   class Config
     class << self
@@ -50,7 +51,8 @@ module Dendrite
       end
 
       def public_ip
-        ip = Socket.ip_address_list.detect{|intf| intf.ipv4_private?}
+        ip = Socket.ip_address_list.detect{|intf| intf.ipv4_private?} ||
+             Socket.ip_address_list.detect{|intf| intf.ipv4? && !intf.ipv4_loopback? && !intf.ipv4_multicast? && !intf.ipv4_private?}
         ip.ip_address if ip
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dendrite
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Yagnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-01 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler