MovableInkAWS 1.1.5 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 135c3f868d20fde5a59ac85a4e899cbd008fdcf6e4adb52e87ce0ce890305c6a
-  data.tar.gz: e5c2db50def4842fd9d70278603aec613d2bb3e13874740ba4d2dc8cb088819f
+  metadata.gz: 7021c3e1d0f994fe76adec836d62f1fa50454389c9dc9d07c0e754a1f05f9ac5
+  data.tar.gz: 47fa2194267bb7f8e163ae1e815d708588832789cd1857184d581c5725570d04
 SHA512:
-  metadata.gz: 31b99276587e8b25f7cfd3af5f7852542d969c675ce168236b1d2a1c33f683844151897e946eb6edebc4f1a3c70900e7c6d0aef204b389702b031b5652f7f3bd
-  data.tar.gz: 22d3b8dfb489a985f10b70f615be7055759882f52ca818c345d546f9f64291cd787b341430d1df72636df73ffb51ef370d85b66be883a45d2d081cc2739e95c0
+  metadata.gz: 8c1c045dbc080b60e3101796494ed88cc6dd4e3f4ae697342a41771dc194c9c4c3526ea4fefd1f4c70ce0647bf3593e8c13d0832c057974d8f60221a3e3cc2f7
+  data.tar.gz: 9b553f0f33f02d1456eafb8e06ee1ff65b60adc02f6fc1b0f17f6c94eae56b9774fdbcb547619474fa4773f3b2d8c36af344cb27a3bf91168284a970183ca53c

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    MovableInkAWS (1.1.5)
+    MovableInkAWS (1.3.0)
       aws-sdk-athena (~> 1)
       aws-sdk-autoscaling (~> 1)
       aws-sdk-cloudwatch (~> 1)
       aws-sdk-core (~> 3)
       aws-sdk-ec2 (~> 1)
+      aws-sdk-eks (~> 1)
       aws-sdk-elasticache (~> 1)
       aws-sdk-rds (~> 1)
       aws-sdk-route53 (~> 1)
@@ -20,48 +21,51 @@ GEM
   remote: https://rubygems.org/
   specs:
     aws-eventstream (1.1.0)
-    aws-partitions (1.325.0)
-    aws-sdk-athena (1.27.0)
-      aws-sdk-core (~> 3, >= 3.71.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.37.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-autoscaling (1.45.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatch (1.38.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-cloudwatch (1.43.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.97.1)
+    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.165.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-ec2 (1.193.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticache (1.36.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-eks (1.41.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.33.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-elasticache (1.41.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-rds (1.85.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-kms (1.37.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-route53 (1.35.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-rds (1.97.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.67.1)
-      aws-sdk-core (~> 3, >= 3.96.1)
+    aws-sdk-route53 (1.42.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
+      aws-sigv4 (~> 1.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.24.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-sns (1.30.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ssm (1.80.0)
-      aws-sdk-core (~> 3, >= 3.71.0)
+    aws-sdk-ssm (1.88.0)
+      aws-sdk-core (~> 3, >= 3.99.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.1.4)
-      aws-eventstream (~> 1.0, >= 1.0.2)
+    aws-sigv4 (1.2.2)
+      aws-eventstream (~> 1, >= 1.0.2)
     diff-lcs (1.3)
     httparty (0.16.3)
       mime-types (~> 3.0)

data/MovableInkAWS.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'aws-sdk-autoscaling', '~> 1'
   s.add_runtime_dependency 'aws-sdk-cloudwatch', '~> 1'
   s.add_runtime_dependency 'aws-sdk-ec2', '~> 1'
+  s.add_runtime_dependency 'aws-sdk-eks', '~> 1'
   s.add_runtime_dependency 'aws-sdk-elasticache', '~> 1'
   s.add_runtime_dependency 'aws-sdk-rds', '~> 1'
   s.add_runtime_dependency 'aws-sdk-route53', '~> 1'

data/lib/movable_ink/aws.rb

@@ -7,6 +7,7 @@ require_relative 'aws/route53'
 require_relative 'aws/ssm'
 require_relative 'aws/athena'
 require_relative 'aws/s3'
+require_relative 'aws/eks'
 require_relative 'aws/elasticache'
 require_relative 'aws/api_gateway'
 require 'aws-sdk-cloudwatch'
@@ -24,6 +25,7 @@ module MovableInk
     include S3
     include ElastiCache
     include ApiGateway
+    include EKS
 
     class << self
       def regions
@@ -62,6 +64,7 @@ module MovableInk
         rescue Aws::EC2::Errors::RequestLimitExceeded,
                Aws::EC2::Errors::ResourceAlreadyAssociated,
                Aws::EC2::Errors::Unavailable,
+               Aws::EKS::Errors::TooManyRequestsException,
                Aws::SNS::Errors::ThrottledException,
                Aws::AutoScaling::Errors::Throttling,
                Aws::AutoScaling::Errors::ThrottledException,
@@ -71,6 +74,7 @@ module MovableInk
                Aws::Route53::Errors::PriorRequestNotComplete,
                Aws::Route53::Errors::ServiceUnavailable,
                Aws::SSM::Errors::TooManyUpdates,
+               Aws::SSM::Errors::ThrottlingException,
                Aws::Athena::Errors::ThrottlingException,
                MovableInk::AWS::Errors::NoEnvironmentTagError
           sleep_time = (num+1)**2 + rand(10)

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/aws/eks.rb

@@ -0,0 +1,60 @@
+require 'aws-sdk-eks'
+require 'yaml'
+
+module MovableInk
+  class AWS
+    module EKS
+      def eks(region: my_region)
+        @eks_client ||= {}
+        @eks_client[region] ||= Aws::EKS::Client.new(region: region)
+      end
+
+      def generate_kubeconfig(region: my_region, cluster_name:)
+        client = eks(region: region)
+
+        resp = run_with_backoff do
+          begin
+            client.describe_cluster({ name: cluster_name })
+          rescue Aws::EKS::Errors::ResourceNotFoundException
+            return nil
+          end
+        end
+
+        cluster_arn = resp.cluster.arn
+        cluster_server_address = resp.cluster.endpoint
+        cluster_certificate_authority_data = resp.cluster.certificate_authority.data
+
+        {
+          'apiVersion' => 'v1',
+          'clusters' => [{
+            'cluster' => {
+              'certificate-authority-data' => cluster_certificate_authority_data,
+              'server' => cluster_server_address,
+            },
+            'name' => cluster_arn
+          }],
+          'contexts' => [{
+            'context' => {
+              'cluster' => cluster_arn,
+              'user' => cluster_arn,
+            },
+            'name' => cluster_arn,
+          }],
+          'current-context' => cluster_arn,
+          'kind' => 'Config',
+          'preferences' => {},
+          'users' => [{
+            'name' => cluster_arn,
+            'user' => {
+              'exec' => {
+                'apiVersion' => 'client.authentication.k8s.io/v1alpha1',
+                'args' => ['--region', region, 'eks', 'get-token', '--cluster-name', cluster_name],
+                'command' => 'aws',
+              }
+            }
+          }]
+        }.to_yaml
+      end
+    end
+  end
+end

data/lib/movable_ink/version.rb

@@ -1,5 +1,5 @@
 module MovableInk
   class AWS
-    VERSION = '1.1.5'
+    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.1.5
+  version: 1.3.0
 platform: ruby
 authors:
 - Matt Chesler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-04 00:00:00.000000000 Z
+date: 2020-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-eks
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-elasticache
   requirement: !ruby/object:Gem::Requirement
@@ -210,6 +224,7 @@ files:
 - lib/movable_ink/aws/athena.rb
 - lib/movable_ink/aws/autoscaling.rb
 - lib/movable_ink/aws/ec2.rb
+- lib/movable_ink/aws/eks.rb
 - lib/movable_ink/aws/elasticache.rb
 - lib/movable_ink/aws/errors.rb
 - lib/movable_ink/aws/metadata.rb