cfndsl 1.0.0.pre.1 → 1.0.0

data/lib/cfndsl/aws/patches/200_Scrutinies_patch.json

@@ -0,0 +1,86 @@
+{
+    "ResourceTypes": {
+        "AWS::Lambda::Permission": {
+            "patch": {
+                "description": "Permission scrutiny",
+                "operations": [
+                    {
+                        "op": "add",
+                        "path": "/ScrutinyType",
+                        "value": "LambdaPermission"
+                    }
+                ]
+            }
+        },
+        "AWS::SNS::Subscription": {
+            "patch": {
+                "description": "SNS: These are not IAM policies",
+                "operations": [
+                    {
+                        "op": "add",
+                        "path": "/Properties/DeliveryPolicy/ScrutinyType",
+                        "value": "None"
+                    },
+                    {
+                        "op": "add",
+                        "path": "/Properties/FilterPolicy/ScrutinyType",
+                        "value": "None"
+                    }
+                ]
+            }
+        },
+        "AWS::SQS::Queue": {
+            "patch": {
+                "description": "SQS: Not an IAM policy",
+                "operations": [
+                    {
+                        "op": "add",
+                        "path": "/Properties/RedrivePolicy/ScrutinyType",
+                        "value": "None"
+                    }
+                ]
+            }
+        },
+        "AWS::EC2::SecurityGroup": {
+            "patch": {
+                "description": "SecurityGroup: Mark ingress/egress rules",
+                "operations": [
+                    {
+                        "op": "add",
+                        "path": "/Properties/SecurityGroupIngress/ScrutinyType",
+                        "value": "IngressRules"
+                    },
+                    {
+                        "op": "add",
+                        "path": "/Properties/SecurityGroupEgress/ScrutinyType",
+                        "value": "EgressRules"
+                    }
+                ]
+            }
+        },
+        "AWS::EC2::SecurityGroupIngress": {
+            "patch": {
+                "description": "SecurityGroupIngress: Mark ingress rules",
+                "operations": [
+                    {
+                        "op": "add",
+                        "path": "/ScrutinyType",
+                        "value": "IngressRuleResource"
+                    }
+                ]
+            }
+        },
+        "AWS::EC2::SecurityGroupEgress": {
+            "patch": {
+                "description": "SecurityGroupEgress: Mark egress rules",
+                "operations": [
+                    {
+                        "op": "add",
+                        "path": "/ScrutinyType",
+                        "value": "EgressRuleResource"
+                    }
+                ]
+            }
+        }
+    }
+}

data/lib/cfndsl/aws/patches/500_NetworkAclEntry_patch.json

@@ -0,0 +1,16 @@
+{
+    "ResourceTypes": {
+        "AWS::EC2::NetworkAclEntry": {
+            "patch": {
+                "description": "https://github.com/aws/aws-cdk/issues/1517",
+                "operations": [
+                    {
+                        "op": "add",
+                        "path": "/Properties/CidrBlock/Required",
+                        "value": false
+                    }
+                ]
+            }
+        }
+    }
+}

data/lib/cfndsl/aws/patches/520_ServiceDiscovery_InstanceAttributes_patch.json

@@ -0,0 +1,16 @@
+{
+  "ResourceTypes": {
+      "AWS::ServiceDiscovery::Instance": {
+          "patch": {
+              "description": "Treat Map primitive type as Json",
+              "operations": [
+                  {
+                      "op": "replace",
+                      "path": "/Properties/InstanceAttributes/PrimitiveType",
+                      "value": "Json"
+                  }
+              ]
+          }
+      }
+  }
+}

data/lib/cfndsl/cloudformation.rb

@@ -42,7 +42,14 @@ module CfnDsl
         logstream.puts("Loading #{klass_name} file #{file}") if logstream
         params.load_file file
       when :raw
-        params.set_param(*file.split('='))
+        file_parts = file.split('=')
+        if file_parts[1].downcase == 'true'
+          params.set_param(file_parts[0], true)
+        elsif file_parts[1].downcase == 'false'
+          params.set_param(file_parts[0], false)
+        else
+          params.set_param(*file.split('='))
+        end
       end
     end
 

data/lib/cfndsl/jsonable.rb

@@ -133,6 +133,7 @@ module CfnDsl
     # Instance variables that begin with two underscores have one of
     # them removed.
     def as_json(_options = {})
+      check_names
       hash = {}
       instance_variables.each do |var|
         name = var[1..-1]
@@ -162,6 +163,19 @@ module CfnDsl
       instance_eval(&block) if block_given?
       self
     end
+
+    private
+
+    def check_names
+      return if instance_variable_get('@Resources').nil?
+
+      instance_variable_get('@Resources').keys.each do |name|
+        next unless name !~ /\A\p{Alnum}+\z/
+
+        warn "Resource name: #{name} is invalid"
+        exit 1
+      end
+    end
   end
 
   # Handles all of the Fn:: objects

data/lib/cfndsl/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CfnDsl
-  VERSION = '1.0.0.pre.1'
+  VERSION = '1.0.0'
 end

data/sample/config_service.rb

@@ -5,7 +5,7 @@ CloudFormation do
 
   Description 'Creates SNS, SQS, S3 bucket and enables AWS Config.'
 
-  Queue('ConfigServiceQueue') do
+  SQS_Queue('ConfigServiceQueue') do
     QueueName 'ConfigServiceQueue'
   end
 

data/spec/cli_spec.rb

@@ -135,6 +135,20 @@ Specification ([0-9]+\.){2}[0-9]+ successfully written to #{ENV['HOME']}/.cfndsl
     end
   end
 
+  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=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
+
   context 'cfndsl FILE --verbose' do
     before { write_file('params.yaml', 'DESC: yaml') }
 

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/spec_helper.rb

@@ -15,4 +15,4 @@ require 'cfndsl/globals'
 # use local fixture for tests
 CfnDsl.specification_file CfnDsl::LOCAL_SPEC_FILE
 require 'cfndsl'
-Dir[File.expand_path('support/**/*.rb', __dir__)].each { |f| require f }
+Dir[File.expand_path('support/**/*.rb', __dir__)].sort.each { |f| require f }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cfndsl
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Steven Jack
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-10-27 00:00:00.000000000 Z
+date: 2020-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -19,14 +19,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: hana
   requirement: !ruby/object:Gem::Requirement
@@ -66,15 +66,19 @@ files:
 - 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
@@ -159,6 +163,7 @@ files:
 - 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
@@ -180,9 +185,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.7
@@ -221,6 +226,7 @@ test_files:
 - 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