MovableInkAWS 2.7.6 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f6dce584d3446fcb01d1b4ae891bd1d639f4319662c0ffebe0ab80509a04974
-  data.tar.gz: b6535994401231a30f9500393deb8d108271ae37e7224e9a47e608c92bfbe5a1
+  metadata.gz: ae345b3fe4acd6f3054463c70369adfed8b3c5afa9f5875329585cb52b35087d
+  data.tar.gz: 5c6db268b0ef31eb56add0010eeacffa4e8d1425c10728a81ba01a92b90098a2
 SHA512:
-  metadata.gz: d679722fe0abdb344440a2e1dcabb913be3ba9ff279be3d8523c4e98e0d067e6d360362bc8dce7f71d0afd510eead66ab329702792426d5df9336bb3ca8dca04
-  data.tar.gz: '0238e618656e228fb021ce475303791d99c09c814e5b55f7948478dc78c3657b2a0d355acee87b8dbd5e0ed61997c82c00888970daae64e13c9927bc87a2b795'
+  metadata.gz: 8e2253d2636f7075d9ba9dcbc5237bba87def5d6865ff4db45149b94ab5e551d86abbbe5ffe7ff6059efa8798a2999af0bb9b5692db45302cbe73f895a34b562
+  data.tar.gz: 51c3f1882e637eb36e1806924123acfab8d8f07f0ccfaa66c560aea523bc13bca17eb0a8e798a48155660c645ad2b9d09434f58a8f5b662ab75e812f206d033b

data/Gemfile.lock

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

data/lib/movable_ink/aws/ec2.rb

@@ -255,6 +255,24 @@ module MovableInk
           })
         end
       end
+
+      def elastic_ip_address_exist?(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
+            ec2.describe_addresses({
+              public_ips: [public_ip]
+            })
+            return true
+          end
+        rescue MovableInk::AWS::Errors::ServiceError, Aws::EC2::Errors::InvalidAddressNotFound
+          return false
+        end
+        # returns false if it ran out of API retries
+        return false
+      end
     end
   end
 end

data/lib/movable_ink/aws/route53.rb

@@ -35,11 +35,20 @@ module MovableInk
       end
 
       def list_all_r53_resource_record_sets(hosted_zone_id, client = nil)
-        run_with_backoff do
-          route53(client).list_resource_record_sets({
-            hosted_zone_id: hosted_zone_id
-          }).flat_map(&:resource_record_sets)
+        resp = run_with_backoff { route53(client).list_resource_record_sets({ hosted_zone_id: hosted_zone_id }) }
+        rrs = resp.resource_record_sets
+
+        # https://docs.aws.amazon.com/Route53/latest/APIReference/API_ListResourceRecordSets.html
+        while resp.is_truncated
+          resp = run_with_backoff { route53(client).list_resource_record_sets({
+            hosted_zone_id: hosted_zone_id,
+            start_record_name: resp.next_record_name,
+            start_record_type: resp.next_record_type,
+            start_record_identifier: resp.next_record_identifier
+          }) }
+          rrs += resp.resource_record_sets
         end
+        rrs
       end
 
       def list_health_checks(client = nil)
@@ -62,6 +71,18 @@ module MovableInk
           get_health_check_tags(health_check.id, client).detect { |tag| tag.key == key && tag.value.include?(value) }
         end
       end
+
+      def list_hosted_zones(client: nil)
+        resp = run_with_backoff { route53(client).list_hosted_zones() }
+        zones = resp.hosted_zones
+
+        # https://docs.aws.amazon.com/Route53/latest/APIReference/API_ListHostedZones.html
+        while resp.is_truncated
+          resp = run_with_backoff { route53(client).list_hosted_zones({marker: resp.next_marker}) }
+          zones += resp.hosted_zones
+        end
+        zones
+      end
     end
   end
 end

data/lib/movable_ink/version.rb

@@ -1,5 +1,5 @@
 module MovableInk
   class AWS
-    VERSION = '2.7.6'
+    VERSION = '2.8.1'
   end
 end

data/spec/ec2_spec.rb

@@ -718,5 +718,34 @@ describe MovableInk::AWS::EC2 do
         expect(aws.assign_ip_address(role: 'some_role').association_id).to eq('eipassoc-3')
       end
     end
+    
+    context 'elastic ips' do
+      let(:public_ip_data) {ec2.stub_data(:describe_addresses, addresses: [
+          {
+            allocation_id: "eipalloc-12345678",
+            association_id: "eipassoc-12345678",
+            public_ip: "185.35.4.3", 
+          }
+        ])
+      }
+
+      let(:empty_public_ip_data) {ec2.stub_data(:describe_addresses, addresses: [])}
+
+      it 'will return true when there is an elastic IP' do
+        ec2.stub_responses(:describe_addresses, public_ip_data)
+        allow(aws).to receive(:my_region).and_return('us-east-2')
+        allow(aws).to receive(:public_ip).and_return('185.35.3.4')
+        allow(aws).to receive(:ec2).and_return(ec2)
+        expect(aws.elastic_ip_address_exist?(public_ip: '185.35.3.4')).to eq(true)
+      end
+  
+      it 'will return false when there is no elastic IP' do
+        ec2.stub_responses(:describe_addresses, MovableInk::AWS::Errors::ServiceError.new("Aws::EC2::Errors::InvalidAddressNotFound: Address \'185.35.3.4\' not found."))
+        allow(aws).to receive(:my_region).and_return('us-east-2')
+        allow(aws).to receive(:public_ip).and_return('185.35.3.4')
+        allow(aws).to receive(:ec2).and_return(ec2)
+        expect(aws.elastic_ip_address_exist?(public_ip: '185.35.3.4')).to eq(false)
+      end
+    end
   end
 end

data/spec/route53_spec.rb

@@ -3,9 +3,60 @@ require_relative '../lib/movable_ink/aws'
 describe MovableInk::AWS::Route53 do
   let(:aws) { MovableInk::AWS.new }
 
+  context 'hosted zones' do
+    let(:route53) { Aws::Route53::Client.new(stub_responses: true) }
+
+    it "should list all hosted zones" do
+      zones_data = route53.stub_data(:list_hosted_zones, is_truncated: false, hosted_zones: [{
+        id: '123456789X',
+        name: 'domain.tld'
+      }])
+      route53.stub_responses(:list_hosted_zones, zones_data)
+      allow(aws).to receive(:route53).and_return(route53)
+
+      expect(aws.list_hosted_zones.count).to eq(1)
+      expect(aws.list_hosted_zones.first.id).to eq('123456789X')
+      expect(aws.list_hosted_zones.first.name).to eq('domain.tld')
+    end
+
+    it "should list all hosted zones w/ pagination" do
+      zones_response_1 = {
+        is_truncated: true,
+        next_marker: 'this is fake marker',
+        marker: 'this is fake marker',
+        max_items: 1,
+        hosted_zones: [{
+          id: '123456789X',
+          name: 'domain.tld',
+          caller_reference: '123'
+      }]}
+
+      zones_response_2 = {
+        is_truncated: false,
+        next_marker: nil,
+        marker: 'this is fake marker',
+        max_items: 1,
+        hosted_zones: [{
+          id: 'X123456789',
+          name: 'tld.domain',
+          caller_reference: '321'
+      }]}
+
+      route53.stub_responses(:list_hosted_zones, [ zones_response_1, zones_response_2 ])
+      allow(aws).to receive(:route53).and_return(route53)
+
+      zones = aws.list_hosted_zones
+      expect(zones.count).to eq(2)
+      expect(zones.first.id).to eq('123456789X')
+      expect(zones.first.name).to eq('domain.tld')
+      expect(zones[1].id).to eq('X123456789')
+      expect(zones[1].name).to eq('tld.domain')
+    end
+  end
+
   context "resource record sets" do
     let(:route53) { Aws::Route53::Client.new(stub_responses: true) }
-    let(:rrset_data) { route53.stub_data(:list_resource_record_sets, resource_record_sets: [
+    let(:rrset_data) { route53.stub_data(:list_resource_record_sets, is_truncated: false, resource_record_sets: [
         {
           name: 'host1.domain.tld.',
           set_identifier: '10_0_0_1',
@@ -34,6 +85,42 @@ describe MovableInk::AWS::Route53 do
       expect(aws.resource_record_sets('Z123')[2].name).to eq('host2-other.domain.tld.')
     end
 
+    it "should retrieve all rrsets for zone w/ pagination" do
+
+      rrs_response_1 = {
+        is_truncated: true,
+        max_items: 1,
+        next_record_name: 'record2.domain.',
+        next_record_type: 'A',
+        next_record_identifier: nil,
+        resource_record_sets: [{
+          name: 'record1.domain.',
+          type: 'A',
+          set_identifier: nil
+      }]}
+
+      rrs_response_2 = {
+        is_truncated: false,
+        max_items: 1,
+        next_record_name: nil,
+        next_record_type: nil,
+        next_record_identifier: nil,
+        resource_record_sets: [{
+          name: 'record2.domain.',
+          type: 'A',
+          set_identifier: nil
+      }]}
+
+      rrset_data = [rrs_response_1, rrs_response_2]
+      route53.stub_responses(:list_resource_record_sets, rrset_data)
+      allow(aws).to receive(:route53).and_return(route53)
+
+      rrs = aws.resource_record_sets('Z123')
+      expect(rrs.count).to eq(2)
+      expect(rrs[0].name).to eq('record1.domain.')
+      expect(rrs[1].name).to eq('record2.domain.')
+    end
+
     it "returns all sets with an identifier" do
       route53.stub_responses(:list_resource_record_sets, rrset_data)
       allow(aws).to receive(:route53).and_return(route53)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MovableInkAWS
 version: !ruby/object:Gem::Version
-  version: 2.7.6
+  version: 2.8.1
 platform: ruby
 authors:
 - MI SRE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-28 00:00:00.000000000 Z
+date: 2022-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core