MovableInkAWS 2.0.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9748092eb913e843641b0ac9d68106cb8ae3dc141c5f3ef0cf2794c7b52a41f5
-  data.tar.gz: 1bcbc2de4d41898654cf8df5e09fb1a43465d338f73b64a36fcf785db882fb15
+  metadata.gz: cf12982879cf6c6fbbd4a1027aa6de717c3084431339ad583cd4ae38d934bc91
+  data.tar.gz: e1baa1af0dc4a999bcba1ee421edc4204465afaadbc72a3190e97c57a948c1de
 SHA512:
-  metadata.gz: ed19423e404a705e9caf74762f6bd1cd08b5f552af5b24d6c355364d59c422d2cfba5f225e10cd021a79e77ae5d65ee8773c86eda5340e32d69d088cfb4789c4
-  data.tar.gz: 6c5edc3a00e2d798140c30d2cce8279c03099e9b30aa1c1630e14a10ae075756328d9327ebfab94171bea47394503d4f9a592c9a8d5e706be37fe6c1dfbbd7f6
+  metadata.gz: 567ef63e82f5d5bbf5b57b9b2aa5a853a63af0d572f710e813c322d135fef345456fc9cc3e3f103666f05065d244f67055ea78350f9b4ecec111b159663d2616
+  data.tar.gz: 2712730cb9852affc31a1586d36eba62b76a621d8e82dad39d8439bb0f47db72e897147666e5ea01ca2f75c7c4aeb3f5363f60b531dabd07f90e96813a846cb1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    MovableInkAWS (2.0.1)
+    MovableInkAWS (2.1.0)
       aws-sdk-athena (~> 1)
       aws-sdk-autoscaling (~> 1)
       aws-sdk-cloudwatch (~> 1)
@@ -24,47 +24,47 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     aws-eventstream (1.1.0)
-    aws-partitions (1.390.0)
+    aws-partitions (1.416.0)
     aws-sdk-athena (1.33.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-autoscaling (1.48.0)
+    aws-sdk-autoscaling (1.53.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatch (1.46.0)
+    aws-sdk-cloudwatch (1.47.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.109.2)
+    aws-sdk-core (3.111.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-ec2 (1.207.0)
+    aws-sdk-ec2 (1.220.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-eks (1.45.0)
+    aws-sdk-eks (1.46.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticache (1.45.0)
+    aws-sdk-elasticache (1.50.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.39.0)
+    aws-sdk-kms (1.41.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-rds (1.105.0)
+    aws-sdk-rds (1.110.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-route53 (1.44.0)
+    aws-sdk-route53 (1.45.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.83.1)
+    aws-sdk-s3 (1.87.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sns (1.35.0)
+    aws-sdk-sns (1.36.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ssm (1.95.0)
+    aws-sdk-ssm (1.102.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.2.2)

data/lib/movable_ink/aws.rb

@@ -10,6 +10,7 @@ require_relative 'aws/s3'
 require_relative 'aws/eks'
 require_relative 'aws/elasticache'
 require_relative 'aws/api_gateway'
+require_relative 'consul/consul'
 require 'aws-sdk-cloudwatch'
 
 

data/lib/movable_ink/aws/ec2.rb

@@ -116,18 +116,12 @@ module MovableInk
           raise MovableInk::AWS::Errors::RoleNameInvalidError
         end
 
-        Diplomat.configure do |config|
-          config.url = "https://localhost:8501"
-          config.options = { ssl: { verify: false } }
-        end
-
-        consul_service_options = Hash.new
-
-        consul_service_options[:dc] = datacenter(region: region)
-        consul_service_options[:stale] = true
-        consul_service_options[:cached] = true
-        consul_service_options[:passing] = true
-
+        consul_service_options = {
+          dc: datacenter(region: region),
+          stale: true,
+          cached: true,
+          passing: true,
+        }
         consul_service_options[:node_meta] = "availability_zone:#{availability_zone}" unless availability_zone.nil?
 
         Diplomat::Health.service(role, consul_service_options).map { |endpoint|

data/lib/movable_ink/consul/consul.rb

@@ -0,0 +1,21 @@
+require 'diplomat'
+
+Diplomat.configure do |config|
+  config.url = "https://localhost:8501"
+  config.options = { ssl: { verify: false } }
+end
+
+module MovableInk
+  module Consul
+    module Kv
+      def self.get(*args)
+        begin
+          result = Diplomat::Kv.get(*args)
+          JSON.parse(result) if !result.nil?
+        rescue JSON::ParserError
+          result
+        end
+      end
+    end
+  end
+end

data/lib/movable_ink/version.rb

@@ -1,5 +1,5 @@
 module MovableInk
   class AWS
-    VERSION = '2.0.1'
+    VERSION = '2.1.0'
   end
 end

data/spec/consul_spec.rb

@@ -0,0 +1,22 @@
+require_relative '../lib/movable_ink/aws'
+require 'webmock/rspec'
+
+describe MovableInk::Consul do
+  describe MovableInk::Consul::Kv do
+    it 'get returns a hash of json content' do
+      allow(Diplomat::Kv).to receive(:get).and_return({ hello: 'world' }.to_json)
+      expect(MovableInk::Consul::Kv.get('ham')).to eq({ 'hello' => 'world' })
+    end
+
+    it 'returns a string if the stored value is not json' do
+      value = 'some-database-password'
+      allow(Diplomat::Kv).to receive(:get).and_return(value)
+      expect(MovableInk::Consul::Kv.get('db_password')).to eq(value)
+    end
+
+    it 'forwards all arguments to Diplomat' do
+      expect(Diplomat::Kv).to receive(:get).with('foo/', recurse: true)
+      MovableInk::Consul::Kv.get('foo/', recurse: true)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MovableInkAWS
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
 platform: ruby
 authors:
 - Matt Chesler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-06 00:00:00.000000000 Z
+date: 2021-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -246,9 +246,11 @@ files:
 - lib/movable_ink/aws/s3.rb
 - lib/movable_ink/aws/sns.rb
 - lib/movable_ink/aws/ssm.rb
+- lib/movable_ink/consul/consul.rb
 - lib/movable_ink/version.rb
 - spec/autoscaling_spec.rb
 - spec/aws_spec.rb
+- spec/consul_spec.rb
 - spec/ec2_spec.rb
 - spec/elasticache_spec.rb
 - spec/metadata_spec.rb