dendrite 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7d3f42a77f2e3b124d3828908b2c5d01ff92c74
-  data.tar.gz: 98b1fe74cf265e61713202a91142aaee3914288c
+  metadata.gz: bad4d18d07075176dbe3c2b022d5e4b7388815ec
+  data.tar.gz: 3988a55003746c5af19ac0e948ca672cfedcc228
 SHA512:
-  metadata.gz: 4be8c621a93637efd6654bad84bb542ad0b979d5d8ab968e3420707e6acd3b14544a8481ff21e1fcfda1736ce2aaa2dfdb0cd1d95b5ddda24b0232c266d544f4
-  data.tar.gz: 9443196455dc1b10152091ac67a7220bddff4bb9d6ee77f67468fe0a3ee638116c9684036e8b5bfbe1587d6abbdbffdbe932fbe7289ff06e99c18c4c8750b2bc
+  metadata.gz: e41d4dc75c1b1c57685bd957c214e84fed1b1e42d9a279faac85e204981391631ec9c7781965d68a34c20bb66d6e9d9c3b68275f5dddacb23950009039bbfe1a
+  data.tar.gz: d2a2d7f76f2f66c32289cfbfb8c794e894cd70934dbb1301375561b45356c78230c2fc025092a865c74d167bb31990fe220aa7451ae9f21500ce45e64240303a

data/bin/metadata

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+require 'dendrite'
+require 'optparse'
+
+options = {}
+OptionParser.new do |opts|
+  opts.banner = "Usage: register [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
+end.parse!
+Dendrite::Config.load(source: options[:config])
+graph = Dendrite::IO.load(source: Dendrite::Config.services_source)
+puts graph[options[:service_name]].to_h.to_json

data/conf/services/service.yml

@@ -14,6 +14,9 @@ subcomponents:
     ports:
       loadbalancer_port: 8082
       service_port: 8080
+    telemetry:
+      health_url: /
+      notification_email: foo@bar.com
     dependencies:
       - component: cams
         subcomponent: cat

data/lib/dendrite/service_node.rb

@@ -31,6 +31,12 @@ module Dendrite
         end
       end
 
+      if telemetry && telemetry.invalid?
+        telemetry.errors.each do |key, value|
+          errors.add "telemetry_#{key}", value
+        end
+      end
+
       return errors.count == 0
     end
   end
@@ -39,6 +45,15 @@ module Dendrite
     include ActiveModel::Validations
     prepend Validator
 
+    VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-]+(\.[a-z]+)*\.[a-z]+\z/i
+
+    Telemetry = Struct.new(:health_url, :notification_email) do
+      include ActiveModel::Validations
+      validates_presence_of :health_url
+      validates_presence_of :notification_email
+      validates :notification_email, format: { with: ServiceNode::VALID_EMAIL_REGEX, message: "invalid email format" }
+    end
+
     Port = Struct.new(:name, :port) do
       include ActiveModel::Validations
       validates_presence_of :name
@@ -73,10 +88,8 @@ module Dendrite
       validates_presence_of :package
     end
 
-    VALID_EMAIL_REGEX = /\A[\w+\-.]+@[a-z\d\-]+(\.[a-z]+)*\.[a-z]+\z/i
-
     attr_reader :organization, :component, :lead_email, :team_email,
-                :type, :deploy, :scale, :ports, :dependencies
+                :type, :deploy, :scale, :ports, :dependencies, :telemetry
                 # :name is set but magically
 
     validates_presence_of :organization, :component, :lead_email, :team_email,
@@ -101,6 +114,8 @@ module Dendrite
           @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
+        when :telemetry
+          @telemetry = Telemetry.new(v[:health_url], v[:notification_email]) if v != nil
         else
           instance_variable_set("@#{k}", v)
         end
@@ -127,5 +142,23 @@ module Dendrite
     def add_dependency(service:, latency:)
       @dependencies[service.name] = Dependency.new(service, latency)
     end
+
+    def to_h
+      data = {
+        organization: organization,
+        component: component,
+        name: real_name,
+        complete_name: name,
+        lead_email: lead_email,
+        team_email: team_email,
+        type: type,
+        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
+    end
   end
 end

data/lib/dendrite/version.rb

@@ -1,3 +1,3 @@
 module Dendrite
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dendrite
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Yagnik
@@ -85,6 +85,7 @@ email:
 - yagnikkhanna@gmail.com
 executables:
 - add_proxy
+- metadata
 - register
 extensions: []
 extra_rdoc_files: []
@@ -96,6 +97,7 @@ files:
 - README.md
 - Rakefile
 - bin/add_proxy
+- bin/metadata
 - bin/register
 - conf/config.yaml
 - conf/services/service.yml