terrafying-components 1.8.0 → 1.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55faf0808fc9982431b901ab4a2bf8faedf8eb471f040340b1075e5982d61aa0
-  data.tar.gz: f81aec1f8b7236d05d9e234531827c9f7f05e9e06c2e927b42368e5d5cba3bf7
+  metadata.gz: 62751638a41d97b8677d5e6821fea20a95d7f5db08382238504f0ed647c43f88
+  data.tar.gz: 7b87dab5a5740196d4e0f4af1e4994a35e0e2b774ee3ad5519d1d1dace1ddecc
 SHA512:
-  metadata.gz: 0c0012e3b2469b6de2cc9c9de6c8d4ce995e07d3f5b3ec17ad3cfd5e78f9c5b08d31784f6d538963623c46ee6c81c3a81a27ba6f1dbe16a73dbda91957a0d82e
-  data.tar.gz: d7eba0ca0c56aae91f8cab7b9bdd726cebe07ed1a3de09645667d1424583d2afa97dbbd31b857bd35106cc6d37e09fec574602f9c1ae8dd30823e6252411e4ff
+  metadata.gz: 8a4fee0f8eb676ae6f30b2e72b807625b88d6ce2902d467c55a74bcb3bde2cb553443324d5126bb7cee45e392016e7e56b6d549ba50249415c43a367000bd8d4
+  data.tar.gz: 9d06d16c3a1dab348ba05c629e85e30f869c3e8fb3b4e20c06cc3bb29e71efdb6cc7e0241ef3c4a9b8d193939954ef67d76b8b89fd4e72fdadf6f3c0ea7f4137

data/lib/terrafying/components/dynamicset.rb

@@ -74,7 +74,7 @@ module Terrafying
                                    image_id: options[:ami],
                                    instance_type: options[:instance_type],
                                    user_data: options[:user_data],
-                                   iam_instance_profile: options[:instance_profile] && options[:instance_profile].id,
+                                   iam_instance_profile: profile_from(options[:instance_profile]),
                                    associate_public_ip_address: options[:public],
                                    root_block_device: {
                                      volume_type: 'gp2',
@@ -87,7 +87,7 @@ module Terrafying
                                    lifecycle: {
                                      create_before_destroy: true,
                                    },
-                                   depends_on: options[:instance_profile] ? options[:instance_profile].resource_names : [],
+                                   depends_on: resources_from(options[:instance_profile]),
                                  }
 
         if options[:instances][:track]
@@ -123,6 +123,14 @@ module Terrafying
         self
       end
 
+      def profile_from(profile)
+        profile.respond_to?(:id) ? profile.id : profile
+      end
+
+      def resources_from(profile)
+        profile.respond_to?(:resource_names) ? profile.resource_names : []
+      end
+
       def attach_load_balancer(load_balancer)
         load_balancer.target_groups.each.with_index { |target_group, i|
           resource :aws_autoscaling_attachment, "#{load_balancer.name}-#{@name}-#{i}", {

data/lib/terrafying/components/instance.rb

@@ -84,7 +84,7 @@ module Terrafying
         @id = resource :aws_instance, ident, {
                          ami: options[:ami],
                          instance_type: options[:instance_type],
-                         iam_instance_profile: options[:instance_profile] && options[:instance_profile].id,
+                         iam_instance_profile: profile_from(options[:instance_profile]),
                          subnet_id: @subnet.id,
                          associate_public_ip_address: options[:public],
                          root_block_device: {
@@ -109,6 +109,9 @@ module Terrafying
         self
       end
 
+      def profile_from(profile)
+        profile.respond_to?(:id) ? profile.id : profile
+      end
     end
   end
 end

data/lib/terrafying/components/loadbalancer.rb

@@ -1,3 +1,4 @@
+require 'digest'
 require 'terrafying/components/usable'
 require 'terrafying/generator'
 
@@ -62,9 +63,13 @@ module Terrafying
           ports: [],
           public: false,
           subnets: vpc.subnets.fetch(:private, []),
-          tags: {},
+          tags: {
+            Name: name
+          },
+          hex_ident: false
         }.merge(options)
 
+        @hex_ident = options[:hex_ident]
         @ports = enrich_ports(options[:ports])
 
         l4_ports = @ports.select{ |p| is_l4_port(p) }
@@ -78,7 +83,7 @@ module Terrafying
         ident = make_identifier(@type, vpc.name, name)
         @name = ident
 
-        if @type == "application"
+        if application?
           @security_group = resource :aws_security_group, ident, {
                                        name: "loadbalancer-#{ident}",
                                        description: "Describe the ingress and egress of the load balancer #{ident}",
@@ -94,14 +99,12 @@ module Terrafying
         end
 
         @id = resource :aws_lb, ident, {
-                         name: ident,
-                         load_balancer_type: type,
-                         internal: !options[:public],
-                         subnet_mapping: options[:subnets].map{ |subnet|
-                           {subnet_id: subnet.id}
-                         },
-                         tags: options[:tags],
-                       }.merge(@type == "application" ? { security_groups: [@security_group] } : {})
+          name: ident,
+          load_balancer_type: type,
+          internal: !options[:public],
+          tags: options[:tags],
+        }.merge(subnets_for(options[:subnets]))
+         .merge(application? ? { security_groups: [@security_group] } : {})
 
         @target_groups = []
 
@@ -145,24 +148,30 @@ module Terrafying
         self
       end
 
-      def attach(set)
-        if set.respond_to?(:attach_load_balancer)
-          set.attach_load_balancer(self)
+      def application?
+        @type == 'application'
+      end
 
-          if @type == "network"
-            @security_group = set.ingress_security_group
-          end
-        else
-          raise "Dont' know how to attach object to LB"
-        end
+      def subnets_for(subnets)
+        return { subnets: subnets.map(&:id) } if application?
+        { subnet_mapping: subnets.map { |subnet| { subnet_id: subnet.id } } }
       end
 
-      def make_identifier(type, vpc_name, name)
-        "#{type}-#{tf_safe(vpc_name)}-#{name}"[0..31]
+      def network?
+        @type == 'network'
       end
 
-    end
+      def attach(set)
+        raise "Dont' know how to attach object to LB" unless set.respond_to?(:attach_load_balancer)
+        set.attach_load_balancer(self)
+        @security_group = set.ingress_security_group if network?
+      end
 
+      def make_identifier(type, vpc_name, name)
+        gen_id = "#{type}-#{tf_safe(vpc_name)}-#{name}"
+        return Digest::SHA2.hexdigest(gen_id)[0..24] if @hex_ident || gen_id.size > 26
+        gen_id[0..31]
+      end
+    end
   end
-
 end

data/lib/terrafying/components/service.rb

@@ -86,9 +86,12 @@ module Terrafying
         @domain_names = [ options[:zone].qualify(name) ]
 
         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 })
+        if options.key? :instance_profile
+          @instance_profile = options[:instance_profile]
+        else
+          iam_statements = options[:iam_policy_statements] + options[:keypairs].map { |kp| kp[:iam_statement] }
+          @instance_profile = add! InstanceProfile.create(ident, { statements: iam_statements })
+        end
 
         tags = options[:tags].merge({ service_name: name })
 

data/lib/terrafying/components/version.rb

@@ -1,5 +1,5 @@
 module Terrafying
   module Components
-    VERSION = "1.8.0"
+    VERSION = "1.8.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: terrafying-components
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.8.1
 platform: ruby
 authors:
 - uSwitch Limited
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-20 00:00:00.000000000 Z
+date: 2018-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler