consul_application_settings 3.0.1 → 4.0.0.pre.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 686e4efaf1dd51db8fdb6ade9ec5622a080d2d1a84db1c78b1c66dd19444e3f5
-  data.tar.gz: 8eba55e8bf3b905ba24e5f069b55b0dafd8c4374e98ee7fea5ed2feede597703
+  metadata.gz: 709d93b5794a39ed2f78eb61462cc07ff0ed77dccd66343ad22fc13abc45c267
+  data.tar.gz: 6daa5f0e9266fad7baee4e44efe8ed49ac5451744bd3abb60667afb1afb1a132
 SHA512:
-  metadata.gz: 447e52e8cceef44793db9de2977fc2facb752fc1232f6975eb73af38bd189458ebfc3287a7cde383da3d41f6ed744bf791c1f7079f3d8f91616dca0779dc54ef
-  data.tar.gz: e22c374ec16003f67bcf520943fcde6b00084178225c332d80df1fa6d34602c96bbce9c7b59a8290c68f197ba5ee8de444945ee9fda85d53b18667bd34428635
+  metadata.gz: 399c74e1bed212dea80f9b5d3f0f202c702b2e7704824214703f8003841b35792b66e3c6707ec7594d4b6860acbdd1b341c65e85312448d9fef3e2aa4a1c6c16
+  data.tar.gz: 4b04c272e96bc975d0cae6984dc6c44e4d442b0dc1a78a51b9d6ca772b4d5b09bcc10ce6155113a955210e9abe4d91ccb446224fd881f0a79f29da55aebb6fc7

data/.github/workflows/main.yml

@@ -14,12 +14,19 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ruby: [ '2.5.x', '2.6.x' ]
+        ruby: [ '2.5.x', '2.6.x', '2.7.x', '3.0.x' ]
     services:
-      redis:
+      consul:
         image: consul:1.6
         ports:
           - '8500:8500'
+      vault:
+        image: vault
+        ports:
+          - "8200:8200"
+        env:
+          VAULT_DEV_ROOT_TOKEN_ID: root_token
+          SKIP_SETCAP: true
     steps:
       - name: Checkout
         uses: actions/checkout@v1

data/.rubocop.yml

@@ -2,6 +2,7 @@ AllCops:
   TargetRubyVersion: 2.5
   Exclude:
     - 'tmp/**/*'
+    - 'bin/**/*'
 
 Metrics/LineLength:
   Max: 120
@@ -10,4 +11,4 @@ Style/FrozenStringLiteralComment:
   Enabled: false
 
 Metrics/BlockLength:
-  ExcludedMethods: ['describe', 'context']
+  ExcludedMethods: ['describe', 'context', 'shared_examples']

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 ## [Unreleased]
 
+## [4.0.0-alpha]
+### Breaking Changes
+- When using `settings.get` to retrieve object - exception is raised 
+### New features
+- Introduce resolvers concept
+- Add environment resolver
+- Add erb resolver
+- Add vault alpha resolver
+
 ## [3.0.1]
 ### Fixes
 - Fix exception when preloading settings without consul 
@@ -59,7 +68,8 @@
 - Support deep settings search
 - Support nested configs
 
-[Unreleased]: https://github.com/matic-insurance/consul_application_settings/compare/3.0.1...HEAD
+[Unreleased]: https://github.com/matic-insurance/consul_application_settings/compare/4.0.0-alpha...HEAD
+[4.0.0-alpha]: https://github.com/matic-insurance/consul_application_settings/compare/3.0.1...4.0.0-alpha
 [3.0.1]: https://github.com/matic-insurance/consul_application_settings/compare/3.0.0...3.0.1
 [3.0.0]: https://github.com/matic-insurance/consul_application_settings/compare/2.0.0...3.0.0
 [2.1.1]: https://github.com/matic-insurance/consul_application_settings/compare/2.1.0...2.1.1

data/Gemfile.lock

@@ -2,12 +2,16 @@ PATH
   remote: .
   specs:
     consul_application_settings (0.0.0)
+      deep_merge (~> 1.2)
       diplomat (~> 2.5.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.0)
+    aws-eventstream (1.2.0)
+    aws-sigv4 (1.4.0)
+      aws-eventstream (~> 1, >= 1.0.2)
     codecov (0.4.3)
       simplecov (>= 0.15, < 0.22)
     deep_merge (1.2.1)
@@ -61,6 +65,8 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     unicode-display_width (1.5.0)
+    vault (0.16.0)
+      aws-sigv4
 
 PLATFORMS
   ruby
@@ -74,6 +80,7 @@ DEPENDENCIES
   rubocop (~> 0.66)
   rubocop-rspec (~> 1.32.0)
   simplecov (~> 0.16)
+  vault (~> 0.16)
 
 BUNDLED WITH
    2.1.2

data/README.md

@@ -3,26 +3,16 @@
 ![Build Status](https://github.com/matic-insurance/consul_application_settings/workflows/ci/badge.svg?branch=master)
 [![Test Coverage](https://codecov.io/gh/matic-insurance/consul_application_settings/branch/master/graph/badge.svg?token=5E8NA8EE8L)](https://codecov.io/gh/matic-insurance/consul_application_settings)
 
-Gem that simplifies usage of Consul (via [Diplomat gem](https://github.com/WeAreFarmGeek/diplomat)) 
-to host application settings. Gem provides defaults via yaml files and other utilities 
-to simplify storage and control of application with Consul KV storage.
+This gem that simplifies usage of Consul (via [Diplomat gem](https://github.com/WeAreFarmGeek/diplomat)) 
+to host application settings. 
 
-Gem is trying to solve a problem of distributing application settings for local development environment and provide defaults 
-in production before custom value is set inside of consul. 
+Except reading value from Consul the gem also:
+- Fallbacks to YAML if value is missing in consul
+- Resolve actual value from other sources to facilitate overriding via ENV, storing secret values in Vault,  
+  or executing small ERB snippets 
 
-Example use cases:
-
-- One engineer has created a new feature that depend on consul key/value. 
-  
-  How enginner can notify other engineers that they need to set this value in their consul environments?
-
-- DevOps team responsible to configure and maintain deployment. 
-
-  How do they learn (have reference) of what settings and structure application expect? 
-
-Gem reads any particular setting from consul and if it is missing tries to find value in YAML defaults file
-
-**NOTE** Consul is requested every time you query the settings. Defaults YAML file is loaded in memory and is not changing.
+Default values in YAML also can be considered as a way to communicate structure of settings to other engineers.
+Default values also support local settings to allow override on local environment or deployment in production.
 
 ## Installation
 
@@ -39,22 +29,27 @@ gem 'consul_application_settings'
 At the load of application: 
 ```ruby
 ConsulApplicationSettings.configure do |config|
-  # Specify path to the base settings YML. Default: 'config/application_settings.yml' 
-  config.base_file_path = Rails.root.join('config/my_settings.yml')
-  # Specify path to the local settings YML, which overrides the base file. Default: 'config/application_settings.local.yml'
-  config.local_file_path = Rails.root.join('config/my_settings.local.yml')
-  # Specify whether exceprion should be thrown on Consul connection errors. Default: false
+  # Specify path to the base settings YML. Default: 'config/app_settings.yml' 
+  config.base_file_path = Rails.root.join('config/app_settings.yml')
+  # Specify path to the local settings YML, which overrides the base file. Default: 'config/app_settings.local.yml'
+  config.local_file_path = Rails.root.join('config/app_settings.local.yml')
+  # Specify whether exception should be thrown on Consul connection errors. Default: false
   config.disable_consul_connection_errors = true
   # Specify setting providers. Default: [ConsulApplicationSettings::Providers::ConsulPreloaded, ConsulApplicationSettings::Providers::LocalStorage]
   config.settings_providers = [
     ConsulApplicationSettings::Providers::Consul,          
     ConsulApplicationSettings::Providers::LocalStorage          
   ]
+  # Specify how values will be additionally resolved. Default: [ConsulApplicationSettings::Resolvers::Env] 
+  config.value_resolvers = [
+    ConsulApplicationSettings::Resolvers::Erb,
+    ConsulApplicationSettings::Resolvers::Env,
+  ]
 end
 
-APP_SETTINGS = ConsulApplicationSettings.load
 # Specify path to settings both in YML files and Consul
-AUTH_SETTIGNS = ConsulApplicationSettings.load('authentication')
+AUTH_SETTIGNS = ConsulApplicationSettings.load('my_cool_app')
+# Load at root without any prefix: APP_SETTINGS = ConsulApplicationSettings.load
 ```
 
 **NOTE** For rails you can add this code to custom initializer `console_application_settings.rb` in `app/config/initializers`
@@ -65,35 +60,32 @@ AUTH_SETTIGNS = ConsulApplicationSettings.load('authentication')
 
 Assuming your defaults file in repository `config/application_settings.yml` looks like:
 ```yaml
-staging:
-  my_cool_app:
-    app_name: 'MyCoolApp'
-    hostname: 'http://localhost:3001'
-    
-    integrations:
-      database:
-        domain: localhost
-        user: app
-        password: password1234
-      slack:
-        enabled: false
-        webhook_url: 'https://hooks.slack.com/services/XXXXXX/XXXXX/XXXXXXX'
+my_cool_app:
+  app_name: 'MyCoolApp'
+  hostname: 'http://localhost:3001'
+  
+  integrations:
+    database:
+      domain: localhost
+      user: app
+      password: password1234
+    slack:
+      enabled: false
+      webhook_url: 'https://hooks.slack.com/services/XXXXXX/XXXXX/XXXXXXX'
 ```
 
 And consul has following settings
 ```json
 {
-  "staging": {
-    "my_cool_app": {
-     "hostname": "https://mycoolapp.com",
-     "integrations": {
-        "database": {
-          "domain": "194.78.92.19",
-          "password": "*************"
-        },
-        "slack": {
-          "enabled": "true"
-        }
+  "my_cool_app": {
+   "hostname": "https://mycoolapp.com",
+   "integrations": {
+      "database": {
+        "domain": "194.78.92.19",
+        "password": "*************"
+      },
+      "slack": {
+        "enabled": "true"
       }
     }
   }
@@ -120,10 +112,60 @@ gem provides interface to avoid duplicating absolute path
 
 ```ruby
 # You can load subsettings from root object
-db_settings = APP_SETTINGS.load('integrations/database')
+db_settings = APP_SETTINGS.load('integrations/database') # ConsulApplicationSettings::Reader
 db_settings.get(:domain)                  # "194.78.92.19"
 db_settings['user']                       # "app"
-``` 
+
+#if you try to get subsettings via get - error is raised
+APP_SETTINGS.get('integrations/database') # raise ConsulApplicationSettings::Error
+```
+
+## Advanced Configurations
+
+### Setting Providers
+Providers controls how and in which order settings are retrieved. 
+When application asks for specific setting - gem retrieves them from every provider in order of configuration
+until one returns not nil value.
+
+Default order for providers is:
+1. `ConsulApplicationSettings::Providers::ConsulPreloaded`
+2. `ConsulApplicationSettings::Providers::LocalStorage`
+
+List of built in providers:
+- `ConsulApplicationSettings::Providers::ConsulPreloaded` - Retrieves all settings from consul on every `.load`
+- `ConsulApplicationSettings::Providers::Consul` - Retrieves setting every time `.get` method is called
+- `ConsulApplicationSettings::Providers::LocalStorage` - Retrieves all settings from local files on every `.load`
+
+Custom provider can be added as long as it support following interface:
+```ruby
+class CustomProvider
+  #constructor
+  def initialize(base_path, config)
+  end
+  
+  # get value by `base_path + '/' + path`
+  def get(path)
+  end
+end
+```
+
+### Resolvers
+Once value is retrieved - it will be additionally processed by resolvers. 
+This allows for additional flexibility like getting values from external sources. 
+While every resolver can be implemented in a form of a provider - one will be limited by the structure of settings, 
+while other system might not be compatible with this.
+
+When value is retrieved - gem finds **first** provider that can resolve value and resolves it. 
+Resolved value is returned to application.
+
+Default list of resolvers:
+- `ConsulApplicationSettings::Resolvers::Env`
+
+List of built in resolvers
+- `ConsulApplicationSettings::Resolvers::Env` - resolves any value by looking up environment variable. 
+  Matching any value that starts with `env://`. Value like `env://TEST_URL` will be resolved as `ENV['TEST_URL']`
+- `ConsulApplicationSettings::Resolvers::Erb` - resolves value by rendering it via ERB. 
+  Matching any value that contains `<%` and `%>` in it. Value like `<%= 2 + 2 %>` will be resolved as `4`
 
 ### Gem Configuration
 You can configure gem with block:
@@ -145,18 +187,17 @@ All Gem configurations
 | local_file_path                  | no       | 'config/application_settings.local.yml' | String  | Path to the file with local settings overriding the base settings            |
 | disable_consul_connection_errors | no       | true                                    | Boolean | Do not raise exception when consul is not available (useful for development) |
 | settings_providers               | no       | Array(Provider)                         | Array   | Specify custom setting provider lists                                        |
-
-### Performance vs Consistency
-To be defined in future iterations on Consul Providers
+| value_resolvers                  | no       | Array(Resolver)                         | Array   | Specify custom value resolvers lists                                         |
 
 ## Development
 
-1. [Install Consul](https://www.consul.io/docs/install/index.html)
 1. Run `bin/setup` to install dependencies
-1. Run tests `rspec`
-1. Add new test
-1. Add new code
-1. Go to step 3
+2. Run `docker-compose up` to spin up dependencies (Consul)
+3. Run tests `rspec`
+4. Add new test
+5. Add new code
+6. Go to step 3
+7. Create PR
 
 ## Contributing
 

data/bin/benchmark

@@ -54,10 +54,9 @@ puts 'Benchmark without consul agent'
 kill_consul
 benchmark_gem
 
-
 puts '-' * 80
 puts 'Benchmark with consul agent running'
 start_consul
 benchmark_gem
 
-kill_consul
+kill_consul

data/consul_application_settings.gemspec

@@ -29,13 +29,15 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'deep_merge', '~> 1.2'
   spec.add_dependency 'diplomat', '~> 2.5.1'
 
   spec.add_development_dependency 'bundler', '~> 2.0'
+  spec.add_development_dependency 'codecov', '~> 0.4'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.66'
   spec.add_development_dependency 'rubocop-rspec', '~> 1.32.0'
   spec.add_development_dependency 'simplecov', '~> 0.16'
-  spec.add_development_dependency 'codecov', '~> 0.4'
+  spec.add_development_dependency 'vault', '~> 0.16'
 end

data/docker-compose.yml

@@ -0,0 +1,17 @@
+# dependencies needed for development environment
+version: '3'
+services:
+  vault:
+    image: vault
+    ports:
+      - "8200:8200"
+    cap_add:
+      - IPC_LOCK
+    environment:
+      VAULT_DEV_ROOT_TOKEN_ID: root_token
+  consul:
+    image: consul
+    ports:
+      - "8500:8500"
+    environment:
+      CONSUL_BIND_INTERFACE: eth0

data/lib/consul_application_settings/configuration.rb

@@ -6,14 +6,19 @@ module ConsulApplicationSettings
     DEFAULT_PROVIDERS = [
       ConsulApplicationSettings::Providers::ConsulPreloaded,
       ConsulApplicationSettings::Providers::LocalStorage
-    ]
-    attr_accessor :base_file_path, :local_file_path, :disable_consul_connection_errors, :settings_providers
+    ].freeze
+    DEFAULT_RESOLVERS = [
+      ConsulApplicationSettings::Resolvers::Env
+    ].freeze
+    attr_accessor :base_file_path, :local_file_path, :disable_consul_connection_errors,
+                  :settings_providers, :value_resolvers
 
     def initialize
       @base_file_path = DEFAULT_BASE_FILE_PATH
       @local_file_path = DEFAULT_LOCAL_FILE_PATH
       @disable_consul_connection_errors = true
       @settings_providers = DEFAULT_PROVIDERS
+      @value_resolvers = DEFAULT_RESOLVERS
     end
   end
 end

data/lib/consul_application_settings/providers/abstract.rb

@@ -3,10 +3,11 @@ module ConsulApplicationSettings
     # Abstract class with basic functionality
     class Abstract
       def initialize(base_path, config)
-        @base_path, @config = base_path, config
+        @base_path = base_path
+        @config = config
       end
 
-      def get(path)
+      def get(_path)
         raise NotImplementedError
       end
 
@@ -22,4 +23,4 @@ module ConsulApplicationSettings
       end
     end
   end
-end
+end

data/lib/consul_application_settings/providers/consul.rb

@@ -7,18 +7,26 @@ module ConsulApplicationSettings
       def get(path)
         full_path = absolute_key_path(path)
         value = get_from_consul(full_path)
+        value = resolve_tree_response(value, full_path)
         ConsulApplicationSettings::Utils.cast_consul_value(value)
       end
 
       private
 
       def get_from_consul(path)
-        Diplomat::Kv.get(path, {})
+        Diplomat::Kv.get(path, recurse: true)
       rescue Diplomat::KeyNotFound
-        return nil
+        nil
       rescue SystemCallError, Faraday::ConnectionFailed, Diplomat::PathNotFound => e
         raise e unless @config.disable_consul_connection_errors
       end
+
+      def resolve_tree_response(value, full_path)
+        return value unless value.is_a?(Array)
+
+        value.each { |item| item[:key] = item[:key].delete_prefix("#{full_path}/") }
+        value
+      end
     end
   end
 end

data/lib/consul_application_settings/providers/consul_preloaded.rb

@@ -4,24 +4,42 @@ module ConsulApplicationSettings
     class ConsulPreloaded < Abstract
       def initialize(base_path, config)
         super
-        @data = get_all_from_consul
+        @data = read_all_from_consul
       end
 
       def get(path)
         value = get_value_from_hash(absolute_key_path(path), @data)
+        value = resolve_tree_response(value)
         ConsulApplicationSettings::Utils.cast_consul_value(value)
       end
 
       protected
 
-      def get_all_from_consul
-        Diplomat::Kv.get_all(@base_path, { convert_to_hash: true })
+      def read_all_from_consul
+        Diplomat::Kv.get_all(@base_path, convert_to_hash: true)
       rescue Diplomat::KeyNotFound
         {}
       rescue SystemCallError, Faraday::ConnectionFailed, Diplomat::PathNotFound => e
         raise e unless @config.disable_consul_connection_errors
+
         {}
       end
+
+      def resolve_tree_response(value)
+        return value unless value.is_a?(Hash)
+
+        deep_cast(value)
+      end
+
+      def deep_cast(hash)
+        hash.each_pair do |k, v|
+          if v.is_a?(Hash)
+            deep_cast(v)
+          else
+            hash[k] = ConsulApplicationSettings::Utils.cast_consul_value(v)
+          end
+        end
+      end
     end
   end
-end
+end

data/lib/consul_application_settings/providers/local_storage.rb

@@ -19,7 +19,7 @@ module ConsulApplicationSettings
         base_yml = read_yml(base_file_path)
         local_yml = read_yml(local_file_path)
         DeepMerge.deep_merge!(local_yml, base_yml, preserve_unmergeables: false, overwrite_arrays: true,
-                              merge_nil_values: true)
+                                                   merge_nil_values: true)
       end
 
       def base_file_path

data/lib/consul_application_settings/reader.rb

@@ -1,18 +1,16 @@
 module ConsulApplicationSettings
-  # Provides access to settings stored in Consul or in file system
+  # Orchestrates fetching values from provider and resolving them
   class Reader
     def initialize(base_path, config)
       @base_path = base_path
       @config = config
       @providers = config.settings_providers.map { |provider| provider.new(base_path, config) }
+      @resolvers = config.value_resolvers.map(&:new)
     end
 
     def get(path)
-      @providers.each do |provider|
-        value = provider.get(path)
-        return value unless value.nil?
-      end
-      nil
+      value = fetch_value(path)
+      resolve_value(value, path)
     end
 
     alias [] get
@@ -21,5 +19,32 @@ module ConsulApplicationSettings
       new_path = ConsulApplicationSettings::Utils.generate_path(@base_path, sub_path)
       self.class.new(new_path, @config)
     end
+
+    protected
+
+    def check_deep_structure(value, path)
+      return unless value.is_a?(Hash)
+
+      message = "Getting value of complex object at path: '#{path}'. Use #load method to get new scoped instance"
+      raise ConsulApplicationSettings::Error, message if value.is_a?(Hash)
+    end
+
+    def fetch_value(path)
+      @providers.each do |provider|
+        value = provider.get(path)
+        check_deep_structure(value, path)
+        return value unless value.nil?
+      end
+      nil
+    end
+
+    def resolve_value(value, path)
+      resolver = @resolvers.detect { |r| r.resolvable?(value, path) }
+      if resolver
+        resolver.resolve(value, path)
+      else
+        value
+      end
+    end
   end
 end

data/lib/consul_application_settings/resolvers/abstract.rb

@@ -0,0 +1,14 @@
+module ConsulApplicationSettings
+  module Resolvers
+    # Abstract resolver with basic functionality
+    class Abstract
+      def resolvable?(_value, _path)
+        false
+      end
+
+      def resolve(value, _path)
+        value
+      end
+    end
+  end
+end

data/lib/consul_application_settings/resolvers/env.rb

@@ -0,0 +1,19 @@
+module ConsulApplicationSettings
+  module Resolvers
+    # Resolve values in environment
+    class Env
+      IDENTIFIER = 'env://'.freeze
+
+      def resolvable?(value, _path)
+        return unless value.respond_to?(:start_with?)
+
+        value.start_with?(IDENTIFIER)
+      end
+
+      def resolve(value, _path)
+        env_path = value.to_s.delete_prefix(IDENTIFIER)
+        ENV[env_path]
+      end
+    end
+  end
+end

data/lib/consul_application_settings/resolvers/erb.rb

@@ -0,0 +1,18 @@
+module ConsulApplicationSettings
+  module Resolvers
+    # Run values through ERB
+    class Erb
+      IDENTIFIER = /(<%).*(%>)/.freeze
+
+      def resolvable?(value, _path)
+        return unless value.is_a?(String)
+
+        IDENTIFIER.match?(value)
+      end
+
+      def resolve(value, _path)
+        ERB.new(value.to_s).result
+      end
+    end
+  end
+end

data/lib/consul_application_settings/resolvers/vault.rb

@@ -0,0 +1,24 @@
+module ConsulApplicationSettings
+  module Resolvers
+    # Resolve values using vault
+    class Vault
+      IDENTIFIER = 'vault://'.freeze
+
+      def resolvable?(value, _path)
+        return unless value.respond_to?(:start_with?)
+
+        value.start_with?(IDENTIFIER)
+      end
+
+      # Expect value in format `vault://mount/path/to/secret?attribute_name`
+      def resolve(value, _path)
+        value = value.delete_prefix(IDENTIFIER)
+        mount, secret = value.split('/', 2)
+        secret, attribute = secret.split('?')
+        attribute ||= 'value'
+        secret = ::Vault.kv(mount).read(secret)
+        secret && secret.data[attribute.to_sym]
+      end
+    end
+  end
+end

data/lib/consul_application_settings/utils.rb

@@ -9,6 +9,8 @@ module ConsulApplicationSettings
         return nil if value.nil?
         return false if value == 'false'
         return true if value == 'true'
+        return value if value.is_a?(Hash)
+        return convert_to_hash(value) if value.is_a?(Array)
 
         cast_complex_value(value)
       end
@@ -34,6 +36,16 @@ module ConsulApplicationSettings
         end
         value.to_s
       end
+
+      def convert_to_hash(data)
+        data_h = data.map do |item|
+          value = cast_consul_value(item[:value])
+          item[:key].split('/').reverse.reduce(value) { |h, v| { v => h } }
+        end
+        data_h.reduce({}) do |dest, source|
+          DeepMerge.deep_merge!(source, dest, preserve_unmergeables: true)
+        end
+      end
     end
   end
 end

data/lib/consul_application_settings/version.rb

@@ -1,3 +1,3 @@
 module ConsulApplicationSettings
-  VERSION = '3.0.1'.freeze
+  VERSION = '4.0.0-alpha'.freeze
 end

data/lib/consul_application_settings.rb

@@ -3,6 +3,9 @@ require 'consul_application_settings/providers/abstract'
 require 'consul_application_settings/providers/consul'
 require 'consul_application_settings/providers/consul_preloaded'
 require 'consul_application_settings/providers/local_storage'
+require 'consul_application_settings/resolvers/abstract'
+require 'consul_application_settings/resolvers/env'
+require 'consul_application_settings/resolvers/erb'
 require 'consul_application_settings/configuration'
 require 'consul_application_settings/reader'
 require 'consul_application_settings/utils'
@@ -13,7 +16,6 @@ module ConsulApplicationSettings
 
   class << self
     attr_accessor :config
-    attr_accessor :defaults
   end
 
   self.config ||= ConsulApplicationSettings::Configuration.new

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: consul_application_settings
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 4.0.0.pre.alpha
 platform: ruby
 authors:
 - Volodymyr Mykhailyk
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-09 00:00:00.000000000 Z
+date: 2021-12-06 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: deep_merge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: diplomat
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: codecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -109,19 +137,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.16'
 - !ruby/object:Gem::Dependency
-  name: codecov
+  name: vault
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.16'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '0.16'
 description: |-
   Gem that simplifies usage of Consul (via Diplomat gem) to host application settings.
                         Gem provides defaults and utilities
@@ -148,6 +176,7 @@ files:
 - bin/rspec
 - bin/setup
 - consul_application_settings.gemspec
+- docker-compose.yml
 - lib/consul_application_settings.rb
 - lib/consul_application_settings/configuration.rb
 - lib/consul_application_settings/providers/abstract.rb
@@ -155,6 +184,10 @@ files:
 - lib/consul_application_settings/providers/consul_preloaded.rb
 - lib/consul_application_settings/providers/local_storage.rb
 - lib/consul_application_settings/reader.rb
+- lib/consul_application_settings/resolvers/abstract.rb
+- lib/consul_application_settings/resolvers/env.rb
+- lib/consul_application_settings/resolvers/erb.rb
+- lib/consul_application_settings/resolvers/vault.rb
 - lib/consul_application_settings/utils.rb
 - lib/consul_application_settings/version.rb
 homepage: https://github.com/matic-insurance/consul_application_settings
@@ -175,9 +208,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3.1
 signing_key: