terrafying-components 1.7.2 → 1.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83a5aa96d0e23191e7a6f9815a1293535b8ceb71af791129ba2b4999b08f61b8
-  data.tar.gz: 114fc47ebc900ac85a5384b9d03fe9a5bc098171ffb06c1af13066b4a45e64ea
+  metadata.gz: 4a9bc69b9f076bd59fa7922ff83f0c59e472e570ba28b40dd29631e7d8378a90
+  data.tar.gz: 0c8c6f2131804dfb187d63d3db89d9b21d2f4c14f213ee9e42e88683eede6016
 SHA512:
-  metadata.gz: 3a9d6dce3183b75251eb8430cb4ea53aaf4734b50bee76ef42626b25995be72114a4393ee5a87b44c5b118ef9d14d6a1e7542ff3d169b740b1851692b8540600
-  data.tar.gz: 31756d5d7359054c017e17d772f5e9fd0cafbd720c4735a43b28842c3f64bb4025d47004338e2e15809db99931c4db20cb125e811f3f762338d98f1c065986d6
+  metadata.gz: 06fac52650040faef41a28e93a497ff9c8faf7aef38e83fa0eea0e79b943b8cb1597fccdcc6d1c71d9959aba5e623a5ecfda48c9d3cf88ebe1c13a9d6265c3db
+  data.tar.gz: 5bd0f0c64239f5173cb69410ca84fafd1d9b3b11069a4e097434ab433543d3bd98156c5f79a615bf8254a127ca9bae484c9c5486483235405151d949a5bba3ee

data/lib/terrafying/components/ca.rb

@@ -15,6 +15,10 @@ module Terrafying
         ref = {
           name: name,
           ca: self,
+          path: {
+            cert: File.join("/etc/ssl", @name, name, "cert"),
+            key: File.join("/etc/ssl", @name, name, "key"),
+          },
           source: {
             cert: File.join("s3://", @bucket, @prefix, @name, name, "cert"),
             key: File.join("s3://", @bucket, @prefix, @name, name, "key"),

data/lib/terrafying/components/instanceprofile.rb

@@ -5,7 +5,7 @@ module Terrafying
 
     class InstanceProfile < Terrafying::Context
 
-      attr_reader :id
+      attr_reader :id, :role_arn, :role_resource
 
       def self.create(name, options={})
         InstanceProfile.new.create name, options
@@ -74,6 +74,9 @@ module Terrafying
                          role: output_of(:aws_iam_role, name, :name),
                        }
 
+        @role_arn = output_of(:aws_iam_role, name, :arn)
+        @role_resource = "aws_iam_role.#{name}"
+
         self
       end
     end

data/lib/terrafying/components/loadbalancer.rb

@@ -98,7 +98,6 @@ module Terrafying
                          name: ident,
                          load_balancer_type: type,
                          internal: !options[:public],
-                         subnets: options[:subnets].map(&:id),
                          subnet_mapping: options[:subnets].map{ |subnet|
                            {subnet_id: subnet.id}
                          },

data/lib/terrafying/components/selfsignedca.rb

@@ -86,6 +86,10 @@ module Terrafying
 
         {
           ca: self,
+          path: {
+            cert: File.join("/etc/ssl", @name, "ca.cert"),
+            key: File.join("/etc/ssl", @name, "ca.key"),
+          },
           source: {
             cert: File.join("s3://", @bucket, @prefix, @name, "ca.cert"),
             key: File.join("s3://", @bucket, @prefix, @name, "ca.key"),

data/lib/terrafying/components/service.rb

@@ -20,7 +20,7 @@ module Terrafying
 
     class Service < Terrafying::Context
 
-      attr_reader :name, :domain_names, :ports, :load_balancer, :instance_set
+      attr_reader :name, :domain_names, :ports, :instance_profile, :load_balancer, :instance_set
 
       include Usable
 
@@ -87,16 +87,21 @@ module Terrafying
         depends_on = options[:depends_on] + options[:keypairs].map{ |kp| kp[:resources] }.flatten
 
         iam_statements = options[:iam_policy_statements] + options[:keypairs].map { |kp| kp[:iam_statement] }
-        instance_profile = add! InstanceProfile.create(ident, { statements: iam_statements })
+        @instance_profile = add! InstanceProfile.create(ident, { statements: iam_statements })
 
         tags = options[:tags].merge({ service_name: name })
 
         set = options[:instances].is_a?(Hash) ? DynamicSet : StaticSet
 
-        wants_load_balancer = (set == DynamicSet && @ports.count > 0) || options[:loadbalancer]
+        if options.has_key?(:loadbalancer) # explicitly requested or rejected a loadbalancer
+          wants_load_balancer = options[:loadbalancer]
+        else
+          # by default we want one if we are an ASG with exposed ports
+          wants_load_balancer = set == DynamicSet && @ports.count > 0
+        end
 
         instance_set_options = {
-          instance_profile: instance_profile,
+          instance_profile: @instance_profile,
           depends_on: depends_on,
           tags: tags,
         }

data/lib/terrafying/components/templates/ignition.yaml

@@ -83,14 +83,14 @@ storage:
     <% keypairs.each { |keypair| %>
     <% if keypair.has_key?(:name) %>
     - filesystem: "root"
-      path: "/etc/ssl/<%= keypair[:ca].name %>/<%= keypair[:name] %>/cert"
+      path: "<%= keypair[:path][:cert] %>"
       mode: 0444
       user: { id: 0 }
       group: { id: 0 }
       contents:
         source: "<%= keypair[:source][:cert] %>"
     - filesystem: "root"
-      path: "/etc/ssl/<%= keypair[:ca].name %>/<%= keypair[:name] %>/key"
+      path: "<%= keypair[:path][:key] %>"
       mode: 0444
       user: { id: 0 }
       group: { id: 0 }
@@ -98,7 +98,7 @@ storage:
         source: "<%= keypair[:source][:key] %>"
     <% else %>
     - filesystem: "root"
-      path: "/etc/ssl/<%= keypair[:ca].name %>/ca.key"
+      path: "<%= keypair[:path][:key] %>"
       mode: 0444
       user: { id: 0 }
       group: { id: 0 }

data/lib/terrafying/components/version.rb

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

metadata

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