terrafying-components 1.11.3 → 1.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12a356bb3bd059ffcde3680685f307fb7a89755cd89a881cd879566397968ce9
-  data.tar.gz: 214186688d3906b86c78b1167a40e860c673268367f989cad82c78a899e91fec
+  metadata.gz: b9ba3f6790937e43326088e2e77daeb418ae044c68e45b0460aa392a06276db5
+  data.tar.gz: a2e46ea27137ba9890caab6a35569bac628cd071f23bf462cc8df5d173ba4805
 SHA512:
-  metadata.gz: 51936f3ef40d7a9307791c8b4cd612be2461e8eca85795ed78e25f80f019f4e3dc970ede362ea52eb740ac3f29e3deb1256957b42660c8568d49a5ee7c959b68
-  data.tar.gz: b3b6a8fe8528f3fbc95c1e8dbc2f9c5f88b80c520d37b131ba8aa0aee22fe2adc3fa84ab2cedca5741017f0e31f494cd2e90ae1bb988565fd56183d750292083
+  metadata.gz: 95345ab09c06d5b69370bdb078207d464f371ab7d9a2b3eab31d3f9d662f5076682227adaf2ccfad5972355ce771ce654657e7191e4b18516488fb0ed393354b
+  data.tar.gz: 5b0a8e035624fb3a4d4075e23d95da163c4af304187c45860fa799e64a758eba90fe4f3fa8ce74558071938ad2dcee5583edecdb41c8f48f005b9e943599a3f8

data/lib/terrafying/components/version.rb

@@ -1,5 +1,5 @@
 module Terrafying
   module Components
-    VERSION = "1.11.3"
+    VERSION = "1.11.4"
   end
 end

data/lib/terrafying/components/vpn.rb

@@ -28,7 +28,7 @@ module Terrafying
 
     class VPN < Terrafying::Context
 
-      attr_reader :name, :cidr
+      attr_reader :name, :cidr, :service, :ip_address
 
       def self.create_in(vpc, name, provider, options={})
         VPN.new.create_in vpc, name, provider, options
@@ -46,6 +46,7 @@ module Terrafying
           subnets: vpc.subnets.fetch(:public, []),
           static: false,
           route_all_traffic: false,
+          route_dns_entries: [],
           units: [],
           tags: {},
           service: {},
@@ -68,7 +69,7 @@ module Terrafying
 
         units = [
           openvpn_service,
-          openvpn_authz_service(options[:route_all_traffic]),
+          openvpn_authz_service(options[:route_all_traffic], options[:route_dns_entries]),
           caddy_service(options[:ca])
         ]
         files = [
@@ -98,10 +99,11 @@ module Terrafying
           instances = [{}]
         end
 
+        @is_public = options[:public]
         @service = add! Service.create_in(
                           vpc, name,
                           {
-                            public: options[:public],
+                            public: @is_public,
                             ports: [22, 443, { number: 1194, type: "udp" }],
                             tags: options[:tags],
                             units: units + options[:units],
@@ -122,9 +124,40 @@ module Terrafying
                             ],
                           }.merge(options[:service])
                         )
+
+        @ip_address = @service.instance_set.instances[0].ip_address
+
         self
       end
 
+      def allow_security_group_in(vpc, name: "")
+        name = "allow-#{@vpc.name}-vpn".downcase if name.empty?
+
+        ingress_rules = [
+          {
+            from_port: 0,
+            to_port: 0,
+            protocol: -1,
+            security_groups: [ @service.egress_security_group ],
+          },
+        ]
+
+        if @is_public
+          ingress_rules << {
+            from_port: 0,
+            to_port: 0,
+            protocol: -1,
+            cidr_blocks: [ "#{@ip_address}/32" ],
+          }
+        end
+
+        resource :aws_security_group, tf_safe("#{name}-#{vpc.name}"), {
+               name: name,
+               vpc_id: vpc.id,
+               ingress: ingress_rules,
+             }
+      end
+
       def openvpn_service
         Ignition.container_unit(
           "openvpn", "kylemanna/openvpn",
@@ -140,15 +173,19 @@ module Terrafying
         )
       end
 
-      def openvpn_authz_service(route_all_traffic)
+      def openvpn_authz_service(route_all_traffic, route_dns_entry)
         optional_arguments = []
 
         if route_all_traffic
           optional_arguments << "--route-all"
         end
 
+        if route_dns_entry.count > 0
+          optional_arguments = optional_arguments + route_dns_entry.map { |entry| "--route-dns-entries #{entry}" }
+        end
+
         Ignition.container_unit(
-          "openvpn-authz", "quay.io/uswitch/openvpn-authz:1.1",
+          "openvpn-authz", "quay.io/uswitch/openvpn-authz:1.2",
           {
             host_networking: true,
             volumes: [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terrafying-components
 version: !ruby/object:Gem::Version
-  version: 1.11.3
+  version: 1.11.4
 platform: ruby
 authors:
 - uSwitch Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-22 00:00:00.000000000 Z
+date: 2019-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler