terrafying-components 1.11.15 → 1.11.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58c1f699ab0be91038f929d5854e26a71354b9c6ffadb58ed943daadef765d05
-  data.tar.gz: f30533a1ca0987301a3f9eae2149d11a8c11cc0a4c5a554dc57bd7852d9a96dc
+  metadata.gz: 9e9121015f6897ad8f1ef2101c0a607af0bbab6101ef5d2b6c2908fe65d3b1e0
+  data.tar.gz: 16b0ce21f4a8257f0020dd7120444f334e4fbc85b5c776714261e706932ba3a6
 SHA512:
-  metadata.gz: ca44d50f99a394df8d0a6d39e70896078961eef694d6ba7de2a0ceaa02f48529fb0f81d3bbb567c3f23aad284fdf54c56fd58fa30cf2ba4e78f708b4b87f828e
-  data.tar.gz: f6ee8c6164921993eaac80aeffd04cd7a1f62dfe9fe6c099323b2a1bdbcf147b03a3944cb4c30ef9369174499c68cdb1211423515144c218abbab47cb097c1f8
+  metadata.gz: 036c602e8ce1e0ca611c4df369e69c543e18dc49a679da4d245ba0111a9f53e4fb382d520cc432ceb7a3a7e957253e089f87eb52e79b03a1a08fc60ba4162a06
+  data.tar.gz: f512360a77ce4ffcc0ac9a507079b2d5b33e70b3b25249c5e98cfff9b81fb6ff8793dee086100f9f773a21974419cec8c21d3677fc9d80913ac6452d0215bf14

data/lib/hash/merge_with_arrays.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ::Hash
   def merge_with_arrays_merged(newhash)
     merge(newhash) do |_key, oldval, newval|

data/lib/terrafying/components.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require 'terrafying/components/endpoint'
 require 'terrafying/components/endpointservice'

data/lib/terrafying/components/auditd.rb

@@ -36,14 +36,14 @@ module Terrafying
 
       def default_tags
         {
-          name:          'tagset_name',
-          instance_id:   'instance_id',
+          name: 'tagset_name',
+          instance_id: 'instance_id',
           instance_type: 'instance_type',
-          private_ip:    'private_ip',
-          az:            'availability_zone',
-          vpc_id:        'vpc_id',
-          ami_id:        'image_id',
-          account_id:    'account_id'
+          private_ip: 'private_ip',
+          az: 'availability_zone',
+          vpc_id: 'vpc_id',
+          ami_id: 'image_id',
+          account_id: 'account_id'
         }
       end
 

data/lib/terrafying/components/ca.rb

@@ -1,11 +1,9 @@
+# frozen_string_literal: true
 
 module Terrafying
-
   module Components
-
     module CA
-
-      def create_keypair(name, options={})
+      def create_keypair(name, options = {})
         create_keypair_in(self, name, options)
       end
 
@@ -18,19 +16,20 @@ module Terrafying
       end
 
       def object_name(name, type)
-        "#{object_ident(name)}-#{type.to_s}"
+        "#{object_ident(name)}-#{type}"
       end
 
-      def object_key(name, type, version='')
-        if (ca? name)
-          File.join('', @prefix, @name, "ca.#{type.to_s}")
+      def object_key(name, type, version = '')
+        if ca? name
+          File.join('', @prefix, @name, "ca.#{type}")
         else
-          raise "A non-ca object must have a version" if version.empty?
+          raise 'A non-ca object must have a version' if version.empty?
+
           File.join('', @prefix, @name, name, version, type.to_s)
         end
       end
 
-      def object_arn(name, type, version="*")
+      def object_arn(name, type, version = '*')
         key = object_key(name, type, version)
 
         "arn:aws:s3:::#{@bucket}#{key}"
@@ -40,7 +39,7 @@ module Terrafying
         name = object_name(name, type)
         key = output_of(:aws_s3_bucket_object, name, :key).to_s
 
-        File.join("s3://", "#{@bucket}#{key}")
+        File.join('s3://', "#{@bucket}#{key}")
       end
 
       def reference_keypair(ctx, name)
@@ -48,27 +47,27 @@ module Terrafying
           name: name,
           ca: self,
           path: {
-            cert: File.join("/etc/ssl", @name, name, "cert"),
-            key: File.join("/etc/ssl", @name, name, "key"),
+            cert: File.join('/etc/ssl', @name, name, 'cert'),
+            key: File.join('/etc/ssl', @name, name, 'key')
           },
           source: {
             cert: object_url(name, :cert),
-            key: object_url(name, :key),
+            key: object_url(name, :key)
           },
           resources: [
             "aws_s3_bucket_object.#{object_name(name, :key)}",
             "aws_s3_bucket_object.#{object_name(name, :cert)}"
           ],
           iam_statement: {
-            Effect: "Allow",
+            Effect: 'Allow',
             Action: [
-              "s3:GetObjectAcl",
-              "s3:GetObject",
+              's3:GetObjectAcl',
+              's3:GetObject'
             ],
             Resource: [
               object_arn(@name, :cert),
               object_arn(name, :cert),
-              object_arn(name, :key),
+              object_arn(name, :key)
             ]
           }
         }
@@ -83,9 +82,6 @@ module Terrafying
       def <=>(other)
         @name <=> other.name
       end
-
     end
-
   end
-
 end

data/lib/terrafying/components/dynamicset.rb

@@ -1,19 +1,17 @@
+# frozen_string_literal: true
 
 require 'terrafying/components/usable'
 
 require_relative './ports'
 
 module Terrafying
-
   module Components
-
     class DynamicSet < Terrafying::Context
-
       attr_reader :name, :stack, :asg
 
       include Usable
 
-      def self.create_in(vpc, name, options={})
+      def self.create_in(vpc, name, options = {})
         DynamicSet.new.create_in vpc, name, options
       end
 
@@ -21,7 +19,7 @@ module Terrafying
         DynamicSet.new.find_in vpc, name
       end
 
-      def initialize()
+      def initialize
         super
       end
 
@@ -31,11 +29,11 @@ module Terrafying
         self
       end
 
-      def create_in(vpc, name, options={})
+      def create_in(vpc, name, options = {})
         options = {
           public: false,
-          ami: aws.ami("base-image-24b8d5fb", owners=["136393635417"]),
-          instance_type: "t2.micro",
+          ami: aws.ami('base-image-24b8d5fb', owners = ['136393635417']),
+          instance_type: 't2.micro',
           instances: { min: 1, max: 1, desired: 1, tags: {} },
           ports: [],
           instance_profile: nil,
@@ -44,7 +42,7 @@ module Terrafying
           ssh_group: vpc.ssh_group,
           subnets: vpc.subnets.fetch(:private, []),
           depends_on: [],
-          rolling_update: :simple,
+          rolling_update: :simple
         }.merge(options)
 
         ident = "#{tf_safe(vpc.name)}-#{name}"
@@ -52,37 +50,35 @@ module Terrafying
         @name = ident
         @ports = enrich_ports(options[:ports])
 
-        @security_group = resource :aws_security_group, ident, {
-          name: "dynamicset-#{ident}",
-          description: "Describe the ingress and egress of the service #{ident}",
-          tags: options[:tags],
-          vpc_id: vpc.id
-        }
+        @security_group = resource :aws_security_group, ident,
+                                   name: "dynamicset-#{ident}",
+                                   description: "Describe the ingress and egress of the service #{ident}",
+                                   tags: options[:tags],
+                                   vpc_id: vpc.id
 
         default_egress_rule(ident, @security_group)
 
         path_mtu_setup!
 
-        launch_config = resource :aws_launch_configuration, ident, {
-                                   name_prefix: "#{ident}-",
-                                   image_id: options[:ami],
-                                   instance_type: options[:instance_type],
-                                   user_data: options[:user_data],
-                                   iam_instance_profile: profile_from(options[:instance_profile]),
-                                   associate_public_ip_address: options[:public],
-                                   root_block_device: {
-                                     volume_type: 'gp2',
-                                     volume_size: 32,
-                                   },
-                                   security_groups: [
-                                     vpc.internal_ssh_security_group,
-                                     @security_group,
-                                   ].push(*options[:security_groups]),
-                                   lifecycle: {
-                                     create_before_destroy: true,
-                                   },
-                                   depends_on: resource_name_from(options[:instance_profile]),
-                                 }
+        launch_config = resource :aws_launch_configuration, ident,
+                                 name_prefix: "#{ident}-",
+                                 image_id: options[:ami],
+                                 instance_type: options[:instance_type],
+                                 user_data: options[:user_data],
+                                 iam_instance_profile: profile_from(options[:instance_profile]),
+                                 associate_public_ip_address: options[:public],
+                                 root_block_device: {
+                                   volume_type: 'gp2',
+                                   volume_size: 32
+                                 },
+                                 security_groups: [
+                                   vpc.internal_ssh_security_group,
+                                   @security_group
+                                 ].push(*options[:security_groups]),
+                                 lifecycle: {
+                                   create_before_destroy: true
+                                 },
+                                 depends_on: resource_name_from(options[:instance_profile])
 
         if options[:instances][:track]
           instances = instances_by_tags(Name: ident)
@@ -91,26 +87,25 @@ module Terrafying
           end
         end
 
-        if options.has_key?(:health_check)
-          raise 'Health check needs a type and grace_period' if ! options[:health_check].has_key?(:type) and ! options[:health_check].has_key?(:grace_period)
+        if options.key?(:health_check)
+          raise 'Health check needs a type and grace_period' if !options[:health_check].key?(:type) && !options[:health_check].key?(:grace_period)
         else
           options = {
             health_check: {
-              type: "EC2",
+              type: 'EC2',
               grace_period: 0
-            },
+            }
           }.merge(options)
         end
-        tags = { Name: ident, service_name: name,}.merge(options[:tags]).merge(options[:instances].fetch(:tags, {})).map { |k,v| { Key: k, Value: v, PropagateAtLaunch: true }}
+        tags = { Name: ident, service_name: name }.merge(options[:tags]).merge(options[:instances].fetch(:tags, {})).map { |k, v| { Key: k, Value: v, PropagateAtLaunch: true } }
 
-        resource :aws_cloudformation_stack, ident, {
-                   name: ident,
-                   disable_rollback: true,
-                   template_body: generate_template(
-                     options[:health_check], options[:instances], launch_config,
-                     options[:subnets].map(&:id), tags, options[:rolling_update]
-                   ),
-                 }
+        resource :aws_cloudformation_stack, ident,
+                 name: ident,
+                 disable_rollback: true,
+                 template_body: generate_template(
+                   options[:health_check], options[:instances], launch_config,
+                   options[:subnets].map(&:id), tags, options[:rolling_update]
+                 )
 
         @stack = "arn:aws:cloudformation:#{aws.region}:#{aws.account_id}:stack/#{ident}/*"
 
@@ -119,16 +114,14 @@ module Terrafying
         self
       end
 
-
       def default_egress_rule(ident, security_group)
-        resource :aws_security_group_rule, "#{ident}-default-egress", {
-          security_group_id: security_group,
-          type: 'egress',
-          from_port: 0,
-          to_port: 0,
-          protocol: -1,
-          cidr_blocks: ['0.0.0.0/0'],
-        }
+        resource :aws_security_group_rule, "#{ident}-default-egress",
+                 security_group_id: security_group,
+                 type: 'egress',
+                 from_port: 0,
+                 to_port: 0,
+                 protocol: -1,
+                 cidr_blocks: ['0.0.0.0/0']
       end
 
       def profile_from(profile)
@@ -140,14 +133,13 @@ module Terrafying
       end
 
       def attach_load_balancer(load_balancer)
-        load_balancer.targets.each.with_index { |target, i|
-          resource :aws_autoscaling_attachment, "#{load_balancer.name}-#{@name}-#{i}", {
-                     autoscaling_group_name: @asg,
-                     alb_target_group_arn: target.target_group
-                   }
-        }
+        load_balancer.targets.each.with_index do |target, i|
+          resource :aws_autoscaling_attachment, "#{load_balancer.name}-#{@name}-#{i}",
+                   autoscaling_group_name: @asg,
+                   alb_target_group_arn: target.target_group
+        end
 
-        self.used_by(load_balancer) if load_balancer.application?
+        used_by(load_balancer) if load_balancer.application?
       end
 
       def autoscale_on_load_balancer(load_balancer, target_value:, disable_scale_in:)
@@ -158,54 +150,53 @@ module Terrafying
           listener = "aws_lb_listener.#{target.listener.to_s.split('.')[1]}"
           autoscaling_attachment = "aws_autoscaling_attachment.#{policy_name}"
 
-          resource :aws_autoscaling_policy, policy_name, {
-            name: policy_name,
-            autoscaling_group_name: @asg,
-            policy_type: 'TargetTrackingScaling',
-            target_tracking_configuration: {
-              predefined_metric_specification: {
-                predefined_metric_type: 'ALBRequestCountPerTarget',
-                resource_label: "#{lb_arn}/#{tg_arn}"
-              },
-              target_value: target_value,
-              disable_scale_in: disable_scale_in
-            },
-            depends_on: [listener, autoscaling_attachment]
-          }
+          resource :aws_autoscaling_policy, policy_name,
+                   name: policy_name,
+                   autoscaling_group_name: @asg,
+                   policy_type: 'TargetTrackingScaling',
+                   target_tracking_configuration: {
+                     predefined_metric_specification: {
+                       predefined_metric_type: 'ALBRequestCountPerTarget',
+                       resource_label: "#{lb_arn}/#{tg_arn}"
+                     },
+                     target_value: target_value,
+                     disable_scale_in: disable_scale_in
+                   },
+                   depends_on: [listener, autoscaling_attachment]
         end
       end
 
-      def generate_template(health_check, instances, launch_config, subnets,tags, rolling_update)
+      def generate_template(health_check, instances, launch_config, subnets, tags, rolling_update)
         template = {
           Resources: {
             AutoScalingGroup: {
-              Type: "AWS::AutoScaling::AutoScalingGroup",
+              Type: 'AWS::AutoScaling::AutoScalingGroup',
               Properties: {
-                Cooldown: "300",
-                HealthCheckType: "#{health_check[:type]}",
+                Cooldown: '300',
+                HealthCheckType: (health_check[:type]).to_s,
                 HealthCheckGracePeriod: health_check[:grace_period],
-                LaunchConfigurationName: "#{launch_config}",
+                LaunchConfigurationName: launch_config.to_s,
                 MetricsCollection: [
                   {
-                    Granularity: "1Minute",
-                    Metrics: [
-                      "GroupMinSize",
-                      "GroupMaxSize",
-                      "GroupDesiredCapacity",
-                      "GroupInServiceInstances",
-                      "GroupPendingInstances",
-                      "GroupStandbyInstances",
-                      "GroupTerminatingInstances",
-                      "GroupTotalInstances"
+                    Granularity: '1Minute',
+                    Metrics: %w[
+                      GroupMinSize
+                      GroupMaxSize
+                      GroupDesiredCapacity
+                      GroupInServiceInstances
+                      GroupPendingInstances
+                      GroupStandbyInstances
+                      GroupTerminatingInstances
+                      GroupTotalInstances
                     ]
-                  },
+                  }
                 ],
                 MaxSize: instances[:max].to_s,
                 MinSize: instances[:min].to_s,
                 DesiredCapacity: instances[:desired] ? instances[:desired].to_s : nil,
                 Tags: tags,
                 TerminationPolicies: [
-                  "Default"
+                  'Default'
                 ],
                 VPCZoneIdentifier: subnets
               }.compact
@@ -213,31 +204,31 @@ module Terrafying
           },
           Outputs: {
             AsgName: {
-              Description: "The name of the auto scaling group",
+              Description: 'The name of the auto scaling group',
               Value: {
-                Ref: "AutoScalingGroup",
-              },
-            },
-          },
+                Ref: 'AutoScalingGroup'
+              }
+            }
+          }
         }
 
         if rolling_update == :signal
           template[:Resources][:AutoScalingGroup][:UpdatePolicy] = {
             AutoScalingRollingUpdate: {
-              MinInstancesInService: "#{instances[:desired]}",
-              MaxBatchSize: "#{instances[:desired]}",
-              PauseTime: "PT10M",
+              MinInstancesInService: (instances[:desired]).to_s,
+              MaxBatchSize: (instances[:desired]).to_s,
+              PauseTime: 'PT10M',
               WaitOnResourceSignals: true,
-              SuspendProcesses: %w[HealthCheck ReplaceUnhealthy AZRebalance AlarmNotification ScheduledActions],
+              SuspendProcesses: %w[HealthCheck ReplaceUnhealthy AZRebalance AlarmNotification ScheduledActions]
             }
           }
         elsif rolling_update
           template[:Resources][:AutoScalingGroup][:UpdatePolicy] = {
             AutoScalingRollingUpdate: {
-              MinInstancesInService: "#{instances[:min]}",
-              MaxBatchSize: "1",
-              PauseTime: "PT0S",
-              SuspendProcesses: %w[HealthCheck ReplaceUnhealthy AZRebalance AlarmNotification ScheduledActions],
+              MinInstancesInService: (instances[:min]).to_s,
+              MaxBatchSize: '1',
+              PauseTime: 'PT0S',
+              SuspendProcesses: %w[HealthCheck ReplaceUnhealthy AZRebalance AlarmNotification ScheduledActions]
             }
           }
         end
@@ -249,24 +240,20 @@ module Terrafying
         begin
           asgs = aws.asgs_by_tags(tags)
 
-          if asgs.count != 1
-            raise "Didn't find only one ASG :("
-          end
+          raise "Didn't find only one ASG :(" if asgs.count != 1
 
           instances = {
             min: asgs[0].min_size,
             max: asgs[0].max_size,
-            desired: asgs[0].desired_capacity,
+            desired: asgs[0].desired_capacity
           }
-        rescue RuntimeError => err
-          $stderr.puts("instances_by_tags: #{err}")
+        rescue RuntimeError => e
+          warn("instances_by_tags: #{e}")
           instances = nil
         end
 
         instances
       end
     end
-
   end
-
 end