service_skeleton 0.0.0.25.gbf57918 → 0.0.0.28.gae2711b

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89afe58f5f8ce484ee0250284bae409b7d3a4f8f279747d1ee17e575befaa7df
-  data.tar.gz: 2c6cc5ff9cf019be8e8c8258e5713c86090aa62dd2dddda7d10c22fece7a992d
+  metadata.gz: 260e10d209930607a4d11e9578f2e3d90b4489017e194b96206d9ccaf0402497
+  data.tar.gz: 4a02d856abb457d581917db95a913aeb8d645d582836000516153f7c367fd40d
 SHA512:
-  metadata.gz: 7ab638d056ee90b752eb55fe4494fc2c395295413c651ad4e5f7b1b322e611ac02b02caf1c2b782c0518afb120708409ea92ec00f8d8258ef6116b12277e6885
-  data.tar.gz: 73be99a6c35c5885e1e6edbac125ed0998f657421fa0b0a2dff019e468e47d14ae95d55ad6396cf81ddeb46867dea8e0f3b233bda13355d72c88333de90adb9d
+  metadata.gz: a4e08f970330214fc17c46c75c552ba6382fe6a6824d719032f5c5484ade8a8239a3769cf62869a81cc5faa0b9950601cad2db9895761815e3e7eaf31e78fcf7
+  data.tar.gz: e543e44d9b841fb86cf259610e0ef4265daff759efc9e44d7b482b9f150c307a5ccd1cf57c5d58f883ee98b73aaa0562267d88e5aa0cd96b6e763e37c393c4dd

data/lib/service_skeleton/config.rb

@@ -24,17 +24,25 @@ class ServiceSkeleton
 
     def parse_registered_variables(env)
       @svc.registered_variables.each do |var|
-        val = var.value(env[var.name.to_s])
+        val = var.value(env)
+
         define_singleton_method(var.method_name(@svc.service_name)) do
           val
         end
 
+        define_singleton_method(var.method_name(@svc.service_name) + "=") do |v|
+          val = v
+        end
+
         if var.sensitive?
           if env.object_id != ENV.object_id
             raise ServiceSkeleton::Error::CannotSanitizeEnvironmentError,
                   "Attempted to sanitize sensitive variable #{var.name}, but was not passed the ENV object"
           end
-          env[var.name.to_s] = "*SENSITIVE*"
+
+          var.env_keys(env).each do |k|
+            env[k] = "*SENSITIVE*"
+          end
         end
       end
     end

data/lib/service_skeleton/config_variable.rb

@@ -1,6 +1,6 @@
 class ServiceSkeleton
   class ConfigVariable
-    attr_reader :name
+    attr_reader :name, :key_pattern
 
     def initialize(name, **opts, &blk)
       @name = name
@@ -16,8 +16,21 @@ class ServiceSkeleton
       !!@opts[:sensitive]
     end
 
-    def value(raw_val)
-      @blk.call(raw_val)
+    def value(env)
+      if @opts[:key_pattern]
+        matches = env.select { |k, _| @opts[:key_pattern] === k.to_s }
+        @blk.call(matches)
+      else
+        @blk.call(env[@name.to_s])
+      end
+    end
+
+    def env_keys(env)
+      if @opts[:key_pattern]
+        env.keys.select { |k| @opts[:key_pattern] === k.to_s }
+      else
+        env.keys.include?(@name.to_s) ? [@name.to_s] : []
+      end
     end
   end
 end

data/lib/service_skeleton/config_variables.rb

@@ -77,14 +77,27 @@ class ServiceSkeleton
 
     def path_list(var_name, default: UNDEFINED, sensitive: false)
       register_variable(var_name, sensitive: sensitive) do |value|
-        value.split(":")
+        maybe_default(value, default, var_name) do
+          value.split(":")
+        end
+      end
+    end
+
+    def kv_list(var_name, default: UNDEFINED, sensitive: false, key_pattern: nil)
+      key_pattern ||= /\A#{var_name}_(.*)\z/
+      register_variable(var_name, sensitive: sensitive, key_pattern: key_pattern) do |matches|
+        maybe_default(matches, default, var_name) do
+          matches.transform_keys do |k|
+            key_pattern.match(k)[1].to_sym
+          end
+        end
       end
     end
 
     private
 
     def maybe_default(value, default, var_name)
-      if value.nil?
+      if value.nil? || value == {}
         if default == UNDEFINED
           raise ServiceSkeleton::Error::InvalidEnvironmentError,
                 "Value for required environment variable #{var_name} not specified"

data/lib/service_skeleton.rb

@@ -129,7 +129,6 @@ class ServiceSkeleton
 
     @metrics.singleton_class.prepend(ServiceSkeleton::MetricsMethods)
     @metrics.service = self
-
   end
 
   def start_metrics_server

data/service_skeleton.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
 
   s.files = `git ls-files -z`.split("\0").reject { |f| f =~ /^(G|spec|Rakefile)/ }
 
-  s.required_ruby_version = ">= 2.3.0"
+  s.required_ruby_version = ">= 2.5.0"
 
   s.add_runtime_dependency "frankenstein", "~> 1.2"
   s.add_runtime_dependency "loggerstash", "~> 0.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: service_skeleton
 version: !ruby/object:Gem::Version
-  version: 0.0.0.25.gbf57918
+  version: 0.0.0.28.gae2711b
 platform: ruby
 authors:
 - Matt Palmer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-05 00:00:00.000000000 Z
+date: 2019-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: frankenstein
@@ -292,7 +292,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"