MovableInkAWS 2.11.6 → 2.11.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e435c7e7f7f63344b18f29da2e373d44bac9f990dc7514bc868deb1e18d0a01b
-  data.tar.gz: 7da29c9c9daf0ca24c0395422365f87c0ac596274620e98992fd5645ca053984
+  metadata.gz: 6b00042330c59a011318a6718225fcfbaea513c07c4c92c10edc6469281b4b73
+  data.tar.gz: 4fb15e463994046e52e35f0d8094b2f91e9a501636a4b107eb9b75f3bcc759a6
 SHA512:
-  metadata.gz: 3ee0936e7d71cfffe8bcbaaf861c0c2bfaf3e6d24e7288f485cd4f922abb430bf4a9c0ae8b400674ffaba46e4084c46493c26865340af1779cf2f901cdad8d3a
-  data.tar.gz: da6308796716af6dd1138dbb5c582da293f890247d1fe0de1f502ab668596be62485860795bc2c6d6046030261f718b86ec82aa186dae3790de285f7b97ce4f3
+  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.6)
+    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

@@ -309,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.6'
+    VERSION = '2.11.7'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MovableInkAWS
 version: !ruby/object:Gem::Version
-  version: 2.11.6
+  version: 2.11.7
 platform: ruby
 authors:
 - MI SRE
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-01-23 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