sumomo 0.8.4 → 0.8.6

data/lib/sumomo/irregular.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+# For functions that do not conform to Ruby's naming convention
+# of funcs must be snake_case
+module HasIrregularlyNamedFunctions
+  def defi(name, &block)
+    define_method(name, &block)
+  end
+end

data/lib/sumomo/momo_extensions/resource.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 
 module Momo
-	class Resource
-		def exec_role
-			res = Momo::Resource.new("AWS::IAM::Role", "LambdaFunctionExecutionRole", @stack)
-			res.complete!
-			res
-		end
-	end 
+  class Resource
+    def exec_role
+      res = Momo::Resource.new('AWS::IAM::Role', 'LambdaFunctionExecutionRole', @stack)
+      res.complete!
+      res
+    end
+  end
 end

data/lib/sumomo/momo_extensions/stack.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
 
 module Momo
-	class Stack
-		alias_method :stack_make, :make
-	end 
+  class Stack
+    alias stack_make make
+  end
 end

data/lib/sumomo/network.rb

@@ -1,108 +1,111 @@
-require "active_support/inflector"
-require "hashie"
+# frozen_string_literal: true
+
+require 'active_support/inflector'
+require 'hashie'
 
 module Sumomo
-	module Stack
-
-		def make_network(layers: [])
-
-			zones = get_azs()
-
-			region = @region
-
-			vpc = make "AWS::EC2::VPC" do
-				CidrBlock "10.0.0.0/16"
-				EnableDnsSupport true
-				EnableDnsHostnames true
-				tag "Name", call("Fn::Join", "-", [ref("AWS::StackName")])
-			end
-
-			gateway = make "AWS::EC2::InternetGateway" do
-				tag "Name", call("Fn::Join", "-", [ref("AWS::StackName")])
-			end
-
-			attachment = make "AWS::EC2::VPCGatewayAttachment" do
-				VpcId vpc
-				InternetGatewayId gateway
-			end
-
-			inet_route_table = make "AWS::EC2::RouteTable" do
-				depends_on attachment
-				VpcId vpc
-				tag "Name", call("Fn::Join", "-", ["public", ref("AWS::StackName")])
-			end
-
-			make "AWS::EC2::Route" do
-				RouteTableId inet_route_table
-				DestinationCidrBlock "0.0.0.0/0"
-				GatewayId gateway
-			end
-
-			last_unused_number = 0
-
-			subnet_numbers = []
-
-			#load current config
-			number_hash = {}
-			subnet_hash = {}
-
-			ec2 = Aws::EC2::Client.new(region: @region)
-			ec2_subnets = ec2.describe_subnets().subnets
-			ec2_subnets.each do |subnet|
-				if subnet.tags.select {|x| x.key == "aws:cloudformation:stack-name" && x.value == @bucket_name}.length == 1
-					layer = /^#{@bucket_name}-(?<layer_name>.+)-[a-z]+$/.match(subnet.tags.select{|x| x.key == "Name"}.first.value)[:layer_name]
-					zone = subnet.availability_zone
-					number = /^10.0.(?<num>[0-9]+).0/.match(subnet.cidr_block)[:num].to_i
-
-					key = "#{layer}/#{zone}"
-					number_hash[number] = key
-					subnet_hash[key] = number
-				end
-			end
-
-			# assign numbers to unassigned subnets
-			layers.product(zones).each do |e|
-				key = "#{e[0]}/#{e[1]}"
-				if !subnet_hash.has_key?(key)
-					loop do
-						break if !number_hash.has_key?(last_unused_number)
-						last_unused_number += 1
-					end
-					number_hash[last_unused_number] = key
-					subnet_hash[key] = last_unused_number
-					subnet_numbers << [e, last_unused_number]
-				else
-					subnet_numbers << [e, subnet_hash[key]]
-				end
-			end
-
-			subnets = {}
-
-			subnet_numbers.each do |e, subnet_number|
-				layer = e[0]
-				zone = e[1]
-
-				zone_letter = zone.sub("#{region}", "")
-				cidr = "10.0.#{subnet_number}.0/24"
-
-				subnet = make "AWS::EC2::Subnet", name: "SubnetFor#{layer.camelize}Layer#{zone_letter.upcase}" do
-					AvailabilityZone zone
-					VpcId vpc
-					CidrBlock cidr
-
-					tag("Name", call("Fn::Join", "-", [ ref("AWS::StackName"), "#{layer}", zone_letter] ) )
-				end
-
-				make "AWS::EC2::SubnetRouteTableAssociation", name: "SubnetRTAFor#{layer.camelize}Layer#{zone_letter.upcase}" do
-					SubnetId subnet
-					RouteTableId inet_route_table
-				end
-
-				subnets[layer] ||= []
-				subnets[layer] << {name: subnet, cidr: cidr, zone: zone}
-			end
-
-			Hashie::Mash.new vpc: vpc, subnets: subnets, azs: zones, attachment: attachment
-		end
-	end
-end
+  module Stack
+    def make_network(layers: [])
+      zones = get_azs
+
+      region = @region
+
+      vpc = make 'AWS::EC2::VPC' do
+        CidrBlock '10.0.0.0/16'
+        EnableDnsSupport true
+        EnableDnsHostnames true
+        tag 'Name', call('Fn::Join', '-', [ref('AWS::StackName')])
+      end
+
+      gateway = make 'AWS::EC2::InternetGateway' do
+        tag 'Name', call('Fn::Join', '-', [ref('AWS::StackName')])
+      end
+
+      attachment = make 'AWS::EC2::VPCGatewayAttachment' do
+        VpcId vpc
+        InternetGatewayId gateway
+      end
+
+      inet_route_table = make 'AWS::EC2::RouteTable' do
+        depends_on attachment
+        VpcId vpc
+        tag 'Name', call('Fn::Join', '-', ['public', ref('AWS::StackName')])
+      end
+
+      make 'AWS::EC2::Route' do
+        RouteTableId inet_route_table
+        DestinationCidrBlock '0.0.0.0/0'
+        GatewayId gateway
+      end
+
+      last_unused_number = 0
+
+      subnet_numbers = []
+
+      # load current config
+      number_hash = {}
+      subnet_hash = {}
+
+      ec2 = Aws::EC2::Client.new(region: @region)
+      ec2_subnets = ec2.describe_subnets.subnets
+      ec2_subnets.each do |subnet|
+        unless subnet.tags.select { |x| x.key == 'aws:cloudformation:stack-name' && x.value == @bucket_name }.length == 1
+          next
+        end
+
+        layer = /^#{@bucket_name}-(?<layer_name>.+)-[a-z]+$/.match(subnet.tags.select { |x| x.key == 'Name' }.first.value)[:layer_name]
+        zone = subnet.availability_zone
+        number = /^10.0.(?<num>[0-9]+).0/.match(subnet.cidr_block)[:num].to_i
+
+        key = "#{layer}/#{zone}"
+        number_hash[number] = key
+        subnet_hash[key] = number
+      end
+
+      # assign numbers to unassigned subnets
+      layers.product(zones).each do |e|
+        key = "#{e[0]}/#{e[1]}"
+        if !subnet_hash.key?(key)
+          loop do
+            break unless number_hash.key?(last_unused_number)
+
+            last_unused_number += 1
+          end
+          number_hash[last_unused_number] = key
+          subnet_hash[key] = last_unused_number
+          subnet_numbers << [e, last_unused_number]
+        else
+          subnet_numbers << [e, subnet_hash[key]]
+        end
+      end
+
+      subnets = {}
+
+      subnet_numbers.each do |e, subnet_number|
+        layer = e[0]
+        zone = e[1]
+
+        zone_letter = zone.sub(region.to_s, '')
+        cidr = "10.0.#{subnet_number}.0/24"
+
+        subnet = make 'AWS::EC2::Subnet', name: "SubnetFor#{layer.camelize}Layer#{zone_letter.upcase}" do
+          AvailabilityZone zone
+          VpcId vpc
+          CidrBlock cidr
+
+          tag('Name', call('Fn::Join', '-', [ref('AWS::StackName'), layer.to_s, zone_letter]))
+        end
+
+        make 'AWS::EC2::SubnetRouteTableAssociation', name: "SubnetRTAFor#{layer.camelize}Layer#{zone_letter.upcase}" do
+          SubnetId subnet
+          RouteTableId inet_route_table
+        end
+
+        subnets[layer] ||= []
+        subnets[layer] << { name: subnet, cidr: cidr, zone: zone }
+      end
+
+      Hashie::Mash.new vpc: vpc, subnets: subnets, azs: zones, attachment: attachment
+    end
+  end
+end

data/lib/sumomo/stack.rb

@@ -1,192 +1,194 @@
+# frozen_string_literal: true
 
 module Sumomo
-	module Stack
-
-		def hidden_value(value)
-			name = make_default_resource_name("HiddenValue")
-			if !@hidden_values
-				@hidden_values = []
-			end
-
-			@hidden_values << {
-				parameter_key: name,
-				parameter_value: value
-			}
-
-			param name, type: :string
-		end
-
-		def upload_file(name,content)
-			@store.set_raw("uploads/#{name}", content)
-			puts "Uploaded #{name}"
-		end
-
-		def make_lambda(name: nil, files:[{name:"index.js", code:""}],
-			description: "Lambda Function in #{@bucket_name}", 
-			function_key: "cloudformation/lambda/function_#{name}",
-			handler: "index.handler",
-			runtime: "nodejs8.10",
-			memory_size: 128,
-			timeout: 30,
-			with_statements: [])
-
-			name ||= make_default_resource_name("Lambda")
-
-			stringio = Zip::OutputStream.write_buffer do |zio|
-				files.each do |file|
-					zio.put_next_entry(file[:name])
-					if file[:code]
-						zio.write file[:code]
-					elsif file[:path]
-						zio.write File.read(file[:path])
-					else
-						raise "Files needs to be an array of objects with :name and :code or :path members"
-					end
-				end
-			end
-
-			@store.set_raw(function_key, stringio.string)
-
-			stack = self
-
-			code_location = {"S3Bucket": @bucket_name, "S3Key": function_key}
-			fun = make "AWS::Lambda::Function", name: name do
-				Code code_location
-				Description description
-				MemorySize memory_size
-				Handler handler
-				Runtime runtime
-				Timeout timeout
-				Role stack.exec_role(with_statements: with_statements).Arn
-			end
-
-			log_group = make "AWS::Logs::LogGroup", name: "#{name}LogGroup" do
-				LogGroupName call("Fn::Join", "", ["/aws/lambda/", fun])
-				RetentionInDays 30
-			end
-
-			fun
-		end
-
-		def define_custom_resource(name: nil,code:)
-
-			name ||= make_default_resource_name("CustomResource")
-
-			func = make_lambda(
-				name: name, 
-				files:[
-					{
-						name: "index.js", 
-						code: File.read( File.join(Gem.loaded_specs['sumomo'].full_gem_path, "data", "sumomo", "custom_resource_utils.js") ).sub("{{ CODE }}", code)
-					}
-				],
-				description: "CF Resource Custom::#{name}",
-				function_key: "cloudformation/custom_resources/function_#{name}")
-
-			@custom_resources["Custom::#{name}"] = func
-		end
-
-		def make_custom(custom_resource, options = {}, &block)
-			bucket_name = @bucket_name
-			stack_make "Custom::#{custom_resource.name}", options do
-				ServiceToken custom_resource.Arn
-				Region ref("AWS::Region")
-				Bucket bucket_name
-				instance_eval(&block) if block
-			end
-		end
-
-		def make(type, options = {}, &block)
-			match = /^Custom\:\:(?<name>[a-z0-9]+)/i.match(type)
-			if match
-				if !@custom_resources[type]
-
-					resource_function_source = File.join(Gem.loaded_specs['sumomo'].full_gem_path, "data", "sumomo", "custom_resources", "#{match[:name]}.js")
-					
-					if File.exists? resource_function_source
-						define_custom_resource(name: match[:name], code: File.read(resource_function_source))
-					else
-						throw "#{resource_function_source} does not exist"
-
-					end
-				end
-				make_custom(@custom_resources[type], options, &block)
-			else
-				stack_make(type, options, &block)
-			end
-		end
-
-		def exec_role(with_statements: [])
-
-			if @exec_roles == nil
-				@exec_roles = {}
-			end
-
-			statement_key = JSON.parse(with_statements.to_json)
-
-			if !@exec_roles.has_key?(statement_key)
-				name = make_default_resource_name("LambdaExecRole")
-
-				role_policy_doc = {
-					"Version" => "2012-10-17",
-					"Statement" => [{
-						"Effect" => "Allow",
-						"Principal" => {"Service" => ["edgelambda.amazonaws.com", "lambda.amazonaws.com"]},
-						"Action" => ["sts:AssumeRole"]
-					}]
-				}
-
-				bucket_name = @bucket_name
-
-				statement_list = [
-					{
-						"Effect" => "Allow",
-						"Action" => ["logs:CreateLogStream","logs:PutLogEvents"],
-						"Resource" => "arn:aws:logs:*:*:*"
-					},
-					{
-						"Effect" => "Allow",
-						"Action" => ["cloudformation:DescribeStacks", "ec2:Describe*", ],
-						"Resource" => "*"
-					},
-					{
-						"Effect" => "Allow",
-						"Action" => ["s3:DeleteObject", "s3:GetObject", "s3:PutObject"],
-						"Resource" => "arn:aws:s3:::#{bucket_name}/*"
-					},
-					{
-						"Effect" => "Allow",
-						"Action" => ["cloudfront:CreateCloudFrontOriginAccessIdentity", "cloudfront:DeleteCloudFrontOriginAccessIdentity"],
-						"Resource" => "*"
-					},
-					{
-						"Effect" => "Allow",
-						"Action" => ["apigateway:*", "cloudfront:UpdateDistribution"],
-						"Resource" => "*"
-					},
-					{
-						"Effect" => "Allow",
-						"Action" => ["acm:RequestCertificate", "acm:DeleteCertificate", "acm:DescribeCertificate"],
-						"Resource" => "*"
-					}] + with_statements
-
-				@exec_roles[statement_key] = make "AWS::IAM::Role", name: name do
-					AssumeRolePolicyDocument role_policy_doc
-					Path "/"
-					Policies [
-						{
-							"PolicyName" => name,
-							"PolicyDocument" => {
-								"Version" => "2012-10-17",
-								"Statement" => statement_list
-							}
-						}
-					]
-				end
-			end
-
-			@exec_roles[statement_key]
-
-		end
-	end
+  module Stack
+    def hidden_value(value)
+      name = make_default_resource_name('HiddenValue')
+      @hidden_values ||= []
+
+      @hidden_values << {
+        parameter_key: name,
+        parameter_value: value
+      }
+
+      param name, type: :string
+    end
+
+    def upload_file(name, content)
+      @store.set_raw("uploads/#{name}", content)
+      puts "Uploaded #{name}"
+    end
+
+    def make_lambda(name: nil, files: [{ name: 'index.js', code: '' }],
+                    description: "Lambda Function in #{@bucket_name}",
+                    function_key: "cloudformation/lambda/function_#{name}",
+                    handler: 'index.handler',
+                    runtime: 'nodejs8.10',
+                    memory_size: 128,
+                    timeout: 30,
+                    role: nil)
+
+      name ||= make_default_resource_name('Lambda')
+      role ||= custom_resource_exec_role
+
+      stringio = Zip::OutputStream.write_buffer do |zio|
+        files.each do |file|
+          zio.put_next_entry(file[:name])
+          if file[:code]
+            zio.write file[:code]
+          elsif file[:path]
+            zio.write File.read(file[:path])
+          else
+            raise 'Files needs to be an array of objects with :name and :code or :path members'
+          end
+        end
+      end
+
+      @store.set_raw(function_key, stringio.string)
+
+      stack = self
+
+      code_location = { "S3Bucket": @bucket_name, "S3Key": function_key }
+      fun = make 'AWS::Lambda::Function', name: name do
+        Code code_location
+        Description description
+        MemorySize memory_size
+        Handler handler
+        Runtime runtime
+        Timeout timeout
+        Role role.Arn
+      end
+
+      log_group = make 'AWS::Logs::LogGroup', name: "#{name}LogGroup" do
+        LogGroupName call('Fn::Join', '', ['/aws/lambda/', fun])
+        RetentionInDays 30
+      end
+
+      fun
+    end
+
+    def define_custom_resource(name: nil, code:, role: nil)
+      name ||= make_default_resource_name('CustomResource')
+      role ||= custom_resource_exec_role
+
+      func = make_lambda(
+        name: name,
+        role: role,
+        files: [
+          {
+            name: 'index.js',
+            code: File.read(File.join(Gem.loaded_specs['sumomo'].full_gem_path, 'data', 'sumomo', 'custom_resource_utils.js')).sub('{{ CODE }}', code)
+          }
+        ],
+        description: "CF Resource Custom::#{name}",
+        function_key: "cloudformation/custom_resources/function_#{name}"
+      )
+
+      @custom_resources["Custom::#{name}"] = func
+    end
+
+    def make_custom(custom_resource, options = {}, &block)
+      bucket_name = @bucket_name
+      stack_make "Custom::#{custom_resource.name}", options do
+        ServiceToken custom_resource.Arn
+        Region ref('AWS::Region')
+        Bucket bucket_name
+        instance_eval(&block) if block
+      end
+    end
+
+    def make(type, options = {}, &block)
+      match = /^Custom\:\:(?<name>[a-z0-9]+)/i.match(type)
+      if match
+        unless @custom_resources[type]
+
+          resource_function_source = File.join(Gem.loaded_specs['sumomo'].full_gem_path, 'data', 'sumomo', 'custom_resources', "#{match[:name]}.js")
+
+          if File.exist? resource_function_source
+            define_custom_resource(name: match[:name], code: File.read(resource_function_source))
+          else
+            throw "#{resource_function_source} does not exist"
+
+          end
+        end
+        make_custom(@custom_resources[type], options, &block)
+      else
+        stack_make(type, options, &block)
+      end
+    end
+
+    def lambda_exec_role(statements: [], principals: [])
+      name = make_default_resource_name('LambdaExecRole')
+
+      role_policy_doc = {
+        'Version' => '2012-10-17',
+        'Statement' => [{
+          'Effect' => 'Allow',
+          'Principal' => { 'Service' => principals },
+          'Action' => ['sts:AssumeRole']
+        }]
+      }
+
+      make 'AWS::IAM::Role', name: name do
+        AssumeRolePolicyDocument role_policy_doc
+        Path '/'
+        Policies [
+          {
+            'PolicyName' => name,
+            'PolicyDocument' => {
+              'Version' => '2012-10-17',
+              'Statement' => statements
+            }
+          }
+        ]
+      end
+    end
+
+    def custom_resource_exec_role(with_statements: [])
+      @exec_roles ||= {}
+
+      statement_key = JSON.parse(with_statements.to_json)
+
+      @exec_roles[statement_key] ||= lambda_exec_role(
+        principals: ['edgelambda.amazonaws.com', 'lambda.amazonaws.com'],
+        statements: [
+          {
+            'Effect' => 'Allow',
+            'Action' => ['logs:CreateLogStream', 'logs:PutLogEvents'],
+            'Resource' => 'arn:aws:logs:*:*:*'
+          },
+          {
+            'Effect' => 'Allow',
+            'Action' => ['cloudformation:DescribeStacks', 'ec2:Describe*'],
+            'Resource' => '*'
+          },
+          {
+            'Effect' => 'Allow',
+            'Action' => ['s3:DeleteObject', 's3:GetObject', 's3:PutObject'],
+            'Resource' => "arn:aws:s3:::#{@bucket_name}/*"
+          },
+          {
+            'Effect' => 'Allow',
+            'Action' => ['cloudfront:CreateCloudFrontOriginAccessIdentity', 'cloudfront:DeleteCloudFrontOriginAccessIdentity'],
+            'Resource' => '*'
+          },
+          {
+            'Effect' => 'Allow',
+            'Action' => ['apigateway:*', 'cloudfront:UpdateDistribution'],
+            'Resource' => '*'
+          },
+          {
+            'Effect' => 'Allow',
+            'Action' => ['acm:RequestCertificate', 'acm:DeleteCertificate', 'acm:DescribeCertificate'],
+            'Resource' => '*'
+          },
+          {
+            'Effect' => 'Allow',
+            'Action' => ['s3:*'],
+            'Resource' => 'arn:aws:s3:::*'
+          }
+        ] + with_statements
+      )
+    end
+  end
 end