cfn-model 0.6.5 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0192739b7367787ee3b788d075ce2753c618bbf5962542f9612b0799c458c4ae'
-  data.tar.gz: 0cdec84887e934a1794ba04a97bf7dee42946d668e845573908d801306fc6dc6
+  metadata.gz: 172517e2e8a7b2806737ca0075e8ea4eb0c1032b437956f4d9e0631decc0915f
+  data.tar.gz: 39c9ec8fa931f309cf07d70298be30a0fa25444e2d4785ee295e90da539656b0
 SHA512:
-  metadata.gz: 3bab8d35d13d44789d734cceba9289182a9673821d11d8b6e5db34c06d7a7af6ba25db9f5522ac5bfae7ae03d1b39ce79488dc56ba0a38c5d8afec978ab39ae2
-  data.tar.gz: 143f2f5c176f14c1c4c568e5de4be4baf6f289e256daf6197f30fa1310ce770144deeb889cc7b4292355051e802c05a0d30206b0e73ceb059d891e252e407c5c
+  metadata.gz: 1f9c56d1c4ca8fda37efe1c459239a15b1a62ccd22aa233955c94f85ac918db6d2d0d5ced0e37578c0549da2ebd502296935702cd8cfbadef2ed01c28eff0ced
+  data.tar.gz: 745cfa7e2eea93b915ed17ffd06abe3621de48b2752b8b09900ff5e4099efd067b25fdf4528276dbe86105a2c9da27695ebbe49902a56139e586ae716783a3b3

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

@@ -3,10 +3,10 @@
 require_relative 'references'
 
 class CfnModel
-  attr_reader :resources, :parameters, :line_numbers, :conditions, :globals, :mappings
+  attr_reader :resources, :parameters, :line_numbers, :conditions, :globals, :mappings, :element_types
 
   ##
-  # if you really want it, here it is - the raw Hash from YAML.load.  you'll have to mess with structural nits of
+  # if you really want it, here it is - the raw Hash from YAML.safe_load.  you'll have to mess with structural nits of
   # CloudFormation and deal with variations between yaml/json refs and all that
   #
   attr_accessor :raw_model
@@ -19,6 +19,7 @@ class CfnModel
     @mappings = {}
     @raw_model = nil
     @line_numbers = {}
+    @element_types = {}
   end
 
   ##

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

@@ -65,7 +65,7 @@ class CfnParser
       if with_line_numbers
         parse_with_line_numbers(cloudformation_yml)
       else
-        YAML.load cloudformation_yml
+        YAML.safe_load cloudformation_yml, permitted_classes: [Date]
       end
 
     # Transform raw resources in template as performed by
@@ -110,7 +110,7 @@ class CfnParser
       if condition_values_json.nil?
         condition_values = {}
       else
-        condition_values = JSON.load condition_values_json
+        condition_values = JSON.parse condition_values_json
       end
 
       cfn_hash['Conditions'].each do |condition_key, _|
@@ -156,6 +156,7 @@ class CfnParser
       assign_fields_based_upon_properties resource_object, resource, cfn_model
 
       cfn_model.resources[resource_name] = resource_object
+      cfn_model.element_types[resource_name] = "resource"
     end
     cfn_model
   end
@@ -173,6 +174,7 @@ class CfnParser
 
       cfn_model.resources[resource_name] = resource_object
       cfn_model.line_numbers[resource_name] = resource['Type']['line']
+      cfn_model.element_types[resource_name] = "resource"
     end
     cfn_model
   end
@@ -193,6 +195,7 @@ class CfnParser
 
       cfn_model.parameters[parameter_name] = parameter
       cfn_model.line_numbers[parameter_name] = parameter_hash['Type']['line']
+      cfn_model.element_types[parameter_name] = "parameter"
     end
     cfn_model
   end

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

@@ -9,7 +9,7 @@ class ParameterSubstitution
 
   def apply_parameter_values(cfn_model, parameter_values_json)
     unless parameter_values_json.nil?
-      parameter_values = JSON.load parameter_values_json
+      parameter_values = JSON.parse parameter_values_json
       if is_aws_format?(parameter_values)
         parameter_values = convert_aws_to_legacy_format(parameter_values)
       elsif !is_legacy_format?(parameter_values)

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

@@ -12,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, permitted_classes: [Date]))
   rescue ArgumentError, IOError, NameError => e
     raise ParserError, e.inspect
   end

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

@@ -5,7 +5,7 @@ require 'cfn-model/parser/parser_error'
 class ResourceTypeValidator
 
   def self.validate(cloudformation_yml)
-    hash = YAML.load cloudformation_yml
+    hash = YAML.safe_load cloudformation_yml, permitted_classes: [Date]
     if hash == false || hash.nil?
       raise ParserError.new 'yml empty'
     end

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

@@ -19,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
@@ -82,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfn-model
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.8
 platform: ruby
 authors:
 - Eric Kascic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-25 00:00:00.000000000 Z
+date: 2022-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -84,16 +84,22 @@ dependencies:
   name: psych
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.1'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '5'
 description: An object model for CloudFormation templates
 email: 
 executables:
@@ -193,9 +199,9 @@ licenses:
 metadata:
   bug_tracker_uri: https://github.com/stelligent/cfn-model/issues
   changelog_uri: https://github.com/stelligent/cfn-model/releases
-  documentation_uri: https://www.rubydoc.info/gems/cfn-model/0.6.5
+  documentation_uri: https://www.rubydoc.info/gems/cfn-model/0.6.8
   homepage_uri: https://github.com/stelligent/cfn-model
-  source_code_uri: https://github.com/stelligent/cfn-model/tree/v0.6.5
+  source_code_uri: https://github.com/stelligent/cfn-model/tree/v0.6.8
 post_install_message: 
 rdoc_options: []
 require_paths: