cfndsl 0.17.5 → 1.0.0.pre.1

data/spec/generate_spec.rb

@@ -1,5 +1,7 @@
-# rubocop:disable Style/FrozenStringLiteralComment
+# frozen_string_literal: false
+
 require 'spec_helper'
+
 describe Cfnlego do
   let(:template) { Cfnlego.run(resources: ['AWS::EC2::EIP,EIP']) }
 
@@ -9,9 +11,9 @@ 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
   end
 end
-# rubocop:enable Style/FrozenStringLiteralComment

data/spec/resources_spec.rb

@@ -5,13 +5,6 @@ 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/spec_helper.rb

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

data/spec/support/shared_examples/orchestration_template.rb

@@ -1,6 +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)
@@ -27,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
@@ -40,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/types_definition_spec.rb

@@ -2,14 +2,10 @@
 
 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', __dir__)
-  os_spec = YAML.load_file File.expand_path('../lib/cfndsl/os/types.yaml', __dir__)
-  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']
@@ -29,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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfndsl
 version: !ruby/object:Gem::Version
-  version: 0.17.5
+  version: 1.0.0.pre.1
 platform: ruby
 authors:
 - Steven Jack
@@ -9,9 +9,9 @@ authors:
 - Travis Dempsey
 - Greg Cockburn
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2019-12-27 00:00:00.000000000 Z
+date: 2019-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -19,14 +19,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.0'
+- !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
@@ -46,16 +60,35 @@ 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_sam.spec.json
+- lib/cfndsl/aws/patches/100_sam.spec_DeploymentPreference_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_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/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
@@ -64,26 +97,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
@@ -106,6 +132,7 @@ 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
@@ -113,9 +140,11 @@ files:
 - 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
@@ -125,7 +154,6 @@ files:
 - 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
@@ -141,8 +169,7 @@ 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
@@ -153,9 +180,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.7
@@ -167,6 +194,7 @@ 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
@@ -174,9 +202,11 @@ test_files:
 - 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
@@ -186,7 +216,6 @@ test_files:
 - 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

data/bin/cfndsl

@@ -1,160 +0,0 @@
-#!/usr/bin/env ruby
-# frozen_string_literal: true
-
-require 'cfndsl/globals'
-require 'cfndsl/version'
-require 'fileutils'
-require 'json'
-require 'open-uri'
-require 'optparse'
-require 'cfnlego'
-
-options = { resources: [] }
-
-optparse = OptionParser.new do |opts|
-  Version = CfnDsl::VERSION
-  opts.banner = 'Usage: cfndsl [options] FILE'
-
-  # Define the options, and what they do
-  options[:output] = '-'
-  opts.on('-o', '--output FILE', 'Write output to file') do |file|
-    options[:output] = file
-  end
-
-  options[:extras] = []
-  opts.on('-y', '--yaml FILE', 'Import yaml file as local variables') do |file|
-    options[:extras].push([:yaml, File.expand_path(file)])
-  end
-
-  opts.on('-r', '--ruby FILE', 'Evaluate ruby file before template') do |file|
-    options[:extras].push([:ruby, File.expand_path(file)])
-  end
-
-  opts.on('-j', '--json FILE', 'Import json file as local variables') do |file|
-    options[:extras].push([:json, File.expand_path(file)])
-  end
-
-  opts.on('-p', '--pretty', 'Pretty-format output JSON') do
-    options[:pretty] = true
-  end
-
-  opts.on('-f', '--format FORMAT', 'Specify the output format (JSON default)') do |format|
-    raise "Format #{format} not supported" unless %w[json yaml].include?(format)
-
-    options[:outformat] = format
-  end
-
-  opts.on('-D', '--define "VARIABLE=VALUE"', 'Directly set local VARIABLE as VALUE') do |file|
-    options[:extras].push([:raw, file])
-  end
-
-  options[:verbose] = false
-  opts.on('-v', '--verbose', 'Turn on verbose ouptut') do
-    options[:verbose] = true
-  end
-
-  opts.on('-b', '--disable-binding', 'Disable binding configuration') do
-    CfnDsl.disable_binding
-  end
-
-  opts.on('-m', '--disable-deep-merge', 'Disable deep merging of yaml') do
-    CfnDsl.disable_deep_merge
-  end
-
-  opts.on('-s', '--specification-file FILE', 'Location of Cloudformation Resource Specification file') do |file|
-    CfnDsl.specification_file File.expand_path(file)
-  end
-
-  opts.on('-u', '--update-specification [VERSION]', 'Update the Resource Specification file to latest, or specific version') do |file|
-    options[:spec_version] = file || 'latest'
-    options[:update_spec] = true
-  end
-
-  opts.on('-g', '--generate RESOURCE_TYPE,RESOURCE_LOGICAL_NAME', 'Add resource type and logical name') do |r|
-    options[:lego] = true
-    options[:resources] << r
-  end
-
-  opts.on('-a', '--assetversion', 'Print out the specification version') do
-    options[:assetversion] = true
-  end
-
-  opts.on('-l', '--list', 'List supported resources') do
-    puts Cfnlego.Resources.sort
-    exit
-  end
-
-  # This displays the help screen, all programs are
-  # assumed to have this option.
-  opts.on('-h', '--help', 'Display this screen') do
-    puts opts
-    exit
-  end
-end
-
-optparse.parse!
-
-if options[:update_spec]
-  warn 'Updating specification file'
-  FileUtils.mkdir_p File.dirname(CfnDsl.specification_file)
-  begin
-    content = open("https://d1uauaxba7bl26.cloudfront.net/#{options[:spec_version]}/gzip/CloudFormationResourceSpecification.json").read
-  rescue OpenURI::HTTPError
-    warn "Resource Specification version #{options[:spec_version]} not found, defaulting to 'latest'"
-    content = open('https://d1uauaxba7bl26.cloudfront.net/latest/gzip/CloudFormationResourceSpecification.json').read
-  end
-  File.open(CfnDsl.specification_file, 'w') { |f| f.puts content }
-  warn "Specification successfully written to #{CfnDsl.specification_file}"
-end
-
-if options[:assetversion]
-  spec_file = JSON.parse File.read(CfnDsl.specification_file)
-  warn spec_file['ResourceSpecificationVersion']
-end
-
-if options[:lego]
-  puts Cfnlego.run(options)
-  exit
-end
-
-if ARGV.empty?
-  if options[:update_spec] || options[:assetversion]
-    exit 0
-  else
-    puts optparse.help
-    exit 1
-  end
-end
-
-filename = File.expand_path(ARGV[0])
-verbose = options[:verbose] && STDERR
-
-unless CfnDsl.disable_binding?
-  warn <<-MSG.gsub(/^\s*/, '')
-    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/cfndsl/cfndsl/issues/170
-    Use the --disable-binding flag to suppress this message
-  MSG
-end
-
-warn "Using specification file #{CfnDsl.specification_file}" if verbose
-
-require 'cfndsl'
-
-model = CfnDsl.eval_file_with_extras(filename, options[:extras], verbose)
-
-output = STDOUT
-if options[:output] != '-'
-  puts("Writing to #{options[:output]}") if verbose
-  output = File.open(File.expand_path(options[:output]), 'w')
-elsif verbose
-  verbose.puts('Writing to STDOUT')
-end
-
-if options[:outformat] == 'yaml'
-  data = model.to_json
-  output.puts JSON.parse(data).to_yaml
-else
-  output.puts options[:pretty] ? JSON.pretty_generate(model) : model.to_json
-end