MovableInkAWS 2.8.0 → 2.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f349ad96411750bb34591fdab29321576d2d253571311ac28b17945befe0da25
-  data.tar.gz: 1dfddfb2d024bf894a6b769115e57116a711458788da44920f15c1a75a9c0d55
+  metadata.gz: bf52a28dc79926b9dd09f38da90e0845f64fd7db39387ec7d2d3df92a84cdf5f
+  data.tar.gz: '0897366b09d975cd88a2333259f75de784536e7bc2441803997e3351a2d60271'
 SHA512:
-  metadata.gz: 65af34acc71341c2c30f7e05cfc43c8712cc92b659f3505dbf520904524da80ccbd17e0e6e2430ee40fc406d25c200a9f3ca8088733bccbee0692a1cc11b83b5
-  data.tar.gz: f4f630f2920477c57af48c5613207e646c0d870029ee72663250fdc95dbe108d652f9786b2af97940c087195c1611aab11f10ccf5a5a158d5d2931cc6219600c
+  metadata.gz: 27fa94453efdd9f4fad175b8069d0b59f135cb63068d2d393e22d9d0fd60093c2db599aa61cea1d1d19c6bbc95cce8a54dd03a1e691857a5227ea0b0ce2904b0
+  data.tar.gz: dd1c9c8cf0732151fff6942872d36de84585ca40875aea92d8ad0d3b5fa69c4194e07757ad20fe090f952c2eeb37dba23b551b291b1640628c4b9f4a029b9370

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    MovableInkAWS (2.8.0)
+    MovableInkAWS (2.8.2)
       aws-sdk-athena (~> 1)
       aws-sdk-autoscaling (~> 1)
       aws-sdk-cloudwatch (~> 1)
@@ -16,7 +16,7 @@ PATH
       aws-sdk-sns (~> 1)
       aws-sdk-ssm (~> 1)
       aws-sigv4 (~> 1.1)
-      diplomat (= 2.4.2)
+      diplomat (= 2.6.4)
       httparty (= 0.16.3)
 
 GEM
@@ -25,73 +25,74 @@ GEM
     addressable (2.8.0)
       public_suffix (>= 2.0.2, < 5.0)
     aws-eventstream (1.2.0)
-    aws-partitions (1.605.0)
-    aws-sdk-athena (1.54.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-partitions (1.673.0)
+    aws-sdk-athena (1.59.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-autoscaling (1.79.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-autoscaling (1.83.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-cloudwatch (1.64.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-cloudwatch (1.69.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-core (3.131.2)
+    aws-sdk-core (3.168.3)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.525.0)
-      aws-sigv4 (~> 1.1)
+      aws-partitions (~> 1, >= 1.651.0)
+      aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-ec2 (1.321.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-ec2 (1.354.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-eks (1.75.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-eks (1.81.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-elasticache (1.78.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-elasticache (1.82.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-iam (1.69.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-iam (1.73.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-kms (1.57.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-kms (1.61.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-rds (1.148.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-rds (1.163.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-route53 (1.63.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-route53 (1.69.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.114.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-s3 (1.117.2)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sdk-sns (1.53.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-sns (1.57.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-ssm (1.137.0)
-      aws-sdk-core (~> 3, >= 3.127.0)
+    aws-sdk-ssm (1.145.0)
+      aws-sdk-core (~> 3, >= 3.165.0)
       aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.5.0)
+    aws-sigv4 (1.5.2)
       aws-eventstream (~> 1, >= 1.0.2)
     crack (0.4.5)
       rexml
     deep_merge (1.2.2)
     diff-lcs (1.3)
-    diplomat (2.4.2)
-      deep_merge (~> 1.0, >= 1.0.1)
-      faraday (>= 0.9, < 1.1.0)
-    faraday (1.0.1)
-      multipart-post (>= 1.2, < 3)
+    diplomat (2.6.4)
+      deep_merge (~> 1.2)
+      faraday (>= 0.9, < 3.0, != 2.0.0)
+    faraday (2.7.1)
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-net_http (3.0.2)
     hashdiff (1.0.1)
     httparty (0.16.3)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    jmespath (1.6.1)
+    jmespath (1.6.2)
     mime-types (3.4.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2022.0105)
     multi_xml (0.6.0)
-    multipart-post (2.2.3)
     public_suffix (4.0.7)
     rexml (3.2.5)
     rspec (3.9.0)
@@ -107,6 +108,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
+    ruby2_keywords (0.0.5)
     webmock (3.17.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)

data/MovableInkAWS.gemspec

@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'aws-sdk-ssm', '~> 1'
   s.add_runtime_dependency 'aws-sigv4', '~> 1.1'
   s.add_runtime_dependency 'httparty',  '0.16.3'
-  s.add_runtime_dependency 'diplomat',  '2.4.2'
+  s.add_runtime_dependency 'diplomat',  '2.6.4'
 
   all_files  = `git ls-files`.split("\n")
   test_files = `git ls-files -- {test,spec,features}/*`.split("\n")

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/version.rb

@@ -1,5 +1,5 @@
 module MovableInk
   class AWS
-    VERSION = '2.8.0'
+    VERSION = '2.8.2'
   end
 end

data/spec/ec2_spec.rb

@@ -440,12 +440,12 @@ describe MovableInk::AWS::EC2 do
         allow(miaws).to receive(:my_region).and_return('us-east-1')
 
         json = JSON.generate(consul_app_service_instances)
-        stub_request(:get, "https://localhost:8501/v1/health/service/app?cached&dc=#{my_datacenter}&passing&stale").
+        stub_request(:get, "https://localhost:8501/v1/health/service/app?cached=true&dc=#{my_datacenter}&passing=true&stale=true").
          with(
             headers: {
             'Accept'=>'*/*',
             'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
-            'User-Agent'=>'Faraday v1.0.1'
+            'User-Agent'=>'Faraday v2.7.1'
            }).
          to_return(status: 200, body: json, headers: {})
 
@@ -453,12 +453,12 @@ describe MovableInk::AWS::EC2 do
         expect(app_instances.map{|i| i.tags.first[:value]}).to eq(['app_instance1', 'app_instance2'])
 
         json = JSON.generate(consul_ojos_service_instances)
-        stub_request(:get, "https://localhost:8501/v1/health/service/ojos?cached&dc=#{my_datacenter}&passing&stale").
+        stub_request(:get, "https://localhost:8501/v1/health/service/ojos?cached=true&dc=#{my_datacenter}&passing=true&stale=true").
          with(
            headers: {
           'Accept'=>'*/*',
           'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
-          'User-Agent'=>'Faraday v1.0.1'
+          'User-Agent'=>'Faraday v2.7.1'
            }).
          to_return(status: 200, body: json, headers: {})
 
@@ -471,12 +471,12 @@ describe MovableInk::AWS::EC2 do
         allow(miaws).to receive(:my_region).and_return('us-east-1')
 
         json = JSON.generate(consul_ojos_service_instances)
-        stub_request(:get, "https://localhost:8501/v1/health/service/ojos?cached&dc=#{my_datacenter}&node-meta=availability_zone:#{other_availability_zone}&passing&stale").
+        stub_request(:get, "https://localhost:8501/v1/health/service/ojos?cached=true&dc=#{my_datacenter}&node-meta=availability_zone:#{other_availability_zone}&passing=true&stale=true").
          with(
             headers: {
             'Accept'=>'*/*',
             'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
-            'User-Agent'=>'Faraday v1.0.1'
+            'User-Agent'=>'Faraday v2.7.1'
            }).
          to_return(status: 200, body: json, headers: {})
 
@@ -490,12 +490,12 @@ describe MovableInk::AWS::EC2 do
         allow(miaws).to receive(:my_region).and_return('us-east-1')
 
         json = JSON.generate(consul_kubernetes_service_instances)
-        stub_request(:get, "https://localhost:8501/v1/health/service/kubernetes-service-name?cached&dc=#{my_datacenter}&passing&stale")
+        stub_request(:get, "https://localhost:8501/v1/health/service/kubernetes-service-name?cached=true&dc=#{my_datacenter}&passing=true&stale=true")
           .with({
             headers: {
               'Accept'=>'*/*',
               'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
-              'User-Agent'=>'Faraday v1.0.1'
+              'User-Agent'=>'Faraday v2.7.1'
             }
           })
           .to_return(status: 200, body: json, headers: {})
@@ -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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MovableInkAWS
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.8.2
 platform: ruby
 authors:
 - MI SRE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-31 00:00:00.000000000 Z
+date: 2022-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk-core
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.6.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.4.2
+        version: 2.6.4
 description: AWS Utility methods for MovableInk
 email: devops@movableink.com
 executables: []