chambermaid 0.2.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ceb4e76a467a39e91b32a40efff57e8fe8d213e28ea38c9742569af98eac7e0f
-  data.tar.gz: dfdb963dece1c57711fae828eaeebf53490ce2569f6fa339839d2c01a24787ca
+  metadata.gz: 5f6943ccaff6b33633d9cee801822d739f222b1eb86dd63b154ad0ee5139a252
+  data.tar.gz: 2a4bed5d0f0fe66048880f57e4ed1c7b62530bd1a6eabdc3227ea05e98528a4c
 SHA512:
-  metadata.gz: 2997b5bf940b31802cb900d50b042820885da4209fff8e2231228994fbb3daf3efa4c979fb6a41f37a1512e3cea96440e3744b8ca2939dcd2543cc1287c1e960
-  data.tar.gz: cc518b62b452ea0c63e83b04fd3535345ed335a671fffd6fba6c184addfdaa45a9f29553a825d55e97921598300675e1c054d496dd30a850ca520968170f15be
+  metadata.gz: a22085c2da52baec3bb93cd59f7cc524e3f87f974cfdf26a5f315eed7cb90002fdd315c3718aed15be0b6c253ec05fcab76137a86f96808dbc374eb205b948d3
+  data.tar.gz: 2991226e4b8fb1021b2369e4b449967ce5d925d6e66f7d56fa64cc2c1d0e051c4ea4640d674a87d17b325a01724aa13e4491c95789d08fdb25e76ce6d4f13274

data/Gemfile

@@ -2,6 +2,3 @@ source "https://rubygems.org"
 
 # Specify your gem's dependencies in chambermaid.gemspec
 gemspec
-
-gem "rake", "~> 12.0"
-gem "rspec", "~> 3.0"

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    chambermaid (0.2.0)
+    chambermaid (0.4.1)
       aws-sdk-ssm (~> 1.85)
 
 GEM
   remote: https://rubygems.org/
   specs:
     aws-eventstream (1.1.0)
-    aws-partitions (1.348.0)
+    aws-partitions (1.349.0)
     aws-sdk-core (3.104.3)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)

data/README.md

@@ -1,4 +1,4 @@
-# Chambermaid
+# Chambermaid [![Gem Version](https://badge.fury.io/rb/chambermaid.svg)](https://badge.fury.io/rb/chambermaid) [![Build Status](https://travis-ci.com/mileszim/chambermaid.svg?branch=master)](https://travis-ci.com/mileszim/chambermaid)
 
 Companion RubyGem for [chamber](https://github.com/segmentio/chamber).
 
@@ -26,6 +26,7 @@ Or install it yourself as:
 
 ```ruby
 Chambermaid.add_namespace("/my/param/namespace")
+Chambermaid.add_service("my-chamber-service")
 ```
 
 **Configuration Block**
@@ -34,12 +35,24 @@ Chambermaid.add_namespace("/my/param/namespace")
 # config/initializers/chambermaid.rb
 
 Chambermaid.configure do |config|
+  # Load all values from SSM Namespace path
   config.add_namespace("/my/param/namespace")
 
+  # Load values from chamber-cli service
+  config.add_service("my-chamber-service")
+
   # Set `overload: true` to choose these params over existing
   # ones in ENV when they are merged together
   config.add_namespace("/my/important/namespace", overload: true)
 end
+
+# Load after configuration
+Chambermaid.load!
+```
+
+**Reload SSM into ENV**
+```ruby
+Chambermaid.reload!
 ```
 
 **Restore ENV to original state**
@@ -48,6 +61,24 @@ Chambermaid.restore!
 Chambermaid.reset! # alias of .restore!
 ```
 
+**Configure Logging**
+```ruby
+Chambermaid.configure do |config|
+  # ... other config ...
+
+  # Change log level
+  config.log_level = :debug
+
+  # Set custom logger instance
+  config.logger = MyCoolLogger.new
+end
+
+# Outside of config block
+Chambermaid.log_level = :warn
+```
+
+_Note: Chambermaid.logger is set to Rails.logger automatically if including inside a rails app_
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/chambermaid.gemspec

@@ -28,4 +28,6 @@ Gem::Specification.new do |spec|
 
   # Gems
   spec.add_dependency("aws-sdk-ssm", "~> 1.85")
+  spec.add_development_dependency("rspec", "~> 3.0")
+  spec.add_development_dependency("rake", "~> 12.0")
 end

data/lib/chambermaid.rb

@@ -1,5 +1,6 @@
 require "chambermaid/base"
 require "chambermaid/version"
+require "chambermaid/railtie" if defined?(Rails)
 
 module Chambermaid
   class Error < StandardError; end

data/lib/chambermaid/base.rb

@@ -1,10 +1,14 @@
+require "logger"
+
+require "chambermaid/environment"
+require "chambermaid/namespace"
 require "chambermaid/parameter_store"
 
 module Chambermaid
   module Base
     def self.extended(base)
       # Make a copy of ENV before we mess it all up
-      @@_original_env = ENV.to_h.dup
+      @@_original_env = ENV.to_h.dup.freeze
     end
 
     extend self
@@ -18,16 +22,18 @@ module Chambermaid
       raise "Namespaces must be defined" unless @namespaces
     end
 
+    # Load SSM into ENV
+    def load!
+      @namespaces.each(&:load!)
+    end
+
     # @todo
     def reload!
-      restore!
-      @namespaces.each do |ns|
-        ns[:store].reload!
-        update_env!(
-          params: ns[:store].params,
-          overload: ns[:overload]
-        )
-      end
+      @namespaces.each(&:reload!)
+    end
+
+    def unload!
+      @namespaces.each(&:unload!)
     end
 
     # Restore ENV to its original state
@@ -43,30 +49,99 @@ module Chambermaid
     #   true  - replace any duplicate ENV keys with new params
     #   false - keep any existing duplicate ENV key values
     #
-    # @raise
+    # @raise [ArgumentError]
+    #   when `path` is not a string
+    #
+    # @example
+    #   Chambermaid.add_namespace("/my/param/namespace")
+    #
+    # @example overload duplicate ENV vars
+    #   Chambermaid.add_namespace("/my/param/namespace", overload: true)
     def add_namespace(path, overload: false)
-      @namespaces ||= []
-      # raise "namespace already included in ENV" unless @namespaces[path].nil?
+      raise ArgumentError.new("`path` must be a string") unless path.is_a?(String)
+      raise ArgumentError.new("`overload` must be a boolean") unless [true, false].include?(overload)
+
+      namespaces << Namespace.new(path: path, overload: overload)
+    end
+
+    # Immediately load an AWS SSM parameter namespace to ENV
+    #
+    # @param [String] path
+    # @param [Boolean] overload
+    #   true  - replace any duplicate ENV keys with new params
+    #   false - keep any existing duplicate ENV key values
+    #
+    # @raise [ArgumentError]
+    #   when `path` is not a string
+    #
+    # @example
+    #   Chambermaid.add_namespace!("/my/param/namespace")
+    #
+    # @example overload duplicate ENV vars
+    #   Chambermaid.add_namespace("/my/param/namespace", overload: true)
+    def add_namespace!(path, overload: false)
+      raise ArgumentError.new("`path` must be a string") unless path.is_a?(String)
+      raise ArgumentError.new("`overload` must be a boolean") unless [true, false].include?(overload)
 
-      store = ParameterStore.load!(path: path)
-      @namespaces << { store: store, overload: overload }
-      update_env!(params: store.params, overload: overload)
+      namespaces << Namespace.load!(path: path, overload: overload)
     end
 
-    # Inject into ENV
+    # Add all secrets from Chamber service to ENV
     #
-    # @param [Hash] params
+    # @param [String] service
     # @param [Boolean] overload
     #   true  - replace any duplicate ENV keys with new params
     #   false - keep any existing duplicate ENV key values
-    def update_env!(params:, overload:)
-      if overload
-        ENV.update(params)
-      else
-        current_env = ENV.to_h.dup
-        new_env = params.merge(current_env)
-        ENV.replace(new_env)
-      end
+    #
+    # @example
+    #   Chambermaid.add_service("my-chamber-service")
+    #
+    # @example overload duplicate ENV vars
+    #   Chambermaid.add_service("my-chamber-service", overload: true)
+    #
+    # @see {Chambermaid::Base.add_namespace}
+    def add_service(service, overload: false)
+      service = "/#{service}" unless service[0] == "/"
+      add_namespace(service)
+    end
+
+    # !@attribute [r] logger
+    #   @return [Logger]
+    def logger
+      @logger ||= Logger.new(STDOUT,
+        level: log_level,
+        progname: "Chambermaid"
+      )
+    end
+
+    # !@attribute [w] logger
+    #   @return [Logger]
+    def logger=(val)
+      @logger = val
+      @logger.progname = "Chambermaid"
+      logger
+    end
+
+    # !@attribute [r] log_level
+    #   @return [Symbol] (default = :info) current logger level
+    def log_level
+      return logger.level unless @logger.nil?
+      return @log_level unless @log_level.nil?
+      return :info
+    end
+
+    # !@attribute [w] log_level
+    #   @return [Symbol] (default = :info) current logger level
+    def log_level=(val = :info)
+      @logger.level = val unless @logger.nil?
+      @log_level = val
+      val
+    end
+
+    private
+
+    def namespaces
+      @namespaces ||= []
     end
   end
 end

data/lib/chambermaid/environment.rb

@@ -0,0 +1,68 @@
+module Chambermaid
+  class Environment < Hash
+    attr_reader :params
+
+    # Create new Chambermaid::Environment
+    #
+    # @param [Hash] params
+    #
+    # @raise [ArgumentError]
+    #   if params is not type Hash
+    #
+    # @return [Chambermaid::Environment]
+    def initialize(params)
+      validate_params!(params)
+      stash_current_env!
+      update(format_env(params))
+    end
+
+    # Generate a dotenv (.env) compatible string
+    #
+    # @return [String] dotenv compatible string
+    def to_dotenv
+      to_h.inject("") do |env_str, param|
+        env_str + "#{param[0]}=#{param[1]}\n"
+      end
+    end
+
+    # Write a .env file
+    #
+    # @param [String] file_path
+    def to_file!(file_path)
+      File.open(file_path, "wb") do |f|
+        f.write(to_dotenv)
+      end
+    end
+
+    # Inject into ENV without overwriting duplicates
+    def load!
+      each { |k, v| ENV[k] ||= v }
+    end
+
+    # Inject into ENV and overwrite duplicates
+    def overload!
+      each { |k, v| ENV[k] = v }
+    end
+
+    # Restore to original ENV
+    def unload!
+      ENV.replace(@_original_env)
+    end
+
+    private
+
+    def stash_current_env!
+      @_original_env ||= ENV.to_h.dup.freeze
+    end
+
+    def format_env(params)
+      params.map{|k,v| [k.upcase, v]}.to_h
+    end
+
+    def validate_params!(params)
+      unless params.is_a?(Hash)
+        raise ArgumentError.new("`params` must be a hash")
+      end
+    end
+  end
+end

data/lib/chambermaid/namespace.rb

@@ -0,0 +1,44 @@
+module Chambermaid
+  class Namespace
+    # @param [String] path
+    # @param [Boolean] overload
+    def initialize(path:, overload: false)
+      @path = path
+      @overload = overload
+
+      @store = ParameterStore.new(path: path)
+      @env = Environment.new({})
+    end
+
+    def self.load!(path:, overload: false)
+      namespace = new(path: path, overload: overload)
+      namespace.load!
+      namespace
+    end
+
+    def load!
+      @store.load!
+      load_env!
+    end
+
+    def reload!
+      @env.unload!
+      @store.reload!
+      load_env!
+    end
+
+    def unload!
+      @env.unload!
+      Chambermaid.logger.info("unloaded #{@env.size} params from ENV")
+    end
+
+    private
+
+    # Inject into ENV
+    def load_env!
+      @env.replace(@store.params)
+      @overload ? @env.overload! : @env.load!
+      Chambermaid.logger.info("loaded #{@env.size} params into ENV from `#{@path}`")
+    end
+  end
+end

data/lib/chambermaid/parameter_store.rb

@@ -15,6 +15,10 @@ module Chambermaid
       fetch_ssm_params!
     end
 
+    def loaded?
+      !@params_list.empty?
+    end
+
     def self.load!(path:)
       store = new(path: path)
       store.load!
@@ -29,12 +33,6 @@ module Chambermaid
 
     alias :to_h :params
 
-    def to_env
-      params.inject("") do |env_str, param|
-        env_str + "#{param[0]}=#{param[1]}\n"
-      end
-    end
-
     private
 
     def client
@@ -42,14 +40,20 @@ module Chambermaid
     end
 
     def fetch_ssm_params!
+      Chambermaid.logger.debug("fetching AWS SSM parameters from `#{@path}`")
       @param_list = []
       response = nil
       loop do
         response = fetch_ssm_param_batch!(response&.next_token)
         @param_list.concat(response.parameters)
 
-        break unless response.next_token
+        if response.next_token
+          Chambermaid.logger.debug("response.next_token found, continuing fetch")
+        else
+          break
+        end
       end
+      Chambermaid.logger.debug("fetched #{@param_list.size} parameters from `#{@path}`")
     end
 
     def fetch_ssm_param_batch!(next_token = nil)
@@ -63,7 +67,7 @@ module Chambermaid
 
     def clear_params!
       @params = nil
-      @params_list = nil
+      @params_list = []
     end
   end
 end

data/lib/chambermaid/railtie.rb

@@ -0,0 +1,8 @@
+module Chambermaid
+  class Railtie < Rails::Railtie
+    config.after_initialize do
+      Chambermaid.logger = Rails.logger
+      Chambermaid.load!
+    end
+  end
+end

data/lib/chambermaid/version.rb

@@ -1,3 +1,3 @@
 module Chambermaid
-  VERSION = "0.2.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chambermaid
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Miles Zimmerman
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-01 00:00:00.000000000 Z
+date: 2020-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ssm
@@ -24,6 +24,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.85'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
 description: 
 email:
 - miles@asktrim.com
@@ -45,7 +73,10 @@ files:
 - chambermaid.gemspec
 - lib/chambermaid.rb
 - lib/chambermaid/base.rb
+- lib/chambermaid/environment.rb
+- lib/chambermaid/namespace.rb
 - lib/chambermaid/parameter_store.rb
+- lib/chambermaid/railtie.rb
 - lib/chambermaid/version.rb
 homepage: https://github.com/mileszim/chambermaid
 licenses: