MovableInkAWS 2.11.3 → 2.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a27ff1c925fa1f4e8c22d0861a3771d54a6e2205fca2bb55851c16a5c33173cf
-  data.tar.gz: 93f02dadcc1ad75dc3165bef287399c5f79beb5a039ea5b92060c1641058f99f
+  metadata.gz: 361a67ed7171eeb934284d6a93146745556b502bc4e1d5bff5020a6bedf2616f
+  data.tar.gz: 28d07f7b416cd307d0d0e8eddda7f33d8cc011c47728ce4afd43046321750256
 SHA512:
-  metadata.gz: 1096049ab54da211a309f8489de0f9c4565ef992a394589beda3bb6feec63741dbc59b2fca5008f04c48644dc42b1a7372aee5b72b153b6b47c887e939782ed9
-  data.tar.gz: 57802cc971e2f35b848d26e14105213706656b959b2352645e5adb694edb2b8cfc1c627f0cf3f53217c9ba4e86fadd5afbfae20783e78e61e42101e0423ca6f2
+  metadata.gz: '069a70e2f69250c0f7f3aa2deb148bf3a738ac5f6f176e7ea8f006f0ebd34dc851cb829756db3be0a33a3a94a2cdb7266e776dfa8fa9237519a6ed1c4d9f2fd9'
+  data.tar.gz: 5e4c0a3b0efe1bec352b885227b91503d59e5c97e0c3a4583492f7e630e24545100873101817de2467b43bea6f7b1677f0885b2d4918622970116e305ae2f994

data/Gemfile.lock

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

data/lib/movable_ink/aws/ec2.rb

@@ -161,7 +161,7 @@ module MovableInk
               value: role
             }
           ],
-          placement: { availability_zone: nil }
+          placement: { availability_zone: endpoint.Service.dig('Meta', 'external-k8s-topology-zone') }
         })
       end
 
@@ -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,20 +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_with_retries(role:)
+      def assign_ip_address_with_retries(role:, allow_reassociation: false)
+        response = nil
         run_with_backoff do
-          ec2_with_retries.associate_address({
+          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).sample.allocation_id,
+            allow_reassociation: allow_reassociation
           })
         end
+        response
       end
 
-      def assign_ip_address(role:)
+      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.3'
+    VERSION = '2.11.5'
   end
 end

data/spec/ec2_spec.rb

@@ -418,6 +418,7 @@ describe MovableInk::AWS::EC2 do
               "Meta": {
                 "external-source": "kubernetes",
                 "external-k8s-ns": "default",
+                "external-k8s-topology-zone": "us-east-1a",
               }
             }
           }
@@ -484,7 +485,7 @@ describe MovableInk::AWS::EC2 do
          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')
+         expect(backend.placement[:availability_zone]).to eq('us-east-1a')
       end
     end
 
@@ -692,6 +693,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.3
+  version: 2.11.5
 platform: ruby
 authors:
 - MI SRE
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-11 00:00:00.000000000 Z
+date: 2025-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core