rubycfn 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c09925e14474150813c8cc1fc68f659c2fd9b4f6
-  data.tar.gz: 147d961011de3e4452b273cd9d7192fa14bfa50a
+  metadata.gz: 7d01bd17b4d8c71bd2377cbee3606eddb28778df
+  data.tar.gz: 7d92a19ab91e083aed1492c4b0a00f74b01896d4
 SHA512:
-  metadata.gz: a2d9cc012275a915b20b7ceaaf952d40d741d74b1efb5b22f5d84c62d448e000f9ad021607a53a12ed4e94d252331ece33cb6725fb3ce0af9a90e3c85b8d5fad
-  data.tar.gz: 4f4fd5565902584c1568bb5ed8198783a2f3ba6befe96a3a20d9de65206ddf2c6b4ccc46f261ec1d9fafb65d3fea5e26e2aa19c2cd3ad68bb260508c9293d985
+  metadata.gz: d3708591c58295896ef5a5b46924eead40ace9744a800a52361842d6e6057f4639bc87f13ee2bc80e50dc7e879b3f8fd51a8687e8e9bb2c1a5c37c6eab9191e8
+  data.tar.gz: 9174d991980b0ec38e0b2d92894f9de68307c1f0fc82f14b0fdcad7d347bd412ba61d319d108ecb2c1f2a11b930ad152fa7f13a5e08aba25c3b14fda516af831

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubycfn (0.1.1)
+    rubycfn (0.1.2)
       activesupport (~> 5.1.5)
       dotenv (~> 2.4.0)
       json (~> 2.1.0)

data/README.md

@@ -12,7 +12,7 @@ or, create a Gemfile with this content:
 ```
 source "https://rubygems.org"
 
-gem "rubycfn", "~> 0.1.1"
+gem "rubycfn", "~> 0.1.2"
 
 ```
 

data/lib/compound/resources.rb

@@ -0,0 +1 @@
+require_relative "vpc"

data/lib/compound/vpc.rb

@@ -0,0 +1,89 @@
+module RubyCfn
+  module VPC
+    def self.[](prefix, suffix, &block)
+      Module.new do
+        extend ActiveSupport::Concern
+
+        included do
+
+          def validate_instance_tenancy(value)
+            unless ["", 'default', 'dedicated'].include? value
+              raise "Expected instance_tenancy to be within `default` or `dedicated`. Received `#{value}`"
+            end
+            value
+          end
+
+          variable :cidr_block,
+                   default: "10.0.0.0/16" 
+          variable :enable_dns_support,
+                   default: true
+          variable :enable_dns_hostnames,
+                   default: true
+          variable :instance_tenancy,
+                   filter: :validate_instance_tenancy
+          # TODO: Move to separate compound resource
+          # variable :ipv6,
+          #          default: false
+          # variable :subnets,
+          #          default: 3
+          # variable :subnet_ip_addresses,
+          #          default: 256
+
+          yield self if block_given? # Variable overrides
+
+          resource "#{prefix}_vpc#{suffix}",
+                   type: "AWS::EC2::VPC" do |r, index|
+            r.property(:cidr_block) { cidr_block }
+            r.property(:enable_dns_support) { enable_dns_support }
+            r.property(:enable_dns_hostnames) { enable_dns_hostnames }
+            r.property(:instance_tenancy) { instance_tenancy } unless instance_tenancy.empty?
+          end
+
+          resource "#{prefix}_internet_gateway#{suffix}",
+                   type: "AWS::EC2::InternetGateway"
+
+          resource "#{prefix}_route#{suffix}",
+                   type: "AWS::EC2::Route" do |r, index|
+            r.property(:destination_cidr_block) { "0.0.0.0/0" }
+            r.property(:gateway_id) { "#{prefix}_internet_gateway#{suffix}".cfnize.ref }
+            r.property(:route_table_id) { "#{prefix}_route_table#{suffix}".cfnize.ref }
+          end
+
+          resource "#{prefix}_route_table#{suffix}",
+                   type: "AWS::EC2::RouteTable" do |r, index|
+            r.property(:vpc_id) { "#{prefix}_vpc#{suffix}".cfnize.ref }
+          end
+
+          resource "#{prefix}_vpc_gateway_attachment#{suffix}",
+                   type: "AWS::EC2::VPCGatewayAttachment" do |r, index|
+            r.property(:internet_gateway_id) { "#{prefix}_internet_gateway#{suffix}".cfnize.ref }
+            r.property(:vpc_id) { "#{prefix}_vpc#{suffix}".cfnize.ref }
+          end
+
+          # TODO: Move to separate compound resource
+          #subnets.times do |i|
+          #  resource "#{prefix}_subnet#{suffix}#{i == 0 ? "" : i+1}",
+          #           type: "AWS::EC2::Subnet",
+          #           compound: true do |r, index|
+          #    r.property(:vpc_id) { "#{prefix}_vpc#{suffix}".cfnize.ref }
+          #    r.property(:cidr_block) { ["#{prefix}_vpc#{suffix}".cfnize.ref("CidrBlock"), subnets.to_s, ((Math.log(subnet_ip_addresses)/Math.log(2)).floor).to_s].fncidr.fnselect(i) }
+          #    #if ipv6 == "true"
+          #    #  r.property(:ipv6_cidr_block) do
+          #    #    .. todo ..
+          #    #  end
+          #    #end
+          #  end
+          #end
+
+          #if ipv6 == "true"
+          #  resource "#{prefix}_ipv6_cidr_block#{suffix}",
+          #           type: "AWS::EC2::VPCCidrBlock" do |r, index|
+          #    r.property(:vpc_id) { "#{prefix}_vpc#{suffix}".cfnize.ref }
+          #    r.property(:amazon_provided_ipv6_cidr_block) { true }
+          #  end
+          #end
+        end
+      end
+    end
+  end
+end

data/lib/compound.rb

@@ -0,0 +1 @@
+require_relative "compound/vpc"

data/lib/rubycfn/version.rb

@@ -1,4 +1,4 @@
 # Rubycfn version
 module Rubycfn
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/rubycfn.rb

@@ -2,6 +2,7 @@
 require "neatjson"
 require "json"
 require "rubycfn/version"
+require "compound/resources"
 require 'active_support/concern'
 
 @depends_on = [] 
@@ -9,6 +10,7 @@ require 'active_support/concern'
 @outputs = {}
 @parameters = {}
 @properties = {}
+@mappings = {}
 @resources = {}
 @variables = {}
 @global_variables = {}
@@ -59,6 +61,22 @@ class String
 end
 
 class Array
+  def fncidr
+    {
+      "Fn::Cidr": self
+    }
+  end
+  alias_method :cidr, :fncidr
+
+  def fnfindinmap(name = nil)
+    self.unshift(name.cfnize) if name
+    {
+      "Fn::FindInMap": self
+    }
+  end
+  alias_method :find_in_map, :fnfindinmap
+  alias_method :findinmap, :fnfindinmap
+
   def fnjoin(separator = "")
     {
       "Fn::Join": [
@@ -93,6 +111,15 @@ class ::Hash
   def compact
     delete_if { |k, v| v.nil? }
   end
+
+  def fnselect(index = 0)
+    {
+      "Fn::Select": [
+        index,
+        self
+      ]
+    }
+  end
 end
 
 module Rubycfn
@@ -115,6 +142,24 @@ module Rubycfn
       end
     end
 
+    def self.mapping(name, arguments = {})
+      raise "`name` is required for mapping." unless arguments[:name]
+      unless arguments[:data]
+        %w(key value).each do |k|
+          raise "`#{k}` is required for mapping, unless a `data` hash is passed." unless arguments[k.to_sym]
+        end
+      end
+
+      name = name.to_s.cfnize
+      kv_pairs = arguments[:data] ? arguments[:data] : { "#{arguments[:key]}": "#{arguments[:value]}" }
+      res = {
+        "#{name}": {
+          "#{arguments[:name]}": kv_pairs
+        }
+      } 
+      TOPLEVEL_BINDING.eval("@mappings = @mappings.deep_merge(#{res})")
+    end
+
     def self.parameter(name, arguments)
       name = name.to_s.cfnize
       arguments[:type] ||= "String"
@@ -151,6 +196,7 @@ module Rubycfn
       arguments[:value] ||= ""
       arguments[:required] ||= false
       arguments[:global] ||= false
+      arguments[:filter] ||= nil
 
       if arguments[:value].empty?
         arguments[:value] = arguments[:default]
@@ -161,6 +207,10 @@ module Rubycfn
         end
       end
 
+      if arguments[:filter]
+        arguments[:value] = self.send(arguments[:filter], arguments[:value])
+      end
+
       res = {
         "#{name}": arguments[:value]
       }
@@ -197,11 +247,12 @@ module Rubycfn
 
     def self.resource(name, arguments, &block)
       arguments[:amount] ||= 1
+      origname = name.to_s
       name = name.to_s.cfnize
       arguments[:amount].times do |i|
         resource_suffix = i == 0 ? "" : "#{i+1}"
         if arguments[:type].class == Module
-          send("include", arguments[:type][name, resource_suffix, &block])
+          send("include", arguments[:type][origname, resource_suffix, &block])
         else
           yield self, i if block_given?
           res = {
@@ -228,10 +279,11 @@ module Rubycfn
       skeleton = { "AWSTemplateFormatVersion": "2010-09-09" }
       skeleton = JSON.parse(skeleton.to_json)
       skeleton.merge!(Description: TOPLEVEL_BINDING.eval("@description"))
+      skeleton.merge!(Mappings: sort_json(TOPLEVEL_BINDING.eval("@mappings")))
       skeleton.merge!(Parameters: sort_json(TOPLEVEL_BINDING.eval("@parameters")))
       skeleton.merge!(Resources: sort_json(TOPLEVEL_BINDING.eval("@resources")))
       skeleton.merge!(Outputs: sort_json(TOPLEVEL_BINDING.eval("@outputs")))
-      TOPLEVEL_BINDING.eval("@variables = @resources = @outputs = @properties = @parameters = {}")
+      TOPLEVEL_BINDING.eval("@variables = @resources = @outputs = @properties = @mappings = @parameters = {}")
       TOPLEVEL_BINDING.eval("@depends_on = []")
       TOPLEVEL_BINDING.eval("@description = ''")
       JSON.pretty_generate(skeleton.recursive_compact)

data/templates/compile.rb.erb

@@ -11,6 +11,6 @@ Module.constants.select do |mod|
 end
 
 stacks.each do |stack_name, stack|
-  puts "- Saved #{stack_name} to build/#{stack_name.downcase}.json"
-  File.open("build/#{stack_name.downcase}.json", "w") { |f| f.write(stack) }
+  puts "- Saved #{stack_name} to build/#{ENV["ENVIRONMENT"]}-#{stack_name.downcase}.json"
+  File.open("build/#{ENV["ENVIRONMENT"]}-#{stack_name.downcase}.json", "w") { |f| f.write(stack) }
 end

data/templates/project_concern.rb.erb

@@ -20,6 +20,24 @@ module <%= name %>Stack
         r.property(:name) { example_variable }
       end
 
+      # Example VPC, creates VPC, IGW, Route, and VPCGatewayAttachment
+      # Settable variables:
+      # - cidr_block (defaults to 10.0.0.0/16)
+      # - enable_dns_support (boolean, default true)
+      # - enable_dns_hostnames (boolean, default true)
+      # - instance_tenancy (`default` or `dedicated`) 
+      resource :my_first,
+               type: RubyCfn::VPC do |r|
+        r.set(:cidr_block) { "10.1.0.0/16" }
+      end
+          variable :cidr_block,
+                   default: "10.0.0.0/16"
+          variable :enable_dns_support,
+                   default: true
+          variable :enable_dns_hostnames,
+                   default: true
+          variable :instance_tenancy,
+                   filter: :validate_instance_tenancy
       # Example resource, dynamically generated name
       resource :my_example_s3_bucket,
                type: "AWS::S3::Bucket"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubycfn
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Dennis Vink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-29 00:00:00.000000000 Z
+date: 2018-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: neatjson
@@ -263,6 +263,9 @@ files:
 - Rakefile
 - bin/rubycfn
 - lib/cli_methods.rb
+- lib/compound.rb
+- lib/compound/resources.rb
+- lib/compound/vpc.rb
 - lib/rubycfn.rb
 - lib/rubycfn/version.rb
 - rubycfn.gemspec