MovableInkAWS 2.11.5 → 2.11.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 361a67ed7171eeb934284d6a93146745556b502bc4e1d5bff5020a6bedf2616f
-  data.tar.gz: 28d07f7b416cd307d0d0e8eddda7f33d8cc011c47728ce4afd43046321750256
+  metadata.gz: 6b00042330c59a011318a6718225fcfbaea513c07c4c92c10edc6469281b4b73
+  data.tar.gz: 4fb15e463994046e52e35f0d8094b2f91e9a501636a4b107eb9b75f3bcc759a6
 SHA512:
-  metadata.gz: '069a70e2f69250c0f7f3aa2deb148bf3a738ac5f6f176e7ea8f006f0ebd34dc851cb829756db3be0a33a3a94a2cdb7266e776dfa8fa9237519a6ed1c4d9f2fd9'
-  data.tar.gz: 5e4c0a3b0efe1bec352b885227b91503d59e5c97e0c3a4583492f7e630e24545100873101817de2467b43bea6f7b1677f0885b2d4918622970116e305ae2f994
+  metadata.gz: dbbbb81690b663d8388ed2dd850f9c12f81602aecfc79d9a20a62e8d7d0558088c854ede1b42a1c444721993cc1c84bdafa329d4c7176ca95c25db9032236c75
+  data.tar.gz: 7d43ffce9e0fdff9ea3bbb0925b5c07dcfd172363e8646dce8a54d54388a8478dd5628db20c1373a3c9e25dfa96682c028f0c391f3b19707b01e829c65b685bc

data/.github/workflows/test.yaml

@@ -13,13 +13,13 @@ jobs:
 
     strategy:
       matrix:
-        ruby-version: ['2.7', '3.0', '3.1', '3.2', '3.3', '3.4']
+        ruby-version: ['2.7', '3.0', '3.1', '3.2', '3.3', '3.4', '4.0']
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
 
     - name: Install ruby
-      uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@afeafc3d1ab54a631816aba4c914a0081c12ff2f # v1.310.0
       with:
         ruby-version: ${{ matrix.ruby-version }}
 
@@ -35,10 +35,10 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/')
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
 
     - name: Install ruby
-      uses: ruby/setup-ruby@v1
+      uses: ruby/setup-ruby@afeafc3d1ab54a631816aba4c914a0081c12ff2f # v1.310.0
       with:
         ruby-version: 3.1
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    MovableInkAWS (2.11.5)
+    MovableInkAWS (2.11.7)
       aws-sdk-athena (~> 1)
       aws-sdk-autoscaling (~> 1)
       aws-sdk-cloudwatch (~> 1)
@@ -20,6 +20,7 @@ PATH
       diplomat (= 2.6.4)
       faraday (~> 2)
       httparty (= 0.23.1)
+      ostruct
 
 GEM
   remote: https://rubygems.org/
@@ -105,6 +106,7 @@ GEM
     logger (1.7.0)
     mini_mime (1.1.5)
     multi_xml (0.6.0)
+    ostruct (0.5.2)
     public_suffix (5.1.1)
     rexml (3.4.1)
     rspec (3.13.1)

data/MovableInkAWS.gemspec

@@ -26,6 +26,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'aws-sdk-sns', '~> 1'
   s.add_runtime_dependency 'aws-sdk-ssm', '~> 1'
   s.add_runtime_dependency 'aws-sigv4', '~> 1'
+  s.add_runtime_dependency 'ostruct'
   s.add_runtime_dependency 'httparty',  '0.23.1'
   s.add_runtime_dependency 'diplomat',  '2.6.4'
 

data/lib/movable_ink/aws/ec2.rb

@@ -136,7 +136,11 @@ module MovableInk
         # within MI configuration
         Diplomat::Health.service(role.gsub('_', '-'), consul_service_options).map { |endpoint|
           if endpoint.Node.dig('Meta', 'external-source') == 'kubernetes'
+            # Legacy catalog sync
             map_k8s_consul_endpoint(endpoint, role)
+          elsif endpoint.Service && endpoint.Service.dig('Meta', 'managed-by') == 'consul-k8s-endpoints-controller'
+            # Consul mesh with service mesh sidecar
+            map_k8s_consul_mesh_endpoint(endpoint, role)
           else
             map_ec2_consul_endpoint(endpoint)
           end
@@ -165,6 +169,40 @@ module MovableInk
         })
       end
 
+      def map_k8s_consul_mesh_endpoint(endpoint, role)
+        OpenStruct.new ({
+          private_ip_address: endpoint.Service.dig('Address'),
+          instance_id: nil,
+          tags: [
+            {
+              key: 'Name',
+              value: endpoint.Service.dig('Meta', 'pod-name')
+            },
+            {
+              key: 'mi:roles',
+              value: role
+            },
+            {
+              key: 'mi:monitoring_roles',
+              value: role
+            },
+            {
+              key: 'k8s:namespace',
+              value: endpoint.Service.dig('Meta', 'k8s-namespace')
+            },
+            {
+              key: 'k8s:service',
+              value: endpoint.Service.dig('Meta', 'k8s-service-name')
+            },
+            {
+              key: 'k8s:pod-uid',
+              value: endpoint.Service.dig('Meta', 'pod-uid')
+            }
+          ],
+          placement: { availability_zone: endpoint.Service.dig('Locality', 'Zone') }
+        })
+      end
+
       def map_ec2_consul_endpoint(endpoint)
         OpenStruct.new ({
           private_ip_address: endpoint.Node.dig('Address'),
@@ -271,27 +309,31 @@ module MovableInk
         @unassigned_elastic_ips ||= elastic_ips.select { |address| address.association_id.nil? }
       end
 
-      def available_elastic_ips(role:)
-        unassigned_elastic_ips.select { |address| address.tags.detect { |t| t.key == 'mi:roles' && t.value == role } }
+      def available_elastic_ips(role:, eip_pool: nil)
+        if eip_pool
+          unassigned_elastic_ips.select { |address| address.tags.detect { |t| t.key == 'mi:eip-pool' && t.value == eip_pool } }
+        else
+          unassigned_elastic_ips.select { |address| address.tags.detect { |t| t.key == 'mi:roles' && t.value == role } }
+        end
       end
 
-      def assign_ip_address_with_retries(role:, allow_reassociation: false)
+      def assign_ip_address_with_retries(role:, eip_pool: nil, allow_reassociation: false)
         response = nil
         run_with_backoff do
           response = ec2_with_retries.associate_address({
             instance_id: instance_id,
-            allocation_id: available_elastic_ips(role: role).sample.allocation_id,
+            allocation_id: available_elastic_ips(role: role, eip_pool: eip_pool).sample.allocation_id,
             allow_reassociation: allow_reassociation
           })
         end
         response
       end
 
-      def assign_ip_address(role:, allow_reassociation: false)
+      def assign_ip_address(role:, eip_pool: nil, allow_reassociation: false)
         run_with_backoff do
           ec2.associate_address({
             instance_id: instance_id,
-            allocation_id: available_elastic_ips(role: role).sample.allocation_id,
+            allocation_id: available_elastic_ips(role: role, eip_pool: eip_pool).sample.allocation_id,
             allow_reassociation: allow_reassociation
           })
         end

data/lib/movable_ink/version.rb

@@ -1,5 +1,5 @@
 module MovableInk
   class AWS
-    VERSION = '2.11.5'
+    VERSION = '2.11.7'
   end
 end

data/spec/ec2_spec.rb

@@ -487,6 +487,99 @@ describe MovableInk::AWS::EC2 do
          expect(backend.private_ip_address).to eq('10.0.0.1')
          expect(backend.placement[:availability_zone]).to eq('us-east-1a')
       end
+
+      it "returns backends that are synced from consul mesh with service mesh sidecar" do
+        consul_mesh_service_instances = [
+          {
+            "Node": {
+              "ID": "",
+              "Node": "k8s-mesh-virtual-node",
+              "Address": "10.0.0.10",
+              "Datacenter": my_datacenter,
+              "TaggedAddresses": nil,
+              "Meta": {
+                "synthetic-node": "true"
+              },
+              "CreateIndex": 12345,
+              "ModifyIndex": 12345
+            },
+            "Service": {
+              "ID": "test-service-abc123-xyz-test-service",
+              "Service": "test-service",
+              "Tags": [],
+              "Address": "10.0.0.11",
+              "Meta": {
+                "k8s-namespace": "default",
+                "k8s-service-name": "test-service",
+                "managed-by": "consul-k8s-endpoints-controller",
+                "pod-name": "test-service-abc123-xyz",
+                "pod-uid": "00000000-0000-0000-0000-000000000000",
+                "synthetic-node": "true"
+              },
+              "Port": 8080,
+              "Weights": {
+                "Passing": 1,
+                "Warning": 1
+              },
+              "EnableTagOverride": false,
+              "Locality": {
+                "Region": "us-east-1",
+                "Zone": "us-east-1b"
+              },
+              "Proxy": {
+                "Mode": "",
+                "MeshGateway": {},
+                "Expose": {}
+              },
+              "Connect": {},
+              "PeerName": "",
+              "CreateIndex": 12345,
+              "ModifyIndex": 12345
+            },
+            "Checks": [
+              {
+                "Node": "k8s-mesh-virtual-node",
+                "CheckID": "default/test-service-abc123-xyz-test-service",
+                "Name": "Kubernetes Readiness Check",
+                "Status": "passing",
+                "Notes": "",
+                "Output": "Kubernetes health checks passing",
+                "ServiceID": "test-service-abc123-xyz-test-service",
+                "ServiceName": "test-service",
+                "ServiceTags": [],
+                "Type": "kubernetes-readiness",
+                "Interval": "",
+                "Timeout": "",
+                "ExposedPort": 0,
+                "Definition": {},
+                "CreateIndex": 12345,
+                "ModifyIndex": 12345
+              }
+            ]
+          }
+        ]
+
+        json = JSON.generate(consul_mesh_service_instances)
+        stub_request(:get, "https://localhost:8501/v1/health/service/test-service?cached=true&dc=#{my_datacenter}&passing=true&stale=true")
+          .to_return(status: 200, body: json, headers: {})
+
+         resp_instances = aws.instances(role: 'test-service', 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' }
+         k8s_namespace_tag = backend.tags.find {|t| t[:key] == 'k8s:namespace' }
+         k8s_service_tag = backend.tags.find {|t| t[:key] == 'k8s:service' }
+         k8s_pod_uid_tag = backend.tags.find {|t| t[:key] == 'k8s:pod-uid' }
+
+         expect(name_tag[:value]).to eq('test-service-abc123-xyz')
+         expect(roles_tag[:value]).to eq('test-service')
+         expect(k8s_namespace_tag[:value]).to eq('default')
+         expect(k8s_service_tag[:value]).to eq('test-service')
+         expect(k8s_pod_uid_tag[:value]).to eq('00000000-0000-0000-0000-000000000000')
+         expect(backend.instance_id).to eq(nil)
+         expect(backend.private_ip_address).to eq('10.0.0.11')
+         expect(backend.placement[:availability_zone]).to eq('us-east-1b')
+      end
     end
 
     context "ordered roles" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MovableInkAWS
 version: !ruby/object:Gem::Version
-  version: 2.11.5
+  version: 2.11.7
 platform: ruby
 authors:
 - MI SRE
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-21 00:00:00.000000000 Z
+date: 2026-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -220,6 +220,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement