cfn-model 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 702d90232151bcf0d9ff451aea44a157a63002340de9c10c24807ec28f89014b
-  data.tar.gz: 95bc3e23433b7e9d16789db07078a00161833615e1d81f4323afcd7cf2d652a2
+  metadata.gz: 68a4e445da9675875b5414f73501cb35a9f903ea89ce5f18013b45aed9fd0ecc
+  data.tar.gz: e2b3ec103eb8a3666e82a6e7a53c15582637c855bfaf2d7051a37c8d7ab7bad1
 SHA512:
-  metadata.gz: c0808af4434d1fb040be696d96275dd0a52c0a13fa28a710dba1ea0a6e685393e0f9653c97bb803cb9ee8c019d39566ca4b9530c3f8f9afb1837889fdb2b1c44
-  data.tar.gz: cba32f169fcdf11cbf54c89a6b1c8c67d315ccf441c3e7235f16ebbb87892f007f5cbc591fb5f84942bbd13d3103d52ca684f85703663ad6508de36b98f00cae
+  metadata.gz: d0b0ffdee38353e30698e759d5c83e695b942eb1bf9f6691a5ae6669eaabaea42432ea01d33a0cecbf07282b78ef4012cbfa21e41519ed45fbd634c3b680bf49
+  data.tar.gz: 8aef73ceda3ab93de719dcdc840b83524e099f16949c54637835d4595ebb2351487a63cf4b8e4bf1913c335038079ce9ae6e29a23341b2f11106b31fcf758b27

data/lib/cfn-model/schema/AWS_IAM_Group.yml

@@ -9,10 +9,8 @@ mapping:
     required: no
     mapping:
       ManagedPolicyArns:
-        type:   seq
+        type: any
         required: no
-        sequence:
-          - type:   any
       Policies:
         type:   seq
         required: no

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

@@ -1,12 +1,30 @@
 require_relative 'schema_generator'
 require 'kwalify'
+require 'json'
 
 class CloudFormationValidator
   def validate(cloudformation_string)
-    schema = SchemaGenerator.new.generate 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
+
+  def valid_json?(cloudformation_string)
+      JSON.parse(cloudformation_string)
+      return true
+  rescue JSON::ParserError => error
+    return false
+  end
 end

metadata

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