dendrite 0.5.16 → 0.5.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49062c845259f7937adde0c0117c2e959230c1a8
-  data.tar.gz: ff0d54398dc923cc2b216c6c733b32fa81401169
+  metadata.gz: 7bf4b1fdc08a024b3a13ce91325cf5cf2dc8ee7a
+  data.tar.gz: 41723c08f763f7aa8e4be85e780cb21375ca8ba7
 SHA512:
-  metadata.gz: 805535d01e524c4ba6c1c43bbf035f147da826061a1dae416fb71d326b859cd17cc330333c0fbf577c7f68e0c9f3c337eb5a4173f3c904f58288d95280b0ff49
-  data.tar.gz: 64611c7155aae5776642a218c8c5d51f467b1fd609bab47666720544293e54c8489c6d7d3b5d3d7adaea0b4df94918bc521fbdba539f41dad58f4d0707785673
+  metadata.gz: 2632a11b89af6cb462cb1ea725f46895d19141993cceb35e1896d488c7f75077a7d680cdadad53d450c1c02c9534cf31960eca1952583c2c2ea4e5acc799c8c2
+  data.tar.gz: 2de9a065d1e4e1a3f5bd2a0a8d2f646e6d03c26fe709f060c37f54885fb19f3610912ce9bffab6a40201522885ec9fea878fa6daca24c4beb45e5a8ba63abe4a

data/bin/register

@@ -28,7 +28,7 @@ rescue
   []
 end.collect(&:to_s)
 services += options[:service_name].split(',')
-services.uniq!
+services = services.collect{|s| s.gsub("_readonly", "")}.uniq
 
 raise Dendrite::InvalidData unless graph.valid?
 raise Dendrite::UnknownService unless services.collect {|service_name| graph[service_name]}.all?

data/conf/services/service.yml

@@ -40,6 +40,7 @@ subcomponents:
         subcomponent: cat
         latency: foo
         identifier: barbaz
+        read_only: true
       - component: cams
         subcomponent: foobar
         latency: foo
@@ -55,13 +56,19 @@ subcomponents:
     scale:
       min_instance_count: 1
       max_instance_count: 5
+    default_servers:
+      - host: 0.0.0.0
+        port: 8080
+        environment: prd
     ports:
       loadbalancer_port: 8081
       service_port: 8080
     dependencies:
       - component: cams
-        subcomponent: foobar
-        latency: foo
+        subcomponent: cat
+        latency: 10
+    metadata:
+      read_only: true
   - name: baz
     type: tomcat
     deploy:

data/lib/dendrite/generators/nerve.rb

@@ -11,7 +11,19 @@ module Dendrite
 
       def to_h
         service_list = services.inject({}) do |hash, service|
-          hash[service.name] = service.to_h
+          if service.read_write
+            hash[service.name] = service.to_h
+            hash["#{service.name}_readonly"] = service.to_h.merge({
+              zk_path: "/smartstack/services/#{service.organization}/#{service.component}/#{service.service.real_name}_readonly/instances"
+            })
+          elsif service.read_only
+            hash["#{service.name}_readonly"] = service.to_h.merge({
+              zk_path: "/smartstack/services/#{service.organization}/#{service.component}/#{service.service.real_name}_readonly/instances"
+            })
+          else
+            hash[service.name] = service.to_h
+          end
+
           hash
         end
 
@@ -26,6 +38,14 @@ module Dendrite
         def_delegator :service, :component, :component
         def_delegator :service, :organization, :organization
 
+        def read_only
+          service.metadata && service.metadata.read_only
+        end
+
+        def read_write
+          read_only && service.metadata.write_only
+        end
+
         def to_h
           {
             host: Dendrite::Config.public_ip,

data/lib/dendrite/generators/synapse.rb

@@ -1,17 +1,26 @@
 module Dendrite
   module Generators
     class Synapse < Base
-      def initialize(graph:, service_names:, proxy: false, environment: :dev)
+      attr_reader :read_only
+      def initialize(graph:, service_names:, environment: :dev)
         super(graph: graph, service_names: service_names)
-        unless proxy
-          dep = []
-          @services.each do |service|
-            service.dependencies.each do |_, dependency|
-              dep << dependency.service
+        dep = []
+        read_only = {}
+        @services.each do |service|
+          service.dependencies.each do |_, dependency|
+            dep << dependency.service
+            if read_only.keys.include?(dependency.service.name)
+              if read_only[dependency.service.name] != dependency.read_only
+                raise "Trying to add r/o and r/w for same service"
+              end
+            else
+              read_only[dependency.service.name] = dependency.read_only
             end
           end
-          @services = dep.uniq
         end
+
+        @read_only = read_only
+        @services = dep.uniq
         @services.group_by { |service| service.loadbalancer_port }.each do |port, services|
           if services.length > 1
             raise PortCollision, "Port collission between #{services.collect(&:name).join(',')}"
@@ -22,7 +31,17 @@ module Dendrite
 
       def to_h
         service_list = services.inject({}) do |hash, service|
-          hash[service.name] = service.to_h
+
+          if read_only[service.name]
+            data = service.to_h
+            discovery_data = data[:discovery].merge({
+              path: "/smartstack/services/#{service.organization}/#{service.component}/#{service.service.real_name}_readonly/instances"
+            })
+            data[:discovery] = discovery_data
+            hash[service.name] = data
+          else
+            hash[service.name] = service.to_h
+          end
           hash
         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], identifier: deps[:identifier])
+              graph[node.name].add_dependency(service: graph[dependency_name], latency: deps[:latency], identifier: deps[:identifier], read_only: deps.fetch(:read_only, false))
             end
           end
         end

data/lib/dendrite/service_node.rb

@@ -95,7 +95,7 @@ module Dendrite
       validates_inclusion_of :port, :in => 1..65535
     end
 
-    Dependency = Struct.new(:service, :latency, :identifier) do
+    Dependency = Struct.new(:service, :latency, :identifier, :read_only) do
       include ActiveModel::Validations
       validates_presence_of :service
       validates_presence_of :latency
@@ -196,8 +196,8 @@ module Dendrite
       ports[:loadbalancer_port].port if ports[:loadbalancer_port]
     end
 
-    def add_dependency(service:, latency:, identifier:)
-      @dependencies[service.name] = Dependency.new(service, latency, identifier)
+    def add_dependency(service:, latency:, identifier:, read_only: false)
+      @dependencies[service.name] = Dependency.new(service, latency, identifier, read_only == true)
     end
 
     def to_h

data/lib/dendrite/version.rb

@@ -1,3 +1,3 @@
 module Dendrite
-  VERSION = "0.5.16"
+  VERSION = "0.5.20"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dendrite
 version: !ruby/object:Gem::Version
-  version: 0.5.16
+  version: 0.5.20
 platform: ruby
 authors:
 - Yagnik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2017-01-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,7 +84,6 @@ description: Build config files for synapse and nerve of smartstack
 email:
 - yagnikkhanna@gmail.com
 executables:
-- add_proxy
 - metadata
 - register
 extensions: []
@@ -96,7 +95,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- bin/add_proxy
 - bin/metadata
 - bin/register
 - conf/config.yml

data/bin/add_proxy

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