rubycfn 0.1.11 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a89e4f19981be58c78f515a9d3889e6695720d6
-  data.tar.gz: 41c80d1691b6bf92c52aca43468860bec24168c9
+  metadata.gz: c43cabdbb5f495f514c1ebc4a349558b5c9d8333
+  data.tar.gz: d5440442930fa154a50f53499b29f33c7caeac69
 SHA512:
-  metadata.gz: 0f1f7fb12c993d004a14959af5cecdb101345ba852efc4a1bd63964913e05e4f312e4b1bd179208a0de3db5a0a2837937daa72a2a6b997d5d63b85d1ab7d7e35
-  data.tar.gz: c5ede7352a5379fd501bb33dcb332a552c0fbf02da632f775f41db80436aa5491a9c98a0e07016da3723933071fb1259a6e44231b7bf199c6bde1b6ad36f1158
+  metadata.gz: 47448e9fa021ecb199521f3550d1c4f5b505dc6c34700dea376518f5972416601852f73f716372010e90d19fa3e7afe71b222eadcdf14a3e63099bc12f39e786
+  data.tar.gz: d27ca79b9e457f496e5435e659845df1870a9fb140806a4f777d991d88fae306d685b7c47a70acb92989d125b229df88abd1b6692fc8833e5fb288f760c2c838

data/CHANGELOG.md

@@ -2,7 +2,11 @@
 All notable changes to Rubycfn will be documented in this file.
 This project uses [Semantic Versioning](http://semver.org/).
 
-## 0.1.12 (Next Release)
+## 0.2.1 (Next Release)
+
+## 0.2.0
+  * Added support for GCP templates -- [@dennisvink][@dennisvink]
+  * No camel casing property and resource names if type is String instead of Symbol -- [@dennisvink][@dennisvink]
 
 ## 0.1.11
   * Added small script to convert a CloudFormation template to Rubycfn code -- [@dennisvink][@dennisvink]

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubycfn (0.1.11)
+    rubycfn (0.2.0)
       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.10"
+gem "rubycfn", "~> 0.2.0"
 
 ```
 

data/lib/rubycfn/version.rb

@@ -1,4 +1,4 @@
 # Rubycfn version
 module Rubycfn
-  VERSION = "0.1.11"
+  VERSION = "0.2.0"
 end

data/lib/rubycfn.rb

@@ -13,7 +13,10 @@ require "rubycfn/version"
 @properties = {}
 @mappings = {}
 @conditions = {}
-@resources = {}
+@AWSresources = {}
+@GCPresources = []
+@MSFresources = {}
+@imports = []
 @resource_name = ""
 @variables = {}
 @global_variables = {}
@@ -271,6 +274,10 @@ module Rubycfn
       end
     end
 
+    def self.import(gcp_import)
+      TOPLEVEL_BINDING.eval("@imports.push(#{gcp_import})")
+    end
+
     def self.depends_on(resources)
       case resources
         when String
@@ -293,7 +300,11 @@ module Rubycfn
     end
 
     def self.property(name, index = 0, &block)
-      name = TOPLEVEL_BINDING.eval("'#{name}'.cfnize")
+      if name.class == Symbol
+        name = TOPLEVEL_BINDING.eval("'#{name}'.cfnize")
+      else
+        name = TOPLEVEL_BINDING.eval("'#{name}'")
+      end
       res = { "#{name}": yield(block) }
       TOPLEVEL_BINDING.eval("@properties = @properties.deep_merge(#{res})")
     end
@@ -301,7 +312,19 @@ module Rubycfn
     def self.resource(name, arguments, &block)
       arguments[:amount] ||= 1
       origname = name.to_s
-      name = name.to_s.cfnize
+      # Allow for non-camelcased resource names 
+      if name.class == Symbol
+        name = name.to_s.cfnize
+      else
+        name = name.to_s
+      end
+      arguments[:type] =~ /^([A-Za-z0-9]*)\:\:/
+      arguments[:cloud] ||= $1
+
+      # Custom resource types are AWS resources
+      if arguments[:cloud] == "Custom" || arguments[:cloud] == "Rspec"
+        arguments[:cloud] = "AWS"
+      end
       arguments[:amount].times do |i|
         resource_suffix = i == 0 ? "" : "#{i+1}"
         if arguments[:type].class == Module
@@ -315,15 +338,24 @@ module Rubycfn
             TOPLEVEL_BINDING.eval("@resource_name = ''")
           end
 
-          res = {
-            "#{name.to_s}#{i == 0 ? "" : resource_postpend}": {
-              DependsOn: TOPLEVEL_BINDING.eval("@depends_on"),
-              Properties: TOPLEVEL_BINDING.eval("@properties"),
-              Type: arguments[:type],
-              Condition: arguments[:condition]
+          if arguments[:cloud] == "AWS"
+            res = {
+              "#{name.to_s}#{i == 0 ? "" : resource_postpend}": {
+                DependsOn: TOPLEVEL_BINDING.eval("@depends_on"),
+                Properties: TOPLEVEL_BINDING.eval("@properties"),
+                Type: arguments[:type],
+                Condition: arguments[:condition]
+              }
+            }
+            TOPLEVEL_BINDING.eval("@AWSresources = @AWSresources.deep_merge(#{res})")
+          elsif arguments[:cloud] == "GCP"
+            res = {
+              "name": "#{name.to_s}",
+              "type": "#{arguments[:type].to_s.gsub(/GCP::/, "")}",
+              "properties": TOPLEVEL_BINDING.eval("@properties")
             }
-          }
-          TOPLEVEL_BINDING.eval("@resources = @resources.deep_merge(#{res})")
+            TOPLEVEL_BINDING.eval("@GCPresources.push(#{res})")
+          end
         end
         TOPLEVEL_BINDING.eval("@depends_on = []")
         TOPLEVEL_BINDING.eval("@properties = {}")
@@ -336,19 +368,31 @@ module Rubycfn
       )
     end
 
-    def self.render_template
-      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!(Conditions: sort_json(TOPLEVEL_BINDING.eval("@conditions")))
-      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 = @mappings = @parameters = {}")
-      TOPLEVEL_BINDING.eval("@depends_on = []")
-      TOPLEVEL_BINDING.eval("@description = ''")
-      JSON.pretty_generate(skeleton.recursive_compact)
+    def self.render_template(type = "AWS")
+      case type
+      when "AWS"
+        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!(Conditions: sort_json(TOPLEVEL_BINDING.eval("@conditions")))
+        skeleton.merge!(Resources: sort_json(TOPLEVEL_BINDING.eval("@AWSresources")))
+        skeleton.merge!(Outputs: sort_json(TOPLEVEL_BINDING.eval("@outputs")))
+        TOPLEVEL_BINDING.eval("@variables = @AWSresources = @outputs = @properties = @mappings = @parameters = {}")
+        TOPLEVEL_BINDING.eval("@depends_on = []")
+        TOPLEVEL_BINDING.eval("@description = ''")
+        JSON.pretty_generate(skeleton.recursive_compact)
+      when "GCP"
+        gcp_skeleton = {}
+        gcp_skeleton = JSON.parse(gcp_skeleton.to_json)
+        gcp_skeleton.merge!(imports: TOPLEVEL_BINDING.eval("@imports"))
+        gcp_skeleton.merge!(resources: sort_json(TOPLEVEL_BINDING.eval("@GCPresources")))
+        TOPLEVEL_BINDING.eval("@variables = @outputs = @properties = @mappings = @parameters = {}")
+        TOPLEVEL_BINDING.eval("@imports = @GCPresources = @depends_on = []")
+        TOPLEVEL_BINDING.eval("@description = ''")
+        JSON.pretty_generate(gcp_skeleton.recursive_compact)
+      end
     end
   end
 end

data/templates/compile.rb.erb

@@ -2,11 +2,15 @@ require 'fileutils'
 
 FileUtils.mkdir_p 'build'
 
+google_stacks = {}
 stacks = {}
+
 Module.constants.select do |mod|
   if mod =~ /Stack$/
     send("include", Object.const_get("SharedConcerns"))
-    stacks[mod.to_sym] = send("include", Object.const_get(mod)).render_template
+    google_stacks[mod.to_sym] = send("include", Object.const_get(mod)).render_template("GCP")
+    send("include", Object.const_get("SharedConcerns"))
+    stacks[mod.to_sym] = send("include", Object.const_get(mod)).render_template("AWS")
   end
 end
 
@@ -14,3 +18,8 @@ stacks.each do |stack_name, 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
+
+google_stacks.each do |stack_name, stack|
+  puts "- Saved #{stack_name} to build/#{ENV["ENVIRONMENT"]}-gcp-#{stack_name.downcase}.json"
+  File.open("build/#{ENV["ENVIRONMENT"]}-gcp-#{stack_name.downcase}.json", "w") { |f| f.write(stack) }
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubycfn
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.2.0
 platform: ruby
 authors:
 - Dennis Vink