aws-cfn-dsl 0.5.0 → 0.6.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTRkZGM3ZjljMDFlZDk5NjFkNGNmNjRlYzYwM2ExNTNlNGRhMjM2NQ==
+    OTVjY2UxNTJiYmQyZjgzYmQ2M2NhYzljZDE2NGRkMWU3ZGY3YzBjZA==
   data.tar.gz: !binary |-
-    MDhjZTc2YzRhMmRhMTU2ODg3OGQxZDhmMDU0ZmM4Yzc2MzAzYWRhNA==
+    NTdkNGVhNWQ5NzRhMTVmNjA3ZTA4Y2QzOGZhOWM3N2IxYTc3ODk1OA==
 SHA512:
   metadata.gz: !binary |-
-    ZDIyMmZkNDQ1ZDFjNWNmZjI0NzEzNTI0MDJhZjIwOTcwZDMyMTkwNjU3MWU2
-    MzBlNDAwNjUxZjg0ZjlhODhjMGI2ZGI3NzA2ODAzZjkyYmExZjc2ODFiZTM0
-    ZjRjOGRkYTcwYjBjNzY5NjRjYmUyNWIzOTg2NjExOGM4ZjhhNzI=
+    OTYzNDdmODQ2ODNkZTUxMjMzZDExYzU0ZTM4M2UwM2VjZjQ5YzVkNGM3NDk2
+    ZTc2ZTBhZjc4MTU3OGY3ODlkYzMzOWMzYmMwM2U1Yjc1MGZlZmVhYTVmN2Vm
+    MTMxYTI3MWM3MDMzYWVkYjllNTRkZWEyOGQ4MjRjMGQ5MWEzYTk=
   data.tar.gz: !binary |-
-    ZTI1MmVkZWQzODgwZWVjMTUzMDJmMTcwMmVhZGZiOTRmY2Y0OWEwOWVlYzk0
-    ZWJhNzQxYWIxMDkwNDAzMGEzYTU2YzBlMDU1ODhiYzk4YmU2OGYwNzdhMzA3
-    MzVkNWQzYTYxZDlkNWVlOGEyMzNiOGU2MDE4Y2ZkMjE4YmRhOTc=
+    NzFjZjgyNmJlNzcxOTMwNzUwZTk4NmMyZTg3NDRiM2JiNjQ3ZmQzNDM3MmEz
+    NGJmNWYyZWI0NDhiYjBmZGJiOGY5NDMyMTE0YTNlNmQ1MjNlODZmMTU0YTBm
+    NWMxMDMwYTQ3MmQ5NGY0ZmViOGUwZDZjODdhMTJiMDcwMzYwYTY=

data/Gemfile

@@ -7,7 +7,6 @@ gem 'cloudformation-ruby-dsl', :path => '../cloudformation-ruby-dsl', :group =>
 
 gem 'dldinternet-mixlib-logging', :path => '../dldinternet-mixlib-logging', :group => :development
 gem 'dldinternet-mixlib-cli', :path => '../dldinternet-mixlib-cli', :group => :development
-gem 'aws-cfn-dsl', :path => '../aws-cfn-dsl', :group => :development
 gem 'aws-cfn-decompiler', :path => '../aws-cfn-decompiler', :group => :development
 gem 'aws-cfn-compiler', :path => '../aws-cfn-compiler', :group => :development
 gem 'aws-cfn-yats', :path => '../aws-cfn-yats', :group => :development

data/aws-cfn-dsl.iml

@@ -10,23 +10,7 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="aws-cfn-compiler" />
     <orderEntry type="module" module-name="aws-cfn-decompiler" />
-    <orderEntry type="module-library">
-      <library name="aws-cfn-stacker (v[path], /Users/cdelange/Dropbox/DLDInternet/ws/gems-ws/aws-cfn-stacker) [path][gem]">
-        <CLASSES>
-          <root url="file://$MODULE_DIR$/../aws-cfn-stacker/bin" />
-          <root url="file://$MODULE_DIR$/../aws-cfn-stacker/lib" />
-          <root url="file://$MODULE_DIR$/../aws-cfn-stacker/pkg" />
-          <root url="file://$MODULE_DIR$/../aws-cfn-stacker/.idea" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="file://$MODULE_DIR$/../aws-cfn-stacker/bin" />
-          <root url="file://$MODULE_DIR$/../aws-cfn-stacker/lib" />
-          <root url="file://$MODULE_DIR$/../aws-cfn-stacker/pkg" />
-          <root url="file://$MODULE_DIR$/../aws-cfn-stacker/.idea" />
-        </SOURCES>
-      </library>
-    </orderEntry>
+    <orderEntry type="module" module-name="aws-cfn-stacker" />
     <orderEntry type="module" module-name="aws-cfn-yats" />
     <orderEntry type="module" module-name="cloudformation-ruby-dsl" />
     <orderEntry type="module-library">

data/lib/aws/cfn/dsl/base.rb

@@ -1,4 +1,3 @@
-require "aws/cfn/decompiler"
 require "aws/cfn/dsl/fncall"
 
 require 'ap'
@@ -44,11 +43,41 @@ module Aws
 
         end
 
-        def save(path=nil,parts=@items)
-          pprint(simplify(parts))
+        def save_dsl(path=nil,parts=@items)
+          pprint(simplify(parts,true))
+          @logger.step "*** DSL generated ***"
         end
 
-        def simplify(val)
+        def load_template(file=nil)
+          if file
+            logStep "Loading #{file}"
+            begin
+              abs = File.absolute_path(File.expand_path(file))
+              unless File.exists?(abs) or @opts[:output].nil?
+                abs = File.absolute_path(File.expand_path(File.join(@opts[:output],file)))
+              end
+            rescue
+              # pass
+            end
+            if File.exists?(abs)
+              case File.extname(File.basename(abs)).downcase
+                when /json|js/
+                  @items = JSON.parse(File.read(abs))
+                when /yaml|yml/
+                  @items = YAML.load(File.read(abs))
+                else
+                  abort! "Unsupported file type for specification: #{file}"
+              end
+            else
+              abort! "Unable to open template: #{abs}"
+            end
+          end
+        end
+
+        protected
+
+        def simplify(val,start=false)
+          logStep "Simplify a block ..." if start
           if val.is_a?(Hash)
             val = Hash[val.map { |k,v| [k, simplify(v)] }]
             if val.length != 1
@@ -93,6 +122,7 @@ module Aws
         end
 
         def pprint(val)
+          logStep "Pretty print ..."
           case detect_type(val)
             when :template
               pprint_cfn_template(val)
@@ -109,7 +139,10 @@ module Aws
           end
         end
 
-        protected
+        def module_name(parts=-1)
+          name = self.class.to_s.split("::")
+          name[0..parts-1].join('::')
+        end
 
         def abort!(msg=nil,rc=1)
           @logger.error msg if msg
@@ -153,59 +186,72 @@ module Aws
         end
 
         def pprint_cfn_template(tpl)
-          open_output('',File.basename(@opts[:template].gsub(%r'\.(json|yaml|rb)'i,'')))
-          writeln "#!/usr/bin/env ruby"
-          writeln
-          if @opts[:output]
-            writeln "$:.unshift(File.dirname(__FILE__))"
-            # noinspection RubyExpressionInStringInspection
-            writeln '$:.unshift File.absolute_path("#{File.dirname(__FILE__)}/../lib")'
-          end
-          writeln "require 'bundler/setup'"
-          writeln "require 'aws/cfn/dsl/template'"
-          #writeln "require 'cloudformation-ruby-dsl/spotprice'"
-          # writeln "require 'cloudformation-ruby-dsl/table'"
-          writeln
-          writeln "template do"
-          writeln
-          tpl.each do |section, v|
-            case section
-              when 'Parameters'
-              when 'Mappings'
-              when 'Resources'
-              when 'Outputs'
-              else
-                write "  value #{fmt_key(section)} => "
-                pprint_value v, '  '
-                writeln
-                writeln
+          file = File.basename(@opts[:template]).gsub(%r'\.(json|yaml|js|yaml)$'i, '.rb')
+          # noinspection RubyParenthesesAroundConditionInspection
+          if (iam = open_output('', file.gsub(%r'\.(json|yaml|js|yml|rb)'i, '')))
+            logStep "Saving #{file}"
+            writeln "#!/usr/bin/env ruby"
+            print_maintainer('')
+            writeln
+            if @opts[:output]
+              writeln "$:.unshift(File.dirname(__FILE__))"
+              # noinspection RubyExpressionInStringInspection
+              writeln '$:.unshift File.absolute_path("#{File.dirname(__FILE__)}/../lib")'
             end
+            writeln "require 'bundler/setup'"
+            writeln "require 'aws/cfn/dsl/template'"
+            #writeln "require 'cloudformation-ruby-dsl/spotprice'"
+            #writeln "require 'cloudformation-ruby-dsl/table'"
+            writeln
+            writeln "template do"
+            writeln
+            tpl.each do |section, v|
+              case section
+                when 'Parameters'
+                when 'Mappings'
+                when 'Resources'
+                when 'Outputs'
+                else
+                  write "  value #{fmt_key(section)} => "
+                  pprint_value v, '  '
+                  writeln
+                  writeln
+              end
+            end
+          else
+            @logger.warn "Not overwriting template: '#{file}'"
           end
           %w(Mappings Parameters Resources Outputs).each do |section|
-            writeln "  # #{section}"
+            writeln "  # #{section}" if iam
             v = tpl[section]
             case section
               when 'Parameters'
-                v.each { |name, options| pprint_cfn_section 'parameter', name, options, 'Parameters' }
+                v.each { |name, options| pprint_cfn_section 'parameter', name, options, 'Parameters', iam }
               when 'Mappings'
-                v.each { |name, options| pprint_cfn_section 'mapping', name, options, 'Mappings' }
+                v.each { |name, options| pprint_cfn_section 'mapping', name, options, 'Mappings', iam }
               when 'Resources'
-                v.each { |name, options| pprint_cfn_resource name, options }
+                v.each { |name, options| pprint_cfn_resource name, options, iam }
               when 'Outputs'
-                v.each { |name, options| pprint_cfn_section 'output', name, options, 'Outputs' }
+                v.each { |name, options| pprint_cfn_section 'output', name, options, 'Outputs', iam }
               else
-                raise "Internal Error: Unexpected section '#{section}'"
+                abort! "Internal Error: Unexpected section '#{section}'"
             end
-            writeln
+            writeln if iam
           end
-          writeln "end.exec!"
+          writeln "end.exec!" if iam
         end
 
         def open_output(subdir,name)
           if @opts[:output]
             file = rb_file(subdir, name)
-
-            @output.unshift File.open(file, 'w')
+            if i_am_maintainer(file)
+              @output.unshift File.open(file, 'w')
+              true
+            else
+              false
+            end
+          else
+            true
           end
         end
 
@@ -233,43 +279,104 @@ module Aws
           end
         end
 
-        def pprint_cfn_section(section, name, options, subdir)
-          open_output(subdir,name)
-          write "  #{section} #{fmt_string(name)}"
-          indent = '  ' + (' ' * section.length) + ' '
-          options.each do |k, v|
-            writeln ","
-            write indent, fmt_key(k), " => "
-            pprint_value v, indent
+        def maintainer(parts=-1)
+          "maintainer: #{module_name parts}"
+        end
+
+        def maintainer_comment(indent='  ')
+          "#{indent}# WARNING: This code is generated. Your changes may be overwritten!\n" +
+          "#{indent}# Remove this message and/or set the 'maintainer: <author name>' when you need your changes to survive.\n" +
+          "#{indent}# Abscence of the 'maintainer: ' will be considered conscent to overwrite.\n" +
+          "#{indent}# #{maintainer 3}\n" +
+          "#\n"
+        end
+
+        def print_maintainer(indent='  ')
+          writeln maintainer_comment(indent)
+        end
+
+        def i_am_maintainer(file)
+          # mod = module_name 2
+          if File.exists?(file)
+            src = IO.read(file)
+            mtc = src.match(%r'#{maintainer 2}')
+            iam = (not mtc.nil? or src.match(%r'#\s*maintainer:').nil?)
+            ovr = @config[:overwrite]
+            iam or ovr
+          else
+            true
           end
-          writeln
-          writeln
-          close_output
-          add_brick(subdir,name)
         end
 
-        def pprint_cfn_resource(name, options)
-          subdir = 'Resources'
-          open_output(subdir,name)
-          writeln '# noinspection RubyStringKeysInHashInspection'
-          writeln "resource #{fmt_string(name)},"
-          indent = '  '
-          options.each do |k, v|
-            case k
-            when /^(Metadata|Properties)$/
-              write   "#{indent}#{fmt_key(k)} => "
-              pprint_value options[k], indent
-              writeln ','
-            else
-              write   "#{indent}#{fmt_key(k)} => "
-              writeln "#{fmt(v)},"
+        def prelude_code(indent='  ')
+          "scope = Aws::Cfn::Compiler.binding[File.basename(File.dirname(__FILE__))][File.basename(__FILE__, '.rb')]\n"+
+          "template = scope[:template]\n"+
+          "\n"+
+          "# noinspection RubyStringKeysInHashInspection\n"+
+          "template." +
+          ""
+        end
+
+        def print_with_wrapper(code,indent='  ')
+          write prelude_code(indent)+code.gsub(%r'^\s+','')
+        end
+
+        def pprint_cfn_section(section, name, options, subdir, brick=true)
+          if open_output(subdir,name)
+            @logger.info "Pretty print #{section} '#{name}' to '#{rb_file(subdir, name)}'"
+            print_maintainer ''
+            print_with_wrapper "#{section} #{fmt_string(name)}"
+            indent = '  ' + (' ' * section.length) + ' '
+            hang   = true
+            options.each do |k, v|
+              if hang
+                writeln ','
+                hang = false
+              end
+              write indent, fmt_key(k), " => "
+              pprint_value v, indent
+              hang = true
             end
-            unless k == 'Properties'
+            writeln
+            writeln
+            close_output
+            add_brick(subdir,name) if brick
+          else
+            @logger.warn "NOT overwriting existing source file '#{rb_file(subdir, name)}'"
+          end
+        end
+
+        def pprint_cfn_resource(name, options, brick=true)
+          subdir = 'Resources'
+          if open_output(subdir,name)
+            @logger.info "Pretty print resource '#{name}' to '#{rb_file(subdir, name)}'"
+            print_maintainer ''
+            print_with_wrapper "resource #{fmt_string(name)}"
+            indent = '  '
+            hang   = true
+            options.each do |k, v|
+              if hang
+                writeln ','
+                hang = false
+              end
+
+              case k
+                when /^(Metadata|Properties)$/
+                  write   "#{indent}#{fmt_key(k)} => "
+                  pprint_value options[k], indent
+                  hang = true
+                else
+                  write   "#{indent}#{fmt_key(k)} => "
+                  write "#{fmt(v)}"
+                  hang = true
+              end
             end
+            writeln
+            close_output
+            add_brick(subdir,name) if brick
+          else
+            @logger.warn "NOT overwriting existing source file '#{rb_file(subdir, name)}'"
           end
-          writeln
-          close_output
-          add_brick(subdir,name)
         end
 
         def pprint_value(val, indent)

data/lib/aws/cfn/dsl/fncall.rb

@@ -1,4 +1,3 @@
-require "aws/cfn/decompiler"
 
 module Aws
   module Cfn

data/lib/aws/cfn/dsl/main.rb

@@ -9,17 +9,24 @@ module Aws
         def run
 
           @opts = Slop.parse(help: true) do
-            on :j, :template=,      'The template to convert', as: String
-            on :o, :output=,        'The directory to output the DSL to.', as: String
+            on :j, :template=,      'The template to convert', as: String, argument: true
+            on :o, :output=,        'The directory to output the DSL to.', as: String, argument: true
+            on :O, :overwrite,      'Overwrite existing generated source files. (HINT: Think twice ...)', { as: String, optional_argument: true, default: 'off', match: %r/0|1|yes|no|on|off|enable|disable|set|unset|true|false|raw/i }
           end
 
+          @config[:overwrite] = if @opts[:overwrite].downcase.match %r'^(1|true|on|yes|enable|set)$'
+                                  true
+                                else
+                                  false
+                                end
+
           unless @opts[:template]
             abort! @opts
           end
 
-          load(@opts[:template])
+          load_template(@opts[:template])
 
-          save(@opts[:output])
+          save_dsl(@opts[:output])
 
         end
       end

data/lib/aws/cfn/dsl/template.rb

@@ -70,7 +70,7 @@ module Aws
           end
         end
 
-        def hash_refs(line)
+        def hash_refs(line,scope)
           match = line.match %r/^(.*?)(\{\s*:\S+\s*=>.*?\}|\{\s*\S+:\s*.*?\})(.*)$/
           if match
             h = nil
@@ -84,8 +84,8 @@ module Aws
                 end
 
             h[k.to_s] = v
-            VARS[:logger].debug h
-            [match[1], h, hash_refs(match[3]) ]
+            scope[:logger].debug h
+            [match[1], h, hash_refs(match[3],scope) ]
           else
             "#{line}\n"
           end

data/lib/aws/cfn/dsl/version.rb

@@ -1,7 +1,7 @@
 module Aws
   module Cfn
     module Dsl
-      VERSION = "0.5.0"
+      VERSION = "0.6.0"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aws-cfn-dsl
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Christo DeLange
@@ -95,26 +95,6 @@ files:
 - lib/aws/cfn/dsl/main.rb
 - lib/aws/cfn/dsl/template.rb
 - lib/aws/cfn/dsl/version.rb
-- test/Mappings/AWSRegion2AMI.rb
-- test/Outputs/ChefSecurityGroup.rb
-- test/Outputs/ServerURL.rb
-- test/Outputs/ValidationKeyBucket.rb
-- test/Parameters/CookbookLocation.rb
-- test/Parameters/InstanceType.rb
-- test/Parameters/KeyName.rb
-- test/Parameters/RoleLocation.rb
-- test/Parameters/SSHLocation.rb
-- test/Resources/BucketPolicy.rb
-- test/Resources/ChefClientSecurityGroup.rb
-- test/Resources/ChefServer.rb
-- test/Resources/ChefServerSecurityGroup.rb
-- test/Resources/ChefServerUser.rb
-- test/Resources/ChefServerWaitCondition.rb
-- test/Resources/ChefServerWaitHandle.rb
-- test/Resources/HostKeys.rb
-- test/Resources/PrivateKeyBucket.rb
-- test/chef-server.json
-- test/chef-server.rb
 homepage: ''
 licenses:
 - MIT
@@ -139,24 +119,4 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby DSL for creating Cloudformation templates
-test_files:
-- test/Mappings/AWSRegion2AMI.rb
-- test/Outputs/ChefSecurityGroup.rb
-- test/Outputs/ServerURL.rb
-- test/Outputs/ValidationKeyBucket.rb
-- test/Parameters/CookbookLocation.rb
-- test/Parameters/InstanceType.rb
-- test/Parameters/KeyName.rb
-- test/Parameters/RoleLocation.rb
-- test/Parameters/SSHLocation.rb
-- test/Resources/BucketPolicy.rb
-- test/Resources/ChefClientSecurityGroup.rb
-- test/Resources/ChefServer.rb
-- test/Resources/ChefServerSecurityGroup.rb
-- test/Resources/ChefServerUser.rb
-- test/Resources/ChefServerWaitCondition.rb
-- test/Resources/ChefServerWaitHandle.rb
-- test/Resources/HostKeys.rb
-- test/Resources/PrivateKeyBucket.rb
-- test/chef-server.json
-- test/chef-server.rb
+test_files: []

data/test/Mappings/AWSRegion2AMI.rb

@@ -1,10 +0,0 @@
-  mapping 'AWSRegion2AMI',
-          :'us-east-1' => { :id => 'ami-83dee0ea' },
-          :'us-west-1' => { :id => 'ami-c45f6281' },
-          :'us-west-2' => { :id => 'ami-d0d8b8e0' },
-          :'eu-west-1' => { :id => 'ami-aa56a1dd' },
-          :'sa-east-1' => { :id => 'ami-d55bfbc8' },
-          :'ap-southeast-1' => { :id => 'ami-bc7325ee' },
-          :'ap-southeast-2' => { :id => 'ami-e577e9df' },
-          :'ap-northeast-1' => { :id => 'ami-f72e45f6' }
-

data/test/Outputs/ChefSecurityGroup.rb

@@ -1,4 +0,0 @@
-  output 'ChefSecurityGroup',
-         :Description => 'EC2 Security Group with access to Opscode chef server',
-         :Value => { :Ref => 'ChefClientSecurityGroup' }
-

data/test/Outputs/ServerURL.rb

@@ -1,13 +0,0 @@
-  output 'ServerURL',
-         :Description => 'URL of newly created Opscode chef server',
-         :Value => {
-             :'Fn::Join' => [
-                 '',
-                 [
-                     'https://',
-                     { :'Fn::GetAtt' => [ 'ChefServer', 'PublicDnsName' ] },
-                     ':443',
-                 ],
-             ],
-         }
-

data/test/Outputs/ValidationKeyBucket.rb

@@ -1,4 +0,0 @@
-  output 'ValidationKeyBucket',
-         :Description => 'Location of validation key',
-         :Value => { :Ref => 'PrivateKeyBucket' }
-

data/test/Parameters/CookbookLocation.rb

@@ -1,5 +0,0 @@
-  parameter 'CookbookLocation',
-            :Type => 'String',
-            :Default => 'https://github.com/opscode-cookbooks/aws/tarball/master',
-            :Description => 'Location of chef cookbooks to upload to server'
-

data/test/Parameters/InstanceType.rb

@@ -1,7 +0,0 @@
-  parameter 'InstanceType',
-            :Description => 'WebServer EC2 instance type',
-            :Type => 'String',
-            :Default => 'm1.small',
-            :AllowedValues => %w(t1.micro m1.small m1.medium m1.large m1.xlarge m2.xlarge m2.2xlarge m2.4xlarge m3.xlarge m3.2xlarge c1.medium c1.xlarge cc1.4xlarge cc2.8xlarge cg1.4xlarge),
-            :ConstraintDescription => 'must be a valid EC2 instance type.'
-

data/test/Parameters/KeyName.rb

@@ -1,8 +0,0 @@
-  parameter 'KeyName',
-            :Description => 'Name of an existing EC2 KeyPair to enable SSH access to the web server',
-            :Type => 'String',
-            :MinLength => '1',
-            :MaxLength => '255',
-            :AllowedPattern => '[\\x20-\\x7E]*',
-            :ConstraintDescription => 'can contain only ASCII characters.'
-

data/test/Parameters/RoleLocation.rb

@@ -1,5 +0,0 @@
-  parameter 'RoleLocation',
-            :Type => 'String',
-            :Default => 'https://s3.amazonaws.com/cloudformation-examples/example_chef_roles.tar.gz',
-            :Description => 'Location of client roles to upload to server'
-

data/test/Parameters/SSHLocation.rb

@@ -1,9 +0,0 @@
-  parameter 'SSHLocation',
-            :Description => 'The IP address range that can be used to SSH to the EC2 instances',
-            :Type => 'String',
-            :MinLength => '9',
-            :MaxLength => '18',
-            :Default => '0.0.0.0/0',
-            :AllowedPattern => '(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})/(\\d{1,2})',
-            :ConstraintDescription => 'must be a valid IP CIDR range of the form x.x.x.x/x.'
-

data/test/Resources/BucketPolicy.rb

@@ -1,28 +0,0 @@
-  resource 'BucketPolicy', :Type => 'AWS::S3::BucketPolicy', :Properties => {
-      :PolicyDocument => {
-          :Version => '2008-10-17',
-          :Id => 'WritePolicy',
-          :Statement => [
-              {
-                  :Sid => 'WriteAccess',
-                  :Action => [ 's3:PutObject' ],
-                  :Effect => 'Allow',
-                  :Resource => {
-                      :'Fn::Join' => [
-                          '',
-                          [
-                              'arn:aws:s3:::',
-                              { :Ref => 'PrivateKeyBucket' },
-                              '/*',
-                          ],
-                      ],
-                  },
-                  :Principal => {
-                      :AWS => { :'Fn::GetAtt' => [ 'ChefServerUser', 'Arn' ] },
-                  },
-              },
-          ],
-      },
-      :Bucket => { :Ref => 'PrivateKeyBucket' },
-  }
-

data/test/Resources/ChefClientSecurityGroup.rb

@@ -1,2 +0,0 @@
-  resource 'ChefClientSecurityGroup', :Type => 'AWS::EC2::SecurityGroup', :Properties => { :GroupDescription => 'Group with access to Chef Server' }
-

data/test/Resources/ChefServer.rb

@@ -1,57 +0,0 @@
-  resource 'ChefServer', :Type => 'AWS::EC2::Instance', :Metadata => { :'AWS::CloudFormation::Init' => { :config => { :packages => { :apt => { :s3cmd => [] } }, :sources => { :'/home/ubuntu/chef-repo' => 'https://github.com/opscode/chef-repo/tarball/master', :'/home/ubuntu/chef-repo/cookbooks' => { :Ref => 'CookbookLocation' }, :'/home/ubuntu/chef-repo/roles' => { :Ref => 'RoleLocation' } }, :files => { :'/home/ubuntu/setup_environment' => { :source => 'https://s3.amazonaws.com/cloudformation-examples/setup-chef-server-with-knife', :mode => '000755', :owner => 'ubuntu', :group => 'ubuntu' }, :'/home/ubuntu/.s3cfg' => { :content => { :'Fn::Join' => [ '', [ "[default]\n", 'access_key = ', { :Ref => 'HostKeys' }, "\n", 'secret_key = ', { :'Fn::GetAtt' => [ 'HostKeys', 'SecretAccessKey' ] }, "\n", "use_https = True\n" ] ] }, :mode => '000644', :owner => 'ubuntu', :group => 'ubuntu' }, :'/home/ubuntu/chef_11.10.0-1.ubuntu.12.04_amd64.deb' => { :source => 'https://s3.amazonaws.com/cloudformation-examples/chef_11.10.0-1.ubuntu.12.04_amd64.deb', :mode => '000664', :owner => 'ubuntu', :group => 'ubuntu' }, :'/home/ubuntu/chef-server_11.0.10-1.ubuntu.12.04_amd64.deb' => { :source => 'https://s3.amazonaws.com/cloudformation-examples/chef-server_11.0.10-1.ubuntu.12.04_amd64.deb', :mode => '000664', :owner => 'ubuntu', :group => 'ubuntu' } } } } }, :Properties => {
-      :SecurityGroups => [
-          { :Ref => 'ChefServerSecurityGroup' },
-      ],
-      :ImageId => {
-          :'Fn::FindInMap' => [
-              'AWSRegion2AMI',
-              { :Ref => 'AWS::Region' },
-              'id',
-          ],
-      },
-      :UserData => {
-          :'Fn::Base64' => {
-              :'Fn::Join' => [
-                  '',
-                  [
-                      "#!/bin/bash\n",
-                      "function error_exit\n",
-                      "{\n",
-                      '  cfn-signal -e 1 -r "$1" \'',
-                      { :Ref => 'ChefServerWaitHandle' },
-                      "'\n",
-                      "  exit 1\n",
-                      "}\n",
-                      "apt-get -y install python-setuptools\n",
-                      "easy_install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-latest.tar.gz\n",
-                      'cfn-init --region ',
-                      { :Ref => 'AWS::Region' },
-                      '    -s ',
-                      { :Ref => 'AWS::StackId' },
-                      ' -r ChefServer ',
-                      "|| error_exit 'Failed to run cfn-init'\n",
-                      "# Bootstrap chef\n",
-                      "dpkg -i /home/ubuntu/chef_11.10.0-1.ubuntu.12.04_amd64.deb > /tmp/chef_install.log 2>&1 || error_exit 'Failed to install chef client tools'\n",
-                      "dpkg -i /home/ubuntu/chef-server_11.0.10-1.ubuntu.12.04_amd64.deb >> /tmp/chef_install.log 2>&1 || error_exit 'Failed to install chef server'\n",
-                      "sleep 5\n",
-                      "sudo /usr/bin/chef-server-ctl reconfigure > /tmp/chef_configure.log 2>&1 || error_exit 'Failed to configure chef server'\n",
-                      "sleep 5\n",
-                      "sudo chef-server-ctl start\n",
-                      "# Setup development environment in ubuntu user\n",
-                      "sudo -u ubuntu /home/ubuntu/setup_environment > /tmp/setup_environment.log 2>&1 || error_exit 'Failed to bootstrap chef server'\n",
-                      "# copy validation key to S3 bucket\n",
-                      's3cmd -c /home/ubuntu/.s3cfg put /etc/chef-server/validation.pem s3://',
-                      { :Ref => 'PrivateKeyBucket' },
-                      "/validation.pem > /tmp/put_validation_key.log 2>&1 || error_exit 'Failed to put Chef Server validation key'\n",
-                      "# If all went well, signal success\n",
-                      'cfn-signal -e $? -r \'Chef Server configuration\' \'',
-                      { :Ref => 'ChefServerWaitHandle' },
-                      "'\n",
-                  ],
-              ],
-          },
-      },
-      :KeyName => { :Ref => 'KeyName' },
-      :InstanceType => { :Ref => 'InstanceType' },
-  }
-

data/test/Resources/ChefServerSecurityGroup.rb

@@ -1,19 +0,0 @@
-  resource 'ChefServerSecurityGroup', :Type => 'AWS::EC2::SecurityGroup', :Properties => {
-      :GroupDescription => 'Open up SSH access plus Chef Server required ports',
-      :SecurityGroupIngress => [
-          {
-              :IpProtocol => 'tcp',
-              :FromPort => '22',
-              :ToPort => '22',
-              :CidrIp => { :Ref => 'SSHLocation' },
-          },
-          {
-              :IpProtocol => 'tcp',
-              :FromPort => '443',
-              :ToPort => '443',
-              :SourceSecurityGroupName => { :Ref => 'ChefClientSecurityGroup' },
-          },
-          { :IpProtocol => 'tcp', :FromPort => '443', :ToPort => '443', :CidrIp => '0.0.0.0/0' },
-      ],
-  }
-

data/test/Resources/ChefServerUser.rb

@@ -1,18 +0,0 @@
-  resource 'ChefServerUser', :Type => 'AWS::IAM::User', :Properties => {
-      :Path => '/',
-      :Policies => [
-          {
-              :PolicyName => 'root',
-              :PolicyDocument => {
-                  :Statement => [
-                      {
-                          :Effect => 'Allow',
-                          :Action => [ 'cloudformation:DescribeStackResource', 's3:Put' ],
-                          :Resource => '*',
-                      },
-                  ],
-              },
-          },
-      ],
-  }
-

data/test/Resources/ChefServerWaitCondition.rb

@@ -1,5 +0,0 @@
-  resource 'ChefServerWaitCondition', :Type => 'AWS::CloudFormation::WaitCondition', :DependsOn => 'ChefServer', :Properties => {
-      :Handle => { :Ref => 'ChefServerWaitHandle' },
-      :Timeout => '1200',
-  }
-

data/test/Resources/ChefServerWaitHandle.rb

@@ -1,2 +0,0 @@
-  resource 'ChefServerWaitHandle', :Type => 'AWS::CloudFormation::WaitConditionHandle'
-

data/test/Resources/HostKeys.rb

@@ -1,4 +0,0 @@
-  resource 'HostKeys', :Type => 'AWS::IAM::AccessKey', :Properties => {
-      :UserName => { :Ref => 'ChefServerUser' },
-  }
-

data/test/Resources/PrivateKeyBucket.rb

@@ -1,2 +0,0 @@
-  resource 'PrivateKeyBucket', :Type => 'AWS::S3::Bucket', :DeletionPolicy => 'Delete', :Properties => { :AccessControl => 'Private' }
-

data/test/chef-server.json

@@ -1,392 +0,0 @@
-{
-  "AWSTemplateFormatVersion": "2010-09-09",
-  "Description": "Sample template to bring up an Opscode Chef Server using the Opscode debian files for installation. This configuration creates and starts the Chef Server with the WebUI enabled, initializes knife and uploads specified cookbooks and roles to the chef server. A WaitCondition is used to hold up the stack creation until the application is deployed. **WARNING** This template creates one or more Amazon EC2 instances. You will be billed for the AWS resources used if you create a stack from this template.",
-  "Mappings": {
-    "AWSRegion2AMI": {
-      "us-east-1": {
-        "id": "ami-83dee0ea"
-      },
-      "us-west-1": {
-        "id": "ami-c45f6281"
-      },
-      "us-west-2": {
-        "id": "ami-d0d8b8e0"
-      },
-      "eu-west-1": {
-        "id": "ami-aa56a1dd"
-      },
-      "sa-east-1": {
-        "id": "ami-d55bfbc8"
-      },
-      "ap-southeast-1": {
-        "id": "ami-bc7325ee"
-      },
-      "ap-southeast-2": {
-        "id": "ami-e577e9df"
-      },
-      "ap-northeast-1": {
-        "id": "ami-f72e45f6"
-      }
-    }
-  },
-  "Parameters": {
-    "KeyName": {
-      "Description": "Name of an existing EC2 KeyPair to enable SSH access to the web server",
-      "Type": "String",
-      "MinLength": "1",
-      "MaxLength": "255",
-      "AllowedPattern": "[\\x20-\\x7E]*",
-      "ConstraintDescription": "can contain only ASCII characters."
-    },
-    "CookbookLocation": {
-      "Type": "String",
-      "Default": "https://github.com/opscode-cookbooks/aws/tarball/master",
-      "Description": "Location of chef cookbooks to upload to server"
-    },
-    "RoleLocation": {
-      "Type": "String",
-      "Default": "https://s3.amazonaws.com/cloudformation-examples/example_chef_roles.tar.gz",
-      "Description": "Location of client roles to upload to server"
-    },
-    "InstanceType": {
-      "Description": "WebServer EC2 instance type",
-      "Type": "String",
-      "Default": "m1.small",
-      "AllowedValues": [
-        "t1.micro",
-        "m1.small",
-        "m1.medium",
-        "m1.large",
-        "m1.xlarge",
-        "m2.xlarge",
-        "m2.2xlarge",
-        "m2.4xlarge",
-        "m3.xlarge",
-        "m3.2xlarge",
-        "c1.medium",
-        "c1.xlarge",
-        "cc1.4xlarge",
-        "cc2.8xlarge",
-        "cg1.4xlarge"
-      ],
-      "ConstraintDescription": "must be a valid EC2 instance type."
-    },
-    "SSHLocation": {
-      "Description": "The IP address range that can be used to SSH to the EC2 instances",
-      "Type": "String",
-      "MinLength": "9",
-      "MaxLength": "18",
-      "Default": "0.0.0.0/0",
-      "AllowedPattern": "(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})\\.(\\d{1,3})/(\\d{1,2})",
-      "ConstraintDescription": "must be a valid IP CIDR range of the form x.x.x.x/x."
-    }
-  },
-  "Resources": {
-    "ChefServerUser": {
-      "Type": "AWS::IAM::User",
-      "Properties": {
-        "Path": "/",
-        "Policies": [
-          {
-            "PolicyName": "root",
-            "PolicyDocument": {
-              "Statement": [
-                {
-                  "Effect": "Allow",
-                  "Action": [
-                    "cloudformation:DescribeStackResource",
-                    "s3:Put"
-                  ],
-                  "Resource": "*"
-                }
-              ]
-            }
-          }
-        ]
-      }
-    },
-    "HostKeys": {
-      "Type": "AWS::IAM::AccessKey",
-      "Properties": {
-        "UserName": {
-          "Ref": "ChefServerUser"
-        }
-      }
-    },
-    "ChefServer": {
-      "Type": "AWS::EC2::Instance",
-      "Metadata": {
-        "AWS::CloudFormation::Init": {
-          "config": {
-            "packages": {
-              "apt": {
-                "s3cmd": [
-
-                ]
-              }
-            },
-            "sources": {
-              "/home/ubuntu/chef-repo": "https://github.com/opscode/chef-repo/tarball/master",
-              "/home/ubuntu/chef-repo/cookbooks": {
-                "Ref": "CookbookLocation"
-              },
-              "/home/ubuntu/chef-repo/roles": {
-                "Ref": "RoleLocation"
-              }
-            },
-            "files": {
-              "/home/ubuntu/setup_environment": {
-                "source": "https://s3.amazonaws.com/cloudformation-examples/setup-chef-server-with-knife",
-                "mode": "000755",
-                "owner": "ubuntu",
-                "group": "ubuntu"
-              },
-              "/home/ubuntu/.s3cfg": {
-                "content": {
-                  "Fn::Join": [
-                    "",
-                    [
-                      "[default]\n",
-                      "access_key = ",
-                      {
-                        "Ref": "HostKeys"
-                      },
-                      "\n",
-                      "secret_key = ",
-                      {
-                        "Fn::GetAtt": [
-                          "HostKeys",
-                          "SecretAccessKey"
-                        ]
-                      },
-                      "\n",
-                      "use_https = True\n"
-                    ]
-                  ]
-                },
-                "mode": "000644",
-                "owner": "ubuntu",
-                "group": "ubuntu"
-              },
-              "/home/ubuntu/chef_11.10.0-1.ubuntu.12.04_amd64.deb": {
-                "source": "https://s3.amazonaws.com/cloudformation-examples/chef_11.10.0-1.ubuntu.12.04_amd64.deb",
-                "mode": "000664",
-                "owner": "ubuntu",
-                "group": "ubuntu"
-              },
-              "/home/ubuntu/chef-server_11.0.10-1.ubuntu.12.04_amd64.deb": {
-                "source": "https://s3.amazonaws.com/cloudformation-examples/chef-server_11.0.10-1.ubuntu.12.04_amd64.deb",
-                "mode": "000664",
-                "owner": "ubuntu",
-                "group": "ubuntu"
-              }
-            }
-          }
-        }
-      },
-      "Properties": {
-        "SecurityGroups": [
-          {
-            "Ref": "ChefServerSecurityGroup"
-          }
-        ],
-        "ImageId": {
-          "Fn::FindInMap": [
-            "AWSRegion2AMI",
-            {
-              "Ref": "AWS::Region"
-            },
-            "id"
-          ]
-        },
-        "UserData": {
-          "Fn::Base64": {
-            "Fn::Join": [
-              "",
-              [
-                "#!/bin/bash\n",
-                "function error_exit\n",
-                "{\n",
-                "  cfn-signal -e 1 -r \"$1\" '",
-                {
-                  "Ref": "ChefServerWaitHandle"
-                },
-                "'\n",
-                "  exit 1\n",
-                "}\n",
-                "apt-get -y install python-setuptools\n",
-                "easy_install https://s3.amazonaws.com/cloudformation-examples/aws-cfn-bootstrap-latest.tar.gz\n",
-                "cfn-init --region ",
-                {
-                  "Ref": "AWS::Region"
-                },
-                "    -s ",
-                {
-                  "Ref": "AWS::StackId"
-                },
-                " -r ChefServer ",
-                "|| error_exit 'Failed to run cfn-init'\n",
-                "# Bootstrap chef\n",
-                "dpkg -i /home/ubuntu/chef_11.10.0-1.ubuntu.12.04_amd64.deb > /tmp/chef_install.log 2>&1 || error_exit 'Failed to install chef client tools'\n",
-                "dpkg -i /home/ubuntu/chef-server_11.0.10-1.ubuntu.12.04_amd64.deb >> /tmp/chef_install.log 2>&1 || error_exit 'Failed to install chef server'\n",
-                "sleep 5\n",
-                "sudo /usr/bin/chef-server-ctl reconfigure > /tmp/chef_configure.log 2>&1 || error_exit 'Failed to configure chef server'\n",
-                "sleep 5\n",
-                "sudo chef-server-ctl start\n",
-                "# Setup development environment in ubuntu user\n",
-                "sudo -u ubuntu /home/ubuntu/setup_environment > /tmp/setup_environment.log 2>&1 || error_exit 'Failed to bootstrap chef server'\n",
-                "# copy validation key to S3 bucket\n",
-                "s3cmd -c /home/ubuntu/.s3cfg put /etc/chef-server/validation.pem s3://",
-                {
-                  "Ref": "PrivateKeyBucket"
-                },
-                "/validation.pem > /tmp/put_validation_key.log 2>&1 || error_exit 'Failed to put Chef Server validation key'\n",
-                "# If all went well, signal success\n",
-                "cfn-signal -e $? -r 'Chef Server configuration' '",
-                {
-                  "Ref": "ChefServerWaitHandle"
-                },
-                "'\n"
-              ]
-            ]
-          }
-        },
-        "KeyName": {
-          "Ref": "KeyName"
-        },
-        "InstanceType": {
-          "Ref": "InstanceType"
-        }
-      }
-    },
-    "ChefServerSecurityGroup": {
-      "Type": "AWS::EC2::SecurityGroup",
-      "Properties": {
-        "GroupDescription": "Open up SSH access plus Chef Server required ports",
-        "SecurityGroupIngress": [
-          {
-            "IpProtocol": "tcp",
-            "FromPort": "22",
-            "ToPort": "22",
-            "CidrIp": {
-              "Ref": "SSHLocation"
-            }
-          },
-          {
-            "IpProtocol": "tcp",
-            "FromPort": "443",
-            "ToPort": "443",
-            "SourceSecurityGroupName": {
-              "Ref": "ChefClientSecurityGroup"
-            }
-          },
-          {
-            "IpProtocol": "tcp",
-            "FromPort": "443",
-            "ToPort": "443",
-            "CidrIp": "0.0.0.0/0"
-          }
-        ]
-      }
-    },
-    "ChefClientSecurityGroup": {
-      "Type": "AWS::EC2::SecurityGroup",
-      "Properties": {
-        "GroupDescription": "Group with access to Chef Server"
-      }
-    },
-    "PrivateKeyBucket": {
-      "Type": "AWS::S3::Bucket",
-      "DeletionPolicy": "Delete",
-      "Properties": {
-        "AccessControl": "Private"
-      }
-    },
-    "BucketPolicy": {
-      "Type": "AWS::S3::BucketPolicy",
-      "Properties": {
-        "PolicyDocument": {
-          "Version": "2008-10-17",
-          "Id": "WritePolicy",
-          "Statement": [
-            {
-              "Sid": "WriteAccess",
-              "Action": [
-                "s3:PutObject"
-              ],
-              "Effect": "Allow",
-              "Resource": {
-                "Fn::Join": [
-                  "",
-                  [
-                    "arn:aws:s3:::",
-                    {
-                      "Ref": "PrivateKeyBucket"
-                    },
-                    "/*"
-                  ]
-                ]
-              },
-              "Principal": {
-                "AWS": {
-                  "Fn::GetAtt": [
-                    "ChefServerUser",
-                    "Arn"
-                  ]
-                }
-              }
-            }
-          ]
-        },
-        "Bucket": {
-          "Ref": "PrivateKeyBucket"
-        }
-      }
-    },
-    "ChefServerWaitHandle": {
-      "Type": "AWS::CloudFormation::WaitConditionHandle"
-    },
-    "ChefServerWaitCondition": {
-      "Type": "AWS::CloudFormation::WaitCondition",
-      "DependsOn": "ChefServer",
-      "Properties": {
-        "Handle": {
-          "Ref": "ChefServerWaitHandle"
-        },
-        "Timeout": "1200"
-      }
-    }
-  },
-  "Outputs": {
-    "ServerURL": {
-      "Description": "URL of newly created Opscode chef server",
-      "Value": {
-        "Fn::Join": [
-          "",
-          [
-            "https://",
-            {
-              "Fn::GetAtt": [
-                "ChefServer",
-                "PublicDnsName"
-              ]
-            },
-            ":443"
-          ]
-        ]
-      }
-    },
-    "ChefSecurityGroup": {
-      "Description": "EC2 Security Group with access to Opscode chef server",
-      "Value": {
-        "Ref": "ChefClientSecurityGroup"
-      }
-    },
-    "ValidationKeyBucket": {
-      "Description": "Location of validation key",
-      "Value": {
-        "Ref": "PrivateKeyBucket"
-      }
-    }
-  }
-}

data/test/chef-server.rb

@@ -1,40 +0,0 @@
-#!/usr/bin/env ruby
-
-$:.unshift(File.dirname(__FILE__))
-$:.unshift File.absolute_path("#{File.dirname(__FILE__)}/../lib")
-require 'bundler/setup'
-require 'aws/cfn/dsl/template'
-
-template do
-
-  value :AWSTemplateFormatVersion => '2010-09-09'
-
-  value :Description => 'Sample template to bring up an Opscode Chef Server using the Opscode debian files for installation. This configuration creates and starts the Chef Server with the WebUI enabled, initializes knife and uploads specified cookbooks and roles to the chef server. A WaitCondition is used to hold up the stack creation until the application is deployed. **WARNING** This template creates one or more Amazon EC2 instances. You will be billed for the AWS resources used if you create a stack from this template.'
-
-  # Mappings
-  mapping 'AWSRegion2AMI'
-
-  # Parameters
-  parameter 'KeyName'
-  parameter 'CookbookLocation'
-  parameter 'RoleLocation'
-  parameter 'InstanceType'
-  parameter 'SSHLocation'
-
-  # Resources
-  resource 'ChefServerUser'
-  resource 'HostKeys'
-  resource 'ChefServer'
-  resource 'ChefServerSecurityGroup'
-  resource 'ChefClientSecurityGroup'
-  resource 'PrivateKeyBucket'
-  resource 'BucketPolicy'
-  resource 'ChefServerWaitHandle'
-  resource 'ChefServerWaitCondition'
-
-  # Outputs
-  output 'ServerURL'
-  output 'ChefSecurityGroup'
-  output 'ValidationKeyBucket'
-
-end.exec!