MovableInkAWS 2.2.0 → 2.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d7b1d77334dfeeb0283ce569cb62b7bce8a2518de96c73156f2b25693f0a2168
-  data.tar.gz: 56b60538a821c7fab3e55ad7ee0a80ac85312ff003521764e0721dcf86d5577c
+  metadata.gz: eb083b13e12b669f0843ea32ea2b8b4280ccce9b5ac6055964d9ca1214d36f60
+  data.tar.gz: 967f30f88ebef0135620f12930075da3bdeb05d4b449c2e5612a267f3197ff73
 SHA512:
-  metadata.gz: 4132433dd73377d07d141297180ec17f983c4f124811ef45e474a78aa31d493d44ec2df98ed393707d13b095821182e54fcbcf23eff61f924d915aaf4eec1edd
-  data.tar.gz: e317ad0ac916a54ffd6042310906310ea5be40f3b6b88f83b3f8c6b45364bcea3df1282c5106a5d9032cf1804137e1c03002fd0cbc7942142ca2f7ec45245798
+  metadata.gz: 687824a79299c74f15b6c9d1f3fded4663020670ae533619045e2097b99a38782348c3572d51bcb0d130d6b0e4e84b0ee78b778795792ba375b45118a94aaba9
+  data.tar.gz: 85feb71050191506f20429f851fca622597090365fe6817b54091daf539f7c84918466b20ba8566d2c948c1326188f4a33bdc8b3989d2f80e9b82cb6ffeebedf

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    MovableInkAWS (2.2.0)
+    MovableInkAWS (2.2.1)
       aws-sdk-athena (~> 1)
       aws-sdk-autoscaling (~> 1)
       aws-sdk-cloudwatch (~> 1)
@@ -23,51 +23,51 @@ GEM
   specs:
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
-    aws-eventstream (1.1.0)
-    aws-partitions (1.416.0)
-    aws-sdk-athena (1.33.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-eventstream (1.1.1)
+    aws-partitions (1.433.0)
+    aws-sdk-athena (1.37.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-autoscaling (1.53.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-autoscaling (1.58.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatch (1.47.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-cloudwatch (1.50.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.111.0)
+    aws-sdk-core (3.113.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-ec2 (1.220.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-ec2 (1.227.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-eks (1.46.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-eks (1.51.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticache (1.50.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-elasticache (1.54.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.41.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-kms (1.43.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-rds (1.110.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-rds (1.117.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-route53 (1.45.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-route53 (1.47.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.87.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-s3 (1.91.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sns (1.36.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-sns (1.39.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ssm (1.102.0)
-      aws-sdk-core (~> 3, >= 3.109.0)
+    aws-sdk-ssm (1.106.0)
+      aws-sdk-core (~> 3, >= 3.112.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.2.2)
+    aws-sigv4 (1.2.3)
       aws-eventstream (~> 1, >= 1.0.2)
     crack (0.4.3)
       safe_yaml (~> 1.0.0)
@@ -85,7 +85,7 @@ GEM
     jmespath (1.4.0)
     mime-types (3.3.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2020.1104)
+    mime-types-data (3.2021.0225)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     public_suffix (4.0.5)

data/lib/movable_ink/aws/ec2.rb

@@ -124,31 +124,60 @@ module MovableInk
         # consul service naming conventions while still retaining the role name we use
         # within MI configuration
         Diplomat::Health.service(role.gsub('_', '-'), consul_service_options).map { |endpoint|
-          OpenStruct.new (
-          {
-            private_ip_address: endpoint.Node['Address'],
-            instance_id: endpoint.Node['Meta']['instance_id'],
-            tags: [
-              {
-                key: 'Name',
-                value: endpoint.Node['Node']
-              },
-              {
-                key: 'mi:roles',
-                value: endpoint.Node['Meta']['mi_roles']
-              },
-              {
-                key: 'mi:monitoring_roles',
-                value: endpoint.Node['Meta']['mi_monitoring_roles']
-              }
-            ],
-            placement: {
-              availability_zone: endpoint.Node['Meta']['availability_zone']
-            }
-          })
+          if endpoint.Node.dig('Meta', 'external-source') == 'kubernetes'
+            map_k8s_consul_endpoint(endpoint, role)
+          else
+            map_ec2_consul_endpoint(endpoint)
+          end
         }
       end
 
+      def map_k8s_consul_endpoint(endpoint, role)
+        OpenStruct.new ({
+          private_ip_address: endpoint.Service.dig('Address'),
+          instance_id: nil,
+          tags: [
+            {
+              key: 'Name',
+              value: endpoint.Service.dig('ID')
+            },
+            {
+              key: 'mi:roles',
+              value: role
+            },
+            {
+              key: 'mi:monitoring_roles',
+              value: role
+            }
+          ],
+          placement: { availability_zone: nil }
+        })
+      end
+
+      def map_ec2_consul_endpoint(endpoint)
+        OpenStruct.new ({
+          private_ip_address: endpoint.Node['Address'],
+          instance_id: endpoint.Node['Meta']['instance_id'],
+          tags: [
+            {
+              key: 'Name',
+              value: endpoint.Node['Node']
+            },
+            {
+              key: 'mi:roles',
+              value: endpoint.Node['Meta']['mi_roles']
+            },
+            {
+              key: 'mi:monitoring_roles',
+              value: endpoint.Node['Meta']['mi_monitoring_roles']
+            }
+          ],
+          placement: {
+            availability_zone: endpoint.Node['Meta']['availability_zone']
+          }
+        })
+      end
+
       def instances(role:, exclude_roles: [], region: my_region, availability_zone: nil, exact_match: false, use_cache: true, discovery_type: 'ec2')
         if discovery_type == 'ec2'
           instances_with_ec2_discovery(role: role, exclude_roles: exclude_roles, region: region, availability_zone: availability_zone, exact_match: exact_match, use_cache: use_cache)

data/lib/movable_ink/version.rb

@@ -1,5 +1,5 @@
 module MovableInk
   class AWS
-    VERSION = '2.2.0'
+    VERSION = '2.2.1'
   end
 end

data/spec/ec2_spec.rb

@@ -386,6 +386,36 @@ describe MovableInk::AWS::EC2 do
         }]
       }
 
+      let(:consul_kubernetes_service_instances) do
+        [
+          {
+            "Node": {
+              "ID": "",
+              "Node": "k8s-sync",
+              "Address": "127.0.0.1",
+              "Datacenter": "my_datacenter",
+              "TaggedAddresses": nil,
+              "Meta": {
+                "external-source": "kubernetes",
+                "CreateIndex": 987654321,
+                "ModifyIndex": 123456789,
+              }
+            },
+            "Service": {
+              "ID": "pod-name-ac8f920827af",
+              "Service": "kubernetes-service-name",
+              "Tags": ["k8s"],
+              "Address": "10.0.0.1",
+              "Port": 8080,
+              "Meta": {
+                "external-source": "kubernetes",
+                "external-k8s-ns": "default",
+              }
+            }
+          }
+        ]
+      end
+
       before(:each) do
         allow(aws).to receive(:mi_env).and_return('test')
         allow(aws).to receive(:availability_zone).and_return(my_availability_zone)
@@ -445,6 +475,33 @@ describe MovableInk::AWS::EC2 do
         ojos_instances = aws.instances(role: 'ojos', availability_zone: other_availability_zone, discovery_type: 'consul')
         expect(ojos_instances.map{|i| i.tags.first[:value]}).to eq(['ojos_instance2', 'ojos_instance3'])
       end
+
+      it "returns backends that are synced from consul-k8s" do
+        miaws = double(MovableInk::AWS)
+        allow(miaws).to receive(:my_region).and_return('us-east-1')
+
+        json = JSON.generate(consul_kubernetes_service_instances)
+        stub_request(:get, "https://localhost:8501/v1/health/service/kubernetes-service-name?cached&dc=#{my_datacenter}&passing&stale")
+          .with({
+            headers: {
+              'Accept'=>'*/*',
+              'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
+              'User-Agent'=>'Faraday v1.0.1'
+            }
+          })
+          .to_return(status: 200, body: json, headers: {})
+
+         resp_instances = aws.instances(role: 'kubernetes-service-name', discovery_type: 'consul')
+         backend = resp_instances.first
+         name_tag = backend.tags.find {|t| t[:key] == 'Name' }
+         roles_tag = backend.tags.find {|t| t[:key] == 'mi:roles' }
+
+         expect(name_tag[:value]).to eq('pod-name-ac8f920827af')
+         expect(roles_tag[:value]).to eq('kubernetes-service-name')
+         expect(backend.instance_id).to eq(nil)
+         expect(backend.private_ip_address).to eq('10.0.0.1')
+         expect(backend.private_ip_address).to eq('10.0.0.1')
+      end
     end
 
     context "ordered roles" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MovableInkAWS
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.2.1
 platform: ruby
 authors:
 - Matt Chesler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2021-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core