terrafying-components 1.7.3 → 1.7.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a9bc69b9f076bd59fa7922ff83f0c59e472e570ba28b40dd29631e7d8378a90
-  data.tar.gz: 0c8c6f2131804dfb187d63d3db89d9b21d2f4c14f213ee9e42e88683eede6016
+  metadata.gz: 6bf81aeec939ed88efa3a15c1162746ef3916811afb15e0386b45de7f7e6d0a4
+  data.tar.gz: 696e19c11302bb6960d7ac1a3c530e0819bc82e55cd018e10c3fed0fdbf040c5
 SHA512:
-  metadata.gz: 06fac52650040faef41a28e93a497ff9c8faf7aef38e83fa0eea0e79b943b8cb1597fccdcc6d1c71d9959aba5e623a5ecfda48c9d3cf88ebe1c13a9d6265c3db
-  data.tar.gz: 5bd0f0c64239f5173cb69410ca84fafd1d9b3b11069a4e097434ab433543d3bd98156c5f79a615bf8254a127ca9bae484c9c5486483235405151d949a5bba3ee
+  metadata.gz: 908ef1feb036a944fe1746e21448c6174d3fb1419226cf5d363e2d5c348412bbd087ef2742f9c785291e895faacebc0507735f76fff16bdc6faeb71f0d5f9bf6
+  data.tar.gz: 6ebfcbf532446269277583d353dbe58ad15c58c4618d06ecf90dda35a73d913cbf591344236ad8ac7a2d12e3eb1a1112265ea4c68217508b153d7ee8ec7e4162

data/lib/terrafying/components/endpoint.rb

@@ -10,7 +10,7 @@ module Terrafying
 
     class Endpoint < Terrafying::Context
 
-      attr_reader :security_group
+      attr_reader :fqdn, :security_group
 
       include Usable
 
@@ -27,7 +27,6 @@ module Terrafying
           auto_accept: true,
           subnets: vpc.subnets.fetch(:private, []),
           private_dns: false,
-          dns_name: name,
           tags: {},
         }.merge(options)
 
@@ -84,7 +83,21 @@ module Terrafying
                    private_dns_enabled: options[:private_dns],
                  }
 
-        vpc.zone.add_cname_in(self, options[:dns_name], output_of(:aws_vpc_endpoint, ident, "dns_entry.0.dns_name"))
+        @fqdn = output_of(:aws_vpc_endpoint, ident, "dns_entry.0.dns_name")
+
+        if options[:service]
+          endpoint_service = options[:service]
+
+          record_name = endpoint_service.fqdn.gsub(/.#{endpoint_service.zone.fqdn}$/, "")
+
+          private_zone = add! Zone.create(endpoint_service.zone.fqdn, vpc: vpc)
+          private_zone.add_record(
+            record_name, [@fqdn], type: "CNAME",
+            resource_name: tf_safe("#{@name}-#{endpoint_service.fqdn}"),
+          )
+        else
+
+        end
 
         self
       end

data/lib/terrafying/components/endpointservice.rb

@@ -7,7 +7,7 @@ module Terrafying
 
     class EndpointService < Terrafying::Context
 
-      attr_reader :name, :load_balancer, :service_name
+      attr_reader :name, :load_balancer, :service_name, :fqdn, :zone
 
       def self.create_for(load_balancer, name, options={})
         EndpointService.new.create_for(load_balancer, name, options)
@@ -40,6 +40,9 @@ module Terrafying
         @name = name
         @load_balancer = load_balancer
 
+        @fqdn = options[:fqdn]
+        @zone = options[:zone]
+
         resource :aws_vpc_endpoint_service, name, {
                    acceptance_required: options[:acceptance_required],
                    allowed_principals: options[:allowed_principals],

data/lib/terrafying/components/service.rb

@@ -20,7 +20,7 @@ module Terrafying
 
     class Service < Terrafying::Context
 
-      attr_reader :name, :domain_names, :ports, :instance_profile, :load_balancer, :instance_set
+      attr_reader :name, :zone, :domain_names, :ports, :instance_profile, :load_balancer, :instance_set
 
       include Usable
 
@@ -81,6 +81,7 @@ module Terrafying
         ident = "#{tf_safe(vpc.name)}-#{name}"
 
         @name = ident
+        @zone = options[:zone]
         @ports = enrich_ports(options[:ports])
         @domain_names = [ options[:zone].qualify(name) ]
 
@@ -143,7 +144,10 @@ module Terrafying
       end
 
       def with_endpoint_service(options = {})
-        add! EndpointService.create_for(@load_balancer, @name, options)
+        add! EndpointService.create_for(@load_balancer, @name, {
+                                          fqdn: @domain_names[0],
+                                          zone: @zone,
+                                        }.merge(options))
       end
 
     end

data/lib/terrafying/components/version.rb

@@ -1,5 +1,5 @@
 module Terrafying
   module Components
-    VERSION = "1.7.3"
+    VERSION = "1.7.4"
   end
 end

data/lib/terrafying/components/zone.rb

@@ -49,11 +49,19 @@ module Terrafying
 
         ident = tf_safe(fqdn)
 
+        zone_config = {
+          name: fqdn,
+          tags: options[:tags],
+        }
+
+        if options[:vpc]
+          zone_config[:vpc_id] = options[:vpc].id
+
+          ident = tf_safe("#{options[:vpc].id}-#{ident}")
+        end
+
         @fqdn = fqdn
-        @id = resource :aws_route53_zone, ident, {
-                         name: fqdn,
-                         tags: options[:tags],
-                       }
+        @id = resource :aws_route53_zone, ident, zone_config
 
         if options[:parent_zone]
           ns = (0..3).map{ |i| output_of(:aws_route53_zone, ident, "name_servers.#{i}") }
@@ -81,10 +89,10 @@ module Terrafying
           name: qualify(name),
         }.merge(options)
 
-        ctx.resource :aws_route53_record, tf_safe(options[:name]), {
+        ctx.resource :aws_route53_record, options[:resource_name] || tf_safe(options[:name]), {
                    zone_id: @id,
                    records: records,
-                 }.merge(options)
+                 }.merge(options.slice(:type, :ttl, :name, :records, :zone_id, :weight))
       end
 
       def add_alias(name, config)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terrafying-components
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: 1.7.4
 platform: ruby
 authors:
 - uSwitch Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-03 00:00:00.000000000 Z
+date: 2018-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler