cfn-model 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fdcd8f5945e95c1176ca1f7287dcaedde6871834fd1eca97a0f472b471ed721d
-  data.tar.gz: a772da89e6547542d4b591fcd56b6cd7773d9af142cbbcb75d1533e47045fc44
+  metadata.gz: ee88579d79a7de2a38cfd40032eeca6eabd4c6a20461b7bd07b846c1b8505e84
+  data.tar.gz: da93cbfd56b231d5ee4852a6fbecacc7b15432cdceca731c4865f734049b8565
 SHA512:
-  metadata.gz: 8e2f370d108e5135c6ec8afa6b88df4692a94b0d07a7a0ee080dd364a499c8157090ae49215eef77a3194301d0c9dc5b898aedad732c9a8fce65417e7112bbd8
-  data.tar.gz: f8f656c8fcfcfe91db50766e3d7ab56474d1991c5eab6ab5e2c882554c61abf7d9956681b0425d8691ba68199d262ea967f615e4f4c3d3f703658913e5430dcd
+  metadata.gz: b8eee9d1a663f1518ae0b50b8b57456214d3c0a03fce1946bf4adbaed2cf35bf3ae26d206617096f2748af509b31330a6c91b5746769ae6743a99aad5b51ef50
+  data.tar.gz: 60b05b4b60c9b72f8a6ae9eefbdbaae71559a7dc224c08c4a2c9ba7150572e1a1ababe384a3fde7e35771ff408d248f9e486bdf3446e27b47d8922d4906a0e71

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

@@ -14,7 +14,7 @@ class Statement
   end
 
   def wildcard_actions
-    @actions.select { |action| action.to_s =~ /\*/ }
+    @actions.select { |action| action.to_s == '*' }
   end
 
   def wildcard_principal?
@@ -22,7 +22,7 @@ class Statement
   end
 
   def wildcard_resources
-    @resources.select { |action| action.to_s =~ /\*/ }
+    @resources.select { |resource| resource.to_s == '*' }
   end
 
   def ==(another_statement)

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

@@ -1,30 +1,12 @@
 require_relative 'schema_generator'
 require 'kwalify'
-require 'json'
 
 class CloudFormationValidator
   def validate(cloudformation_string)
-    if json_text?(cloudformation_string)
-      raise ParserError.new('Invalid JSON!') unless valid_json?(cloudformation_string)
-    end
-
     schema = SchemaGenerator.new.generate cloudformation_string
-    validator = Kwalify::Validator.new(schema)
-    validator.validate(YAML.load(cloudformation_string))
-  end
 
-  private
-
-  def json_text?(cloudformation_string)
-    first_character = cloudformation_string.gsub(/\s/, '').split('').first
-    matches = cloudformation_string.scan(/\{[^}]*\}/)
-    first_character == '{' && !matches.empty?
-  end
+    validator = Kwalify::Validator.new(schema)
 
-  def valid_json?(cloudformation_string)
-      JSON.parse(cloudformation_string)
-      return true
-  rescue JSON::ParserError => error
-    return false
+    validator.validate(YAML.load(cloudformation_string))
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfn-model
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - Eric Kascic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-22 00:00:00.000000000 Z
+date: 2019-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop