From c7a451846c500922af6b14adee7e071afae124c5 Mon Sep 17 00:00:00 2001
From: Kevin Formsma <kevin.formsma@gmail.com>
Date: Tue, 7 Jun 2022 17:57:46 -0400
Subject: [PATCH] chore: Update to cfn-model 0.6.9

---
 Gemfile.lock                | 28 +++++++++++++++-------------
 cfn-nag.gemspec             |  2 +-
 github-action/entrypoint.sh |  1 +
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index 49116057..9e2817cd 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -3,7 +3,7 @@ PATH
   specs:
     cfn-nag (0.0.0)
       aws-sdk-s3 (~> 1.76)
-      cfn-model (= 0.6.6)
+      cfn-model (= 0.6.9)
       lightly (~> 0.3.2)
       logging (~> 2.2.2)
       netaddr (~> 2.0.4)
@@ -15,24 +15,24 @@ GEM
   specs:
     ast (2.4.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.516.0)
-    aws-sdk-core (3.121.1)
+    aws-partitions (1.600.0)
+    aws-sdk-core (3.131.2)
       aws-eventstream (~> 1, >= 1.0.2)
-      aws-partitions (~> 1, >= 1.239.0)
+      aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
-      jmespath (~> 1.0)
-    aws-sdk-kms (1.49.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+      jmespath (~> 1, >= 1.6.1)
+    aws-sdk-kms (1.57.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.103.0)
-      aws-sdk-core (~> 3, >= 3.120.0)
+    aws-sdk-s3 (1.114.0)
+      aws-sdk-core (~> 3, >= 3.127.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
-    aws-sigv4 (1.4.0)
+    aws-sigv4 (1.5.0)
       aws-eventstream (~> 1, >= 1.0.2)
-    cfn-model (0.6.6)
+    cfn-model (0.6.9)
       kwalify (= 0.7.2)
-      psych (~> 3)
+      psych (>= 3.1, < 5)
     diff-lcs (1.4.4)
     docile (1.3.5)
     jmespath (1.6.1)
@@ -48,7 +48,8 @@ GEM
     parallel (1.21.0)
     parser (3.0.2.0)
       ast (~> 2.4.1)
-    psych (3.3.2)
+    psych (4.0.4)
+      stringio
     rainbow (3.0.0)
     rake (13.0.1)
     regexp_parser (2.1.1)
@@ -84,6 +85,7 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.2)
+    stringio (3.0.2)
     unicode-display_width (2.1.0)
 
 PLATFORMS
diff --git a/cfn-nag.gemspec b/cfn-nag.gemspec
index 16d65f89..32fc6807 100644
--- a/cfn-nag.gemspec
+++ b/cfn-nag.gemspec
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   # versus what we used to run tests in cfn-nag before publishing cfn-nag
   # they are coupled and we are doing a good bit of experimenting in cfn-model
   # i might consider collapsing them again....
-  s.add_runtime_dependency('cfn-model', '0.6.6')
+  s.add_runtime_dependency('cfn-model', '0.6.9')
   s.add_runtime_dependency('logging', '~> 2.2.2')
   s.add_runtime_dependency('netaddr', '~> 2.0.4')
   s.add_runtime_dependency('optimist', '~> 3.0.0')
diff --git a/github-action/entrypoint.sh b/github-action/entrypoint.sh
index 69cd9a4a..627e6d56 100755
--- a/github-action/entrypoint.sh
+++ b/github-action/entrypoint.sh
@@ -8,4 +8,5 @@ if [ -n "${INPUT_EXTRA_ARGS}" ]; then
   EXTRA_ARGS="${INPUT_EXTRA_ARGS}"
 fi
 
+set -o pipefail
 cfn_nag_scan ${EXTRA_ARGS} --input-path "${INPUT_INPUT_PATH}" | tee "${INPUT_OUTPUT_PATH}"
\ No newline at end of file