MovableInkAWS 1.1.6 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7cefbe8ebb6f26b75ebbd79c72c54bee43338f21eabfe3402bdcd9496c66bbf4
-  data.tar.gz: 6fa2f605910e9cd4afbb1286a769f7ad6307ce0be94ba2933e2e567ef6cffd33
+  metadata.gz: cd2763ea3f172fa051b72e65e9a3ef722ef961e67ca43fac2195f5a9acfeb881
+  data.tar.gz: 7100767e992eacbd67763ea5ab3c221cf70787d6e36aa9732ee6372d0a27937e
 SHA512:
-  metadata.gz: 6ddba12e6beb952a764278aee29ed2e050f16d102b472acdc6bee2c93452516cb5022c3ff6763f39366bd6baaf06719fee29e697fe0f894e93a58e8c91f80da0
-  data.tar.gz: 4dc568a16f612ef6cc0afdbcd2842ef3a73b3224d0ad395655e7cf407d20ab209d17878c92e4415db71c8cdaa2f9cc6c580ac423a6be8093074c4c2ef2bfd860
+  metadata.gz: 64807199ef1e1aba116ebd9bfac37a0395e32935cca99172a0a82865249b6a4586f452ffe9ccd45733e9354cedef6479967f95d35375c4baf530835eb6b4823c
+  data.tar.gz: aeb957ad8595c852a7f97ca771d766f9f943663dc7db3eb2cdb2e0c9189c627bac4c197609ef2706b499dd33f11deedf9f45a19b99633d9b77261235ded530e5

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    MovableInkAWS (1.1.6)
+    MovableInkAWS (1.3.1)
       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,47 +21,50 @@ GEM
   remote: https://rubygems.org/
   specs:
     aws-eventstream (1.1.0)
-    aws-partitions (1.351.0)
-    aws-sdk-athena (1.30.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-partitions (1.378.0)
+    aws-sdk-athena (1.33.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-autoscaling (1.44.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-autoscaling (1.47.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatch (1.42.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-cloudwatch (1.45.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.104.3)
+    aws-sdk-core (3.109.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-ec2 (1.182.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-ec2 (1.198.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticache (1.40.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-eks (1.44.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.36.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-elasticache (1.43.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-rds (1.95.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-kms (1.39.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-route53 (1.40.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-rds (1.101.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.75.0)
-      aws-sdk-core (~> 3, >= 3.104.1)
+    aws-sdk-route53 (1.44.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.82.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sns (1.29.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-sns (1.32.0)
+      aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ssm (1.86.0)
-      aws-sdk-core (~> 3, >= 3.99.0)
+    aws-sdk-ssm (1.93.0)
+      aws-sdk-core (~> 3, >= 3.109.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/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,7 +64,9 @@ module MovableInk
         rescue Aws::EC2::Errors::RequestLimitExceeded,
                Aws::EC2::Errors::ResourceAlreadyAssociated,
                Aws::EC2::Errors::Unavailable,
+               Aws::EKS::Errors::TooManyRequestsException,
                Aws::SNS::Errors::ThrottledException,
+               Aws::SNS::Errors::Throttling,
                Aws::AutoScaling::Errors::Throttling,
                Aws::AutoScaling::Errors::ThrottledException,
                Aws::S3::Errors::SlowDown,

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.6'
+    VERSION = '1.3.1'
   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.6
+  version: 1.3.1
 platform: ruby
 authors:
 - Matt Chesler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-06 00:00:00.000000000 Z
+date: 2020-10-01 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