MovableInkAWS 2.7.4 → 2.7.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fe63a733a1146744fab177c92681cab506b4b4b7734c4cd3a7c91d65de0fd84
-  data.tar.gz: a6eab91fdcf488895c874d5cedd53e9ef4ccabba9f679461cfcb9148cefd612b
+  metadata.gz: 6f6dce584d3446fcb01d1b4ae891bd1d639f4319662c0ffebe0ab80509a04974
+  data.tar.gz: b6535994401231a30f9500393deb8d108271ae37e7224e9a47e608c92bfbe5a1
 SHA512:
-  metadata.gz: 82769e75ee09f4c0a8dc5c8a4d75c8aba427c3affd5c56270fdffd3bc5124cd20f1b1459dead8adc458f8cb9da3855d5ad4526adf391e35fe4b36ab5a9569697
-  data.tar.gz: 3a07058264a557f11c2a80c9e2eaddcb6189514d2cd449c263ca7ce148407e8ddffb5c66acc351c81f2d9edaa69edd1d2686f02308640d951d232c042136d80f
+  metadata.gz: d679722fe0abdb344440a2e1dcabb913be3ba9ff279be3d8523c4e98e0d067e6d360362bc8dce7f71d0afd510eead66ab329702792426d5df9336bb3ca8dca04
+  data.tar.gz: '0238e618656e228fb021ce475303791d99c09c814e5b55f7948478dc78c3657b2a0d355acee87b8dbd5e0ed61997c82c00888970daae64e13c9927bc87a2b795'

data/Gemfile.lock

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

data/lib/movable_ink/aws/ec2.rb

@@ -4,9 +4,9 @@ require 'diplomat'
 module MovableInk
   class AWS
     module EC2
-      def ec2(region: my_region)
+      def ec2(region: my_region, client: nil)
         @ec2_client ||= {}
-        @ec2_client[region] ||= Aws::EC2::Client.new(region: region)
+        @ec2_client[region] ||= (client) ? client : Aws::EC2::Client.new(region: region)
       end
 
       def mi_env_cache_file_path
@@ -38,9 +38,9 @@ module MovableInk
         end
       end
 
-      def all_instances(region: my_region, no_filter: false)
+      def all_instances(region: my_region, no_filter: false, client: nil)
         @all_instances ||= {}
-        @all_instances[region] ||= load_all_instances(region, no_filter: no_filter)
+        @all_instances[region] ||= load_all_instances(region, no_filter: no_filter, client: client)
       end
 
       def default_filter
@@ -54,11 +54,11 @@ module MovableInk
         }]
       end
 
-      def load_all_instances(region, no_filter: false, filter: nil)
+      def load_all_instances(region, no_filter: false, filter: nil, client: nil)
         filters = no_filter ? nil : (filter || default_filter)
 
         run_with_backoff do
-          ec2(region: region).describe_instances(filters: filters).flat_map do |resp|
+          ec2(region: region, client: client).describe_instances(filters: filters).flat_map do |resp|
             resp.reservations.flat_map(&:instances)
           end
         end
@@ -211,12 +211,26 @@ module MovableInk
         private_ip_addresses(ordered_instances)
       end
 
-      def redis_by_role(role, port)
-        instance_ip_addresses_by_role(role: role)
-          .shuffle
-          .inject([]) { |redii, instance|
-            redii.push({"host" => instance, "port" => port})
-          }
+      def redis_by_role(role, port, availability_zones = [])
+        if availability_zones.class != Array
+          raise MovableInk::AWS::Errors::AvailabilityZonesListInvalidError
+        end
+
+        redis_instances = []
+
+        def redis(host, port)
+          {"host" => host, "port" => port}
+        end
+
+        if availability_zones.length > 0
+          availability_zones.each do |az|
+            redis_instances << instance_ip_addresses_by_role(role: role, availability_zone: az).inject([]) { |redii, instance| redii.push(redis(instance, port)) }
+          end
+        else
+          redis_instances << instance_ip_addresses_by_role(role: role).inject([]) { |redii, instance| redii.push(redis(instance, port)) }
+        end
+
+        redis_instances.flatten.shuffle
       end
 
       def elastic_ips

data/lib/movable_ink/aws/errors.rb

@@ -8,6 +8,7 @@ module MovableInk
       class InvalidDiscoveryTypeError < StandardError; end
       class RoleNameRequiredError < StandardError; end
       class RoleNameInvalidError < StandardError; end
+      class AvailabilityZonesListInvalidError < StandardError; end
 
       class ExpectedError
         def initialize(error_class, message_patterns = [])

data/lib/movable_ink/version.rb

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

data/spec/ec2_spec.rb

@@ -589,6 +589,34 @@ describe MovableInk::AWS::EC2 do
           }
         ]])
       }
+      let(:redis_data_cross_azs) { ec2.stub_data(:describe_instances, reservations: [
+        instances: [
+          {
+            tags: [
+              {
+                key: 'mi:roles',
+                value: 'visitor_redis'
+              }
+            ],
+            private_ip_address: '10.0.0.1',
+            placement: {
+              availability_zone: availability_zone
+            }
+          },
+          {
+            tags: [
+              {
+                key: 'mi:roles',
+                value: 'visitor_redis'
+              }
+            ],
+            private_ip_address: '10.0.0.2',
+            placement: {
+              availability_zone: 'us-east-1z'
+            }
+          }
+        ]])
+      }
       let(:redii) { [{"host" => '10.0.0.1', "port" => 6379},{"host" => '10.0.0.2', "port" => 6379}] }
 
       it "should return redis IPs and ports" do
@@ -600,6 +628,20 @@ describe MovableInk::AWS::EC2 do
 
         expect(aws.redis_by_role('visitor_redis', port)).to match_array(redii)
       end
+
+      it "should return redis IPs and ports only from specified AZs" do
+        ec2.stub_responses(:describe_instances, redis_data_cross_azs)
+        allow(aws).to receive(:mi_env).and_return('test')
+        allow(aws).to receive(:availability_zone).and_return(availability_zone)
+        allow(aws).to receive(:my_region).and_return('us-east-1')
+        allow(aws).to receive(:ec2).and_return(ec2)
+
+        expect(aws.redis_by_role('visitor_redis', port, ['us-east-1z'])).to match_array([{"host" => '10.0.0.2', "port" => 6379}])
+      end
+
+      it "should throw exception if specified AZs list isnt array" do
+        expect { aws.redis_by_role('visitor_redis', port, 'us-east-1z') }.to raise_error(MovableInk::AWS::Errors::AvailabilityZonesListInvalidError)
+      end
     end
 
     context "elastic IPs" do

metadata

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