cfndsl 0.15.0 → 1.0.0

data/spec/aws/rds_db_instance_spec.rb

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

data/spec/aws/serverless_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 def read_json_fixture(filename)
@@ -28,7 +30,6 @@ describe CfnDsl::CloudFormationTemplate do
         }
       )
     end
-    # File.open('/tmp/dump', 'w') { |f| f.write(template.to_json) }
     expect(JSON.parse(template.to_json)).to eq(read_json_fixture('serverless-function.json'))
   end
 
@@ -40,7 +41,6 @@ describe CfnDsl::CloudFormationTemplate do
       CacheClusterSize '512M'
       Variables(Var1: 'value1')
     end
-    File.open('/tmp/dump', 'w') { |f| f.write(template.to_json) }
     expect(JSON.parse(template.to_json)).to eq(read_json_fixture('serverless-api.json'))
   end
 end

data/spec/cfndsl_spec.rb

@@ -1,30 +1,14 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe CfnDsl do
+  let(:test_template_file_name) { "#{File.dirname(__FILE__)}/fixtures/test.rb" }
+
   after(:example) { CfnDsl::ExternalParameters.refresh! }
 
   it 'evaluates a cloud formation' do
-    filename = "#{File.dirname(__FILE__)}/fixtures/test.rb"
-    subject.eval_file_with_extras(filename, [[:raw, 'test=123']])
-  end
-
-  it 'evaluates a heat' do
-    filename = "#{File.dirname(__FILE__)}/fixtures/heattest.rb"
-    subject.eval_file_with_extras(filename)
-  end
-end
-
-describe CfnDsl::HeatTemplate do
-  it 'honors last-set value for non-array properties' do
-    spec = self
-    subject.declare do
-      Server('myserver') do
-        flavor 'foo'
-        flavor 'bar'
-        f = @Properties['flavor'].value
-        spec.expect(f).to spec.eq('bar')
-      end
-    end
+    subject.eval_file_with_extras(test_template_file_name, [[:raw, 'test=123']])
   end
 end
 
@@ -53,16 +37,97 @@ describe CfnDsl::CloudFormationTemplate do
     end
   end
 
-  it 'validates references' do
+  it 'detects cyclic Resource references' do
     q = subject.Resource('q') { DependsOn ['r'] }
     r = subject.Resource('r') { Property('z', Ref('q')) }
-    q_refs = q.build_references({})
-    r_refs = r.build_references({})
-    expect(q_refs).to have_key('r')
-    expect(q_refs).to_not have_key('q')
-    expect(r_refs).to have_key('q')
-    expect(r_refs).to_not have_key('r')
-    expect(subject.check_refs.length).to eq(2)
+    q_refs = q.build_references
+    r_refs = r.build_references
+    expect(q_refs).to include('r')
+    expect(q_refs).to_not include('q')
+    expect(r_refs).to include('q')
+    expect(r_refs).to_not include('r')
+    expect(subject.check_refs.first).to match(/cyclic reference/i)
+  end
+
+  it 'detects a self reference in a Resource' do
+    q = subject.Resource('q') { Property('p', SomeDeepPropery: ['x', Ref('q')]) }
+    q_refs = q.build_references
+    expect(q_refs).to include('q')
+    messages = subject.check_refs
+    expect(messages.size).to eq(1) # Expect a self reference
+    expect(messages.first).to match(/references itself/i)
+  end
+
+  it 'detects a self reference in a Condition' do
+    q = subject.Condition('q', subject.FnAnd([subject.FnEquals('x', 'x'), subject.Condition('q')]))
+    q_refs = q.build_references([], nil, :condition_refs)
+    expect(q_refs).to include('q')
+    messages = subject.check_refs
+    expect(messages.size).to eq(1) # Expect a self reference
+    expect(messages.first).to match(/references itself/i)
+  end
+
+  it 'detects deep cycles in a Resource' do
+    subject.Condition('c', subject.FnEquals('a', 'b'))
+    subject.Resource('q') { Property('p', Ref('r')) }
+    subject.Resource('r') { Property('p', FnIf('c', FnGetAtt('s', 'attr'), 'x')) }
+    subject.Resource('s') { Property('p', FnSub('Something ${q}')) }
+    messages = subject.check_refs
+    expect(messages.size).to eq(1)
+    expect(messages.first).to match(/cyclic reference/i)
+  end
+
+  it 'detects deep cycles in Conditions' do
+    subject.Condition('c', subject.FnEquals('a', 'b'))
+    subject.Condition('d', subject.FnAnd([subject.FnEquals('x', 'x'), subject.Condition('c')]))
+    subject.Condition('q', subject.FnAnd([subject.FnEquals('x', 'x'), subject.Condition('r')]))
+    subject.Condition('r', subject.FnAnd([subject.FnEquals('x', 'x'), subject.Condition('s')]))
+    subject.Condition('s', subject.FnAnd([subject.FnEquals('x', 'x'), subject.Condition('q')]))
+    messages = subject.check_refs
+    expect(messages.size).to eq(1)
+    expect(messages.first).to match(/cyclic reference/i)
+  end
+
+  it 'detects invalid parameter references in Condition expressions' do
+    subject.Condition('x', subject.FnEquals('a', subject.Ref('p')))
+    messages = subject.check_refs
+    expect(messages.size).to eq(1)
+    expect(messages.first).to match(/^Invalid Reference: Conditions.*x.*p/)
+  end
+
+  it 'detects invalid condition references in Condition expressions' do
+    subject.Condition('d', subject.FnAnd([subject.FnEquals('x', 'x'), subject.Condition('c')]))
+    messages = subject.check_refs
+    expect(messages.size).to eq(1)
+    expect(messages.first).to match(/^Invalid Reference: Conditions.*d.*c/)
+  end
+
+  it 'detects invalid condition references in Resource Conditions' do
+    subject.Resource('r') { Condition 'd' }
+    messages = subject.check_refs
+    expect(messages.size).to eq(1)
+    expect(messages.first).to match(/^Invalid Reference: Resources.*r.*d/)
+  end
+
+  it 'detects invalid condition references in FnIf expressions deep inside Resources' do
+    subject.Resource('r') { Property(:p, FnIf(:d, 'vx', 'vy')) }
+    messages = subject.check_refs
+    expect(messages.size).to eq(1)
+    expect(messages.first).to match(/^Invalid Reference: Resources.*r.*d/)
+  end
+
+  it 'detects invalid condition references in Output Conditions' do
+    subject.Output('o') { Condition 'd' }
+    messages = subject.check_refs
+    expect(messages.size).to eq(1)
+    expect(messages.first).to match(/^Invalid Reference: Outputs.*o.*d/)
+  end
+
+  it 'detects invalid condition references in FnIf expressions deep inside Outputs' do
+    subject.Output('o') { Value(FnIf(:d, 'vx', 'vy')) }
+    messages = subject.check_refs
+    expect(messages.size).to eq(1)
+    expect(messages.first).to match(/^Invalid Reference: Outputs.*o.*d/)
   end
 
   it 'is a data-driven language' do
@@ -80,7 +145,7 @@ describe CfnDsl::CloudFormationTemplate do
   end
 
   it 'singularizes indirectly' do
-    user = subject.User 'TestUser'
+    user = subject.IAM_User 'TestUser'
     policy = user.Policy 'stuff'
     expect(policy).to eq('stuff')
 
@@ -104,8 +169,8 @@ describe CfnDsl::CloudFormationTemplate do
     ].each do |param|
       ref = subject.Ref param
       expect(ref.to_json).to eq("{\"Ref\":\"#{param}\"}")
-      refs = ref.build_references({})
-      expect(refs).to have_key(param)
+      refs = ref.build_references
+      expect(refs).to include(param)
     end
   end
 
@@ -140,8 +205,8 @@ describe CfnDsl::CloudFormationTemplate do
     it 'Ref' do
       ref = subject.Ref 'X'
       expect(ref.to_json).to eq('{"Ref":"X"}')
-      refs = ref.build_references({})
-      expect(refs).to have_key('X')
+      refs = ref.build_references
+      expect(refs).to include('X')
     end
 
     it 'FnBase64' do
@@ -202,36 +267,10 @@ describe CfnDsl::CloudFormationTemplate do
       end
     end
 
-    context 'FnFormat', 'String' do
-      it 'formats correctly' do
-        func = subject.FnFormat('abc%0def%1ghi%%x', 'A', 'B')
-        expect(func.to_json).to eq('{"Fn::Join":["",["abc","A","def","B","ghi","%","x"]]}')
-      end
-    end
-
-    context 'FnFormat', 'Hash' do
-      it 'formats correctly' do
-        func = subject.FnFormat('abc%{first}def%{second}ghi%%x', first: 'A', second: 'B')
-        expect(func.to_json).to eq('{"Fn::Join":["",["abc","A","def","B","ghi","%","x"]]}')
-      end
-    end
-
-    context 'FnFormat', 'Multiline' do
-      it 'formats correctly' do
-        multiline = <<-EOF.gsub(/^ {10}/, '')
-          This is the first line
-          This is the %0 line
-          This is a %% sign
-        EOF
-        func = subject.FnFormat(multiline, 'second')
-        expect(func.to_json).to eq('{"Fn::Join":["",["This is the first line\nThis is the ","second"," line\nThis is a ","%"," sign\n"]]}')
-      end
-    end
-
-    context 'FnFormat', 'Ref' do
+    context 'FnCidr', 'Array' do
       it 'formats correctly' do
-        func = subject.FnFormat '123%{Test}456'
-        expect(func.to_json).to eq('{"Fn::Join":["",["123",{"Ref":"Test"},"456"]]}')
+        func = subject.FnCidr('10.0.0.0', '256', '8')
+        expect(func.to_json).to eq('{"Fn::Cidr":["10.0.0.0","256","8"]}')
       end
     end
   end

data/spec/cli_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe 'cfndsl', type: :aruba do
@@ -6,18 +8,18 @@ describe 'cfndsl', type: :aruba do
       Usage: cfndsl [options] FILE
           -o, --output FILE                Write output to file
           -y, --yaml FILE                  Import yaml file as local variables
-          -r, --ruby FILE                  Evaluate ruby file before template
           -j, --json FILE                  Import json file as local variables
           -p, --pretty                     Pretty-format output JSON
           -f, --format FORMAT              Specify the output format (JSON default)
           -D, --define "VARIABLE=VALUE"    Directly set local VARIABLE as VALUE
           -v, --verbose                    Turn on verbose ouptut
-          -b, --disable-binding            Disable binding configuration
           -m, --disable-deep-merge         Disable deep merging of yaml
           -s, --specification-file FILE    Location of Cloudformation Resource Specification file
-          -u, --update-specification       Update the Cloudformation Resource Specification file
+          -u [VERSION],                    Update the Resource Specification file to latest, or specific version
+              --update-specification
           -g RESOURCE_TYPE,RESOURCE_LOGICAL_NAME,
               --generate                   Add resource type and logical name
+          -a, --assetversion               Print out the specification version
           -l, --list                       List supported resources
           -h, --help                       Display this screen
     USAGE
@@ -33,20 +35,43 @@ describe 'cfndsl', type: :aruba do
 
   before(:each) { write_file('template.rb', template_content) }
 
-  context 'cfndsl -u' do
+  # The known working version is the embedded version
+  WORKING_SPEC_VERSION = JSON.parse(File.read(CfnDsl::LOCAL_SPEC_FILE))['ResourceSpecificationVersion']
+
+  context "cfndsl -u #{WORKING_SPEC_VERSION}" do
     it 'updates the specification file' do
-      run 'cfndsl -u'
+      run_command "cfndsl -u #{WORKING_SPEC_VERSION}"
       expect(last_command_started).to have_output_on_stderr(<<-OUTPUT.gsub(/^ {8}/, '').chomp)
         Updating specification file
-        Specification successfully written to #{ENV['HOME']}/.cfndsl/resource_specification.json
+        Specification #{WORKING_SPEC_VERSION} successfully written to #{ENV['HOME']}/.cfndsl/resource_specification.json
       OUTPUT
       expect(last_command_started).to have_exit_status(0)
     end
   end
 
+  context 'cfndsl -u' do
+    it 'updates the specification file' do
+      run_command 'cfndsl -u'
+
+      expected = %r{Updating specification file
+Specification ([0-9]+\.){2}[0-9]+ successfully written to #{ENV['HOME']}/.cfndsl/resource_specification.json}
+
+      expect(last_command_started).to have_output_on_stderr(expected)
+      expect(last_command_started).to have_exit_status(0)
+    end
+  end
+
+  context 'cfndsl -a' do
+    it 'prints out the specification file version' do
+      run_command 'cfndsl -a'
+      expect(last_command_started).to have_output_on_stderr(/([0-9]+\.){2}[0-9]+/)
+      expect(last_command_started).to have_exit_status(0)
+    end
+  end
+
   context 'cfndsl' do
     it 'displays the usage' do
-      run 'cfndsl'
+      run_command'cfndsl'
       expect(last_command_started).to have_output(usage)
       expect(last_command_started).to have_exit_status(1)
     end
@@ -54,31 +79,21 @@ describe 'cfndsl', type: :aruba do
 
   context 'cfndsl --help' do
     it 'displays the usage' do
-      run_simple 'cfndsl --help'
+      run_command_and_stop 'cfndsl --help'
       expect(last_command_started).to have_output(usage)
     end
   end
 
   context 'cfndsl FILE' do
-    it 'gives a deprecation warning about bindings' do
-      run_simple 'cfndsl template.rb'
-      expect(last_command_started).to have_output_on_stderr(<<-WARN.gsub(/^ {8}/, '').chomp)
-        The creation of constants as config is deprecated!
-        Please switch to the #external_parameters method within your templates to access variables
-        See https://github.com/stevenjack/cfndsl/issues/170
-        Use the --disable-binding flag to suppress this message
-      WARN
-    end
-
     it 'generates a JSON CloudFormation template' do
-      run_simple 'cfndsl template.rb'
+      run_command_and_stop 'cfndsl template.rb'
       expect(last_command_started).to have_output_on_stdout('{"AWSTemplateFormatVersion":"2010-09-09","Description":"default"}')
     end
   end
 
   context 'cfndsl FILE --pretty' do
     it 'generates a pretty JSON CloudFormation template' do
-      run_simple 'cfndsl template.rb --pretty'
+      run_command_and_stop 'cfndsl template.rb --pretty'
       expect(last_command_started).to have_output_on_stdout(<<-OUTPUT.gsub(/^ {8}/, '').chomp)
         {
           "AWSTemplateFormatVersion": "2010-09-09",
@@ -90,7 +105,7 @@ describe 'cfndsl', type: :aruba do
 
   context 'cfndsl FILE --output FILE' do
     it 'writes the JSON CloudFormation template to a file' do
-      run_simple 'cfndsl template.rb --output template.json'
+      run_command_and_stop 'cfndsl template.rb --output template.json'
       expect(read('template.json')).to eq(['{"AWSTemplateFormatVersion":"2010-09-09","Description":"default"}'])
     end
   end
@@ -99,7 +114,7 @@ describe 'cfndsl', type: :aruba do
     before { write_file('params.yaml', 'DESC: yaml') }
 
     it 'interpolates the YAML file in the CloudFormation template' do
-      run_simple 'cfndsl template.rb --yaml params.yaml'
+      run_command_and_stop 'cfndsl template.rb --yaml params.yaml'
       expect(last_command_started).to have_output_on_stdout('{"AWSTemplateFormatVersion":"2010-09-09","Description":"yaml"}')
     end
   end
@@ -108,40 +123,29 @@ describe 'cfndsl', type: :aruba do
     before { write_file('params.json', '{"DESC":"json"}') }
 
     it 'interpolates the JSON file in the CloudFormation template' do
-      run_simple 'cfndsl template.rb --json params.json'
+      run_command_and_stop 'cfndsl template.rb --json params.json'
       expect(last_command_started).to have_output_on_stdout('{"AWSTemplateFormatVersion":"2010-09-09","Description":"json"}')
     end
   end
 
-  context 'cfndsl FILE --ruby FILE' do
-    let(:template_content) do
-      <<-TEMPLATE.gsub(/^ {8}/, '')
-        CloudFormation do
-          DESC = 'default' unless defined? DESC
-          Description DESC
-        end
-      TEMPLATE
-    end
-
-    before(:each) { write_file('params.rb', 'DESC = "ruby"') }
-
-    it 'interpolates the Ruby file in the CloudFormation template' do
-      run_simple 'cfndsl template.rb --ruby params.rb'
-      expect(last_command_started).to have_output_on_stdout('{"AWSTemplateFormatVersion":"2010-09-09","Description":"ruby"}')
+  context 'cfndsl FILE --define VARIABLE=VALUE' do
+    it 'interpolates the command line variables in the CloudFormation template' do
+      run_command "cfndsl template.rb --define \"DESC='cli'\""
+      expect(last_command_started).to have_output_on_stdout("{\"AWSTemplateFormatVersion\":\"2010-09-09\",\"Description\":\"'cli'\"}")
     end
+  end
 
-    it 'gives a deprecation warning and does not interpolate if bindings are disabled' do
-      run_simple 'cfndsl template.rb --ruby params.rb --disable-binding --verbose'
-      deprecation_warning = /Interpreting Ruby files was disabled\. .*params.rb will not be read/
-      expect(last_command_started).to have_output_on_stderr(deprecation_warning)
-      expect(last_command_started).to have_output_on_stdout('{"AWSTemplateFormatVersion":"2010-09-09","Description":"default"}')
+  context 'cfndsl FILE --define VARIABLE=true' do
+    it 'interpolates the command line variable with value true in the CloudFormation template ' do
+      run_command 'cfndsl template.rb --define "DESC=true"'
+      expect(last_command_started).to have_output_on_stdout('{"AWSTemplateFormatVersion":"2010-09-09","Description":true}')
     end
   end
 
-  context 'cfndsl FILE --define VARIABLE=VALUE' do
-    it 'interpolates the command line variables in the CloudFormation template' do
-      run "cfndsl template.rb --define \"DESC='cli'\""
-      expect(last_command_started).to have_output_on_stdout("{\"AWSTemplateFormatVersion\":\"2010-09-09\",\"Description\":\"'cli'\"}")
+  context 'cfndsl FILE --define VARIABLE=false' do
+    it 'interpolates the command line variable with value false in the CloudFormation template ' do
+      run_command 'cfndsl template.rb --define "DESC=false"'
+      expect(last_command_started).to have_output_on_stdout('{"AWSTemplateFormatVersion":"2010-09-09","Description":"default"}')
     end
   end
 
@@ -149,11 +153,10 @@ describe 'cfndsl', type: :aruba do
     before { write_file('params.yaml', 'DESC: yaml') }
 
     it 'displays the variables as they are interpolated in the CloudFormation template' do
-      run_simple 'cfndsl template.rb --yaml params.yaml --verbose'
+      run_command_and_stop 'cfndsl template.rb --yaml params.yaml --verbose'
       verbose = /
         Using \s specification \s file .* \.json \n
         Loading \s YAML \s file \s .* params\.yaml \n
-        Setting \s local \s variable \s DESC \s to \s yaml \n
         Loading \s template \s file \s .* template.rb \n
         Writing \s to \s STDOUT
       /x

data/spec/cloud_formation_template_spec.rb

@@ -1,5 +1,240 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe CfnDsl::CloudFormationTemplate do
   it_behaves_like 'an orchestration template'
+
+  context '#validate' do
+    it 'returns self if the template is empty' do
+      # TODO: Strictly Cloudformation requires at least one resource, but this is not validated yet.
+      expect(subject.validate).to equal(subject)
+    end
+
+    context 'resources' do
+      it 'returns self if there are valid Refs to parameters' do
+        subject.Parameter('TestParameter').Type('String')
+        r = subject.Resource(:TestResource)
+        r.Type('Custom-TestType')
+        r.Property(:AProperty, r.Ref(:TestParameter))
+        expect(subject.validate).to equal(subject)
+      end
+
+      it 'returns self if there are valid Refs to other resources' do
+        tr = subject.Resource(:TestResource)
+        tr.Type('Custom-TestType')
+        tr.Property(:AProperty, tr.Ref(:TestResource2))
+
+        t2 = subject.Resource('TestResource2')
+        t2.Type('Custom-TestType')
+        expect(subject.validate).to equal(subject)
+      end
+
+      it 'returns self if there are valid Fn::GetAtt references to other resources' do
+        tr = subject.Resource(:TestResource)
+        tr.Type('Custom-TestType')
+        tr.Property(:AProperty, tr.FnGetAtt(:TestResource2, :AnAttribute))
+
+        t2 = subject.Resource('TestResource2')
+        t2.Type('Custom-TestType')
+        expect(subject.validate).to equal(subject)
+      end
+
+      it 'returns self if there are valid DependsOn to other resources' do
+        tr = subject.Resource(:TestResource)
+        tr.Type('Custom-TestType')
+        tr.DependsOn(:TestResource2)
+
+        t2 = subject.Resource('TestResource2')
+        t2.Type('Custom-TestType')
+        expect(subject.validate).to equal(subject)
+      end
+
+      it 'raises CfnDsl::Error if references a non existent condition' do
+        tr = subject.Resource(:TestResource)
+        tr.Condition('NoCondition')
+        expect { subject.validate }.to raise_error(CfnDsl::Error, /TestResource.*NoCondition/)
+      end
+
+      it 'raises CfnDsl::Error if there are invalid Refs' do
+        tr = subject.Resource(:TestResource)
+        tr.Type('Custom-TestType')
+        tr.Property(:AProperty, tr.Ref(:TestResource2))
+        expect { subject.validate }.to raise_error(CfnDsl::Error, /^Invalid Reference:.*TestResource.*TestResource2/)
+      end
+
+      it 'raises CfnDsl::Error if there are invalid Fn::GetAtt references' do
+        tr = subject.Resource(:TestResource)
+        tr.Type('Custom-TestType')
+        tr.Property(:AProperty, tr.FnGetAtt(:TestResource2, :AnAttribute))
+        expect { subject.validate }.to raise_error(CfnDsl::Error, /^Invalid Reference:.*TestResource.*TestResource2/)
+      end
+
+      it 'raises CfnDsl::Error if there are invalid Fn::Sub attribute references' do
+        tr = subject.Resource(:TestResource)
+        tr.Type('Custom-TestType')
+        tr.Property(:AProperty, tr.FnBase64(tr.FnSub('${TestResource2.AnAttribute}')))
+        expect { subject.validate }.to raise_error(CfnDsl::Error, /^Invalid Reference:.*TestResource.*TestResource2/)
+      end
+
+      it 'raises CfnDsl::Error if there are invalid Fn::Sub references' do
+        tr = subject.Resource(:TestResource)
+        tr.Type('Custom-TestType')
+        tr.Property(:AProperty, tr.FnBase64(tr.FnSub('${TestResource2}')))
+        expect { subject.validate }.to raise_error(CfnDsl::Error, /^Invalid Reference:.*TestResource.*TestResource2/)
+      end
+
+      it 'raises CfnDsl::Error if there are invalid DependsOn' do
+        tr = subject.Resource(:TestResource)
+        tr.Type('Custom-TestType')
+        tr.DependsOn(['TestResource2'])
+        expect { subject.validate }.to raise_error(CfnDsl::Error, /^Invalid Reference:.*TestResource.*TestResource2/)
+      end
+
+      it 'raises CfnDsl::Error if a resource explicitly DependsOn itself' do
+        tr = subject.Resource(:TestResource)
+        tr.Type('Custom-TestType')
+        tr.DependsOn(['TestResource'])
+        expect { subject.validate }.to raise_error(CfnDsl::Error, /TestResource.*references itself/)
+      end
+
+      it 'raises CfnDsl::Error if a resource Refs itself' do
+        tr = subject.Resource(:TestResource)
+        tr.Type('Custom-TestType')
+        tr.Property(:AProperty, tr.Ref(:TestResource))
+        expect { subject.validate }.to raise_error(CfnDsl::Error, /TestResource.*itself/i)
+      end
+
+      it 'raises CfnDsl::Error if a resource references itself in Fn::GetAtt' do
+        tr = subject.Resource(:TestResource)
+        tr.Type('Custom-TestType')
+        tr.Property(:AProperty, tr.FnGetAtt(:TestResource, :AnAttr))
+        expect { subject.validate }.to raise_error(CfnDsl::Error, /TestResource.*itself/i)
+      end
+
+      it 'raises CfnDsl::Error if a resourcs references itself in Fn::Sub expression' do
+        tr = subject.Resource(:TestResource)
+        tr.Type('Custom-TestType')
+        tr.Property(:AProperty, tr.FnSub('${TestResource}'))
+        expect { subject.validate }.to raise_error(CfnDsl::Error, /TestResource.*itself/i)
+      end
+
+      it 'raises CfnDsl::Error if there are cyclic DependsOn references' do
+        tr = subject.Resource(:ResourceOne)
+        tr.Type('Custom-TestType')
+        tr.DependsOn(:ResourceTwo)
+
+        t2 = subject.Resource('ResourceTwo')
+        t2.Type('Custom-TestType')
+        t2.DependsOn(:ResourceOne)
+        expect { subject.validate }.to raise_error(CfnDsl::Error, /cyclic.*ResourceTwo.*ResourceOne/i)
+      end
+
+      it 'raises CfnDsl::Error if there are cyclic Refs' do
+        tr = subject.Resource(:TestResourceOne)
+        tr.Type('Custom-TestType')
+        tr.Property(:AProperty, tr.Ref(:TestResourceTwo))
+
+        t2 = subject.Resource('TestResourceTwo')
+        t2.Type('Custom-TestType')
+        t2.DependsOn('TestResourceOne')
+        expect { subject.validate }.to raise_error(CfnDsl::Error, /cyclic.*Two.*One/i)
+      end
+
+      it 'raises CfnDsl::Error if there are cyclic Fn::GetAtt references' do
+        tr = subject.Resource(:TestResource1)
+        tr.Property(:AProperty, tr.Ref(:TestResource2))
+
+        t2 = subject.Resource('TestResource2')
+        t2.DependsOn('TestResource3')
+
+        t3 = subject.Resource('TestResource3')
+        t3.Property(:OtherProperty, subject.FnGetAtt('TestResource1', :OtherAttribute))
+
+        expect { subject.validate }.to raise_error(CfnDsl::Error, /cyclic.*3.*2.*1/i)
+      end
+
+      it 'raises CfnDsl::Error if there are cyclic Fn::Sub references' do
+        subject.Resource(:TestResource1)
+
+        t2 = subject.Resource('TestResource2')
+        t2.DependsOn(%w[TestResource3 TestResource1])
+
+        t3 = subject.Resource('TestResource3')
+        t3.Property(:OtherProperty, subject.FnSub('SomeValue ${TestResource2}'))
+
+        expect { subject.validate }.to raise_error(CfnDsl::Error, /cyclic*.3?.*2/i)
+      end
+    end
+
+    context 'conditions' do
+      it 'returns self if there are valid condition references' do
+        subject.Parameter('TestParameter').Type('String')
+        subject.Condition(:TestCondition, subject.FnEquals(subject.Ref(:TestParameter), 'testvalue'))
+        expect(subject.validate).to equal(subject)
+      end
+
+      it 'raises CfnDsl::Error if invalid ref in condition' do
+        subject.Condition(:TestCondition, subject.FnEquals(subject.Ref(:NoParam), 'testvalue'))
+        expect { subject.validate }.to raise_error(CfnDsl::Error, /^Invalid Reference:.*TestCondition.*NoParam/)
+      end
+
+      it 'raises CfnDsl::Error if null value in Condition' do
+        subject.Condition(:TestCondition, subject.FnEquals(nil, 'testvalue'))
+        expect { subject.validate }.to raise_error(CfnDsl::Error, /Condition.*TestCondition.*null/)
+      end
+
+      it 'raises CfnDsl::Error if null value deep in Condition' do
+        subject.Condition(:TestCondition, subject.FnEquals({ Condition: nil }, 'testvalue'))
+        expect { subject.validate }.to raise_error(CfnDsl::Error, /Condition.*TestCondition.*null/)
+      end
+
+      # Note cycles in conditions tested in cfndsl_spec.rb
+    end
+
+    context 'outputs' do
+      it 'returns self if there are valid Refs to parameters' do
+        subject.Parameter('TestParameter').Type('String')
+        subject.Output('TestOutput').Value(subject.Ref(:TestParameter))
+        expect(subject.validate).to equal(subject)
+      end
+
+      it 'returns self if there are valid Refs to resources' do
+        subject.Resource(:TestResource)
+        subject.Output('TestResourceOutput').Value(subject.Ref(:TestResource))
+        expect(subject.validate).to equal(subject)
+      end
+
+      it 'returns self if there are valid Fn::GetAtt references to resources' do
+        subject.Resource(:TestResource)
+        subject.Output('TestResourceOutput').Value(subject.FnGetAtt(:TestResource, :AnAtt))
+        expect(subject.validate).to equal(subject)
+      end
+
+      it 'raises CfnDsl::Error if references a non existent condition' do
+        subject.Output(:TestOutput).Condition('NoCondition')
+        expect { subject.validate }.to raise_error(CfnDsl::Error, /TestOutput.*NoCondition/)
+      end
+
+      it 'raises CfnDsl::Error if there are invalid Refs' do
+        subject.Output('TestResourceOutput').Value(subject.Ref(:TestResource))
+        expect { subject.validate }.to raise_error(CfnDsl::Error, /Outputs.*TestResource/)
+      end
+
+      it 'raises CfnDsl::Error if there are invalid Fn::GetAtt references' do
+        subject.Output('TestResourceOutput').Value(subject.FnGetAtt(:TestResource, :Attr))
+        expect { subject.validate }.to raise_error(CfnDsl::Error, /Outputs.*TestResource/)
+      end
+
+      it 'raises CfnDsl::Error if there are invalid Fn::Sub attribute references' do
+        subject.Output('TestResourceOutput').Value(subject.FnSub('prefix ${SomeRef.attr}suffix'))
+        expect { subject.validate }.to raise_error(CfnDsl::Error, /Outputs.*TestResource/)
+      end
+
+      it 'raises CfnDsl::Error if there are invalid Fn::Sub references' do
+        subject.Output('TestResourceOutput').Value(subject.FnSub('prefix ${SomeRef}suffix'))
+        expect { subject.validate }.to raise_error(CfnDsl::Error, /Outputs.*TestResource/)
+      end
+    end
+  end
 end