cfn-model 0.6.6 → 0.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 696ba992da760c8627ace103dccdce05b2eeec0404cc568ed7086fc74b734a5f
-  data.tar.gz: 335d86d84e4f2be5249c954392f1bb889fe19fbbe20b48f81261abdc03f5c74f
+  metadata.gz: 58d4ab0957a1e2ce81106501a32097f6a9dd3a4dba312aa1778437175432ad4c
+  data.tar.gz: 0f0150cfeffa848f54692db4f52e4d00375247988ea1d3b0c528846fb93c8db3
 SHA512:
-  metadata.gz: 0fdc30f8d26a35eb6a91e2146cf37f5dc2ddd7ef3d7d0abba24010efcde2206d82cdede85fe3e0b3c53eccdfb8562126dc84d17b542b9304eb56919e0e6301e1
-  data.tar.gz: 4046b076c06c39f0a61b207921b8ce96ecfa519ff5955895bf0f29b5789b07347adebf2c2eb4c12b069672fd2a71ceef98ce87f3e0afb4214836038768bd388a
+  metadata.gz: 79e5af6430d20ed12a72280ffa5eaacde89756aaf0c43109731025e6864d76e48fb50f476b0fb6e9b95f180086fd86f1ba36e79e07a6f93fc656eb4274f05e15
+  data.tar.gz: 226e8296ea5706ac110a7def4bf7ff1e6db6ba1bba916ba0308736830b107244e457b66d76baf79ed56e9f7ebe2a905448fec7df849f61a1d06c224293efc339

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

@@ -6,7 +6,7 @@ class CfnModel
   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

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, Symbol]
       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, _|

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, Symbol]))
   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, Symbol]
     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.6
+  version: 0.6.9
 platform: ruby
 authors:
 - Eric Kascic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-26 00:00:00.000000000 Z
+date: 2022-06-23 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.6
+  documentation_uri: https://www.rubydoc.info/gems/cfn-model/0.6.9
   homepage_uri: https://github.com/stelligent/cfn-model
-  source_code_uri: https://github.com/stelligent/cfn-model/tree/v0.6.6
+  source_code_uri: https://github.com/stelligent/cfn-model/tree/v0.6.9
 post_install_message: 
 rdoc_options: []
 require_paths: