terrafying-components 1.13.0 → 1.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1059ca89056f183bcc8d684b0b356adc33d5179047b436788e0cdfc4117352c5
-  data.tar.gz: 445ffd8351cd455e4dd4d25e0287fec0efecae4041a7e299e4d1df5f253f028c
+  metadata.gz: e87aa6a31720eaa6bcf59f5a2905b82f8c4041bd05395ec58759966eafc9354c
+  data.tar.gz: 8824ab8ebbfbe49595e81f119077518d9f521bc036dcd7f2ec0b49fe1a604f68
 SHA512:
-  metadata.gz: 07e48e4b9adc0192c95c6182b12cc1507472ffa0036db6b86bec4688bddbd4ab6ab4b94a5efc696a78f2bcdfb50d5d4cc47de9f3fd7fc07569d45da1a382d1b4
-  data.tar.gz: 0b9bb4f07a70422d1f4da39c9e76a718075a52507a9f55c24c55897347de144300b994cfaabb848e241f812a89274e869c8129f6cf7c43f669e954e7d9743496
+  metadata.gz: 25c885618f286940a020c28df09621883fdc18e0362bcb68410e49b0c44ec150a38783bb11dffb7001fca9dd610fc4fe0ebc17daeb93ae89b8a310b4c73efb8c
+  data.tar.gz: d2432d707a88c8ed0231706abf493821451c80ff8c8f143b5a0abc3cb3707742ab8713c94c5a36762ee27683a1e29acf1dcd04c3f401ccb505afd5a322090f4f

data/lib/terrafying/components/service.rb

@@ -136,12 +136,12 @@ module Terrafying
             @egress_security_group = @instance_set.security_group
           end
 
-          vpc.zone.add_alias_in(self, name, @load_balancer.alias_config)
+          @zone.add_alias_in(self, name, @load_balancer.alias_config)
         elsif set == StaticSet
-          vpc.zone.add_record_in(self, name, @instance_set.instances.map(&:ip_address))
+          @zone.add_record_in(self, name, @instance_set.instances.map(&:ip_address))
           @instance_set.instances.each do |i|
             @domain_names << vpc.zone.qualify(i.name)
-            vpc.zone.add_record_in(self, i.name, [i.ip_address])
+            @zone.add_record_in(self, i.name, [i.ip_address])
           end
         end
 

data/lib/terrafying/components/version.rb

@@ -2,6 +2,6 @@
 
 module Terrafying
   module Components
-    VERSION = '1.13.0'
+    VERSION = '1.13.1'
   end
 end

data/lib/terrafying/components/vpc.rb

@@ -32,6 +32,9 @@ module Terrafying
         @name = name
         @id = vpc.vpc_id
         @cidr = vpc.cidr_block
+        @azs = aws.availability_zones
+        @remaining_ip_space = NetAddr::Tree.new
+        @remaining_ip_space.add! cidr
         @tags = {}
         @zone = Terrafying::Components::Zone.find_by_tag(vpc: @id)
         raise 'Failed to find zone' if @zone.nil?
@@ -57,6 +60,17 @@ module Terrafying
         # need to sort subnets so they are in az order
         @subnets.each { |_, s| s.sort! { |a, b| a.az <=> b.az } }
 
+        @subnets.each do |_,subnet|
+          subnet.each do |s|
+            drop_subnet!(s.cidr)
+          end
+        end
+
+        @nat_gateways = []
+         aws.nat_gateways_for_vpc(vpc.vpc_id).each do |nat_gateway|
+          @nat_gateways << nat_gateway.nat_gateway_id
+        end
+
         tags = vpc.tags.select { |tag| tag.key == 'ssh_group' }
         @ssh_group = if tags.count > 0
                        tags[0].value
@@ -336,7 +350,6 @@ module Terrafying
         if targets.count == 0
           raise "Run out of ip space to allocate a /#{bit_size}"
         end
-
         target = targets[0]
 
         @remaining_ip_space.delete!(target)
@@ -354,7 +367,26 @@ module Terrafying
         new_subnet.to_s
       end
 
+      def drop_subnet!(raw_cidr)
+
+        cidr = NetAddr::CIDR.create(raw_cidr)
+        bit_size = cidr.bits
+        target = @remaining_ip_space.longest_match(cidr)
+
+        @remaining_ip_space.delete!(target)
+
+        if target.bits != bit_size
+          target.remainder(cidr).each do |rem|
+            @remaining_ip_space.add!(rem)
+          end
+        end
+      end
+
       def allocate_subnets!(name, options = {})
+        allocate_subnets_in!(self, name, options)
+      end
+
+      def allocate_subnets_in!(ctx, name, options = {})
         options = {
           public: false,
           bit_size: @subnet_size,
@@ -369,20 +401,37 @@ module Terrafying
                    else
                      [nil] * @azs.count
                    end
-
-        @subnets[name] = @azs.zip(gateways).map do |az, gateway|
-          subnet_options = { tags: { subnet_name: name }.merge(options[:tags]).merge(@tags) }
-          unless gateway.nil?
-            if options[:public]
-              subnet_options[:gateway] = gateway
-            elsif options[:internet]
-              subnet_options[:nat_gateway] = gateway
+        if @subnets.has_key?(name.to_sym)
+
+          @subnets[name.to_sym].zip(gateways).map do |subnet, gateway|
+            subnet_options = { tags: { subnet_name: name }.merge(options[:tags]).merge(@tags) }
+            unless gateway.nil?
+              if options[:public]
+                subnet_options[:gateway] = gateway
+              elsif options[:internet]
+                subnet_options[:nat_gateway] = gateway
+              end
             end
+            ctx.add! Terrafying::Components::Subnet.create_in(
+             self, name, subnet.az, subnet.cidr, subnet_options
+            )
           end
 
-          add! Terrafying::Components::Subnet.create_in(
-            self, name, az, extract_subnet!(options[:bit_size]), subnet_options
-          )
+        else
+          @subnets[name] = @azs.zip(gateways).map do |az, gateway|
+            subnet_options = { tags: { subnet_name: name }.merge(options[:tags]).merge(@tags) }
+            unless gateway.nil?
+              if options[:public]
+                subnet_options[:gateway] = gateway
+              elsif options[:internet]
+                subnet_options[:nat_gateway] = gateway
+              end
+            end
+
+            ctx.add! Terrafying::Components::Subnet.create_in(
+             self, name, az, extract_subnet!(options[:bit_size]), subnet_options
+            )
+          end
         end
       end
     end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: terrafying-components
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.13.1
 platform: ruby
 authors:
 - uSwitch Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-10 00:00:00.000000000 Z
+date: 2019-07-23 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +58,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.5
+        version: 1.7.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.7.5
+        version: 1.7.6
 - !ruby/object:Gem::Dependency
   name: xxhash
   requirement: !ruby/object:Gem::Requirement