dendrite 0.4.5 → 0.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60c2b6fffda67f74954dcb48843565d1961dc828
-  data.tar.gz: d4057165eb65727f6ca097743500211b20914d3e
+  metadata.gz: fc5afcf0dbe096ad4b0b58c0447e6e17033b1a18
+  data.tar.gz: cef9b6fe6963aff7ab8f11ecedb6437d740d973a
 SHA512:
-  metadata.gz: 70664b15a20a3b89ff506fcf7f90334b34b133a3fdd20a687fdc48473e148e76f6f87a81ccc3be1789ced0aabd7e1d2e55be144788165f2db1505b38a2b3651e
-  data.tar.gz: d248fe859931165439460a094f3d44891a295b33ac33c4aea75fb3b40ae008399784f9f0a24a03f6a1ce5fee58a89beb777ea09a5ebbe42f877742bf3a1a3184
+  metadata.gz: 2d9324bfd329d586efc9df207fa2a3ce9709a322ce41b6b1a9c20030c78f1f4213cdae30c0477c86c5daa25596ab5a3583485d6c904de0eec132fd63a9f41c26
+  data.tar.gz: ed3febb4518259ff866e8594f0dff1bc4c420f7897e9a3a0cc33d2e202395aa23d6e7b6fae872fd411373153533a2552de30efa404dcda432c919069e340a706

data/bin/register

@@ -12,6 +12,10 @@ OptionParser.new do |opts|
   opts.on("-c", "--config CONFIG_FILE", "config file") do |v|
     options[:config] = v
   end
+
+  opts.on("-e", "--environment ENVIRONMENT", "environment of default servers") do |v|
+    options[:env] = v
+  end
 end.parse!
 
 puts "Loading config"
@@ -30,7 +34,7 @@ raise Dendrite::InvalidData unless graph.valid?
 raise Dendrite::UnknownService unless services.collect {|service_name| graph[service_name]}.all?
 
 puts "Generating synapse"
-synapse = Dendrite::Generators::Synapse.new(graph: graph, service_names: services)
+synapse = Dendrite::Generators::Synapse.new(graph: graph, service_names: services, environment: options[:env])
 Dendrite::IO.write(data: synapse.to_yaml, destination: Dendrite::Config.synapse_config_path)
 
 puts "Generating nerve"

data/conf/services/service.yml

@@ -17,6 +17,13 @@ subcomponents:
     telemetry:
       health_url: /
       notification_email: foo@bar.com
+    default_servers:
+      - host: 192.168.1.1
+        port: 8080
+        environment: stg
+      - host: 50.312.312.312
+        port: 8080
+        environment: prd
     dependencies:
       - component: cams
         subcomponent: cat

data/lib/dendrite/generators/synapse.rb

@@ -1,7 +1,7 @@
 module Dendrite
   module Generators
     class Synapse < Base
-      def initialize(graph:, service_names:, proxy: false)
+      def initialize(graph:, service_names:, proxy: false, environment: :dev)
         super(graph: graph, service_names: service_names)
         unless proxy
           dep = []
@@ -17,7 +17,7 @@ module Dendrite
             raise PortCollision, "Port collission between #{services.collect(&:name).join(',')}"
           end
         end
-        @services = @services.collect { |service| ServiceConfig.new(service)}
+        @services = @services.collect { |service| ServiceConfig.new(service, environment)}
       end
 
       def to_h
@@ -36,14 +36,33 @@ module Dendrite
 
       private
 
-      ServiceConfig = Struct.new(:service) do
+      ServiceConfig = Struct.new(:service, :environment) do
         extend Forwardable
         def_delegator :service, :name, :name
         def_delegator :service, :component, :component
         def_delegator :service, :organization, :organization
+        def_delegator :service, :default_servers, :default_servers
 
         def to_h
           discovery_config.merge(haproxy_config)
+                          .merge(default_servers_config)
+        end
+
+        def default_servers_config
+          servers = default_servers[environment]
+          if servers
+            {
+              default_servers: servers.enum_for(:each_with_index).collect do |server, i|
+                data = server.to_h.merge({
+                  name: "default_#{name}_#{i}"
+                })
+                data.delete(:environment)
+                data
+              end
+            }
+          else
+            {}
+          end
         end
 
         def discovery_config

data/lib/dendrite/io.rb

@@ -19,12 +19,6 @@ module Dendrite
               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[:component]}_#{deps[:subcomponent]}"
-              graph[node.name].add_dependency(service: graph[dependency_name], latency: deps[:latency])
-            end
-          end
         end
 
         graph

data/lib/dendrite/service_node.rb

@@ -37,6 +37,16 @@ module Dendrite
         end
       end
 
+      default_servers.each do |env, srv|
+        if srv.any?(&:invalid?)
+          srv.select(&:invalid?).each do |sr|
+            sr.errors.each do |key, value|
+              errors.add "default_servers_#{key}", value
+            end
+          end
+        end
+      end
+
       return errors.count == 0
     end
   end
@@ -47,6 +57,14 @@ module Dendrite
 
     VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-]+(\.[a-z]+)*\.[a-z]+\z/i
 
+    DefaultServer = Struct.new(:environment, :host, :port) do
+      include ActiveModel::Validations
+      validates_presence_of :environment
+      validates_presence_of :host
+      validates_presence_of :port
+      validates :port, numericality: { only_integer: true }
+    end
+
     Telemetry = Struct.new(:health_url, :notification_email) do
       include ActiveModel::Validations
       validates_presence_of :health_url
@@ -89,7 +107,8 @@ module Dendrite
     end
 
     attr_reader :organization, :component, :lead_email, :team_email,
-                :type, :deploy, :scale, :ports, :dependencies, :telemetry
+                :type, :deploy, :scale, :ports, :dependencies, :telemetry,
+                :default_servers
                 # :name is set but magically
 
     validates_presence_of :organization, :component, :lead_email, :team_email,
@@ -99,11 +118,13 @@ module Dendrite
     validates :component, format: { with: /\A[0-9a-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 :real_name, format: { with: /\A[0-9a-z]+\z/, message: "only allows lowercase letters" }
     validates :name, format: { with: /\A[0-9a-z_]+\z/, message: "only allows lowercase letters" }
     validates :type, inclusion: { in: -> (_) { Dendrite::Config.valid_types } , message: "%{value} is not a valid type" }
 
     def initialize(**args)
       @ports = {}
+      @default_servers = {}
       args.each do |k,v|
         case k
         when :ports
@@ -116,6 +137,11 @@ module Dendrite
           @scale = Scale.new(v[:max_instance_count], v[:min_instance_count]) if v != nil
         when :telemetry
           @telemetry = Telemetry.new(v[:health_url], v[:notification_email]) if v != nil
+        when :default_servers
+          v.each do |node|
+            @default_servers[node[:environment]] ||= []
+            @default_servers[node[:environment]] << DefaultServer.new(node[:environment], node[:host], node[:port])
+          end
         else
           instance_variable_set("@#{k}", v)
         end
@@ -155,10 +181,10 @@ module Dendrite
         ports: ports.values.collect(&:to_h),
         dependencies: dependencies.keys
       }
-      data.merge!({deploy: deploy.to_h}) if deploy
-      data.merge!({scale: scale.to_h}) if scale
-      data.merge!({telemetry: telemetry.to_h}) if telemetry
-      data
+      data.merge!({deploy: deploy ? deploy.to_h : {}})
+      data.merge!({scale: scale ? scale.to_h : {}})
+      data.merge!({telemetry: telemetry ? telemetry.to_h : {}})
+      data.merge!({default_servers: default_servers.values.flatten.collect(&:to_h)})
     end
   end
 end

data/lib/dendrite/version.rb

@@ -1,3 +1,3 @@
 module Dendrite
-  VERSION = "0.4.5"
+  VERSION = "0.4.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dendrite
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.7
 platform: ruby
 authors:
 - Yagnik