secret_config 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4df8a3d3895f2ff46c059cd8f307803743c1b5de4d01dc271e919f1cba5b68da
-  data.tar.gz: 9d0a0bb7f4008a626f93a1a068d42b2293334df2e906e8d019157e8087eee9d7
+  metadata.gz: 2f0d63fa6c5c401060b46f0295181765357cd8f9ec6627d005566db84b84ee36
+  data.tar.gz: d4985e50bfc36057932f30734ae16f48583eaddcee7b8d5d69a3e5721493d88a
 SHA512:
-  metadata.gz: e8608deb9165ed58d542305677f9cfadbcc299eecb4548e1b9e6321e054710808f27176b45a92b09f292784ae2078e6329689b1ed985f163866ff19a5f1645db
-  data.tar.gz: f59f276ded32628b170095e944b75699d0328ed4ee4b39e962c63adc9b80e70d04769a68a97d40384a261909ffcf2dd24a0040cb70769af292dd5173b6238029
+  metadata.gz: 35e03c3cd275db6e03a3719aaae155b3a9c12f31a1f01c0d37f320a50a589a4e582139ead7befc16b52510eca57833a2be09128647b6a6666ef86b941680e6bf
+  data.tar.gz: 202df652fdaca983f8f2736df883957891043a42fe6751914175145af99a43699f0e18e6883b677a25e08b3bef48fc218294f7cc9526f8d6f355e8b4ccf837c5

data/lib/secret_config.rb

@@ -31,7 +31,6 @@ module SecretConfig
   # Which provider to use along with any arguments
   # The path will be overriden by env var `SECRET_CONFIG_PATH` if present.
   def self.use(provider, path: nil, **args)
-    path      ||= ENV["SECRET_CONFIG_PATH"]
     @registry = SecretConfig::Registry.new(path: path, provider: provider, provider_args: args)
   end
 

data/lib/secret_config/cli.rb

@@ -83,11 +83,11 @@ module SecretConfig
           @import = file_name || STDIN
         end
 
-        opts.on '-C', '--copy SOURCE_PATH', 'Import configuration from a file or stdin if no file_name supplied.' do |path|
+        opts.on '--copy SOURCE_PATH', 'Import configuration from a file or stdin if no file_name supplied.' do |path|
           @copy_path = path
         end
 
-        opts.on '-D', '--diff [FILE_NAME]', 'Compare configuration from a file or stdin if no file_name supplied.' do |file_name|
+        opts.on '--diff [FILE_NAME]', 'Compare configuration from a file or stdin if no file_name supplied.' do |file_name|
           @diff = file_name
         end
 
@@ -99,27 +99,35 @@ module SecretConfig
           @path = path
         end
 
-        opts.on '-P', '--provider PROVIDER', 'Provider to use. [ssm | file]. Default: ssm' do |provider|
+        opts.on '--provider PROVIDER', 'Provider to use. [ssm | file]. Default: ssm' do |provider|
           @provider = provider.to_sym
         end
 
-        opts.on '-U', '--no-filter', 'Do not filter passwords and keys.' do
+        opts.on '--no-filter', 'Do not filter passwords and keys.' do
           @no_filter = true
         end
 
-        opts.on '-d', '--prune', 'During import delete all existing keys for which there is no key in the import file.' do
+        opts.on '--prune', 'During import delete all existing keys for which there is no key in the import file.' do
           @prune = true
         end
 
-        opts.on '-k', '--key_id KEY_ID', 'AWS KMS Key id or Key Alias to use when importing configuration values. Default: AWS Default key.' do |key_id|
+        opts.on '--key_id KEY_ID', 'Encrypt config settings with this AWS KMS key id. Default: AWS Default key.' do |key_id|
           @key_id = key_id
         end
 
-        opts.on '-r', '--region REGION', 'AWS Region to use. Default: AWS_REGION env var.' do |region|
+        opts.on '--key_alias KEY_ALIAS', 'Encrypt config settings with this AWS KMS alias.' do |key_alias|
+          if key_alias =~ /^alias\//
+            @key_id = key_alias
+          else
+            @key_id = "alias/#{key_alias}"
+          end
+        end
+
+        opts.on '--region REGION', 'AWS Region to use. Default: AWS_REGION env var.' do |region|
           @region = region
         end
 
-        opts.on '-R', '--random_size INTEGER', 'Size to use when generating random values. Whenever $random is encountered during an import. Default: 32' do |region|
+        opts.on '--random_size INTEGER', Integer, 'Size to use when generating random values. Whenever $random is encountered during an import. Default: 32' do |region|
           @random_size = random_size
         end
 
@@ -168,7 +176,7 @@ module SecretConfig
 
       unless delete_keys.empty?
         puts "Going to delete the following keys:"
-        delete_keys.each {|key| puts "  #{key}"}
+        delete_keys.each { |key| puts "  #{key}" }
         sleep(5)
       end
 
@@ -250,7 +258,8 @@ module SecretConfig
 
     def fetch_config(path, filtered: true)
       registry = Registry.new(path: path, provider: provider_instance)
-      filtered ? registry.configuration : registry.configuration(filters: nil)
+      config = filtered ? registry.configuration : registry.configuration(filters: nil)
+      sort_hash_by_key!(config)
     end
 
     def read_file(file_name_or_io)
@@ -280,14 +289,16 @@ module SecretConfig
     end
 
     def parse(data, format)
-      case format
-      when :yml
-        YAML.load(ERB.new(data).result)
-      when :json
-        JSON.parse(data)
-      else
-        raise ArgumentError, "Invalid format: #{format.inspect}"
-      end
+      config =
+        case format
+        when :yml
+          YAML.load(ERB.new(data).result)
+        when :json
+          JSON.parse(data)
+        else
+          raise ArgumentError, "Invalid format: #{format.inspect}"
+        end
+      sort_hash_by_key!(config)
     end
 
     def file_format(file_name)
@@ -306,5 +317,14 @@ module SecretConfig
     def random_password
       SecureRandom.urlsafe_base64(random_size)
     end
+
+    def sort_hash_by_key!(h)
+      h.keys.sort.each do |key|
+        value = h[key] = h.delete(key)
+        sort_hash_by_key!(value) if value.is_a?(Hash)
+      end
+      h
+    end
+
   end
 end

data/lib/secret_config/providers/ssm.rb

@@ -10,7 +10,7 @@ module SecretConfig
     class Ssm < Provider
       attr_reader :client, :key_id
 
-      def initialize(key_id: nil)
+      def initialize(key_id: ENV["AWS_ACCESS_KEY_ID"])
         @key_id = key_id
         logger  = SemanticLogger['Aws::SSM'] if defined?(SemanticLogger)
         @client = Aws::SSM::Client.new(logger: logger)

data/lib/secret_config/registry.rb

@@ -122,6 +122,10 @@ module SecretConfig
 
     def decompose(key, value, h = {})
       path, name = File.split(key)
+      if path == '.'
+        h[key] = value
+        return h
+      end
       last       = path.split('/').reduce(h) do |target, path|
         if path == ''
           target

data/lib/secret_config/version.rb

@@ -1,3 +1,3 @@
 module SecretConfig
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: secret_config
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Reid Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-30 00:00:00.000000000 Z
+date: 2019-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby