cfn-model 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68a4e445da9675875b5414f73501cb35a9f903ea89ce5f18013b45aed9fd0ecc
-  data.tar.gz: e2b3ec103eb8a3666e82a6e7a53c15582637c855bfaf2d7051a37c8d7ab7bad1
+  metadata.gz: e39e1e4457d48accfce980b48675a4c4621e2a4c53361ed04585ce3daa552d7e
+  data.tar.gz: 67b896b4f06c5098b35967a0b4ec08d0561f7e9c9fd8ac42cf6cc5b93db6f4e7
 SHA512:
-  metadata.gz: d0b0ffdee38353e30698e759d5c83e695b942eb1bf9f6691a5ae6669eaabaea42432ea01d33a0cecbf07282b78ef4012cbfa21e41519ed45fbd634c3b680bf49
-  data.tar.gz: 8aef73ceda3ab93de719dcdc840b83524e099f16949c54637835d4595ebb2351487a63cf4b8e4bf1913c335038079ce9ae6e29a23341b2f11106b31fcf758b27
+  metadata.gz: 8acf757dd507bd6e02e029975b1eabc2f24d1bd9cc78754d3e8dc823cb159fdb6a76d795b1db935aa6ceccee71955abbda11727936c6c4a9f820de7131627a28
+  data.tar.gz: 44d4ae7825f11a8e1bb09d37c340f7d8a29bdd5ee85729356dd912b847b6118a2d7c7e56a81f2baa72e1816b1ad71a79bf453e8456750d2c96828b96e082a501

data/lib/cfn-model.rb

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 require 'cfn-model/parser/cfn_parser'
 require 'cfn-model/model/cfn_model'

data/lib/cfn-model/model/bucket_policy.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative 'model_element'
 
 class AWS::S3::BucketPolicy  < ModelElement

data/lib/cfn-model/model/cfn_model.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'references'
 
 class CfnModel

data/lib/cfn-model/model/ec2_instance.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'model_element'
 
 class AWS::EC2::Instance  < ModelElement

data/lib/cfn-model/model/ec2_network_interface.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'model_element'
 
 class AWS::EC2::NetworkInterface  < ModelElement

data/lib/cfn-model/model/iam_group.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'model_element'
 
 class AWS::IAM::Group  < ModelElement

data/lib/cfn-model/model/iam_managed_policy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'model_element'
 
 class AWS::IAM::ManagedPolicy < ModelElement

data/lib/cfn-model/model/iam_policy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'model_element'
 
 class AWS::IAM::Policy < ModelElement

data/lib/cfn-model/model/iam_role.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'model_element'
 
 class AWS::IAM::Role < ModelElement

data/lib/cfn-model/model/iam_user.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'model_element'
 
 class AWS::IAM::User  < ModelElement

data/lib/cfn-model/model/lambda_principal.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class LambdaPrincipal
   def self.wildcard?(principal)
     if principal.is_a? String

data/lib/cfn-model/model/load_balancer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'model_element'
 
 class AWS::ElasticLoadBalancing::LoadBalancer < ModelElement

data/lib/cfn-model/model/model_element.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'references'
 
 module AWS

data/lib/cfn-model/model/parameter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 #copy-paste alert with ModelElement which should instead be Resource anyway
 class Parameter
   attr_accessor :id, :type

data/lib/cfn-model/model/policy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'model_element'
 
 class Policy

data/lib/cfn-model/model/policy_document.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'statement'
 
 class PolicyDocument

data/lib/cfn-model/model/principal.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Principal
   def self.wildcard?(principal)
     if principal.is_a? String

data/lib/cfn-model/model/queue_policy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'model_element'
 
 class AWS::SQS::QueuePolicy  < ModelElement

data/lib/cfn-model/model/references.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 ##
 # this is a placeholder for anything related to resolving references

data/lib/cfn-model/model/security_group.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'model_element'
 
 class AWS::EC2::SecurityGroup < ModelElement

data/lib/cfn-model/model/security_group_egress.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'model_element'
 
 # this could have been inline or freestanding

data/lib/cfn-model/model/security_group_ingress.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'model_element'
 
 # this could have been inline or freestanding

data/lib/cfn-model/model/statement.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'principal'
 
 class Statement

data/lib/cfn-model/model/topic_policy.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'model_element'
 
 class AWS::SNS::TopicPolicy < ModelElement

data/lib/cfn-model/monkey_patches/psych/nodes/node.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Psych's first step is to parse the Yaml into an AST of Node objects
 # so we open the Node class and add a way to track the line.
 class Psych::Nodes::Node

data/lib/cfn-model/parser/cfn_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 require 'psych'
 require 'json'
@@ -142,7 +144,7 @@ class CfnParser
   end
 
   def transform_hash_into_parameters(cfn_hash, cfn_model)
-    return cfn_model unless cfn_hash.has_key?('Parameters')
+    return cfn_model unless cfn_hash.key?('Parameters')
 
     cfn_hash['Parameters'].each do |parameter_name, parameter_hash|
       parameter = Parameter.new
@@ -176,6 +178,7 @@ class CfnParser
   def assign_fields_based_upon_properties(resource_object, resource)
     unless resource['Properties'].nil?
       resource['Properties'].each do |property_name, property_value|
+        next if %w(Fn::Transform).include? property_name
         resource_object.send("#{map_property_name_to_attribute(property_name)}=", property_value)
       end
     end

data/lib/cfn-model/parser/ec2_instance_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Parser for EC2 instances
 class Ec2InstanceParser
   def parse(cfn_model:, resource:)

data/lib/cfn-model/parser/ec2_network_interface_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Ec2NetworkInterfaceParser
   def parse(cfn_model:, resource:)
     network_interface = resource

data/lib/cfn-model/parser/iam_group_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cfn-model/model/iam_role'
 require 'cfn-model/model/policy'
 require_relative 'policy_document_parser'

data/lib/cfn-model/parser/iam_role_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cfn-model/model/iam_role'
 require 'cfn-model/model/policy'
 require_relative 'policy_document_parser'

data/lib/cfn-model/parser/iam_user_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cfn-model/model/policy_document'
 require 'cfn-model/model/policy'
 require_relative 'policy_document_parser'

data/lib/cfn-model/parser/load_balancer_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class LoadBalancerParser
   def parse(cfn_model:, resource:)
     load_balancer = resource

data/lib/cfn-model/parser/load_balancer_v2_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class LoadBalancerV2Parser
   def parse(cfn_model:, resource:)
     load_balancer = resource

data/lib/cfn-model/parser/parameter_substitution.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 
 class ParameterSubstitution

data/lib/cfn-model/parser/parser_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ParserError < RuntimeError
   attr_accessor :errors
 

data/lib/cfn-model/parser/parser_registry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Dir["#{__dir__}/*_parser.rb"].each { |model| require "cfn-model/parser/#{File.basename(model, '.rb')}" }
 
 class ParserRegistry

data/lib/cfn-model/parser/policy_document_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cfn-model/model/iam_policy'
 require 'cfn-model/model/policy_document'
 

data/lib/cfn-model/parser/security_group_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'parser_error'
 require 'cfn-model/model/security_group_egress'
 require 'cfn-model/model/security_group_ingress'
@@ -34,7 +36,7 @@ class SecurityGroupParser
     security_group.ingresses = security_group.securityGroupIngress.map do |ingress|
       mapped_at_least_one_attribute = false
       ingress_object = AWS::EC2::SecurityGroupIngress.new cfn_model
-      ingress.each do |k,v|
+      ingress.each do |k, v|
         silently_fail do
           ingress_object.send("#{initialLower(k)}=", v)
           mapped_at_least_one_attribute = true
@@ -54,7 +56,7 @@ class SecurityGroupParser
       mapped_at_least_one_attribute = false
 
       egress_object = AWS::EC2::SecurityGroupEgress.new cfn_model
-      egress.each do |k,v|
+      egress.each do |k, v|
         next if k.match /::/
         silently_fail do
           egress_object.send("#{initialLower(k)}=", v)

data/lib/cfn-model/parser/transform_registry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Dir["#{__dir__}/../transforms/*.rb"].each do |transform|
   require "cfn-model/transforms/#{File.basename(transform, '.rb')}"
 end

data/lib/cfn-model/parser/with_policy_document_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'cfn-model/model/iam_policy'
 require 'cfn-model/model/policy_document'
 require_relative 'policy_document_parser'

data/lib/cfn-model/psych/handlers/line_number_handler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # We need to provide a handler that will add the line to the node
 # as it is parsed. TreeBuilder is the "usual" handler, that
 # creates the AST.

data/lib/cfn-model/psych/visitors/to_ruby_with_line_numbers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ToRubyWithLineNumbers < Psych::Visitors::ToRuby
   def revive_hash hash, o
     o.children.each_slice(2) { |k,v|
@@ -10,7 +12,7 @@ class ToRubyWithLineNumbers < Psych::Visitors::ToRuby
       # This is the important bit. If the value is a scalar,
       # we replace it with the desired hash.
       if v.is_a?(::Psych::Nodes::Scalar) && key == 'Type'
-        val = { "value" => val, "line" => line}
+        val = { "value" => val, "line" => line }
       end
 
       hash[key] = val

data/lib/cfn-model/transforms/serverless.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CfnModel
   class Transforms
     # Handle transformation of model elements performed by the

data/lib/cfn-model/validator/cloudformation_validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'schema_generator'
 require 'kwalify'
 require 'json'
@@ -10,7 +12,7 @@ class CloudFormationValidator
 
     schema = SchemaGenerator.new.generate cloudformation_string
     validator = Kwalify::Validator.new(schema)
-    validator.validate(YAML.load(cloudformation_string))
+    validator.validate(YAML.safe_load(cloudformation_string))
   end
 
   private
@@ -23,8 +25,8 @@ class CloudFormationValidator
 
   def valid_json?(cloudformation_string)
       JSON.parse(cloudformation_string)
-      return true
+      true
   rescue JSON::ParserError => error
-    return false
+    false
   end
 end

data/lib/cfn-model/validator/reference_validator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'set'
 
 class ReferenceValidator

data/lib/cfn-model/validator/resource_type_validator.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 require 'cfn-model/parser/parser_error'
 
 class ResourceTypeValidator
 
   def self.validate(cloudformation_yml)
-    hash = YAML.load cloudformation_yml
+    hash = YAML.safe_load cloudformation_yml
     if hash == false || hash.nil?
       raise ParserError.new 'yml empty'
     end
@@ -31,4 +33,4 @@ class ResourceTypeValidator
 
     hash
   end
-end
+end

data/lib/cfn-model/validator/schema_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'resource_type_validator'
 require 'yaml'
 
@@ -17,7 +19,7 @@ class SchemaGenerator
     parameters_schema = generate_schema_for_parameter_keys cloudformation_hash
     resources_schema = generate_schema_for_resource_keys cloudformation_hash
 
-    main_schema = YAML.load IO.read(schema_file('schema.yml.erb'))
+    main_schema = YAML.safe_load IO.read(schema_file('schema.yml.erb'))
     if parameters_schema.empty?
       main_schema['mapping'].delete 'Parameters'
     else
@@ -37,10 +39,10 @@ class SchemaGenerator
     return {} if cloudformation_hash['Parameters'].nil?
 
     parameters_schema = {
-      '=' => { 'type' => 'any'}
+      '=' => { 'type' => 'any' }
     }
 
-    cloudformation_hash['Parameters'].each do |parameter_key, parameter|
+    cloudformation_hash['Parameters'].each do |parameter_key, _|
       parameters_schema[parameter_key] = {
         'type' => 'map',
         'mapping' => {
@@ -58,7 +60,7 @@ class SchemaGenerator
 
   def generate_schema_for_resource_keys(cloudformation_hash)
     resources_schema = {
-      '=' => { 'type' => 'any'}
+      '=' => { 'type' => 'any' }
     }
 
     cloudformation_hash['Resources'].each do |resource_id, resource|
@@ -80,7 +82,7 @@ class SchemaGenerator
     if !File.exist? schema_file_path
       nil
     else
-      YAML.load IO.read(schema_file_path)
+      YAML.safe_load IO.read(schema_file_path)
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfn-model
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - Eric Kascic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-16 00:00:00.000000000 Z
+date: 2019-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop