cfndsl 0.15.0 → 1.0.0

data/spec/condition_spec.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe CfnDsl::ConditionDefinition do
+  let(:template) { CfnDsl::OrchestrationTemplate.new }
+  let(:target) { File.read("#{File.dirname(__FILE__)}/fixtures/condition-assertion.json") }
+
+  context '#Condition' do
+    it 'formats correctly' do
+      template.declare do
+        Condition(:TestConditionTwo, FnNot(Condition(:TestConditionOne)))
+        Resource(:TestResource) do
+          Condition(:TestConditionTwo)
+        end
+        Output(:TestOutput) do
+          Condition(:TestConditionOne)
+        end
+      end
+      json = template.to_json
+      expect(json).to eq(target)
+    end
+  end
+end

data/spec/deep_merge_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 describe DeepMerge do
   source = { key1: { keya1: 1, keya2: 2 }, key2: [1, 2] }

data/spec/direct_ruby_spec.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+class TemplateBuilder
+  include CfnDsl::CloudFormation
+end
+
+describe TemplateBuilder do
+  it 'includes Functions' do
+    expect(subject.FnSub('Substitution')).to be_an_instance_of(CfnDsl::Fn)
+  end
+
+  context('#CloudFormation') do
+    it 'returns a CloudFormationTemplate' do
+      expect(subject.CloudFormation('A Template')).to be_an_instance_of(CfnDsl::CloudFormationTemplate)
+    end
+  end
+end

data/spec/external_parameters_spec.rb

@@ -1,6 +1,13 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe CfnDsl::ExternalParameters do
+  let(:params_struct1) { "#{File.dirname(__FILE__)}/fixtures/params_struct1.yaml" }
+  let(:params_struct2) { "#{File.dirname(__FILE__)}/fixtures/params_struct2.yaml" }
+  let(:params_json) { "#{File.dirname(__FILE__)}/fixtures/params.json" }
+  let(:params_yaml) { "#{File.dirname(__FILE__)}/fixtures/params.yaml" }
+
   subject do
     exp = described_class.new
     exp.set_param(:username, 'Wiz Khalifa')
@@ -39,6 +46,21 @@ describe CfnDsl::ExternalParameters do
     end
   end
 
+  context '#set_param_capitalised' do
+    it 'treats keys as symbols only' do
+      subject.set_param('Reminder', 'You Know What It Is')
+      expect(subject['Reminder']).to eq('You Know What It Is')
+    end
+  end
+
+  context '#set_param_merge_struct' do
+    it 'treats keys as symbols only' do
+      subject.load_file(params_struct1)
+      subject.load_file(params_struct2)
+      expect(subject['TagStandard']).to eq('Tag1' => { 'Default' => 'value1' }, 'Tag2' => { 'Default' => 'value2' })
+    end
+  end
+
   context '#get_param' do
     it 'treats keys as symbols only' do
       subject.set_param(:reminder, 'You Know What It Is')
@@ -52,35 +74,18 @@ describe CfnDsl::ExternalParameters do
     end
   end
 
-  context '#add_to_binding' do
-    it 'defines the parameters as variables in the current binding' do
-      current = binding
-      subject.add_to_binding(current, nil)
-      expect(current).to be_local_variable_defined(:username)
-    end
-
-    it 'prints to a logstream if given' do
-      logstream = StringIO.new
-      subject.add_to_binding(binding, logstream)
-      logstream.rewind
-      expect(logstream.read).to match('Setting local variable username to Wiz Khalifa')
-    end
-  end
-
   context '#load_file JSON', type: :aruba do
     before { write_file('params.json', '{"reminder":"You Know What It Is"}') }
 
     it 'merges a JSON file as parameters' do
-      subject.load_file File.join(expand_path('./params.json'))
+      subject.load_file(params_json)
       expect(subject[:reminder]).to eq('You Know What It Is')
     end
   end
 
-  context '#load_file YAML', type: :aruba do
-    before { write_file('params.yaml', '{"reminder":"You Know What It Is"}') }
-
+  context '#load_file YAML' do
     it 'merges a YAML file as parameters' do
-      subject.load_file File.join(expand_path('./params.yaml'))
+      subject.load_file(params_yaml)
       expect(subject[:reminder]).to eq('You Know What It Is')
     end
   end

data/spec/fixtures/condition-assertion.json

@@ -0,0 +1 @@
+{"AWSTemplateFormatVersion":"2010-09-09","Conditions":{"TestConditionTwo":{"Fn::Not":[{"Condition":"TestConditionOne"}]}},"Resources":{"TestResource":{"Condition":"TestConditionTwo"}},"Outputs":{"TestOutput":{"Condition":"TestConditionOne"}}}

data/spec/fixtures/params.json

@@ -0,0 +1 @@
+{"reminder":"You Know What It Is"}

data/spec/fixtures/params.yaml

@@ -0,0 +1,2 @@
+---
+reminder: You Know What It Is

data/spec/fixtures/params_struct1.yaml

@@ -0,0 +1,4 @@
+---
+TagStandard:
+  Tag1:
+    Default: value1

data/spec/fixtures/params_struct2.yaml

@@ -0,0 +1,4 @@
+---
+TagStandard:
+  Tag2:
+    Default: value2

data/spec/fixtures/rule-assertion.json

@@ -0,0 +1 @@
+{"Assertions":[{"Assert":{"Fn::EachMemberIn":[{"Fn::ValueOfAll":["a","b"]},{"Fn::RefAll":"c"}]},"AssertDescription":"x"}],"RuleCondition":{"Fn::Equals":[{"Ref":"y"},"z"]}}

data/spec/fixtures/test.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 CloudFormation do
-  TEST ||= 'no value set'.freeze
+  TEST ||= 'no value set'
   puts TEST
 
   Description external_parameters[:test]
@@ -16,6 +18,11 @@ CloudFormation do
     MaxLength 15
   end
 
+  Parameter('Three') do
+    String
+    Default external_parameters[:three]
+  end
+
   # Condition Function examples
   Condition('OneIsTest', FnEquals(Ref('One'), 'Test'))
   Condition('OneIsNotTest', FnNot(FnEquals(Ref('One'), 'Test')))
@@ -23,7 +30,8 @@ CloudFormation do
             FnAnd(
               [
                 FnEquals(Ref('One'), 'Test'),
-                FnNot(FnEquals(Ref('Two'), 'Test'))
+                FnNot(FnEquals(Ref('Two'), 'Test')),
+                Condition('OneIsTest')
               ]
             ))
 
@@ -68,8 +76,8 @@ CloudFormation do
   AutoScalingGroup('ASG') do
     UpdatePolicy('AutoScalingRollingUpdate',
                  'MinInstancesInService' => '1',
-                 'MaxBatchSize'          => '1',
-                 'PauseTime'             => 'PT15M')
+                 'MaxBatchSize' => '1',
+                 'PauseTime' => 'PT15M')
     AvailabilityZones FnGetAZs('')
     LaunchConfigurationName Ref('LaunchConfig')
     MinSize 1

data/spec/generate_spec.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: false
+
 require 'spec_helper'
+
 describe Cfnlego do
   let(:template) { Cfnlego.run(resources: ['AWS::EC2::EIP,EIP']) }
 
@@ -8,6 +11,7 @@ describe Cfnlego do
       output << " EC2_EIP('EIP') do\n    Domain String "
       output << '# http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-eip.html#cfn-ec2-eip-domain'
       output << "\n    InstanceId String # http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-eip.html#cfn-ec2-eip-instanceid"
+      output << "\n    PublicIpv4Pool String # http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-eip.html#cfn-ec2-eip-publicipv4pool"
       output << "\n  end\nend\n"
       expect(template).to eq output
     end

data/spec/jsonable_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe CfnDsl::JSONable do

data/spec/metadata_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'Metadata' do

data/spec/names_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe CfnDsl do

data/spec/output_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe CfnDsl::OutputDefinition do

data/spec/plurals_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe CfnDsl::Plurals do

data/spec/resource_name_spec.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe 'cfndsl', type: :aruba do
+  let(:template_content) do
+    <<-TEMPLATE.gsub(/^ {6}/, '')
+      CloudFormation do
+        EC2_Instance(:my_instance) do
+        end
+      end
+    TEMPLATE
+  end
+  before(:each) { write_file('template.rb', template_content) }
+  context 'cfndsl FILE' do
+    it 'errors because the name is invalid' do
+      run_command 'cfndsl template.rb'
+      expect(last_command_started).to have_output_on_stderr('Resource name: my_instance is invalid')
+    end
+  end
+end

data/spec/resources_spec.rb

@@ -1,15 +1,10 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe CfnDsl::ResourceDefinition do
   subject { CfnDsl::CloudFormationTemplate.new.AutoScalingGroup(:web_servers) }
 
-  context '#addTag' do
-    it 'is a pass-through method to add_tag' do
-      expect(subject).to receive(:add_tag).with('role', 'web-server', true)
-      subject.addTag('role', 'web-server', true)
-    end
-  end
-
   context '#add_tag' do
     it 'adds a Tag for the resource' do
       subject.add_tag('role', 'web-server', true)

data/spec/rule_spec.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe CfnDsl::OutputDefinition do
+  let(:template) { CfnDsl::OrchestrationTemplate.new }
+  let(:target) { File.read("#{File.dirname(__FILE__)}/fixtures/rule-assertion.json") }
+  context '#Assert' do
+    it 'formats correctly' do
+      output = template.Rule(:testRule) do
+        Assert('x', FnEachMemberIn(FnValueOfAll('a', 'b'), FnRefAll('c')))
+        RuleCondition FnEquals(Ref('y'), 'z')
+      end
+      expect(output.to_json).to eq(target)
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'aruba/rspec'
 
 if ENV['CFNDSL_COV']
@@ -10,12 +12,7 @@ if ENV['CFNDSL_COV']
 end
 
 require 'cfndsl/globals'
-CfnDsl.specification_file File.expand_path('../../lib/cfndsl/aws/resource_specification.json', __FILE__)
 # use local fixture for tests
+CfnDsl.specification_file CfnDsl::LOCAL_SPEC_FILE
 require 'cfndsl'
-require 'cfnlego'
-
-bindir = File.expand_path('../../bin', __FILE__)
-ENV['PATH'] = [ENV['PATH'], bindir].join(':')
-
-Dir[File.expand_path('../support/**/*.rb', __FILE__)].each { |f| require f }
+Dir[File.expand_path('support/**/*.rb', __dir__)].sort.each { |f| require f }

data/spec/support/shared_examples/orchestration_template.rb

@@ -1,4 +1,19 @@
+# frozen_string_literal: true
+
 shared_examples 'an orchestration template' do
+  context '#initialize with block' do
+    subject do
+      described_class.new { Resource(:foo) { Type :bar } }
+    end
+
+    it 'evaluates the block' do
+      resources = subject.instance_variable_get('@Resources')
+      expect(resources).to_not be_empty
+      foo = resources.first[1]
+      expect(foo.instance_variable_get('@Type')).to eql(:bar)
+    end
+  end
+
   context '#valid_ref?' do
     it 'returns true if ref is global' do
       expect(subject.valid_ref?('AWS::Region')).to eq(true)
@@ -25,7 +40,7 @@ shared_examples 'an orchestration template' do
   context '#check_resource_refs' do
     it 'returns an array with an error message if invalid refs are present' do
       subject.EC2_Instance(:foo) { UserData Ref(:bar) }
-      expect(subject.check_resource_refs).to eq(['Invalid Reference: Resource foo refers to bar'])
+      expect(subject.check_resource_refs.first).to match(/^Invalid Reference:.*foo.*bar/)
     end
 
     it 'returns an empty array ' do
@@ -38,7 +53,7 @@ shared_examples 'an orchestration template' do
     it 'returns an array with an error message if invalid refs are present' do
       subject.EC2_Instance(:foo)
       subject.Output(:baz) { Value Ref(:bar) }
-      expect(subject.check_output_refs).to eq(['Invalid Reference: Output baz refers to bar'])
+      expect(subject.check_output_refs.first).to match(/Invalid Reference:.*baz.*bar/)
     end
 
     it 'returns an empty array' do

data/spec/transform_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'Transform' do

data/spec/types_definition_spec.rb

@@ -1,13 +1,11 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
-# This is a somewhat temporary test class to compare functionality
-# between the AWS, OS and new ways of defining types
 RSpec.describe 'Type Definitions' do
-  aws_spec = YAML.load_file File.expand_path('../../lib/cfndsl/aws/types.yaml', __FILE__)
-  os_spec = YAML.load_file File.expand_path('../../lib/cfndsl/os/types.yaml', __FILE__)
-  new_spec = CfnDsl::Specification.extract_from_resource_spec!
+  new_spec = CfnDsl::Types.extract_from_resource_spec(fail_patches: true)
 
-  { 'AWS' => aws_spec, 'OS' => os_spec, 'New' => new_spec }.each_pair do |cloud, specdef|
+  { 'New' => new_spec }.each_pair do |cloud, specdef|
     context cloud do
       resources = specdef['Resources']
       types = specdef['Types']
@@ -16,7 +14,7 @@ RSpec.describe 'Type Definitions' do
         resources.each do |name, info|
           it "#{name} has all property types defined" do
             properties = info['Properties']
-            properties.each do |_, type|
+            properties.each_value do |type|
               type = type.first if type.is_a?(Array)
               expect(types).to have_key(type)
             end
@@ -27,6 +25,7 @@ RSpec.describe 'Type Definitions' do
       context 'Types' do
         types.each do |name, type|
           it "#{name} has all property types defined" do
+            type = type['Properties'] if type.is_a?(Hash) && type.key?('Properties')
             type = type.first if type.is_a?(Array)
             if type.is_a?(String)
               expect(types).to have_key(type)

metadata

@@ -1,15 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: cfndsl
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Steven Jack
 - Chris Howe
+- Travis Dempsey
+- Greg Cockburn
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2017-06-18 00:00:00.000000000 Z
+date: 2020-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -17,18 +19,34 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: hana
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
 description: DSL for creating AWS Cloudformation templates
 email:
 - stevenmajack@gmail.com
 - chris@howeville.com
+- dempsey.travis@gmail.com
+- gergnz@gmail.com
 executables:
 - cfndsl
 extensions: []
@@ -42,16 +60,39 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bin/cfndsl
+- TODO.md
+- UPGRADING.md
 - cfndsl.gemspec
+- exe/cfndsl
 - lib/cfndsl.rb
 - lib/cfndsl/aws/cloud_formation_template.rb
+- lib/cfndsl/aws/patches/000_CloudFormationResourceSpecification.json
+- lib/cfndsl/aws/patches/000_sam.spec.json
+- lib/cfndsl/aws/patches/100_sam.spec_DeploymentPreference_patch.json
+- lib/cfndsl/aws/patches/200_Scrutinies_patch.json
+- lib/cfndsl/aws/patches/500_Cognito_IdentityPoolRoleAttachment_patches.json
+- lib/cfndsl/aws/patches/500_IoT1Click_patch_PlacementTemplate_DeviceTemplates.json
+- lib/cfndsl/aws/patches/500_NetworkAclEntry_patch.json
+- lib/cfndsl/aws/patches/500_SAM_Serverless_Function_S3Event_Events_patch.json
+- lib/cfndsl/aws/patches/500_SAM_Serverless_Function_S3Location_Version_patch.json
+- lib/cfndsl/aws/patches/500_SSM_AssociationName_patch.json
+- lib/cfndsl/aws/patches/500_VPCEndpoint_patch.json
+- lib/cfndsl/aws/patches/510_ElasticSearch_Domain_patches.json
+- lib/cfndsl/aws/patches/520_ServiceDiscovery_InstanceAttributes_patch.json
+- lib/cfndsl/aws/patches/600_RefKinds_patch.json
+- lib/cfndsl/aws/patches/700_SAM_Serverless_Function_InlineCode_patch.json
+- lib/cfndsl/aws/patches/800_List_types_patch.json
 - lib/cfndsl/aws/resource_specification.json
 - lib/cfndsl/aws/types.rb
 - lib/cfndsl/aws/types.yaml
+- lib/cfndsl/cfnlego.rb
+- lib/cfndsl/cfnlego/cloudformation.erb
+- lib/cfndsl/cfnlego/cloudformation.rb
+- lib/cfndsl/cfnlego/resource.rb
+- lib/cfndsl/cloudformation.rb
 - lib/cfndsl/conditions.rb
 - lib/cfndsl/creation_policy.rb
-- lib/cfndsl/errors.rb
+- lib/cfndsl/deep_merge.rb
 - lib/cfndsl/external_parameters.rb
 - lib/cfndsl/globals.rb
 - lib/cfndsl/json_serialisable_object.rb
@@ -60,25 +101,19 @@ files:
 - lib/cfndsl/module.rb
 - lib/cfndsl/names.rb
 - lib/cfndsl/orchestration_template.rb
-- lib/cfndsl/os/heat_template.rb
-- lib/cfndsl/os/types.rb
-- lib/cfndsl/os/types.yaml
 - lib/cfndsl/outputs.rb
 - lib/cfndsl/parameters.rb
-- lib/cfndsl/patches.rb
 - lib/cfndsl/plurals.rb
 - lib/cfndsl/properties.rb
 - lib/cfndsl/rake_task.rb
 - lib/cfndsl/ref_check.rb
 - lib/cfndsl/resources.rb
+- lib/cfndsl/rules.rb
+- lib/cfndsl/runner.rb
 - lib/cfndsl/specification.rb
 - lib/cfndsl/types.rb
 - lib/cfndsl/update_policy.rb
 - lib/cfndsl/version.rb
-- lib/cfnlego.rb
-- lib/cfnlego/cloudformation.erb
-- lib/cfnlego/cloudformation.rb
-- lib/cfnlego/resource.rb
 - lib/deep_merge/core.rb
 - lib/deep_merge/deep_merge.rb
 - sample/autoscale.rb
@@ -101,44 +136,53 @@ files:
 - spec/aws/ecs_task_definition_spec.rb
 - spec/aws/iam_managed_policy_spec.rb
 - spec/aws/kms_alias_spec.rb
+- spec/aws/list_type_patches_spec.rb
 - spec/aws/logs_log_group_spec.rb
+- spec/aws/nested_arrays_spec.rb
 - spec/aws/rds_db_instance_spec.rb
 - spec/aws/serverless_spec.rb
 - spec/cfndsl_spec.rb
 - spec/cli_spec.rb
 - spec/cloud_formation_template_spec.rb
+- spec/condition_spec.rb
 - spec/deep_merge_spec.rb
+- spec/direct_ruby_spec.rb
 - spec/external_parameters_spec.rb
-- spec/fixtures/heattest.rb
+- spec/fixtures/condition-assertion.json
+- spec/fixtures/params.json
+- spec/fixtures/params.yaml
+- spec/fixtures/params_struct1.yaml
+- spec/fixtures/params_struct2.yaml
+- spec/fixtures/rule-assertion.json
 - spec/fixtures/serverless-api.json
 - spec/fixtures/serverless-function.json
 - spec/fixtures/test.rb
 - spec/generate_spec.rb
-- spec/heat_template_spec.rb
 - spec/jsonable_spec.rb
 - spec/metadata_spec.rb
 - spec/names_spec.rb
 - spec/output_spec.rb
 - spec/plurals_spec.rb
+- spec/resource_name_spec.rb
 - spec/resources_spec.rb
+- spec/rule_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples/orchestration_template.rb
 - spec/transform_spec.rb
 - spec/types_definition_spec.rb
-homepage: https://github.com/stevenjack/cfndsl
+homepage: https://github.com/cfndsl/cfndsl
 licenses:
 - MIT
 metadata: {}
-post_install_message: "'addTag' is now deprecated in favour of 'add_tag'. 'addTag'
-  will be removed in the next major version."
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -146,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: AWS Cloudformation DSL
@@ -155,26 +199,36 @@ test_files:
 - spec/aws/ecs_task_definition_spec.rb
 - spec/aws/iam_managed_policy_spec.rb
 - spec/aws/kms_alias_spec.rb
+- spec/aws/list_type_patches_spec.rb
 - spec/aws/logs_log_group_spec.rb
+- spec/aws/nested_arrays_spec.rb
 - spec/aws/rds_db_instance_spec.rb
 - spec/aws/serverless_spec.rb
 - spec/cfndsl_spec.rb
 - spec/cli_spec.rb
 - spec/cloud_formation_template_spec.rb
+- spec/condition_spec.rb
 - spec/deep_merge_spec.rb
+- spec/direct_ruby_spec.rb
 - spec/external_parameters_spec.rb
-- spec/fixtures/heattest.rb
+- spec/fixtures/condition-assertion.json
+- spec/fixtures/params.json
+- spec/fixtures/params.yaml
+- spec/fixtures/params_struct1.yaml
+- spec/fixtures/params_struct2.yaml
+- spec/fixtures/rule-assertion.json
 - spec/fixtures/serverless-api.json
 - spec/fixtures/serverless-function.json
 - spec/fixtures/test.rb
 - spec/generate_spec.rb
-- spec/heat_template_spec.rb
 - spec/jsonable_spec.rb
 - spec/metadata_spec.rb
 - spec/names_spec.rb
 - spec/output_spec.rb
 - spec/plurals_spec.rb
+- spec/resource_name_spec.rb
 - spec/resources_spec.rb
+- spec/rule_spec.rb
 - spec/spec_helper.rb
 - spec/support/shared_examples/orchestration_template.rb
 - spec/transform_spec.rb