hekate 0.1.0.pre22 → 0.2.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6a5705bec9dcaefad7c05ef8c37cfca764300f6
-  data.tar.gz: f102a337cf9fdc6410276faa50c34ab9cc62ac54
+  metadata.gz: 91c81ae8aa707334a461738f2cf0498065f49da1
+  data.tar.gz: dadc2fb0e8a743479a099b9004cf20db0b1fb73b
 SHA512:
-  metadata.gz: cac58c211511032e7d15521ecd5e4fa63e3ee23fac815f496d0f4df81c7f9758f5796c790c8940996591c5cab1f140879c017080f4610ed12dc8857b9262e422
-  data.tar.gz: f3c70921050eb8cb369d9b60ddb05d9909ae74d8e8615dc67342c84594a80d6a25de48c7efd71a6569c51159b0db04d549a0204b9535460e1abfe619d1fdec36
+  metadata.gz: 577f385bc491bb128f2d2b2ec3dfb5492addbcab7e71c351a9b6afa82f5a72ab5675faee7fef294021783e2ed3e4d5e4e3f68f929098844e3994632a64d8a8a4
+  data.tar.gz: adddbd587dce7b72c4b985089df08df6ac54ad2e6c8e2ac328f8fe5b5b457fc7aee77fae512050edc46c72a07d10519f9efd6b2dcda2234ca39249a90a6d717b

data/.rubocop.yml

@@ -28,7 +28,7 @@ Layout/DotPosition:
   SupportedStyles:
   - leading
   - trailing
-Style/FileName:
+Naming/FileName:
   Description: Use snake_case for source file names.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#snake-case-files
   Enabled: true
@@ -38,15 +38,10 @@ Style/GuardClause:
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#no-nested-conditionals
   Enabled: true
   MinBodyLength: 1
-Style/IfUnlessModifier:
-  Description: Favor modifier if/unless usage when you have a single-line body.
-  StyleGuide: https://github.com/bbatsov/ruby-style-guide#if-as-a-modifier
-  Enabled: false
-  MaxLineLength: 80
 Style/OptionHash:
   Description: Don't use option hashes when you can use keyword arguments.
   Enabled: false
-Style/PredicateName:
+Naming/PredicateName:
   Description: Check the names of predicate methods.
   StyleGuide: https://github.com/bbatsov/ruby-style-guide#bool-methods-qmark
   Enabled: true
@@ -114,7 +109,16 @@ Style/TrailingCommaInArguments:
   - comma
   - consistent_comma
   - no_comma
-Style/TrailingCommaInLiteral:
+Style/TrailingCommaInArrayLiteral:
+  Description: 'Checks for trailing comma in array and hash literals.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-trailing-array-commas'
+  Enabled: true
+  EnforcedStyleForMultiline: no_comma
+  SupportedStylesForMultiline:
+  - comma
+  - consistent_comma
+  - no_comma
+Style/TrailingCommaInHashLiteral:
   Description: 'Checks for trailing comma in array and hash literals.'
   StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-trailing-array-commas'
   Enabled: true
@@ -172,7 +176,7 @@ Layout/AlignParameters:
 Style/InlineComment:
   Description: Avoid inline comments.
   Enabled: false
-Style/AccessorMethodName:
+Naming/AccessorMethodName:
   Description: Check the naming of accessor methods for get_/set_.
   Enabled: false
 Style/Alias:
@@ -244,11 +248,11 @@ RedundantBlockCall:
   Enabled: false
 Style/EmptyMethod:
   Enabled: false
-Style/VariableNumber:
+Naming/VariableNumber:
   EnforcedStyle: snake_case
 
 # checks whether the end keywords are aligned properly for `do` `end` blocks.
-Lint/BlockAlignment:
+Layout/BlockAlignment:
   # The value `start_of_block` means that the `end` should be aligned with line
   # where the `do` keyword appears.
   # The value `start_of_line` means it should be aligned with the whole

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    hekate (0.1.0.pre20)
+    hekate (0.1.0.pre24)
       aws-sdk-core (~> 3.6.0, >= 3.6.0)
       aws-sdk-kms (~> 1.2.0, >= 1.2.0)
       aws-sdk-ssm (~> 1.3.0, >= 1.3.0)
@@ -48,10 +48,10 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
     arel (6.0.4)
-    aws-partitions (1.53.0)
+    aws-partitions (1.96.0)
     aws-sdk-core (3.6.1)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
@@ -62,43 +62,43 @@ GEM
     aws-sdk-ssm (1.3.0)
       aws-sdk-core (~> 3)
       aws-sigv4 (~> 1.0)
-    aws-sigv4 (1.0.2)
+    aws-sigv4 (1.0.3)
     builder (3.2.3)
     codecov (0.1.10)
       json
       simplecov
       url
-    commander (4.4.3)
+    commander (4.4.5)
       highline (~> 1.7.2)
     concurrent-ruby (1.0.5)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    crass (1.0.3)
+    crass (1.0.4)
     diff-lcs (1.3)
-    docile (1.1.5)
-    dotenv (2.2.1)
+    docile (1.3.1)
+    dotenv (2.5.0)
     ec2-metadata (0.2.2)
     erubis (2.7.0)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
-    hashdiff (0.3.5)
+    hashdiff (0.3.7)
     highline (1.7.10)
-    i18n (0.9.1)
+    i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jmespath (1.3.1)
+    jmespath (1.4.0)
     json (2.1.0)
-    loofah (2.1.1)
+    loofah (2.2.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.0)
       mini_mime (>= 0.1.1)
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
-    minitest (5.11.1)
-    nokogiri (1.8.1)
+    minitest (5.11.3)
+    nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
-    public_suffix (2.0.5)
-    rack (1.6.8)
+    public_suffix (3.0.2)
+    rack (1.6.10)
     rack-test (0.6.3)
       rack (>= 1.0)
     rails (4.2.10)
@@ -118,36 +118,36 @@ GEM
       activesupport (>= 4.2.0, < 5.0)
       nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
     railties (4.2.10)
       actionpack (= 4.2.10)
       activesupport (= 4.2.10)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.5.0)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
     rspec_junit_formatter (0.3.0)
       rspec-core (>= 2, < 4, != 2.12.0)
     safe_yaml (1.0.4)
-    simplecov (0.15.0)
-      docile (~> 1.1.0)
+    simplecov (0.16.1)
+      docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    sprockets (3.7.1)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
@@ -156,7 +156,7 @@ GEM
       sprockets (>= 3.0.0)
     thor (0.20.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.4)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
     url (0.3.2)
     webmock (3.0.1)
@@ -177,4 +177,4 @@ DEPENDENCIES
   webmock (~> 3.0.0, ~> 3.0)
 
 BUNDLED WITH
-   1.15.3
+   1.16.1

data/bin/hekate

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'hekate'
+require_relative '../lib/hekate'
 require 'rubygems'
 require 'commander/import'
 

data/hekate.gemspec

@@ -1,7 +1,6 @@
-# coding: utf-8
 # frozen_string_literal: true
 
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "hekate/version"
 
@@ -26,10 +25,10 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "aws-sdk-kms", "~>1.2.0", ">= 1.2.0"
   spec.add_runtime_dependency "aws-sdk-ssm", "~>1.3.0", ">= 1.3.0"
   spec.add_runtime_dependency "commander", "~> 4.4", ">= 4.4.0"
+  spec.add_runtime_dependency "dotenv", "~> 2.2", ">= 2.2.1"
   spec.add_runtime_dependency "ec2-metadata", "~> 0.2", ">= 0.2.0"
-  spec.add_runtime_dependency "railties", "~> 4.2", ">= 4.2.0"
   spec.add_runtime_dependency "rails", "~> 4"
-  spec.add_runtime_dependency "dotenv", "~> 2.2", ">= 2.2.1"
+  spec.add_runtime_dependency "railties", "~> 4.2", ">= 4.2.0"
 
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "codecov", "~> 0.1", "~> 0.1.0"

data/lib/hekate.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "rails"
-require "hekate/aws"
-require "hekate/version"
-require "hekate/railtie"
-require "hekate/engine"
+require_relative "hekate/aws"
+require_relative "hekate/version"
+require_relative "hekate/railtie"
+require_relative "hekate/engine"

data/lib/hekate/aws.rb

@@ -23,19 +23,12 @@ module Hekate
       end
     end
 
-    def list_parameters(environments = [])
-      get_app_env_parameters(environments)
-    end
-
-    def get_parameters(names)
-      result = []
-      names.each_slice(10) do |slice|
-        result.concat(ssm.get_parameters(
-            names: slice,
-            with_decryption: true
-        ).parameters)
+    def get_parameters(environments = [])
+      parameters = []
+      environments.each do |environment|
+        parameters += get_env_parameters(environment)
       end
-      result.flatten
+      parameters
     end
 
     def put_parameter(name, value, environment)
@@ -53,11 +46,17 @@ module Hekate
     private
 
     def kms
-      @kms ||= ::Aws::KMS::Client.new(region: @region)
+      @kms ||= ::Aws::KMS::Client.new(
+          region: @region,
+          retry_limit: 5,
+          retry_backoff: proc { |attempts| sleep(2**attempts) }
+      )
     end
 
     def ssm
-      @ssm ||= ::Aws::SSM::Client.new(region: @region)
+      @ssm ||= ::Aws::SSM::Client.new(region: @region,
+                                      retry_limit: 5,
+                                      retry_backoff: proc { |attempts| sleep(2**attempts) })
     end
 
     def kms_key(environment)
@@ -87,22 +86,19 @@ module Hekate
       aliases.include? kms_alias
     end
 
-    def get_app_env_parameters(environments = [], parameters = [], next_token = nil)
+    def get_env_parameters(environment, parameters = [], next_token = nil)
       query = {
-          filters: [
-              {
-                  key: "Name",
-                  values: environments.map { |e| "#{Hekate::Engine.application}.#{e}" }
-              }
-          ],
-          max_results: 50
+          path: "/#{Hekate::Engine.application}/#{environment}",
+          recursive: false,
+          with_decryption: true,
+          max_results: 10
       }
       query[:next_token] = next_token if next_token
-      response = ssm.describe_parameters(query)
+      response = ssm.get_parameters_by_path(query)
 
       parameters += response.parameters
 
-      parameters = get_app_env_parameters(environments, parameters, response.next_token) if response.next_token
+      parameters = get_env_parameters(environment, parameters, response.next_token) if response.next_token
 
       parameters
     end

data/lib/hekate/engine.rb

@@ -11,7 +11,7 @@ module Hekate
       attr_accessor :application
 
       def get_region
-        if ec2?
+        if !%w[development test].include?(Rails.env.to_s) && ec2?
           Ec2Metadata[:placement]["availability-zone"][0...-1]
         else
           ENV["AWS_REGION"] || "us-east-1"
@@ -21,7 +21,7 @@ module Hekate
       def ec2?
         Ec2Metadata[:instance_id]
         true
-      rescue
+      rescue StandardError
         false
       end
 
@@ -81,7 +81,7 @@ module Hekate
               rescue Errno::EISCONN
                 # Good news everybody, the socket is connected!
                 result = true
-              rescue
+              rescue StandardError
                 # An unexpected exception was raised - the connection is no good.
                 socket.close
                 result = false
@@ -93,7 +93,7 @@ module Hekate
               socket.close
               result = false
             end
-          rescue
+          rescue StandardError
             result = false
           end
         end
@@ -114,17 +114,14 @@ module Hekate
 
     def load_environment
       if Hekate::Engine.online?
-        application = "#{Hekate::Engine.application}."
+        application = Hekate::Engine.application
         environments = ["root", @environment].compact
 
-        parameters = awsclient.list_parameters(environments)
-        parameters = parameters.map(&:name)
-
-        result = awsclient.get_parameters(parameters)
+        parameters = awsclient.get_parameters(environments)
 
         environments.each do |env|
-          result.select { |r| r.name[/#{Hekate::Engine.application}\.#{env}\./] }.each do |parameter|
-            parameter_name = parameter.name.gsub(application, "").gsub("#{env}.", "")
+          parameters.select { |r| r.name.start_with?("/#{application}/#{env}/") }.each do |parameter|
+            parameter_name = parameter.name.gsub("/#{application}/#{env}/", "")
             ENV[parameter_name] = parameter.value
           end
         end
@@ -146,8 +143,8 @@ module Hekate
         next if line.start_with? "#"
 
         key, value = line.split("=")
-
         next if value.nil?
+
         value = value.delete('"').delete("'").delete("\n")
         next if value.empty?
 
@@ -156,17 +153,17 @@ module Hekate
     end
 
     def put(key, value)
-      parameter_key = "#{Hekate::Engine.application}.#{@environment}.#{key}"
+      parameter_key = "/#{Hekate::Engine.application}/#{@environment}/#{key}"
       awsclient.put_parameter(parameter_key, value, @environment)
     end
 
     def get(key)
-      parameter_key = "#{Hekate::Engine.application}.#{@environment}.#{key}"
+      parameter_key = "/#{Hekate::Engine.application}/#{@environment}/#{key}"
       awsclient.get_parameter(parameter_key)
     end
 
     def delete_all
-      parameters = awsclient.list_parameters([@environment]).map(&:name)
+      parameters = awsclient.get_parameters([@environment]).map(&:name)
       progress = Commander::UI::ProgressBar.new(parameters.length)
       parameters.each do |parameter|
         progress.increment
@@ -175,25 +172,19 @@ module Hekate
     end
 
     def delete(key)
-      parameter_key = "#{Hekate::Engine.application}.#{@environment}.#{key}"
+      parameter_key = "/#{Hekate::Engine.application}/#{@environment}/#{key}"
       awsclient.delete_parameter(parameter_key)
     end
 
     def export(env_file)
-      parameter_key = "#{Hekate::Engine.application}.#{@environment}."
-
-      parameters = awsclient.list_parameters([@environment]).map(&:name)
+      parameters = awsclient.get_parameters([@environment])
 
       progress = Commander::UI::ProgressBar.new(parameters.length)
       open(env_file, "w") do |file|
-        parameters.each_slice(10) do |slice|
-          result = awsclient.get_parameters(slice)
-
-          result.each do |parameter|
-            progress.increment
-            parameter_name = parameter.name.gsub(parameter_key, "")
-            file.puts "#{parameter_name}=#{parameter.value}"
-          end
+        parameters.each do |parameter|
+          progress.increment
+          parameter_name = parameter.name.gsub("/#{Hekate::Engine.application}/#{@environment}/", "")
+          file.puts "#{parameter_name}=#{parameter.value}"
         end
       end
     end

data/lib/hekate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Hekate
-  VERSION = "0.1.0.pre22"
+  VERSION = "0.2.0.pre1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hekate
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre22
+  version: 0.2.0.pre1
 platform: ruby
 authors:
 - jasonrisch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-29 00:00:00.000000000 Z
+date: 2018-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -91,45 +91,45 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 4.4.0
 - !ruby/object:Gem::Dependency
-  name: ec2-metadata
+  name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
-  name: railties
+  name: ec2-metadata
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 0.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -145,25 +145,25 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
-  name: dotenv
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.2.1
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement