MovableInkAWS 2.11.2 → 2.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9318b421bc139e87f2e723fdbba3360d952273bd0c01f8667d4cb8788f0b8ae1
-  data.tar.gz: b2b481971587694e25571e53c7a514b2f2ac68e3176ad641b821eef2395e5d9d
+  metadata.gz: 6b512cd51997315bd6fb546d10f60f6ac434a48cd5bb0f7cb6a3e530b5215fda
+  data.tar.gz: 2551f3560ddf52873bfa7b1a80ce330844effde2765ac0bee8fad9ab87eaa651
 SHA512:
-  metadata.gz: f103f6f8518ed20318e4fb08faf4f31cab1f94eae8e60c74b545548257d80f664337c5091f5323a1d9b41457f5821b17087693a5fefec7d9f4f46a0c0bf59dc1
-  data.tar.gz: ce2104a04e8d1bae248a4e5cfbdd72fda580d4f95b5bc349f9b4c33d6978efb6915a72ff8881d451c2f737e569758b340124d8a414accb69334eb478a6f84fb5
+  metadata.gz: a7b4ed079987785359a3f7b29af63a60fe8dfb999d4871d6166d1483505030f687a04c13999315759c84d3e8b6d4d4943216da0c6479e13bec3b233417fc6cc5
+  data.tar.gz: e9b53f15118613fe8fd48a0502d0eed1b7d2af79829678bc99ab86543dff06f8541a64fe573b01a9424afb666951654fbf251cc290fed6a6cd1f77e92d85aa6d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    MovableInkAWS (2.11.2)
+    MovableInkAWS (2.11.4)
       aws-sdk-athena (~> 1)
       aws-sdk-autoscaling (~> 1)
       aws-sdk-cloudwatch (~> 1)

data/lib/movable_ink/aws/ec2.rb

@@ -244,6 +244,23 @@ module MovableInk
         redis_instances.flatten.shuffle
       end
 
+      def describe_ip(public_ip:)
+        expected_errors = [
+          MovableInk::AWS::Errors::ExpectedError.new(Aws::EC2::Errors::InvalidAddressNotFound, [/Address \'#{public_ip}\' not found./])
+        ]
+        begin
+          run_with_backoff(expected_errors: expected_errors) do
+            response = ec2_with_retries.describe_addresses({
+              public_ips: [public_ip]
+            })
+            raise MovableInk::AWS::Errors::ServiceError if response.length > 1
+            return response[0]
+          end
+        rescue MovableInk::AWS::Errors::ServiceError, Aws::EC2::Errors::InvalidAddressNotFound
+          return nil
+        end
+      end
+
       def elastic_ips
         @all_elastic_ips ||= run_with_backoff do
           ec2.describe_addresses.addresses
@@ -258,11 +275,24 @@ module MovableInk
         unassigned_elastic_ips.select { |address| address.tags.detect { |t| t.key == 'mi:roles' && t.value == role } }
       end
 
-      def assign_ip_address(role:)
+      def assign_ip_address_with_retries(role:, 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,
+            allow_reassociation: allow_reassociation
+          })
+        end
+        response
+      end
+
+      def assign_ip_address(role:, 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).sample.allocation_id,
+            allow_reassociation: allow_reassociation
           })
         end
       end

data/lib/movable_ink/version.rb

@@ -1,5 +1,5 @@
 module MovableInk
   class AWS
-    VERSION = '2.11.2'
+    VERSION = '2.11.4'
   end
 end

data/spec/ec2_spec.rb

@@ -692,6 +692,40 @@ describe MovableInk::AWS::EC2 do
 
         expect(aws.assign_ip_address(role: 'some_role').association_id).to eq('eipassoc-3')
       end
+
+      it "should assign an elastic IP with allow_reassociation flag" do
+        ec2.stub_responses(:describe_addresses, elastic_ip_data)
+        ec2.stub_responses(:associate_address, associate_address_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)
+
+        expect(aws.assign_ip_address(role: 'some_role', allow_reassociation: true).association_id).to eq('eipassoc-3')
+      end
+
+      it "should assign an elastic IP with retries and return response" do
+        ec2.stub_responses(:describe_addresses, elastic_ip_data)
+        ec2.stub_responses(:associate_address, associate_address_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)
+        allow(aws).to receive(:ec2_with_retries).and_return(ec2)
+
+        response = aws.assign_ip_address_with_retries(role: 'some_role')
+        expect(response.association_id).to eq('eipassoc-3')
+      end
+
+      it "should assign an elastic IP with retries and allow_reassociation flag" do
+        ec2.stub_responses(:describe_addresses, elastic_ip_data)
+        ec2.stub_responses(:associate_address, associate_address_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)
+        allow(aws).to receive(:ec2_with_retries).and_return(ec2)
+
+        response = aws.assign_ip_address_with_retries(role: 'some_role', allow_reassociation: true)
+        expect(response.association_id).to eq('eipassoc-3')
+      end
     end
 
     context 'elastic ips' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MovableInkAWS
 version: !ruby/object:Gem::Version
-  version: 2.11.2
+  version: 2.11.4
 platform: ruby
 authors:
 - MI SRE
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-28 00:00:00.000000000 Z
+date: 2025-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core