MovableInkAWS 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ca127d84b2a782fac6a45b9f2ab7d39891ea9b58c1f72897198363fdec217b03
-  data.tar.gz: 1bead2930395e8a2f53b7dce303a5904790072e78f7abf965514f29af736d7ac
+  metadata.gz: 9748092eb913e843641b0ac9d68106cb8ae3dc141c5f3ef0cf2794c7b52a41f5
+  data.tar.gz: 1bcbc2de4d41898654cf8df5e09fb1a43465d338f73b64a36fcf785db882fb15
 SHA512:
-  metadata.gz: 6225008398613de6fd9d239394029bf141252ed6adca815068bd1a88be2df8e7a6947a3a7055aaab41d4833c00edeb770e90b191395f139597fb7a5455de47c9
-  data.tar.gz: 5bf8debaf1f7afafb249b494d26c5142c5d5ce147721e112183c5c6f66a5d7a543c1af7d5f4d3cf4fbe701763a50042c5ed47d6a288db357b0b364c51fbb3713
+  metadata.gz: ed19423e404a705e9caf74762f6bd1cd08b5f552af5b24d6c355364d59c422d2cfba5f225e10cd021a79e77ae5d65ee8773c86eda5340e32d69d088cfb4789c4
+  data.tar.gz: 6c5edc3a00e2d798140c30d2cce8279c03099e9b30aa1c1630e14a10ae075756328d9327ebfab94171bea47394503d4f9a592c9a8d5e706be37fe6c1dfbbd7f6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    MovableInkAWS (1.3.3)
+    MovableInkAWS (2.0.1)
       aws-sdk-athena (~> 1)
       aws-sdk-autoscaling (~> 1)
       aws-sdk-cloudwatch (~> 1)
@@ -24,34 +24,34 @@ GEM
     addressable (2.7.0)
       public_suffix (>= 2.0.2, < 5.0)
     aws-eventstream (1.1.0)
-    aws-partitions (1.383.0)
+    aws-partitions (1.390.0)
     aws-sdk-athena (1.33.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-autoscaling (1.47.0)
+    aws-sdk-autoscaling (1.48.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatch (1.45.0)
+    aws-sdk-cloudwatch (1.46.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.109.1)
+    aws-sdk-core (3.109.2)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.239.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-ec2 (1.200.0)
+    aws-sdk-ec2 (1.207.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-eks (1.45.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticache (1.44.0)
+    aws-sdk-elasticache (1.45.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-kms (1.39.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-rds (1.104.0)
+    aws-sdk-rds (1.105.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-route53 (1.44.0)
@@ -61,7 +61,7 @@ GEM
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.1)
-    aws-sdk-sns (1.33.0)
+    aws-sdk-sns (1.35.0)
       aws-sdk-core (~> 3, >= 3.109.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-ssm (1.95.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.0512)
+    mime-types-data (3.2020.1104)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     public_suffix (4.0.5)

data/lib/movable_ink/aws/ec2.rb

@@ -121,38 +121,39 @@ module MovableInk
           config.options = { ssl: { verify: false } }
         end
 
-        consul_instances = Diplomat::Service.get(role, :all, { :dc => datacenter(region: region), :stale => true, :cached => true }).map { |node|
+        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[:node_meta] = "availability_zone:#{availability_zone}" unless availability_zone.nil?
+
+        Diplomat::Health.service(role, consul_service_options).map { |endpoint|
           OpenStruct.new (
-            {
-            private_ip_address:  node.Address,
-            instance_id: node.NodeMeta['instance_id'],
+          {
+            private_ip_address: endpoint.Node['Address'],
+            instance_id: endpoint.Node['Meta']['instance_id'],
             tags: [
               {
                 key: 'Name',
-                value: node.Node
+                value: endpoint.Node['Node']
               },
               {
                 key: 'mi:roles',
-                value: node.NodeMeta['mi_roles']
+                value: endpoint.Node['Meta']['mi_roles']
               },
               {
                 key: 'mi:monitoring_roles',
-                value: node.NodeMeta['mi_monitoring_roles']
+                value: endpoint.Node['Meta']['mi_monitoring_roles']
               }
             ],
             placement: {
-              availability_zone: node.NodeMeta['availability_zone']
+              availability_zone: endpoint.Node['Meta']['availability_zone']
             }
           })
         }
-
-        if availability_zone
-          consul_instances.select { |consul_instance|
-            consul_instance.placement[:availability_zone] == availability_zone
-          }
-        else
-          consul_instances
-        end
       end
 
       def instances(role:, exclude_roles: [], region: my_region, availability_zone: nil, exact_match: false, use_cache: true, discovery_type: 'ec2')

data/lib/movable_ink/version.rb

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

data/spec/ec2_spec.rb

@@ -312,93 +312,78 @@ describe MovableInk::AWS::EC2 do
       let(:my_datacenter) { 'iad' }
       let(:other_availability_zone) { 'us-east-1b' }
       let(:consul_app_service_instances) {
-        [
-          {
-            Node: 'app_instance1',
-            Address: '10.0.0.1',
-            Datacenter: my_datacenter,
-            NodeMeta:
-            {
-              availability_zone: my_availability_zone,
-              instance_id: 'i-12345',
-              mi_monitoring_roles: 'app',
-              mi_roles: 'app'
-            },
-            ServiceID: 'app',
-            ServiceName: 'app',
-            ServiceTags: ['foo', 'bar'],
-            ServicePort: 80,
-          },
-          {
-            Node: 'app_instance2',
-            Address: '10.0.0.2',
-            Datacenter: my_datacenter,
-            NodeMeta:
-            {
-              availability_zone: my_availability_zone,
-              instance_id: 'i-54321',
-              mi_monitoring_roles: 'app',
-              mi_roles: 'app'
-            },
-            ServiceID: 'app',
-            ServiceName: 'app',
-            ServiceTags: ['foo', 'bar'],
-            ServicePort: 80,
-          }
-        ]
+        [{
+            Node: {
+              Node: 'app_instance1',
+              Address: '10.0.0.1',
+              Datacenter: my_datacenter,
+              Meta: {
+                availability_zone: my_availability_zone,
+                instance_id: 'i-12345',
+                mi_monitoring_roles: 'app',
+                mi_roles: 'app'
+              },
+              ServiceID: 'app',
+              ServiceName: 'app',
+              ServiceTags: ['foo', 'bar'],
+              ServicePort: 80,
+            }
+        },
+        {
+          Node: {
+              Node: 'app_instance2',
+              Address: '10.0.0.2',
+              Datacenter: my_datacenter,
+              Meta: {
+                availability_zone: my_availability_zone,
+                instance_id: 'i-54321',
+                mi_monitoring_roles: 'app',
+                mi_roles: 'app'
+              },
+              ServiceID: 'app',
+              ServiceName: 'app',
+              ServiceTags: ['foo', 'bar'],
+              ServicePort: 80,
+            }
+       }]
       }
 
       let(:consul_ojos_service_instances) {
         [
-          {
-            Node: 'ojos_instance1',
-            Address: '10.0.0.3',
-            Datacenter: my_datacenter,
-            NodeMeta:
-            {
-              availability_zone: my_availability_zone,
-              instance_id: 'i-123abc',
-              mi_monitoring_roles: 'ojos',
-              mi_roles: 'ojos'
-            },
-            ServiceID: 'ojos',
-            ServiceName: 'ojos',
-            ServiceTags: ['foo', 'bar'],
-            ServicePort: 2702,
-          },
-          {
-            Node: 'ojos_instance2',
-            Address: '10.0.0.4',
-            Datacenter: my_datacenter,
-            NodeMeta:
-            {
-              availability_zone: other_availability_zone,
-              instance_id: 'i-zyx987',
-              mi_monitoring_roles: 'ojos',
-              mi_roles: 'ojos'
-            },
-            ServiceID: 'ojos',
-            ServiceName: 'ojos',
-            ServiceTags: ['foo', 'bar'],
-            ServicePort: 2702,
-          },
-          {
-            Node: 'ojos_instance3',
-            Address: '10.0.0.5',
-            Datacenter: my_datacenter,
-            NodeMeta:
-            {
-              availability_zone: other_availability_zone,
-              instance_id: 'i-987654',
-              mi_monitoring_roles: 'ojos',
-              mi_roles: 'ojos'
+        {
+            Node: {
+              Node: 'ojos_instance2',
+              Address: '10.0.0.4',
+              Datacenter: my_datacenter,
+              Meta: {
+                availability_zone: other_availability_zone,
+                instance_id: 'i-zyx987',
+                mi_monitoring_roles: 'ojos',
+                mi_roles: 'ojos'
+              },
+              ServiceID: 'ojos',
+              ServiceName: 'ojos',
+              ServiceTags: ['foo', 'bar'],
+              ServicePort: 2702,
             },
-            ServiceID: 'ojos',
-            ServiceName: 'ojos',
-            ServiceTags: ['foo', 'bar'],
-            ServicePort: 2702,
-          }
-        ]
+        },
+        {
+            Node: {
+              Node: 'ojos_instance3',
+              Address: '10.0.0.5',
+              Datacenter: my_datacenter,
+              Meta: {
+                availability_zone: other_availability_zone,
+                instance_id: 'i-987654',
+                mi_monitoring_roles: 'ojos',
+                mi_roles: 'ojos'
+              },
+              ServiceID: 'ojos',
+              ServiceName: 'ojos',
+              ServiceTags: ['foo', 'bar'],
+              ServicePort: 2702,
+            }
+        }]
       }
 
       before(:each) do
@@ -421,7 +406,7 @@ describe MovableInk::AWS::EC2 do
         allow(miaws).to receive(:my_region).and_return('us-east-1')
 
         json = JSON.generate(consul_app_service_instances)
-        stub_request(:get, "https://localhost:8501/v1/catalog/service/app?dc=#{my_datacenter}&stale=true&cached=true").
+        stub_request(:get, "https://localhost:8501/v1/health/service/app?cached&dc=#{my_datacenter}&passing&stale").
          with(
             headers: {
             'Accept'=>'*/*',
@@ -434,7 +419,7 @@ describe MovableInk::AWS::EC2 do
         expect(app_instances.map{|i| i.tags.first[:value]}).to eq(['app_instance1', 'app_instance2'])
 
         json = JSON.generate(consul_ojos_service_instances)
-        stub_request(:get, "https://localhost:8501/v1/catalog/service/ojos?dc=#{my_datacenter}&stale=true&cached=true").
+        stub_request(:get, "https://localhost:8501/v1/health/service/ojos?cached&dc=#{my_datacenter}&passing&stale").
          with(
            headers: {
           'Accept'=>'*/*',
@@ -444,7 +429,7 @@ describe MovableInk::AWS::EC2 do
          to_return(status: 200, body: json, headers: {})
 
         ojos_instances = aws.instances(role: 'ojos', discovery_type: 'consul')
-        expect(ojos_instances.map{|i| i.tags.first[:value ]}).to eq(['ojos_instance1', 'ojos_instance2', 'ojos_instance3'])
+        expect(ojos_instances.map{|i| i.tags.first[:value ]}).to eq(['ojos_instance2', 'ojos_instance3'])
       end
 
       it "returns all instances matching a consul service filtered by availability_zone" do
@@ -452,7 +437,7 @@ describe MovableInk::AWS::EC2 do
         allow(miaws).to receive(:my_region).and_return('us-east-1')
 
         json = JSON.generate(consul_ojos_service_instances)
-        stub_request(:get, "https://localhost:8501/v1/catalog/service/ojos?dc=iad&stale=true&cached=true").
+        stub_request(:get, "https://localhost:8501/v1/health/service/ojos?cached&dc=#{my_datacenter}&node-meta=availability_zone:#{other_availability_zone}&passing&stale").
          with(
             headers: {
             'Accept'=>'*/*',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MovableInkAWS
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Matt Chesler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-04 00:00:00.000000000 Z
+date: 2020-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core