MovableInkAWS 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0539bfb11df57a94a89383fd54ba31df82b1fbee4980262d1ea35c023fad9664
-  data.tar.gz: 6684d49314bbb159b52b88d35a0783e8c917bccbd2bd273cf3fe0adf320128b6
+  metadata.gz: 590ea003298d992808c1b6556bccbb7b25caac6826951a6414c9d2886603a4b5
+  data.tar.gz: 7029aa3fef07dac4b45858f0182c1d5091356937efcd4a01f73b0baec1c4b6cd
 SHA512:
-  metadata.gz: 26464d435dc1f1306967b4166c9d970c6ca9dab58e22b3ec1f8f3b1a94b1b40259f004f2141cfb63364a29280cf36cbafc253709cf4ad39ed70e2ee77b2de2de
-  data.tar.gz: ea438262feb93ca615aff818c417d117651d4b017250c9bf6b0b0f930ae86f16e01ff3d855481db7ce9a4650a590966cfc978ec847d2f883340cc42de134b683
+  metadata.gz: 71bf9f3e2afd8e95375ae0a45321094672f46fe563ffb0f116b8dae9936f86ddca638d013392005602a906f76f5f41318f4a43e75e02ad8861643256806f090e
+  data.tar.gz: e153c1ee20f4318d9d0dc017d13bfc36caec6d2d22d7904f0527bf53a5d301fd0ce50ea174838432aa1684ae8008d75d727129f437d6972fc7c4ce94287c26c5

data/Gemfile.lock

@@ -1,19 +1,19 @@
 PATH
   remote: .
   specs:
-    MovableInkAWS (0.1.4)
+    MovableInkAWS (0.1.6)
       aws-sdk (~> 2.10, >= 2.10.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    aws-sdk (2.11.28)
-      aws-sdk-resources (= 2.11.28)
-    aws-sdk-core (2.11.28)
+    aws-sdk (2.11.21)
+      aws-sdk-resources (= 2.11.21)
+    aws-sdk-core (2.11.21)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.11.28)
-      aws-sdk-core (= 2.11.28)
+    aws-sdk-resources (2.11.21)
+      aws-sdk-core (= 2.11.21)
     aws-sigv4 (1.0.2)
     diff-lcs (1.3)
     jmespath (1.3.1)

data/lib/movable_ink/aws/ec2.rb

@@ -139,6 +139,29 @@ module MovableInk
             redii.push({"host" => instance, "port" => port})
           }
       end
+
+      def elastic_ips
+        @all_elastic_ips ||= run_with_backoff do
+          ec2.describe_addresses.flat_map(&:addresses)
+        end
+      end
+
+      def unassigned_elastic_ips
+        @unassigned_elastic_ips ||= elastic_ips.select { |address| address.association_id.nil? }
+      end
+
+      def available_elastic_ips(role:)
+        unassigned_elastic_ips.select { |address| address.tags.detect { |t| t.key == 'mi:roles' && t.value == role } }
+      end
+
+      def assign_ip_address(role:)
+        run_with_backoff do
+          ec2.associate_address({
+            instance_id: instance_id,
+            allocation_id: available_elastic_ips(role: role).sample.allocation_id
+          })
+        end
+      end
     end
   end
 end

data/lib/movable_ink/aws/route53.rb

@@ -5,42 +5,6 @@ module MovableInk
         @route53_client ||= Aws::Route53::Client.new(region: 'us-east-1')
       end
 
-      def elastic_ips
-        @all_elastic_ips ||= load_all_elastic_ips
-      end
-
-      def load_all_elastic_ips
-        run_with_backoff do
-          ec2.describe_addresses.flat_map(&:addresses)
-        end
-      end
-
-      def unassigned_elastic_ips
-        @unassigned_elastic_ips ||= elastic_ips.select { |address| address.association_id.nil? }
-      end
-
-      def reserved_elastic_ips
-        @reserved_elastic_ips ||= s3.get_object({bucket: 'movableink-chef', key: 'reserved_ips.json'}).body
-                                    .map { |line| JSON.parse(line) }
-      end
-
-      def available_elastic_ips(role:)
-        reserved_elastic_ips.select do |ip|
-          ip["datacenter"] == datacenter &&
-          ip["role"] == role &&
-          unassigned_elastic_ips.map(&:allocation_id).include?(ip["allocation_id"])
-        end
-      end
-
-      def assign_ip_address(role:)
-        run_with_backoff do
-          ec2.associate_address({
-            instance_id: instance_id,
-            allocation_id: available_elastic_ips(role: role).sample["allocation_id"]
-          })
-        end
-      end
-
       def resource_record_sets(hosted_zone_id)
         @resource_record_sets ||= {}
         @resource_record_sets[hosted_zone_id] ||= list_all_r53_resource_record_sets(hosted_zone_id)

data/lib/movable_ink/version.rb

@@ -1,5 +1,5 @@
 module MovableInk
   class AWS
-    VERSION = '0.1.5'
+    VERSION = '0.1.6'
   end
 end

data/spec/ec2_spec.rb

@@ -219,5 +219,80 @@ describe MovableInk::AWS::EC2 do
         expect(aws.redis_by_role('visitor_redis', port)).to match_array(redii)
       end
     end
+
+    context "elastic IPs" do
+      let(:elastic_ip_data) { ec2.stub_data(:describe_addresses, addresses: [
+          {
+            allocation_id: "eipalloc-1",
+            association_id: "eipassoc-1",
+            domain: "vpc",
+            public_ip: "1.1.1.1",
+            tags: [{
+              key: 'mi:roles',
+              value: 'some_role'
+            }]
+          },
+          {
+            allocation_id: "eipalloc-2",
+            association_id: "eipassoc-2",
+            domain: "vpc",
+            public_ip: "1.1.1.2",
+            tags: [{
+              key: 'mi:roles',
+              value: 'some_role'
+            }]
+          },
+          {
+            allocation_id: "eipalloc-3",
+            association_id: nil,
+            domain: "vpc",
+            public_ip: "1.1.1.3",
+            tags: [{
+              key: 'mi:roles',
+              value: 'some_role'
+            }]
+          }
+        ])
+      }
+      let(:associate_address_data) { ec2.stub_data(:associate_address, association_id: 'eipassoc-3') }
+
+      it "should find all elastic IPs" do
+        ec2.stub_responses(:describe_addresses, elastic_ip_data)
+        allow(aws).to receive(:my_region).and_return('us-east-1')
+        allow(aws).to receive(:ec2).and_return(ec2)
+
+        expect(aws.elastic_ips.count).to eq(3)
+        expect(aws.elastic_ips.first.public_ip).to eq('1.1.1.1')
+        expect(aws.elastic_ips.last.public_ip).to eq('1.1.1.3')
+      end
+
+      it "should find unassigned elastic IPs" do
+        ec2.stub_responses(:describe_addresses, elastic_ip_data)
+        allow(aws).to receive(:my_region).and_return('us-east-1')
+        allow(aws).to receive(:ec2).and_return(ec2)
+
+        expect(aws.unassigned_elastic_ips.count).to eq(1)
+        expect(aws.unassigned_elastic_ips.first.public_ip).to eq('1.1.1.3')
+      end
+
+      it "should filter reserved IPs to get available IPs" do
+        ec2.stub_responses(:describe_addresses, elastic_ip_data)
+        allow(aws).to receive(:my_region).and_return('us-east-1')
+        allow(aws).to receive(:ec2).and_return(ec2)
+
+        expect(aws.available_elastic_ips(role: 'some_role').count).to eq(1)
+        expect(aws.available_elastic_ips(role: 'some_role').first['public_ip']).to eq('1.1.1.3')
+      end
+
+      it "should assign an elastic IP" 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').association_id).to eq('eipassoc-3')
+      end
+    end
   end
 end

data/spec/route53_spec.rb

@@ -4,93 +4,6 @@ require_relative '../lib/movable_ink/aws'
 describe MovableInk::AWS::Route53 do
   let(:aws) { MovableInk::AWS.new }
 
-  context "elastic IPs" do
-    let(:ec2) { Aws::EC2::Client.new(stub_responses: true) }
-    let(:s3) { Aws::S3::Client.new(stub_responses: true) }
-    let(:elastic_ip_data) { ec2.stub_data(:describe_addresses, addresses: [
-        {
-          allocation_id: "eipalloc-1",
-          association_id: "eipassoc-1",
-          domain: "vpc",
-          public_ip: "1.1.1.1"
-        },
-        {
-          allocation_id: "eipalloc-2",
-          association_id: "eipassoc-2",
-          domain: "vpc",
-          public_ip: "1.1.1.2"
-        },
-        {
-          allocation_id: "eipalloc-3",
-          association_id: nil,
-          domain: "vpc",
-          public_ip: "1.1.1.3"
-        }
-      ])
-    }
-    let(:associate_address_data) { ec2.stub_data(:associate_address, association_id: 'eipassoc-3') }
-    let(:reserved_ips) { StringIO.new(
-      "{\"datacenter\":\"iad\",\"allocation_id\":\"eipalloc-1\",\"public_ip\":\"1.1.1.1\",\"role\":\"some_role\"}
-       {\"datacenter\":\"iad\",\"allocation_id\":\"eipalloc-2\",\"public_ip\":\"1.1.1.2\",\"role\":\"some_role\"}
-       {\"datacenter\":\"iad\",\"allocation_id\":\"eipalloc-3\",\"public_ip\":\"1.1.1.3\",\"role\":\"some_role\"}"
-    )}
-    let(:s3_reserved_ips_data) { s3.stub_data(:get_object, body: reserved_ips) }
-
-    it "should find all elastic IPs" do
-      ec2.stub_responses(:describe_addresses, elastic_ip_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.elastic_ips.count).to eq(3)
-      expect(aws.elastic_ips.first.public_ip).to eq('1.1.1.1')
-      expect(aws.elastic_ips.last.public_ip).to eq('1.1.1.3')
-    end
-
-    it "should find unassigned elastic IPs" do
-      ec2.stub_responses(:describe_addresses, elastic_ip_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.unassigned_elastic_ips.count).to eq(1)
-      expect(aws.unassigned_elastic_ips.first.public_ip).to eq('1.1.1.3')
-    end
-
-    it "should load reserved elastic IPs from S3" do
-      s3.stub_responses(:get_object, s3_reserved_ips_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(:s3).and_return(s3)
-
-      expect(aws.reserved_elastic_ips.count).to eq(3)
-    end
-
-    it "should filter reserved IPs to get available IPs" do
-      ec2.stub_responses(:describe_addresses, elastic_ip_data)
-      s3.stub_responses(:get_object, s3_reserved_ips_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(:s3).and_return(s3)
-
-      expect(aws.available_elastic_ips(role: 'some_role').count).to eq(1)
-      expect(aws.available_elastic_ips(role: 'some_role').first['public_ip']).to eq('1.1.1.3')
-    end
-
-    it "should assign an elastic IP" do
-      ec2.stub_responses(:describe_addresses, elastic_ip_data)
-      ec2.stub_responses(:associate_address, associate_address_data)
-      s3.stub_responses(:get_object, s3_reserved_ips_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(:s3).and_return(s3)
-
-      expect(aws.assign_ip_address(role: 'some_role').association_id).to eq('eipassoc-3')
-    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: [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MovableInkAWS
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Matt Chesler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-29 00:00:00.000000000 Z
+date: 2018-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk