lono 5.3.4 → 6.0.0

data/lib/lono/s3/bucket.rb

@@ -103,7 +103,7 @@ class Lono::S3
     end
 
     def status
-      ::Cfn::Status.new(STACK_NAME)
+      CfnStatus.new(STACK_NAME)
     end
     memoize :status
 

data/lib/lono/seed/base.rb

@@ -16,6 +16,7 @@ class Lono::Seed
     include Lono::Blueprint::Root
     include Lono::AwsServices
     include Lono::Conventions
+    include ServiceRole
 
     # What's needed for a Thor::Group or "Sequence"
     # Gives us Thor::Actions commands like create_file

data/lib/lono/seed/service_role.rb

@@ -0,0 +1,11 @@
+class Lono::Seed
+  module ServiceRole
+    def create_service_linked_role(aws_service_name)
+      iam.create_service_linked_role(
+        aws_service_name: aws_service_name
+      )
+    rescue Aws::IAM::Errors::InvalidInput # already exist
+      raise if ENV['LONO_DEBUG_SEED']
+    end
+  end
+end

data/lib/lono/template/dsl/builder.rb

@@ -4,7 +4,7 @@ class Lono::Template::Dsl
     include Lono::Template::Context::Loader
 
     include Fn
-    include Helper # built-in helpers
+    include Helpers # built-in helpers
     include Lono::Template::Evaluate
     include Syntax
     extend Memoist
@@ -27,12 +27,12 @@ class Lono::Template::Dsl
     def template
       load_context
       evaluate_template_path(@path) # modifies @cfn
-      camelize(@cfn)
+      @cfn
     end
     memoize :template
 
     def build_template
-      @results = YAML.dump(camelize(@cfn))
+      @results = YAML.dump(@cfn)
     end
 
     def write_output
@@ -51,10 +51,6 @@ class Lono::Template::Dsl
       end
     end
 
-    def camelize(data)
-      CfnCamelizer.transform(data)
-    end
-
     # Not using Lono::Template::Context because that works differently.
     # That is used to load a context object that is passed to RenderMePretty's context.
     # So that we can load context for params files and erb templates.

data/lib/lono/template/dsl/builder/base.rb

@@ -1,14 +1,35 @@
 class Lono::Template::Dsl::Builder
   class Base
     include Fn
-    include Helper
+    include Helpers
 
-    def initialize(*definition)
+    def initialize(blueprint, *definition)
+      @blueprint = blueprint
       @definition = definition.flatten
     end
 
+  private
     def camelize(attributes)
-      CfnCamelizer.transform(attributes)
+      blueprint_meta = Lono::Blueprint::Meta.new(@blueprint)
+      target_section = self.class.to_s.split('::').last.underscore
+      # target_section: Lono::Template::Dsl::Builder::Parameter => parameter
+      if blueprint_meta.auto_camelize?(target_section)
+        CfnCamelizer.transform(attributes)
+      else
+        stringify_keys!(attributes)
+      end
+    end
+
+    # Accounts for Arrays also. ActiveSupport only works for Hashes.
+    def stringify_keys!(data)
+      case data
+      when Array
+        data.map! { |i| stringify_keys!(i) }
+      when Hash
+        data.deep_transform_keys! { |k| k.to_s }
+      else
+        data # do not transform
+      end
     end
   end
 end

data/lib/lono/template/dsl/builder/fn.rb

@@ -21,7 +21,7 @@ class Lono::Template::Dsl::Builder
       # so they can also be called via fn::if
       and: :array,
       equals: :array,
-      if: :array, # special case, if is a Ruby keyword , we'll use fn_if instead
+      if: :array, # special case, if is a Ruby keyword
       not: :array,
       or: :array,
       ref: :simple,
@@ -29,6 +29,12 @@ class Lono::Template::Dsl::Builder
     # These are also Ruby keywords
     # keywords: and if not or
 
+    # Defines both normal method and bang method. Example: if and if!
+    def self.define_methods(name, &block)
+      define_method(name, &block)
+      define_method("#{name}!", &block)
+    end
+
     # Note, for if function, do not flatten the args. Its arguments can be Arrays.  Example:
     #
     #   SecurityGroups:
@@ -42,31 +48,27 @@ class Lono::Template::Dsl::Builder
     #           Ref: ExistingSecurityGroup
     FUNCTIONS.each do |name, type|
       if type == :simple
-        define_method(name) do |arg|
+        define_methods(name) do |arg|
           id = fn_id(name)
-          arg = arg.is_a?(Symbol) ? CfnCamelizer.camelize(arg) : arg
           { id => arg }
         end
       else # array
-        define_method(name) do |*args|
+        define_methods(name) do |*args|
           id = fn_id(name)
           # Note, do not flatten args for if statement as it can have Array as arguments.
           args = args.flatten unless name == :if
-          args = args.map do |arg|
-            arg.is_a?(Symbol) ? CfnCamelizer.camelize(arg) : arg
-          end
           { id => args }
         end
       end
     end
 
     def fn_id(name)
-      "Fn::#{CfnCamelizer.camelize(name)}"
+      "Fn::#{name.to_s.camelize}"
     end
 
     # special cases
     def ref(name)
-      name = CfnCamelizer.camelize(name)
+      name = name.to_s.camelize
       { "Ref" => name }
     end
 
@@ -84,8 +86,10 @@ class Lono::Template::Dsl::Builder
               else
                 item
               end
-      list.map!(&:camelize) unless options[:autoformat] == false
-      { "Fn::GetAtt" => list }
+      # list.map!(&:camelize) unless options[:autoformat] == false # TODO: maybe add as an option.
+      # feel this may be to destructive since am going with auto_camelize false for resources now.
+      args = [list[0], list[1..-1].join('.')]
+      { "Fn::GetAtt" => args }
     end
 
     def join(delimiter, *list)

data/lib/lono/template/dsl/builder/{helper.rb → helpers.rb}

@@ -1,14 +1,15 @@
 # Built-in helpers for the DSL form
 class Lono::Template::Dsl::Builder
-  module Helper
+  module Helpers
     extend Memoist
+    include ParamHelper
 
     def tags(hash, casing: :camelize)
       hash.map do |k,v|
         k = k.to_s
         k = case casing
         when :camelize
-          CfnCamelizer.camelize(k)
+          k.camelize
         when :underscore
           k.underscore
         when :dasherize
@@ -17,13 +18,13 @@ class Lono::Template::Dsl::Builder
           k
         end
 
-        {key: k, value: v}
+        {Key: k, Value: v}
       end
     end
 
     def dimensions(hash, casing: :camelize)
       tags(hash, casing: casing).map { |h|
-        h[:name] = h.delete(:key)
+        h[:Name] = h.delete(:Key) || h.delete(:key)
         h
       }
     end

data/lib/lono/template/dsl/builder/helpers/param_helper.rb

@@ -0,0 +1,33 @@
+# Note: These are experimental helpers. Their interface may change or removed entirely.
+module Lono::Template::Dsl::Builder::Helpers
+  module ParamHelper
+    # Creates:
+    #
+    #    1. parameter
+    #    2. condition - used to make it optional
+    #
+    def conditional_parameter(name, options={})
+      options = normalize_conditional_parameter_options(options)
+      parameter(name, options)
+      condition("Has#{name}", not!(equals(ref(name), "")))
+    end
+
+    # use long name to minimize method name collision
+    def normalize_conditional_parameter_options(options)
+      if options.is_a?(Hash)
+        options = if options.empty?
+          ""
+        else
+          defaults = { Default: "" }
+          options.reverse_merge(defaults)
+        end
+      end
+
+      options
+    end
+
+    def optional_ref(name)
+      if!("Has#{name}", ref(name), ref("AWS::NoValue"))
+    end
+  end
+end

data/lib/lono/template/dsl/builder/output.rb

@@ -14,20 +14,20 @@ class Lono::Template::Dsl::Builder
       if definition.size == 1 && first.is_a?(Hash) # long form
         first # pass through
       elsif definition.size == 2 && second.is_a?(Hash) # medium form
-        if second.key?(:value)
+        if second.key?(:value) || second.key?("Value")
           logical_id, properties = first, second
         else
           logical_id = first
-          properties = {value: second}
+          properties = {Value: second}
         end
         { logical_id => properties }
       elsif definition.size == 2 && (second.is_a?(String) || second.nil?) # short form
         logical_id = first
-        properties = second.is_a?(String) ? { value: second } : {}
+        properties = second.is_a?(String) ? { Value: second } : {}
         { logical_id => properties }
       elsif definition.size == 1
         logical_id = first.to_s
-        properties = {value: ref(logical_id) }
+        properties = { Value: ref(logical_id) }
         { logical_id => properties }
       else # I dont know what form
         raise "Invalid form provided. definition #{definition.inspect}"

data/lib/lono/template/dsl/builder/parameter.rb

@@ -19,7 +19,7 @@ class Lono::Template::Dsl::Builder
       elsif (definition.size == 2 && valid_value?(second)) || # short form
             definition.size == 1
         logical_id = first
-        properties = valid_value?(second) ? { default: second } : {}
+        properties = valid_value?(second) ? { Default: second } : {}
         { logical_id => properties }
       else # I dont know what form
         raise "Invalid form provided. definition #{definition.inspect}"
@@ -28,7 +28,7 @@ class Lono::Template::Dsl::Builder
 
     def add_required(attributes)
       properties = attributes.values.first
-      properties[:type] ||= 'String'
+      properties["Type"] ||= 'String'
       attributes
     end
 

data/lib/lono/template/dsl/builder/resource.rb

@@ -15,7 +15,8 @@ class Lono::Template::Dsl::Builder
         first # pass through
       elsif definition.size == 2 && second.is_a?(Hash) # medium form
         logical_id, attributes = first, second
-        attributes.delete(:properties) if attributes[:properties].nil? || attributes[:properties].empty?
+        attributes.delete(:properties) if attributes[:properties].blank?
+        attributes.delete("Properties") if attributes["Properties"].blank?
         { logical_id => attributes }
       elsif definition.size == 2 && second.is_a?(String) # short form with no properties
         logical_id, type = first, second
@@ -25,7 +26,7 @@ class Lono::Template::Dsl::Builder
       elsif definition.size == 3 && (second.is_a?(String) || second.is_a?(NilClass)) # short form
         logical_id, type, properties = first, second, third
         resource = { logical_id => {
-                       type: type
+                       Type: type
                     }}
 
         attributes = resource.values.first
@@ -33,7 +34,7 @@ class Lono::Template::Dsl::Builder
         property_mover = PropertyMover.new(resource, logical_id, properties)
         property_mover.move!
 
-        attributes[:properties] = properties unless properties.empty?
+        attributes["Properties"] = properties unless properties.empty?
         resource
       else # Dont understand this form
         raise "Invalid form provided. definition #{definition.inspect}"

data/lib/lono/template/dsl/builder/resource/property_mover.rb

@@ -7,7 +7,11 @@ class Lono::Template::Dsl::Builder::Resource
 
     def move!
       %w[depends_on condition].each do |attribute_name|
+        # Account for camelize, underscore, String, and Symbol
         move(attribute_name.to_sym)
+        move(attribute_name.camelize.to_sym)
+        move(attribute_name)
+        move(attribute_name.camelize)
       end
     end
 

data/lib/lono/template/dsl/builder/syntax.rb

@@ -15,44 +15,43 @@ class Lono::Template::Dsl::Builder
 
     def transform(*definition)
       definition = definition.flatten
-      definition.map! { |x| CfnCamelizer.camelize(x) }
       @cfn["Transform"] = definition.size == 1 ? definition.first : definition
     end
 
     def parameter(*definition)
       @cfn["Parameters"] ||= {}
-      param = Parameter.new(definition)
+      param = Parameter.new(@blueprint, definition)
       @cfn["Parameters"].merge!(param.template)
     end
 
     def mapping(*definition)
       @cfn["Mappings"] ||= {}
-      mapping = Mapping.new(definition)
+      mapping = Mapping.new(@blueprint, definition)
       @cfn["Mappings"].merge!(mapping.template)
     end
 
     def resource(*definition)
       @cfn["Resources"] ||= {}
-      resource = Resource.new(definition)
+      resource = Resource.new(@blueprint, definition)
       @cfn["Resources"].merge!(resource.template)
     end
 
     def condition(*definition)
       @cfn["Conditions"] ||= {}
-      condition = Condition.new(definition)
+      condition = Condition.new(@blueprint, definition)
       @cfn["Conditions"].merge!(condition.template)
     end
 
     def output(*definition)
       @cfn["Outputs"] ||= {}
-      output = Output.new(definition)
+      output = Output.new(@blueprint, definition)
       @cfn["Outputs"].merge!(output.template)
     end
 
     # Generic section method in case CloudFormation adds a new future section.
     # The generic section method adds a new top-level key
     def section(key, definition)
-      @cfn[key] = Section.new(definition).template
+      @cfn[key] = Section.new(@blueprint, definition).template
     end
   end
 end

data/lib/lono/version.rb

@@ -1,3 +1,3 @@
 module Lono
-  VERSION = "5.3.4"
+  VERSION = "6.0.0"
 end

data/lib/templates/blueprint/%blueprint_name%.gemspec.tt

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = "Write a short summary because it's required."  # TODO: Change me
   spec.description   = "Write a longer description or delete this line."  # TODO: Change me
-  spec.homepage      = "https://github.com/user/repo"  # TODO: Change me
+  spec.homepage      = "https://github.com/USER/<%= blueprint_name %>"  # TODO: Change me
   spec.license       = "<%= ENV['LONO_LICENSE'] || 'MIT' %>"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'

data/lib/templates/blueprint/.meta/config.yml.tt

@@ -1,3 +1,4 @@
 ---
 blueprint_name: <%= blueprint_name %>
-template_type: dsl
+template_type: dsl
+auto_camelize: false

data/lib/templates/blueprint/README.md

@@ -34,4 +34,4 @@ The PARAM depends on how the blueprint was authored.  The PARAM conventionally d
 Use the [lono cfn deploy](http://lono.cloud/reference/lono-cfn-deploy/) command to deploy. Example:
 
     LONO_ENV=development lono cfn deploy BLUEPRINT-development --blueprint BLUEPRINT --iam
-    LONO_ENV=production  lono cfn deploy BLUEPRINT-production --blueprint BLUEPRINT --iam
+    LONO_ENV=production  lono cfn deploy BLUEPRINT-production  --blueprint BLUEPRINT --iam

data/lib/templates/blueprint_types/dsl/app/templates/%blueprint_name%.rb

@@ -1,36 +1,36 @@
-# Simple Starter Demo Example
+# Starter Demo Example
 aws_template_format_version "2010-09-09"
 description "Demo stack"
 
 parameter("InstanceType", "t3.micro")
 
 mapping("AmiMap",
-  "ap-northeast-1": { ami: "ami-0f9ae750e8274075b" },
-  "ap-northeast-2": { ami: "ami-047f7b46bd6dd5d84" },
-  "ap-south-1":     { ami: "ami-0889b8a448de4fc44" },
-  "ap-southeast-1": { ami: "ami-0b419c3a4b01d1859" },
-  "ap-southeast-2": { ami: "ami-04481c741a0311bbb" },
-  "ca-central-1":   { ami: "ami-03338e1f67dae0168" },
-  "eu-central-1":   { ami: "ami-09def150731bdbcc2" },
-  "eu-north-1":     { ami: "ami-d16fe6af" },
-  "eu-west-1":      { ami: "ami-07683a44e80cd32c5" },
-  "eu-west-2":      { ami: "ami-09ead922c1dad67e4" },
-  "eu-west-3":      { ami: "ami-0451ae4fd8dd178f7" },
-  "sa-east-1":      { ami: "ami-0669a96e355eac82f" },
-  "us-east-1":      { ami: "ami-0de53d8956e8dcf80" },
-  "us-east-2":      { ami: "ami-02bcbb802e03574ba" },
-  "us-west-1":      { ami: "ami-0019ef04ac50be30f" },
-  "us-west-2":      { ami: "ami-061392db613a6357b" }
+  "ap-northeast-1": { Ami: "ami-0f9ae750e8274075b" },
+  "ap-northeast-2": { Ami: "ami-047f7b46bd6dd5d84" },
+  "ap-south-1":     { Ami: "ami-0889b8a448de4fc44" },
+  "ap-southeast-1": { Ami: "ami-0b419c3a4b01d1859" },
+  "ap-southeast-2": { Ami: "ami-04481c741a0311bbb" },
+  "ca-central-1":   { Ami: "ami-03338e1f67dae0168" },
+  "eu-central-1":   { Ami: "ami-09def150731bdbcc2" },
+  "eu-north-1":     { Ami: "ami-d16fe6af" },
+  "eu-west-1":      { Ami: "ami-07683a44e80cd32c5" },
+  "eu-west-2":      { Ami: "ami-09ead922c1dad67e4" },
+  "eu-west-3":      { Ami: "ami-0451ae4fd8dd178f7" },
+  "sa-east-1":      { Ami: "ami-0669a96e355eac82f" },
+  "us-east-1":      { Ami: "ami-0de53d8956e8dcf80" },
+  "us-east-2":      { Ami: "ami-02bcbb802e03574ba" },
+  "us-west-1":      { Ami: "ami-0019ef04ac50be30f" },
+  "us-west-2":      { Ami: "ami-061392db613a6357b" }
 )
 
 resource("Instance", "AWS::EC2::Instance",
-  instance_type: ref("InstanceType"),
-  image_id: find_in_map("AmiMap", ref("AWS::Region"), :ami),
-  security_group_ids: [get_att("SecurityGroup.GroupId")],
-  user_data: base64(user_data("bootstrap.sh"))
+  InstanceType: ref("InstanceType"),
+  ImageId: find_in_map("AmiMap", ref("AWS::Region"), "Ami"),
+  SecurityGroupIds: [get_att("SecurityGroup.GroupId")],
+  UserData: base64(user_data("bootstrap.sh"))
 )
 resource("SecurityGroup", "AWS::EC2::SecurityGroup",
-  group_description: "demo security group",
+  GroupDescription: "demo security group",
 )
 
 output("Instance")