datawire_mdk 2.0.23 → 2.0.25

data/lib/mdk.rb

@@ -1,4 +1,4 @@
-# Quark 1.0.452 run at 2016-10-26 12:53:21.596699
+# Quark 1.0.452 run at 2016-10-27 16:23:20.395751
 module Quark
 require "quark"
 def self.mdk; Mdk; end
@@ -538,6 +538,15 @@ class Session < ::DatawireQuarkCore::QuarkObject
         nil
     end
 
+    ##
+    # Return the session's Environment.
+
+    def getEnvironment()
+        raise NotImplementedError, '`Session.getEnvironment` is an abstract method'
+
+        nil
+    end
+
     def __init_fields__()
         
 
@@ -550,7 +559,7 @@ Session.unlazy_statics
 
 def self.MDKImpl; MDKImpl; end
 class MDKImpl < ::DatawireQuarkCore::QuarkObject
-    attr_accessor :logger, :_reflection_hack, :_runtime, :_wsclient, :_openclose, :_disco, :_discoSource, :_tracer, :_metrics, :procUUID, :_running, :_defaultTimeout
+    attr_accessor :logger, :_reflection_hack, :_runtime, :_wsclient, :_openclose, :_disco, :_discoSource, :_tracer, :_metrics, :procUUID, :_running, :_defaultTimeout, :_environment
     extend ::DatawireQuarkCore::Static
 
     static mdk_MDKImpl_ref: -> { nil }
@@ -564,6 +573,7 @@ class MDKImpl < ::DatawireQuarkCore::QuarkObject
         self.__init_fields__
         @_reflection_hack = ::Hash.new()
         @_runtime = runtime
+        @_environment = runtime.getEnvVarsService().var("MDK_ENVIRONMENT").orElseGet("sandbox")
         if (!((runtime).dependencies.hasService("failurepolicy_factory")))
             (runtime).dependencies.registerService("failurepolicy_factory", self.getFailurePolicy(runtime))
         end
@@ -573,7 +583,7 @@ class MDKImpl < ::DatawireQuarkCore::QuarkObject
         @_disco = ::Quark.mdk_discovery.Discovery.new(runtime)
         @_wsclient = self.getWSClient(runtime)
         if ((@_wsclient) != (nil))
-            @_openclose = ::Quark.mdk_protocol.OpenCloseSubscriber.new(@_wsclient, @procUUID)
+            @_openclose = ::Quark.mdk_protocol.OpenCloseSubscriber.new(@_wsclient, @procUUID, @_environment)
         end
         env = runtime.getEnvVarsService()
         discoFactory = self.getDiscoveryFactory(env)
@@ -608,7 +618,7 @@ class MDKImpl < ::DatawireQuarkCore::QuarkObject
             result = ::Quark.mdk_discovery.protocol.DiscoClientFactory.new(@_wsclient)
         else
             if ((config).start_with?("synapse:path="))
-                result = ::Quark.mdk_discovery.synapse.Synapse.new((config)[(13)...((config).size)])
+                result = ::Quark.mdk_discovery.synapse.Synapse.new((config)[(13)...((config).size)], (self)._environment)
             else
                 if ((config).start_with?("static:nodes="))
                     json = (config)[(13)...((config).size)]
@@ -703,6 +713,7 @@ class MDKImpl < ::DatawireQuarkCore::QuarkObject
         (node).service = service
         (node).version = version
         (node).address = address
+        (node).environment = (self)._environment
         (node).properties = {"datawire_nodeId" => @procUUID}
         @_disco.register(node)
 
@@ -725,7 +736,7 @@ class MDKImpl < ::DatawireQuarkCore::QuarkObject
 
     def session()
         
-        session = ::Quark.mdk.SessionImpl.new(self, nil)
+        session = ::Quark.mdk.SessionImpl.new(self, nil, (self)._environment)
         if ((@_defaultTimeout) != (nil))
             session.setDeadline(@_defaultTimeout)
         end
@@ -750,7 +761,7 @@ class MDKImpl < ::DatawireQuarkCore::QuarkObject
 
     def join(encodedContext)
         
-        session = ::Quark.mdk.SessionImpl.new(self, encodedContext)
+        session = ::Quark.mdk.SessionImpl.new(self, encodedContext, (self)._environment)
         if ((@_defaultTimeout) != (nil))
             session.setDeadline(@_defaultTimeout)
         end
@@ -807,6 +818,9 @@ class MDKImpl < ::DatawireQuarkCore::QuarkObject
         if ((name) == ("_defaultTimeout"))
             return (self)._defaultTimeout
         end
+        if ((name) == ("_environment"))
+            return (self)._environment
+        end
         return nil
 
         nil
@@ -850,6 +864,9 @@ class MDKImpl < ::DatawireQuarkCore::QuarkObject
         if ((name) == ("_defaultTimeout"))
             (self)._defaultTimeout = ::DatawireQuarkCore.cast(value) { ::Float }
         end
+        if ((name) == ("_environment"))
+            (self)._environment = ::DatawireQuarkCore.cast(value) { ::String }
+        end
 
         nil
     end
@@ -868,6 +885,7 @@ class MDKImpl < ::DatawireQuarkCore::QuarkObject
         self.procUUID = ::Quark.quark.concurrent.Context.runtime().uuid()
         self._running = false
         self._defaultTimeout = nil
+        self._environment = nil
 
         nil
     end
@@ -950,7 +968,7 @@ class SessionImpl < ::DatawireQuarkCore::QuarkObject
 
 
 
-    def initialize(mdk, encodedContext)
+    def initialize(mdk, encodedContext, localEnvironment)
         
         self.__init_fields__
         @_experimental = ((mdk)._runtime.getEnvVarsService().var("MDK_EXPERIMENTAL").orElseGet("")) != ("")
@@ -958,6 +976,7 @@ class SessionImpl < ::DatawireQuarkCore::QuarkObject
         encodedContext = ::DatawireQuarkCore.cast(encodedContext) { ::String }
         if (((encodedContext) == (nil)) || ((encodedContext) == ("")))
             @_context = ::Quark.mdk_protocol.SharedContext.new()
+            (@_context).environment = localEnvironment
         else
             ctx = ::Quark.mdk_protocol.SharedContext.decode(encodedContext)
             @_context = ctx.start_span()
@@ -970,6 +989,13 @@ class SessionImpl < ::DatawireQuarkCore::QuarkObject
 
 
 
+    def getEnvironment()
+        
+        return ((self)._context).environment
+
+        nil
+    end
+
     def getProperty(property)
         
         return ((@_context).properties)[property]
@@ -1150,7 +1176,7 @@ class SessionImpl < ::DatawireQuarkCore::QuarkObject
                 end
             end
         end
-        return (@_mdk)._disco._resolve(service, version).andThen(::Quark.quark._BoundMethod.new(self, "_resolvedCallback", ::DatawireQuarkCore::List.new([])))
+        return (@_mdk)._disco.resolve(service, version, self.getEnvironment()).andThen(::Quark.quark._BoundMethod.new(self, "_resolvedCallback", ::DatawireQuarkCore::List.new([])))
 
         nil
     end

data/lib/mdk_discovery/protocol.rb

@@ -1,4 +1,4 @@
-# Quark 1.0.452 run at 2016-10-26 12:53:21.596699
+# Quark 1.0.452 run at 2016-10-27 16:23:20.395751
 module Quark
 require "quark"
 def self.mdk_discovery; MdkDiscovery; end

data/lib/mdk_discovery/synapse.rb

@@ -1,4 +1,4 @@
-# Quark 1.0.452 run at 2016-10-26 12:53:21.596699
+# Quark 1.0.452 run at 2016-10-27 16:23:20.395751
 module Quark
 require "quark"
 def self.mdk_discovery; MdkDiscovery; end
@@ -33,17 +33,18 @@ def self.Synapse; Synapse; end
 #
 
 class Synapse < ::DatawireQuarkCore::QuarkObject
-    attr_accessor :_directory_path
+    attr_accessor :_directory_path, :_environment
     extend ::DatawireQuarkCore::Static
 
     static mdk_discovery_synapse_Synapse_ref: -> { nil }
 
 
 
-    def initialize(directory_path)
+    def initialize(directory_path, environment)
         
         self.__init_fields__
         (self)._directory_path = directory_path
+        (self)._environment = environment
 
         nil
     end
@@ -53,7 +54,7 @@ class Synapse < ::DatawireQuarkCore::QuarkObject
 
     def create(subscriber, runtime)
         
-        return ::Quark.mdk_discovery.synapse._SynapseSource.new(subscriber, (self)._directory_path, runtime)
+        return ::Quark.mdk_discovery.synapse._SynapseSource.new(subscriber, (self)._directory_path, runtime, (self)._environment)
 
         nil
     end
@@ -77,6 +78,9 @@ class Synapse < ::DatawireQuarkCore::QuarkObject
         if ((name) == ("_directory_path"))
             return (self)._directory_path
         end
+        if ((name) == ("_environment"))
+            return (self)._environment
+        end
         return nil
 
         nil
@@ -87,6 +91,9 @@ class Synapse < ::DatawireQuarkCore::QuarkObject
         if ((name) == ("_directory_path"))
             (self)._directory_path = ::DatawireQuarkCore.cast(value) { ::String }
         end
+        if ((name) == ("_environment"))
+            (self)._environment = ::DatawireQuarkCore.cast(value) { ::String }
+        end
 
         nil
     end
@@ -94,6 +101,7 @@ class Synapse < ::DatawireQuarkCore::QuarkObject
     def __init_fields__()
         
         self._directory_path = nil
+        self._environment = nil
 
         nil
     end
@@ -107,19 +115,20 @@ def self._SynapseSource; SynapseSource; end
 # Implementation of the Synapse discovery source.
 
 class SynapseSource < ::DatawireQuarkCore::QuarkObject
-    attr_accessor :subscriber, :directory_path, :files, :dispatcher
+    attr_accessor :subscriber, :directory_path, :files, :dispatcher, :environment
     extend ::DatawireQuarkCore::Static
 
     static mdk_discovery_synapse__SynapseSource_ref: -> { nil }
 
 
 
-    def initialize(subscriber, directory_path, runtime)
+    def initialize(subscriber, directory_path, runtime, environment)
         
         self.__init_fields__
         (self).subscriber = subscriber
         (self).directory_path = directory_path
         (self).files = runtime.getFileService()
+        (self).environment = environment
 
         nil
     end
@@ -152,7 +161,7 @@ class SynapseSource < ::DatawireQuarkCore::QuarkObject
 
     def _update(service, nodes)
         
-        (self).dispatcher.tell(self, ::Quark.mdk_discovery.ReplaceCluster.new(service, nodes), (self).subscriber)
+        (self).dispatcher.tell(self, ::Quark.mdk_discovery.ReplaceCluster.new(service, (self).environment, nodes), (self).subscriber)
 
         nil
     end
@@ -215,6 +224,9 @@ class SynapseSource < ::DatawireQuarkCore::QuarkObject
         if ((name) == ("dispatcher"))
             return (self).dispatcher
         end
+        if ((name) == ("environment"))
+            return (self).environment
+        end
         return nil
 
         nil
@@ -234,6 +246,9 @@ class SynapseSource < ::DatawireQuarkCore::QuarkObject
         if ((name) == ("dispatcher"))
             (self).dispatcher = ::DatawireQuarkCore.cast(value) { ::Quark.mdk_runtime.actors.MessageDispatcher }
         end
+        if ((name) == ("environment"))
+            (self).environment = ::DatawireQuarkCore.cast(value) { ::String }
+        end
 
         nil
     end
@@ -254,6 +269,7 @@ class SynapseSource < ::DatawireQuarkCore::QuarkObject
         self.directory_path = nil
         self.files = nil
         self.dispatcher = nil
+        self.environment = nil
 
         nil
     end

data/lib/mdk_discovery.rb

@@ -1,4 +1,4 @@
-# Quark 1.0.452 run at 2016-10-26 12:53:21.596699
+# Quark 1.0.452 run at 2016-10-27 16:23:20.395751
 module Quark
 require "quark"
 def self.mdk_discovery; MdkDiscovery; end
@@ -139,18 +139,19 @@ def self.ReplaceCluster; ReplaceCluster; end
 # Message from DiscoverySource: replace all nodes in a particular Cluster.
 
 class ReplaceCluster < ::DatawireQuarkCore::QuarkObject
-    attr_accessor :nodes, :cluster
+    attr_accessor :nodes, :cluster, :environment
     extend ::DatawireQuarkCore::Static
 
     static mdk_discovery_ReplaceCluster_ref: -> { nil }
 
 
 
-    def initialize(cluster, nodes)
+    def initialize(cluster, environment, nodes)
         
         self.__init_fields__
         (self).nodes = nodes
         (self).cluster = cluster
+        (self).environment = environment
 
         nil
     end
@@ -173,6 +174,9 @@ class ReplaceCluster < ::DatawireQuarkCore::QuarkObject
         if ((name) == ("cluster"))
             return (self).cluster
         end
+        if ((name) == ("environment"))
+            return (self).environment
+        end
         return nil
 
         nil
@@ -186,6 +190,9 @@ class ReplaceCluster < ::DatawireQuarkCore::QuarkObject
         if ((name) == ("cluster"))
             (self).cluster = ::DatawireQuarkCore.cast(value) { ::String }
         end
+        if ((name) == ("environment"))
+            (self).environment = ::DatawireQuarkCore.cast(value) { ::String }
+        end
 
         nil
     end
@@ -194,6 +201,7 @@ class ReplaceCluster < ::DatawireQuarkCore::QuarkObject
         
         self.nodes = nil
         self.cluster = nil
+        self.environment = "sandbox"
 
         nil
     end
@@ -390,10 +398,10 @@ class StaticRoutes < ::DatawireQuarkCore::QuarkObject
 
 
 
-    def initialize(knowNodes)
+    def initialize(knownNodes)
         
         self.__init_fields__
-        (self)._knownNodes = knowNodes
+        (self)._knownNodes = knownNodes
 
         nil
     end
@@ -1373,7 +1381,7 @@ def self.Node; Node; end
 # server functioning as a service instance.
 
 class Node < ::DatawireQuarkCore::QuarkObject
-    attr_accessor :service, :version, :address, :properties, :_policy
+    attr_accessor :service, :version, :address, :properties, :environment, :_policy
     extend ::DatawireQuarkCore::Static
 
     static mdk_discovery_Node_ref: -> { nil }
@@ -1460,6 +1468,9 @@ class Node < ::DatawireQuarkCore::QuarkObject
         if ((name) == ("properties"))
             return (self).properties
         end
+        if ((name) == ("environment"))
+            return (self).environment
+        end
         if ((name) == ("_policy"))
             return (self)._policy
         end
@@ -1482,6 +1493,9 @@ class Node < ::DatawireQuarkCore::QuarkObject
         if ((name) == ("properties"))
             (self).properties = ::DatawireQuarkCore.cast(value) { ::Hash }
         end
+        if ((name) == ("environment"))
+            (self).environment = ::DatawireQuarkCore.cast(value) { ::String }
+        end
         if ((name) == ("_policy"))
             (self)._policy = ::DatawireQuarkCore.cast(value) { ::Quark.mdk_discovery.FailurePolicy }
         end
@@ -1495,6 +1509,7 @@ class Node < ::DatawireQuarkCore::QuarkObject
         self.version = nil
         self.address = nil
         self.properties = {}
+        self.environment = "sandbox"
         self._policy = nil
 
         nil
@@ -1516,6 +1531,7 @@ class Discovery < ::DatawireQuarkCore::QuarkObject
     extend ::DatawireQuarkCore::Static
 
     static quark_ListUtil_mdk_discovery_Node__ref: -> { nil }
+    static quark_Map_quark_String_quark_Map_quark_String_mdk_discovery_Cluster___ref: -> { nil }
     static quark_Map_quark_String_mdk_discovery_Cluster__ref: -> { nil }
     static mdk_discovery_Discovery_ref: -> { nil }
 
@@ -1602,29 +1618,40 @@ class Discovery < ::DatawireQuarkCore::QuarkObject
     end
 
     ##
-    # Register info about a service node with the discovery service. You must
-    # usually start the uplink before this will do much; see start().
+    # Get the service to Cluster mapping for an Environment.
 
-    def register_service(service, address, version)
+    def _getServices(environment)
         
-        node = ::Quark.mdk_discovery.Node.new()
-        (node).service = service
-        (node).address = address
-        (node).version = version
-        return self.register(node)
+        if (!((@services).key?(environment)))
+            (@services)[environment] = ({})
+        end
+        return (@services)[environment]
 
         nil
     end
 
     ##
-    # Return the current known Nodes for a service, if any.
+    # Get the Cluster for a given service and environment.
 
-    def knownNodes(service)
+    def _getCluster(service, environment)
         
-        if (!((@services).key?(service)))
-            return ::DatawireQuarkCore::List.new([])
+        clusters = self._getServices(environment)
+        if (!((clusters).key?(service)))
+            (clusters)[service] = (::Quark.mdk_discovery.Cluster.new((self)._fpfactory))
         end
-        return ((@services)[service]).nodes
+        return (clusters)[service]
+
+        nil
+    end
+
+    ##
+    # Return the current known Nodes for a service in a particular
+    # Environment, if any.
+    #
+
+    def knownNodes(service, environment)
+        
+        return (self._getCluster(service, environment)).nodes
 
         nil
     end
@@ -1634,7 +1661,7 @@ class Discovery < ::DatawireQuarkCore::QuarkObject
 
     def failurePolicy(node)
         
-        return (@services)[(node).service].failurePolicy(node)
+        return self._getCluster((node).service, (node).environment).failurePolicy(node)
 
         nil
     end
@@ -1644,16 +1671,14 @@ class Discovery < ::DatawireQuarkCore::QuarkObject
     # usually start the uplink before this will do much; see start().
     # The returned Promise will end up with a Node as its value.
 
-    def _resolve(service, version)
+    def resolve(service, version, environment)
         
         factory = ::Quark.mdk_runtime.promise.PromiseResolver.new((@runtime).dispatcher)
         self._lock()
-        if (!((@services).key?(service)))
-            (@services)[service] = (::Quark.mdk_discovery.Cluster.new((self)._fpfactory))
-        end
-        result = (@services)[service].chooseVersion(version)
+        cluster = self._getCluster(service, environment)
+        result = cluster.chooseVersion(version)
         if ((result) == (nil))
-            (@services)[service]._addRequest(version, factory)
+            cluster._addRequest(version, factory)
             self._release()
         else
             self._release()
@@ -1664,29 +1689,6 @@ class Discovery < ::DatawireQuarkCore::QuarkObject
         nil
     end
 
-    ##
-    # Resolve a service; return a (Bluebird) Promise on Javascript. Does not work elsewhere.
-
-    def resolve(service, version)
-        
-        return ::Quark.mdk_util.toNativePromise(self._resolve(service, version))
-
-        nil
-    end
-
-    ##
-    # Wait for service name to resolve into an available service node, or fail
-    # appropriately (typically by raising an exception if the language
-    # supports it). This should only be used in blocking runtimes (e.g.
-    # you do not want to use this in Javascript).
-
-    def resolve_until(service, version, timeout)
-        
-        return ::DatawireQuarkCore.cast(::Quark.mdk_util.WaitForPromise.wait(self._resolve(service, version), timeout, ("service ") + (service))) { ::Quark.mdk_discovery.Node }
-
-        nil
-    end
-
     def onMessage(origin, message)
         
         klass = (::Quark.quark.reflect.QuarkClass.get(::DatawireQuarkCore._getClass(message))).id
@@ -1702,21 +1704,18 @@ class Discovery < ::DatawireQuarkCore::QuarkObject
         end
         if ((klass) == ("mdk_discovery.ReplaceCluster"))
             replace = ::DatawireQuarkCore.cast(message) { ::Quark.mdk_discovery.ReplaceCluster }
-            self._replace((replace).cluster, (replace).nodes)
+            self._replace((replace).cluster, (replace).environment, (replace).nodes)
             return
         end
 
         nil
     end
 
-    def _replace(service, nodes)
+    def _replace(service, environment, nodes)
         
         self._lock()
         @logger.info(((("replacing all nodes for ") + (service)) + (" with ")) + ((nodes).to_s))
-        if (!((@services).key?(service)))
-            (@services)[service] = (::Quark.mdk_discovery.Cluster.new((self)._fpfactory))
-        end
-        cluster = (@services)[service]
+        cluster = self._getCluster(service, environment)
         currentNodes = ::Quark.quark.ListUtil.new().slice((cluster).nodes, 0, ((cluster).nodes).size)
         idx = 0
         while ((idx) < ((currentNodes).size)) do
@@ -1736,12 +1735,8 @@ class Discovery < ::DatawireQuarkCore::QuarkObject
     def _active(node)
         
         self._lock()
-        service = (node).service
         @logger.info(("adding ") + (node.toString()))
-        if (!((@services).key?(service)))
-            (@services)[service] = (::Quark.mdk_discovery.Cluster.new((self)._fpfactory))
-        end
-        cluster = (@services)[service]
+        cluster = self._getCluster((node).service, (node).environment)
         cluster.add(node)
         self._release()
 
@@ -1751,12 +1746,8 @@ class Discovery < ::DatawireQuarkCore::QuarkObject
     def _expire(node)
         
         self._lock()
-        service = (node).service
-        if ((@services).key?(service))
-            cluster = (@services)[service]
-            @logger.info((("removing ") + (node.toString())) + (" from cluster"))
-            cluster.remove(node)
-        end
+        @logger.info((("removing ") + (node.toString())) + (" from cluster"))
+        self._getCluster((node).service, (node).environment).remove(node)
         self._release()
 
         nil
@@ -1821,7 +1812,7 @@ class Discovery < ::DatawireQuarkCore::QuarkObject
     def __init_fields__()
         
         self.logger = ::Quark.quark._getLogger("discovery")
-        self.services = ::Hash.new()
+        self.services = {}
         self.started = false
         self.mutex = ::DatawireQuarkCore::Lock.new()
         self.runtime = nil

data/lib/mdk_introspection/aws.rb

@@ -1,4 +1,4 @@
-# Quark 1.0.452 run at 2016-10-26 12:53:21.596699
+# Quark 1.0.452 run at 2016-10-27 16:23:20.395751
 module Quark
 require "quark"
 def self.mdk_introspection; MdkIntrospection; end

data/lib/mdk_introspection/kubernetes.rb

@@ -1,4 +1,4 @@
-# Quark 1.0.452 run at 2016-10-26 12:53:21.596699
+# Quark 1.0.452 run at 2016-10-27 16:23:20.395751
 module Quark
 require "quark"
 def self.mdk_introspection; MdkIntrospection; end

data/lib/mdk_introspection.rb

@@ -1,4 +1,4 @@
-# Quark 1.0.452 run at 2016-10-26 12:53:21.596699
+# Quark 1.0.452 run at 2016-10-27 16:23:20.395751
 module Quark
 require "quark"
 def self.mdk_introspection; MdkIntrospection; end

data/lib/mdk_metrics.rb

@@ -1,4 +1,4 @@
-# Quark 1.0.452 run at 2016-10-26 12:53:21.596699
+# Quark 1.0.452 run at 2016-10-27 16:23:20.395751
 module Quark
 require "quark"
 def self.mdk_metrics; MdkMetrics; end