MovableInkAWS 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 17ceb1cd0d9da92a94c3e5f7eb4d46d9303546bae02c68355f9257e26719e7d9
-  data.tar.gz: b70e2dcf79443ee2c2b8cdc700880de3976efe52af15517d7852ed69e2c444c0
+  metadata.gz: 7021c3e1d0f994fe76adec836d62f1fa50454389c9dc9d07c0e754a1f05f9ac5
+  data.tar.gz: 47fa2194267bb7f8e163ae1e815d708588832789cd1857184d581c5725570d04
 SHA512:
-  metadata.gz: 1eaced59806f774de531934dc18217f9fa699f8ca5a02829260f10bf1a0c293bb640c97dbb7270c884a7c0e217fc58a506c69cdd44cf5cc567e70f25b7f8fc4d
-  data.tar.gz: 8654770ca2b03ab180af4bcd9727aaa94c4cad1090f4e5002172f621b8c5c6ab90dfd49b90039312de7e86b68fdd2135d78d9882c643330d47f3f7fe0c861bd5
+  metadata.gz: 8c1c045dbc080b60e3101796494ed88cc6dd4e3f4ae697342a41771dc194c9c4c3526ea4fefd1f4c70ce0647bf3593e8c13d0832c057974d8f60221a3e3cc2f7
+  data.tar.gz: 9b553f0f33f02d1456eafb8e06ee1ff65b60adc02f6fc1b0f17f6c94eae56b9774fdbcb547619474fa4773f3b2d8c36af344cb27a3bf91168284a970183ca53c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    MovableInkAWS (1.2.2)
+    MovableInkAWS (1.3.0)
       aws-sdk-athena (~> 1)
       aws-sdk-autoscaling (~> 1)
       aws-sdk-cloudwatch (~> 1)
@@ -21,50 +21,50 @@ GEM
   remote: https://rubygems.org/
   specs:
     aws-eventstream (1.1.0)
-    aws-partitions (1.353.0)
-    aws-sdk-athena (1.30.0)
+    aws-partitions (1.364.0)
+    aws-sdk-athena (1.31.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-autoscaling (1.44.0)
+    aws-sdk-autoscaling (1.45.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatch (1.42.0)
+    aws-sdk-cloudwatch (1.43.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.104.3)
+    aws-sdk-core (3.105.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-ec2 (1.183.0)
+    aws-sdk-ec2 (1.193.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-eks (1.39.0)
+    aws-sdk-eks (1.41.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticache (1.40.0)
+    aws-sdk-elasticache (1.41.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.36.0)
+    aws-sdk-kms (1.37.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-rds (1.95.0)
+    aws-sdk-rds (1.97.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-route53 (1.40.0)
+    aws-sdk-route53 (1.42.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.76.0)
-      aws-sdk-core (~> 3, >= 3.104.1)
+    aws-sdk-s3 (1.79.1)
+      aws-sdk-core (~> 3, >= 3.104.3)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sns (1.29.0)
+    aws-sdk-sns (1.30.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ssm (1.86.0)
+    aws-sdk-ssm (1.88.0)
       aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.1)
+    aws-sigv4 (1.2.2)
       aws-eventstream (~> 1, >= 1.0.2)
     diff-lcs (1.3)
     httparty (0.16.3)

data/lib/movable_ink/aws/ec2.rb

@@ -9,13 +9,13 @@ module MovableInk
       end
 
       def mi_env_cache_file_path
-        '/etc/movableink/mi_env'
+        '/etc/movableink/environments.json'
       end
 
       def mi_env
         @mi_env ||= if File.exist?(mi_env_cache_file_path)
-          value = File.read(mi_env_cache_file_path)
-          value.empty? ? load_mi_env : value
+          environments = JSON.parse(File.read(mi_env_cache_file_path))
+          environments[my_region] || load_mi_env
         else
           load_mi_env
         end

data/lib/movable_ink/version.rb

@@ -1,5 +1,5 @@
 module MovableInk
   class AWS
-    VERSION = '1.2.2'
+    VERSION = '1.3.0'
   end
 end

data/spec/ec2_spec.rb

@@ -32,26 +32,14 @@ describe MovableInk::AWS::EC2 do
     }
 
     it 'will read mi_env from disk when the cache file exists' do
+      allow(aws).to receive(:my_region).and_return('us-east-2')
       f = Tempfile.new('cache')
-      f.write('staging')
+      f.write(JSON.generate({ "us-east-1": "production", "us-west-2": "production", "us-east-2": "staging" }))
       f.close
       allow(aws).to receive(:mi_env_cache_file_path).and_return(f.path)
       expect(aws.mi_env).to eq('staging')
     end
 
-    it 'will read tag data if the cache file is empty' do
-      ec2.stub_responses(:describe_tags, tag_data)
-      allow(aws).to receive(:my_region).and_return('us-east-1')
-      allow(aws).to receive(:instance_id).and_return('i-12345')
-      allow(aws).to receive(:ec2).and_return(ec2)
-
-      f = Tempfile.new('cache')
-      f.write('')
-      f.close
-      allow(aws).to receive(:mi_env_cache_file_path).and_return(f.path)
-      expect(aws.mi_env).to eq('test')
-    end
-
     it "should find the environment from the current instance's tags" do
       ec2.stub_responses(:describe_tags, tag_data)
       allow(aws).to receive(:my_region).and_return('us-east-1')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MovableInkAWS
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Matt Chesler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-01 00:00:00.000000000 Z
+date: 2020-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core