diff --git a/go.mod b/go.mod
index 05c95907b..75a16beac 100644
--- a/go.mod
+++ b/go.mod
@@ -22,7 +22,7 @@ require (
 	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.3.2
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.11.1
 	github.com/aws/smithy-go v1.6.0
-	github.com/awslabs/goformation/v4 v4.19.1
+	github.com/awslabs/goformation/v5 v5.4.5
 	github.com/ghodss/yaml v1.0.0
 	github.com/go-errors/errors v1.0.1
 	github.com/google/go-containerregistry v0.1.2
@@ -43,8 +43,8 @@ require (
 	github.com/mattn/go-isatty v0.0.12
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/moby/buildkit v0.8.3
-	github.com/onsi/ginkgo v1.15.1
-	github.com/onsi/gomega v1.11.0
+	github.com/onsi/ginkgo v1.16.4
+	github.com/onsi/gomega v1.12.0
 	github.com/open-policy-agent/opa v0.22.0
 	github.com/owenrumney/go-sarif v1.0.12
 	github.com/pelletier/go-toml v1.9.3
diff --git a/go.sum b/go.sum
index 48ab38b32..cd2dad94e 100644
--- a/go.sum
+++ b/go.sum
@@ -62,8 +62,6 @@ github.com/Azure/azure-sdk-for-go v35.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9mo
 github.com/Azure/azure-sdk-for-go v38.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-sdk-for-go v42.3.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-sdk-for-go v45.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
-github.com/Azure/azure-sdk-for-go v45.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
-github.com/Azure/azure-sdk-for-go v45.0.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-sdk-for-go v47.1.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-sdk-for-go v51.2.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
 github.com/Azure/azure-sdk-for-go v52.5.0+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc=
@@ -72,8 +70,6 @@ github.com/Azure/azure-sdk-for-go v56.2.0+incompatible/go.mod h1:9XXNKU+eRnpl9mo
 github.com/Azure/azure-service-bus-go v0.9.1/go.mod h1:yzBx6/BUGfjfeqbRZny9AQIbIe3AcV9WZbAdpkoXOa0=
 github.com/Azure/azure-storage-blob-go v0.8.0/go.mod h1:lPI3aLPpuLTeUwh1sViKXFxwl2B6teiRqI0deQUvsw0=
 github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
-github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
-github.com/Azure/go-autorest v10.8.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 github.com/Azure/go-autorest v10.8.1+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 github.com/Azure/go-autorest v10.15.5+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
 github.com/Azure/go-autorest v12.0.0+incompatible/go.mod h1:r+4oMnoxhatjLLJ6zxSWATqVooLgysK6ZNox3g/xq24=
@@ -94,8 +90,6 @@ github.com/Azure/go-autorest/autorest/adal v0.8.1/go.mod h1:ZjhuQClTqx435SRJ2iMl
 github.com/Azure/go-autorest/autorest/adal v0.8.2/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q=
 github.com/Azure/go-autorest/autorest/adal v0.8.3/go.mod h1:ZjhuQClTqx435SRJ2iMlOxPYt3d2C/T/7TiQCVZSn3Q=
 github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg=
-github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg=
-github.com/Azure/go-autorest/autorest/adal v0.9.0/go.mod h1:/c022QCutn2P7uY+/oQWWNcK9YU+MH96NgK+jErpbcg=
 github.com/Azure/go-autorest/autorest/adal v0.9.5/go.mod h1:B7KF7jKIeC9Mct5spmyCB/A8CG/sEz1vwIRGv/bbw7A=
 github.com/Azure/go-autorest/autorest/adal v0.9.13 h1:Mp5hbtOePIzM8pJVRa3YLrWWmZtoxRXqUEzCfJt3+/Q=
 github.com/Azure/go-autorest/autorest/adal v0.9.13/go.mod h1:W/MM4U6nLxnIskrw4UwWzlHfGjwUS50aOsc/I3yuU8M=
@@ -118,8 +112,6 @@ github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935
 github.com/Azure/go-autorest/autorest/to v0.2.0/go.mod h1:GunWKJp1AEqgMaGLV+iocmRAJWqST1wQYhyyjXJ3SJc=
 github.com/Azure/go-autorest/autorest/to v0.3.0/go.mod h1:MgwOyqaIuKdG4TL/2ywSsIWKAfJfgHDo8ObuUk3t5sA=
 github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod h1:fE8iZBn7LQR7zH/9XU2NcPR4o9jEImooCeWJcYV/zLE=
-github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod h1:fE8iZBn7LQR7zH/9XU2NcPR4o9jEImooCeWJcYV/zLE=
-github.com/Azure/go-autorest/autorest/to v0.4.0/go.mod h1:fE8iZBn7LQR7zH/9XU2NcPR4o9jEImooCeWJcYV/zLE=
 github.com/Azure/go-autorest/autorest/validation v0.1.0/go.mod h1:Ha3z/SqBeaalWQvokg3NZAlQTalVMtOIAs1aGK7G6u8=
 github.com/Azure/go-autorest/autorest/validation v0.2.0/go.mod h1:3EEqHnBxQGHXRYq3HT1WyXAvT7LLY3tl70hw6tQIbjI=
 github.com/Azure/go-autorest/autorest/validation v0.3.0/go.mod h1:yhLgjC0Wda5DYXl6JAsWyUe4KVNffhoDhG0zVzUMo3E=
@@ -166,15 +158,11 @@ github.com/Masterminds/squirrel v1.5.0/go.mod h1:NNaOrjSoIDfDA40n7sr2tPNZRfjzjA4
 github.com/Masterminds/vcs v1.13.1/go.mod h1:N09YCmOQr6RLxC6UNHzuVwAdodYbbnycGHSmwVJjcKA=
 github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
 github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw=
-github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw=
-github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw=
 github.com/Microsoft/go-winio v0.4.15-0.20200908182639-5b44b70ab3ab/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw=
 github.com/Microsoft/go-winio v0.4.15/go.mod h1:tTuCMEN+UleMWgg9dVx4Hu52b1bJo+59jBh3ajtinzw=
 github.com/Microsoft/go-winio v0.4.16-0.20201130162521-d1ffc52c7331/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0=
 github.com/Microsoft/go-winio v0.4.16/go.mod h1:XB6nPKklQyQ7GC9LdcBEcBl8PF76WugXOPRXwdLnMv0=
 github.com/Microsoft/hcsshim v0.8.7/go.mod h1:OHd7sQqRFrYd3RmSgbgji+ctCwkbq2wbEYNSzOYtcBQ=
-github.com/Microsoft/hcsshim v0.8.7/go.mod h1:OHd7sQqRFrYd3RmSgbgji+ctCwkbq2wbEYNSzOYtcBQ=
-github.com/Microsoft/hcsshim v0.8.7/go.mod h1:OHd7sQqRFrYd3RmSgbgji+ctCwkbq2wbEYNSzOYtcBQ=
 github.com/Microsoft/hcsshim v0.8.9/go.mod h1:5692vkUqntj1idxauYlpoINNKeqCiG6Sg38RRsjT5y8=
 github.com/Microsoft/hcsshim v0.8.10/go.mod h1:g5uw8EV2mAlzqe94tfNBNdr89fnbD/n3HV0OhsddkmM=
 github.com/Microsoft/hcsshim v0.8.14/go.mod h1:NtVKoYxQuTLx6gEq0L96c9Ju4JbRJ4nY2ow3VK6a9Lg=
@@ -197,7 +185,6 @@ github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:H
 github.com/Shopify/sarama v1.19.0/go.mod h1:FVkBWblsNy7DGZRfXLU0O9RCGt5g3g3yEuWXgklEdEo=
 github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMxUHB2q5Ap20/P/eIdh4G0pI=
 github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
-github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6/go.mod h1:3eOhrUMpNV+6aFIbp5/iudMxNCF27Vw2OZgy4xEx0Fg=
 github.com/VerbalExpressions/GoVerbalExpressions v0.0.0-20200410162751-4d76a1099a6e h1:iWGrfa7OY8FUMYFR1H3dx5hrtq6ujKUGiPJah5LsWCY=
 github.com/VerbalExpressions/GoVerbalExpressions v0.0.0-20200410162751-4d76a1099a6e/go.mod h1:ni/CLk58ZDHxp5OqyWSu43CSOehdLe5rIL5lm25EFG8=
 github.com/VividCortex/gohistogram v1.0.0/go.mod h1:Pf5mBqqDxYaXu3hDrrU+w6nw50o/4+TcAqDqk/vUH7g=
@@ -297,8 +284,9 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.6.0 h1:Y9r6mrzOyAYz4qKaluSH19zqH1236
 github.com/aws/aws-sdk-go-v2/service/sts v1.6.0/go.mod h1:q7o0j7d7HrJk/vr9uUt3BVRASvcU7gYZB9PUgPiByXg=
 github.com/aws/smithy-go v1.6.0 h1:T6puApfBcYiTIsaI+SYWqanjMt5pc3aoyyDrI+0YH54=
 github.com/aws/smithy-go v1.6.0/go.mod h1:SObp3lf9smib00L/v3U2eAKG8FyQ7iLrJnQiAmR5n+E=
-github.com/awslabs/goformation/v4 v4.19.1 h1:xqCDM4+gtkUNmxe1xP3LyH0X7EDMBR4HR1bqHUiMB7o=
-github.com/awslabs/goformation/v4 v4.19.1/go.mod h1:ygNqNsr904Q/Jan2A6ZKw9ewZWDTL9zlclZx2JzZhlM=
+github.com/awslabs/goformation/v4 v4.19.5/go.mod h1:JoNpnVCBOUtEz9bFxc9sjy8uBUCLF5c4D1L7RhRTVM8=
+github.com/awslabs/goformation/v5 v5.4.5 h1:uX3o2Z9BC5R0YUw+vPac/sj0mfMBcz8VBqurL85KHpg=
+github.com/awslabs/goformation/v5 v5.4.5/go.mod h1:zGVZfdzJB7z7Uxm0YhWvx77qnNT8b9kc78twJ/TOtdk=
 github.com/aybabtme/rgbterm v0.0.0-20170906152045-cc83f3b3ce59/go.mod h1:q/89r3U2H7sSsE2t6Kca0lfwTK8JdoNGS/yzM/4iH5I=
 github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc=
 github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
@@ -329,12 +317,8 @@ github.com/bugsnag/panicwrap v0.0.0-20151223152923-e2c28503fcd0/go.mod h1:D/8v3k
 github.com/caarlos0/ctrlc v1.0.0/go.mod h1:CdXpj4rmq0q/1Eb44M9zi2nKB0QraNKuRGYGrrHhcQw=
 github.com/campoy/unique v0.0.0-20180121183637-88950e537e7e/go.mod h1:9IOqJGCPMSc6E5ydlp5NIonxObaeu/Iub/X03EKPVYo=
 github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
-github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
-github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n9yuLkIJQ=
 github.com/cavaliercoder/go-cpio v0.0.0-20180626203310-925f9528c45e/go.mod h1:oDpT4efm8tSYHXV5tHSdRvBet/b/QzxZ+XyyPehvm3A=
 github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
-github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
-github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
 github.com/census-instrumentation/opencensus-proto v0.2.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
@@ -370,19 +354,13 @@ github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL
 github.com/containerd/continuity v0.0.0-20200710164510-efbc4488d8fe/go.mod h1:cECdGN1O8G9bgKTlLhuPJimka6Xb/Gg7vYzCTNVxhvo=
 github.com/containerd/continuity v0.0.0-20201208142359-180525291bb7/go.mod h1:kR3BEg7bDFaEddKm54WSmrol1fKWDU1nKYkgrcgZT7Y=
 github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI=
-github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI=
-github.com/containerd/fifo v0.0.0-20190226154929-a9fb20d87448/go.mod h1:ODA38xgv3Kuk8dQz2ZQXpnv/UZZUHUCL7pnLehbXgQI=
 github.com/containerd/fifo v0.0.0-20200410184934-f15a3290365b/go.mod h1:jPQ2IAeZRCYxpS/Cm1495vGFww6ecHmMk1YJH2Q5ln0=
 github.com/containerd/go-cni v1.0.1/go.mod h1:+vUpYxKvAF72G9i1WoDOiPGRtQpqsNW/ZHtSlv++smU=
 github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0=
-github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0=
-github.com/containerd/go-runc v0.0.0-20180907222934-5a6d9f37cfa3/go.mod h1:IV7qH3hrUgRmyYrtgEeGWJfWbgcHL9CSRruz2Vqcph0=
 github.com/containerd/go-runc v0.0.0-20200220073739-7016d3ce2328/go.mod h1:PpyHrqVs8FTi9vpyHwPwiNEGaACDxT/N/pLcvMSRA9g=
 github.com/containerd/go-runc v0.0.0-20201020171139-16b287bc67d0/go.mod h1:cNU0ZbCgCQVZK4lgG3P+9tn9/PaJNmoDXPpoJhDR+Ok=
 github.com/containerd/stargz-snapshotter v0.0.0-20201027054423-3a04e4c2c116/go.mod h1:o59b3PCKVAf9jjiKtCc/9hLAd+5p/rfhBfm6aBcTEr4=
 github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o=
-github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o=
-github.com/containerd/ttrpc v0.0.0-20190828154514-0e0f228740de/go.mod h1:PvCDdDGpgqzQIzDW1TphrGLssLDZp2GuS+X5DkEJB8o=
 github.com/containerd/ttrpc v1.0.1/go.mod h1:UAxOpgT9ziI0gJrmKvgcZivgxOp8iFPSk8httJEt98Y=
 github.com/containerd/typeurl v0.0.0-20180627222232-a93fcdb778cd/go.mod h1:Cm3kwCdlkCfMSHURc+r6fwoGH6/F1hH3S4sg0rLFWPc=
 github.com/containerd/typeurl v1.0.1 h1:PvuK4E3D5S5q6IqsPDCy928FhP0LUIGcmZ/Yhgp5Djw=
@@ -437,8 +415,6 @@ github.com/docker/distribution v0.0.0-20190905152932-14b96e55d84c/go.mod h1:0+TT
 github.com/docker/distribution v0.0.0-20191216044856-a8371794149d/go.mod h1:0+TTO4EOBfRPhZXAeF1Vu+W3hHZ8eLp8PgKVZlcvtFY=
 github.com/docker/distribution v2.6.0-rc.1.0.20180327202408-83389a148052+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
-github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
 github.com/docker/docker v0.0.0-20200511152416-a93e9eb0e95c/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker v1.4.2-0.20180531152204-71cd53e4a197/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
@@ -449,13 +425,8 @@ github.com/docker/docker v20.10.0-beta1.0.20201110211921-af34b94a78a1+incompatib
 github.com/docker/docker v20.10.0-beta1.0.20201110211921-af34b94a78a1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker-credential-helpers v0.6.3 h1:zI2p9+1NQYdnG6sMU26EX4aVGlqbInSQxQXLvzJ4RPQ=
 github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
-github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
-github.com/docker/docker-credential-helpers v0.6.3/go.mod h1:WRaJzqw3CTB9bk10avuGsjVBZsD05qeibJ1/TYlvc0Y=
-github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
 github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
 github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
-github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
-github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
 github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c/go.mod h1:Uw6UezgYA44ePAFQYUehOuCzmy5zmg/+nl2ZfMWGkpA=
 github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916/go.mod h1:/u0gXw0Gay3ceNrsHubL3BtdOL2fHf93USgMTe0W5dI=
 github.com/docker/go-units v0.3.3/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
@@ -497,8 +468,6 @@ github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL
 github.com/felixge/httpsnoop v1.0.1 h1:lvB5Jl89CsZtGIWuTcDM1E/vkVs49/Ml7JJe07l8SPQ=
 github.com/felixge/httpsnoop v1.0.1/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
-github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
-github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
 github.com/form3tech-oss/jwt-go v3.2.2+incompatible h1:TcekIExNqud5crz4xD2pavyTgWiPvpYe4Xau31I0PRk=
 github.com/form3tech-oss/jwt-go v3.2.2+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k=
 github.com/fortytw2/leaktest v1.2.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
@@ -591,6 +560,8 @@ github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/go-test/deep v1.0.1/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
 github.com/go-test/deep v1.0.3 h1:ZrJSEWsXzPOxaZnFteGEfooLba+ju3FYIbOrS+rQd68=
 github.com/go-test/deep v1.0.3/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
@@ -620,8 +591,6 @@ github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJA
 github.com/godbus/dbus v0.0.0-20190422162347-ade71ed3457e/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4=
 github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/godror/godror v0.13.3/go.mod h1:2ouUT4kdhUBk7TAkHWD4SN0CdI0pgEQbo8FVHhbSKWg=
-github.com/godror/godror v0.13.3/go.mod h1:2ouUT4kdhUBk7TAkHWD4SN0CdI0pgEQbo8FVHhbSKWg=
-github.com/godror/godror v0.13.3/go.mod h1:2ouUT4kdhUBk7TAkHWD4SN0CdI0pgEQbo8FVHhbSKWg=
 github.com/gofrs/flock v0.0.0-20190320160742-5135e617513b/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
 github.com/gofrs/flock v0.7.3/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
 github.com/gofrs/flock v0.8.0/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU=
@@ -671,8 +640,10 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
-github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod h1:k9Qvh+8juN+UKMCS/3jFtGICgW8O96FVaZsaxdzDkR4=
 github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a/go.mod h1:ryS0uhF+x9jgbj/N71xsEqODy9BN81/GonCZiOzirOk=
@@ -708,6 +679,7 @@ github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-containerregistry v0.0.0-20191010200024-a3d713f9b7f8/go.mod h1:KyKXa9ciM8+lgMXwOVsXi7UxGrsf9mM61Mzs+xKUrKE=
@@ -783,8 +755,6 @@ github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/ad
 github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE=
 github.com/gostaticanalysis/analysisutil v0.0.3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE=
 github.com/gosuri/uitable v0.0.4/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo=
-github.com/gosuri/uitable v0.0.4/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo=
-github.com/gosuri/uitable v0.0.4/go.mod h1:tKR86bXuXPZazfOTG1FIzvjIdXzd0mo4Vtn16vt0PJo=
 github.com/gotestyourself/gotestyourself v2.2.0+incompatible/go.mod h1:zZKM6oeNM8k+FRljX1mnzVYeS8wiGgQyvST1/GafPbY=
 github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
@@ -797,8 +767,6 @@ github.com/grpc-ecosystem/grpc-gateway v1.8.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t
 github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.9.2/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
-github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
-github.com/grpc-ecosystem/grpc-gateway v1.9.5/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645/go.mod h1:6iZfnjpejD4L/4DwD7NryNaJyCQdzwWwH2MWhCA90Kw=
 github.com/hanwen/go-fuse v1.0.0/go.mod h1:unqXarDXqzAk0rt98O2tVndEPIpUgLD9+rwFisZH3Ok=
 github.com/hanwen/go-fuse/v2 v2.0.3/go.mod h1:0EQM6aH2ctVpvZ6a+onrQ/vaykxh2GH7hy3e13vzTUY=
@@ -1017,19 +985,15 @@ github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaO
 github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ=
 github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
-github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE=
 github.com/mattn/go-colorable v0.1.6 h1:6Su7aK7lXmJ/U79bYtBjLNaha4Fs1Rg9plHpcH+vvnE=
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-ieproxy v0.0.0-20190610004146-91bb50d98149/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc=
 github.com/mattn/go-ieproxy v0.0.0-20190702010315-6dee0af9227d/go.mod h1:31jz6HNzdxOmlERGGEc4v/dMssOfmp2p5bT/okiKFFc=
 github.com/mattn/go-ieproxy v0.0.1/go.mod h1:pYabZ6IHcRpFh7vIaLfK7rdcWgFEb3SFJ6/gNWuh88E=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
-github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
-github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.4/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
-github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
 github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
 github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
@@ -1123,8 +1087,6 @@ github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
 github.com/nbutton23/zxcvbn-go v0.0.0-20180912185939-ae427f1e4c1d/go.mod h1:o96djdrsSGy3AWPyBgZMAGfxZNfgntdJG+11KU4QvbU=
 github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM=
-github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM=
-github.com/ncw/swift v1.0.47/go.mod h1:23YIA4yWVnGwv2dQlN4bB7egfYX6YLn0Yo/S6zZO/ZM=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/nu7hatch/gouuid v0.0.0-20131221200532-179d4d0c4d8d/go.mod h1:YUTz3bUH2ZwIWBy3CJBeOBEugqcmXREj14T+iG/4k4U=
@@ -1147,8 +1109,9 @@ github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+
 github.com/onsi/ginkgo v1.11.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.12.0/go.mod h1:oUhWkIvk5aDxtKvDDuw8gItl8pKl42LzjC9KZE0HfGg=
 github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
-github.com/onsi/ginkgo v1.15.1 h1:DsXNrKujDlkMS9Rsxmd+Fg7S6Kc5lhE+qX8tY6laOxc=
-github.com/onsi/ginkgo v1.15.1/go.mod h1:Dd6YFfwBW84ETqqtL0CPyPXillHgY6XhQH3uuCCTr/o=
+github.com/onsi/ginkgo v1.16.2/go.mod h1:CObGmKUOKaSC0RjmoAK7tKyn4Azo5P2IWuoMnvwxz1E=
+github.com/onsi/ginkgo v1.16.4 h1:29JGrr5oVBm5ulCWet69zQkzWipVXIol6ygQUe/EzNc=
+github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0=
 github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
 github.com/onsi/gomega v1.5.0/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
@@ -1157,8 +1120,8 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
 github.com/onsi/gomega v1.8.1/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
 github.com/onsi/gomega v1.9.0/go.mod h1:Ho0h+IUsWyvy1OpqCwxlQ/21gkhVunqlU8fDGcoTdcA=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
-github.com/onsi/gomega v1.11.0 h1:+CqWgvj0OZycCaqclBD1pxKHAU+tOkHmQIWvDHq2aug=
-github.com/onsi/gomega v1.11.0/go.mod h1:azGKhqFUon9Vuj0YmTfLSmx0FUwqXYSTl5re8lQLTUg=
+github.com/onsi/gomega v1.12.0 h1:p4oGGk2M2UJc0wWN4lHFvIB71lxsh0T/UiKCCgFADY8=
+github.com/onsi/gomega v1.12.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY=
 github.com/op/go-logging v0.0.0-20160315200505-970db520ece7/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
 github.com/open-policy-agent/opa v0.22.0 h1:KZvn0uMQIorBIwYk8Vc89dp8No9FIEF8eFl0sc1r/1U=
 github.com/open-policy-agent/opa v0.22.0/go.mod h1:rrwxoT/b011T0cyj+gg2VvxqTtn6N3gp/jzmr3fjW44=
@@ -1173,21 +1136,12 @@ github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59P
 github.com/opencontainers/runc v1.0.0-rc10/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U=
 github.com/opencontainers/runc v1.0.0-rc92/go.mod h1:X1zlU4p7wOlX4+WRCz+hvlRv8phdL7UqbYD+vQwNMmE=
 github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
-github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
-github.com/opencontainers/runtime-spec v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
 github.com/opencontainers/runtime-spec v1.0.1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
 github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
 github.com/opencontainers/runtime-spec v1.0.3-0.20200728170252-4d89ac9fbff6/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
 github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs=
-github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs=
-github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs=
-github.com/opencontainers/runtime-tools v0.0.0-20181011054405-1d69bd0f9c39/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs=
-github.com/opencontainers/selinux v1.6.0/go.mod h1:VVGKuOLlE7v4PJyT6h7mNWvq1rzqiriPsEqVhc+svHE=
 github.com/opencontainers/selinux v1.6.0/go.mod h1:VVGKuOLlE7v4PJyT6h7mNWvq1rzqiriPsEqVhc+svHE=
 github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo=
-github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo=
-github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis=
-github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis=
 github.com/opentracing-contrib/go-observer v0.0.0-20170622124052-a52f23424492/go.mod h1:Ngi6UdF0k5OKD5t5wlmGhe/EDKPoUM3BXZSSfIuJbis=
 github.com/opentracing-contrib/go-stdlib v1.0.0/go.mod h1:qtI1ogk+2JhVPIXVc6q+NHziSmy2W5GbdQZFUHADCBU=
 github.com/opentracing/basictracer-go v1.0.0/go.mod h1:QfBfYuafItcjQuMwinw9GhYKwFXS9KnPs5lxoYwgW74=
@@ -1200,8 +1154,6 @@ github.com/openzipkin/zipkin-go v0.1.3/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTm
 github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
 github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
 github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
-github.com/owenrumney/go-sarif v1.0.4 h1:0LFC5eHP6amc/9ajM1jDiE52UfXFcl/oozay+X3KgV4=
-github.com/owenrumney/go-sarif v1.0.4/go.mod h1:DXUGbHwQcCMvqcvZbxh8l/7diHsJVztOKZgmPt88RNI=
 github.com/owenrumney/go-sarif v1.0.12 h1:8cgnqe7MbXGDJYEiMc0jeFi7opwgWM8GWBPAAnn2Ut8=
 github.com/owenrumney/go-sarif v1.0.12/go.mod h1:Jk5smXU9QuCqTdh4N3PehnG+azzrf0XcQ267ZwAG8Ho=
 github.com/packer-community/winrmcp v0.0.0-20180921211025-c76d91c1e7db/go.mod h1:f6Izs6JvFTdnRbziASagjZ2vmf55NSIkC/weStxCHqk=
@@ -1289,8 +1241,6 @@ github.com/rogpeppe/go-internal v1.4.0/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTE
 github.com/rogpeppe/go-internal v1.5.2/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ=
 github.com/rubenv/sql-migrate v0.0.0-20200616145509-8d140a17f351/go.mod h1:DCgfY80j8GYL7MLEfvcpSFvjD0L5yZq/aZUJmhZklyg=
-github.com/rubenv/sql-migrate v0.0.0-20200616145509-8d140a17f351/go.mod h1:DCgfY80j8GYL7MLEfvcpSFvjD0L5yZq/aZUJmhZklyg=
-github.com/rubenv/sql-migrate v0.0.0-20200616145509-8d140a17f351/go.mod h1:DCgfY80j8GYL7MLEfvcpSFvjD0L5yZq/aZUJmhZklyg=
 github.com/rubiojr/go-vhd v0.0.0-20160810183302-0bfd3b39853c/go.mod h1:DM5xW0nvfNNm2uytzsvhI3OnX8uzaRAg8UX/CnDqbto=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
@@ -1437,8 +1387,6 @@ github.com/valyala/quicktemplate v1.2.0/go.mod h1:EH+4AkTd43SvgIbQHYu59/cJyxDoOV
 github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio=
 github.com/vdemeester/k8s-pkg-credentialprovider v1.17.4/go.mod h1:inCTmtUdr5KJbreVojo06krnTgaeAz/Z7lynpPk/Q2c=
 github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw=
-github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw=
-github.com/vektah/gqlparser v1.1.2/go.mod h1:1ycwN7Ij5njmMkPPAOaRFY4rET2Enx7IkVv3vaXspKw=
 github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE=
 github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU=
 github.com/vmihailenco/msgpack v3.3.3+incompatible/go.mod h1:fy3FlTQTDXWkZ7Bh6AcGMlsjHatGryHQYUTf1ShIgkk=
@@ -1481,8 +1429,6 @@ github.com/zclconf/go-cty v1.0.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLE
 github.com/zclconf/go-cty v1.1.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s=
 github.com/zclconf/go-cty v1.2.0/go.mod h1:hOPWgoHbaTUnI5k4D2ld+GRpFJSCe6bCM7m1q/N4PQ8=
 github.com/zclconf/go-cty v1.8.0/go.mod h1:vVKLxnk3puL4qRAv72AO+W99LUD4da90g3uUAzyuvAk=
-github.com/zclconf/go-cty v1.8.2/go.mod h1:vVKLxnk3puL4qRAv72AO+W99LUD4da90g3uUAzyuvAk=
-github.com/zclconf/go-cty v1.8.3 h1:48gwZXrdSADU2UW9eZKHprxAI7APZGW9XmExpJpSjT0=
 github.com/zclconf/go-cty v1.8.3/go.mod h1:vVKLxnk3puL4qRAv72AO+W99LUD4da90g3uUAzyuvAk=
 github.com/zclconf/go-cty v1.9.1 h1:viqrgQwFl5UpSxc046qblj78wZXVDFnSOufaOTER+cc=
 github.com/zclconf/go-cty v1.9.1/go.mod h1:vVKLxnk3puL4qRAv72AO+W99LUD4da90g3uUAzyuvAk=
@@ -1657,9 +1603,9 @@ golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81R
 golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210224082022-3d97a244fca7/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
 golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f h1:OfiFi4JbukWwe3lzw+xunroH1mnC1e2Gy5cxNJApiSY=
 golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/oauth2 v0.0.0-20180724155351-3d292e4d0cdc/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -2010,8 +1956,10 @@ google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
-google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -2117,8 +2065,6 @@ k8s.io/kube-openapi v0.0.0-20191107075043-30be4d16710a/go.mod h1:1TqjTSzOxsLGIKf
 k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o=
 k8s.io/kube-openapi v0.0.0-20210305001622-591a79e4bda7/go.mod h1:wXW5VT87nVfh/iLV8FpR2uDvrFyomxbtb1KivDbvPTE=
 k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e h1:KLHHjkdQFomZy8+06csTWZ0m1343QqxZhR2LJ1OxCYM=
-k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e h1:KLHHjkdQFomZy8+06csTWZ0m1343QqxZhR2LJ1OxCYM=
-k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
 k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
 k8s.io/kubectl v0.21.0/go.mod h1:EU37NukZRXn1TpAkMUoy8Z/B2u6wjHDS4aInsDzVvks=
 k8s.io/kubernetes v1.11.10/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk=
@@ -2177,8 +2123,6 @@ rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
 sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.0.15/go.mod h1:LEScyzhFmoF5pso/YSeBstl57mOzx9xlU9n85RGrDQg=
 sigs.k8s.io/kustomize/api v0.8.5/go.mod h1:M377apnKT5ZHJS++6H4rQoCHmWtt6qTpp3mbe7p6OLY=
 sigs.k8s.io/kustomize/api v0.8.11 h1:LzQzlq6Z023b+mBtc6v72N2mSHYmN8x7ssgbf/hv0H8=
-sigs.k8s.io/kustomize/api v0.8.11 h1:LzQzlq6Z023b+mBtc6v72N2mSHYmN8x7ssgbf/hv0H8=
-sigs.k8s.io/kustomize/api v0.8.11/go.mod h1:a77Ls36JdfCWojpUqR6m60pdGY1AYFix4AH83nJtY1g=
 sigs.k8s.io/kustomize/api v0.8.11/go.mod h1:a77Ls36JdfCWojpUqR6m60pdGY1AYFix4AH83nJtY1g=
 sigs.k8s.io/kustomize/cmd/config v0.9.7/go.mod h1:MvXCpHs77cfyxRmCNUQjIqCmZyYsbn5PyQpWiq44nW0=
 sigs.k8s.io/kustomize/kustomize/v4 v4.0.5/go.mod h1:C7rYla7sI8EnxHE/xEhRBSHMNfcL91fx0uKmUlUhrBk=
@@ -2190,8 +2134,6 @@ sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06 h1:zD2Iem
 sigs.k8s.io/structured-merge-diff v1.0.1-0.20191108220359-b1b620dd3f06/go.mod h1:/ULNhyfzRopfcjskuui0cTITekDduZ7ycKN3oUT9R18=
 sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
 sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
-sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
-sigs.k8s.io/structured-merge-diff/v4 v4.0.2/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
 sigs.k8s.io/structured-merge-diff/v4 v4.1.0 h1:C4r9BgJ98vrKnnVCjwCSXcWjWe0NKcUQkmzDXZXGwH8=
 sigs.k8s.io/structured-merge-diff/v4 v4.1.0/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK1F7G282QMXDPYydCw=
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
diff --git a/pkg/iac-providers/cft/v1/load-file.go b/pkg/iac-providers/cft/v1/load-file.go
index 35283765d..0c15039b6 100644
--- a/pkg/iac-providers/cft/v1/load-file.go
+++ b/pkg/iac-providers/cft/v1/load-file.go
@@ -27,8 +27,8 @@ import (
 	"github.com/accurics/terrascan/pkg/mapper"
 	cftRes "github.com/accurics/terrascan/pkg/mapper/iac-providers/cft/config"
 	"github.com/accurics/terrascan/pkg/mapper/iac-providers/cft/store"
-	"github.com/awslabs/goformation/v4"
-	"github.com/awslabs/goformation/v4/cloudformation"
+	"github.com/awslabs/goformation/v5"
+	"github.com/awslabs/goformation/v5/cloudformation"
 	"go.uber.org/zap"
 )
 
diff --git a/pkg/iac-providers/cft/v1/sanitize-cft-template.go b/pkg/iac-providers/cft/v1/sanitize-cft-template.go
index b2a0a3a81..be72f3868 100644
--- a/pkg/iac-providers/cft/v1/sanitize-cft-template.go
+++ b/pkg/iac-providers/cft/v1/sanitize-cft-template.go
@@ -23,9 +23,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/awslabs/goformation/v4/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/policies"
-	"github.com/awslabs/goformation/v4/intrinsics"
+	"github.com/awslabs/goformation/v5/cloudformation"
+	"github.com/awslabs/goformation/v5/cloudformation/policies"
+	"github.com/awslabs/goformation/v5/intrinsics"
 	"go.uber.org/zap"
 )
 
diff --git a/pkg/iac-providers/cft/v1/sanitize-cft-template_test.go b/pkg/iac-providers/cft/v1/sanitize-cft-template_test.go
index 366ee9681..b1a7508f8 100644
--- a/pkg/iac-providers/cft/v1/sanitize-cft-template_test.go
+++ b/pkg/iac-providers/cft/v1/sanitize-cft-template_test.go
@@ -23,7 +23,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/awslabs/goformation/v4"
+	"github.com/awslabs/goformation/v5"
 )
 
 func TestCFTV1_sanitizeCftTemplate(t *testing.T) {
diff --git a/pkg/mapper/iac-providers/cft/cft.go b/pkg/mapper/iac-providers/cft/cft.go
index 6b5fb6143..8f099aeaf 100644
--- a/pkg/mapper/iac-providers/cft/cft.go
+++ b/pkg/mapper/iac-providers/cft/cft.go
@@ -19,59 +19,60 @@ package cft
 import (
 	"errors"
 
-	"github.com/awslabs/goformation/v4/cloudformation/autoscaling"
-	"github.com/awslabs/goformation/v4/cloudformation/certificatemanager"
-	"github.com/awslabs/goformation/v4/cloudformation/cloudfront"
-	"github.com/awslabs/goformation/v4/cloudformation/cloudtrail"
-	"github.com/awslabs/goformation/v4/cloudformation/codebuild"
-	"github.com/awslabs/goformation/v4/cloudformation/cognito"
-	"github.com/awslabs/goformation/v4/cloudformation/dms"
-	"github.com/awslabs/goformation/v4/cloudformation/emr"
-	"github.com/awslabs/goformation/v4/cloudformation/lambda"
-	"github.com/awslabs/goformation/v4/cloudformation/msk"
-	"github.com/awslabs/goformation/v4/cloudformation/sagemaker"
-	"github.com/awslabs/goformation/v4/cloudformation/sns"
-	"github.com/awslabs/goformation/v4/cloudformation/sqs"
+	"github.com/awslabs/goformation/v5/cloudformation/autoscaling"
+	"github.com/awslabs/goformation/v5/cloudformation/certificatemanager"
+	"github.com/awslabs/goformation/v5/cloudformation/cloudfront"
+	"github.com/awslabs/goformation/v5/cloudformation/cloudtrail"
+	"github.com/awslabs/goformation/v5/cloudformation/codebuild"
+	"github.com/awslabs/goformation/v5/cloudformation/cognito"
+	"github.com/awslabs/goformation/v5/cloudformation/dms"
+	"github.com/awslabs/goformation/v5/cloudformation/eks"
+	"github.com/awslabs/goformation/v5/cloudformation/emr"
+	"github.com/awslabs/goformation/v5/cloudformation/lambda"
+	"github.com/awslabs/goformation/v5/cloudformation/msk"
+	"github.com/awslabs/goformation/v5/cloudformation/sagemaker"
+	"github.com/awslabs/goformation/v5/cloudformation/sns"
+	"github.com/awslabs/goformation/v5/cloudformation/sqs"
 
-	cf "github.com/awslabs/goformation/v4/cloudformation/cloudformation"
-	cnf "github.com/awslabs/goformation/v4/cloudformation/config"
-	"github.com/awslabs/goformation/v4/cloudformation/ecr"
-	"github.com/awslabs/goformation/v4/cloudformation/neptune"
-	"github.com/awslabs/goformation/v4/cloudformation/secretsmanager"
-	"github.com/awslabs/goformation/v4/cloudformation/workspaces"
+	cf "github.com/awslabs/goformation/v5/cloudformation/cloudformation"
+	cnf "github.com/awslabs/goformation/v5/cloudformation/config"
+	"github.com/awslabs/goformation/v5/cloudformation/ecr"
+	"github.com/awslabs/goformation/v5/cloudformation/neptune"
+	"github.com/awslabs/goformation/v5/cloudformation/secretsmanager"
+	"github.com/awslabs/goformation/v5/cloudformation/workspaces"
 
-	"github.com/awslabs/goformation/v4/cloudformation/ec2"
-	"github.com/awslabs/goformation/v4/cloudformation/efs"
-	"github.com/awslabs/goformation/v4/cloudformation/elasticache"
+	"github.com/awslabs/goformation/v5/cloudformation/ec2"
+	"github.com/awslabs/goformation/v5/cloudformation/efs"
+	"github.com/awslabs/goformation/v5/cloudformation/elasticache"
 
-	"github.com/awslabs/goformation/v4/cloudformation/dax"
-	"github.com/awslabs/goformation/v4/cloudformation/dynamodb"
-	"github.com/awslabs/goformation/v4/cloudformation/rds"
+	"github.com/awslabs/goformation/v5/cloudformation/dax"
+	"github.com/awslabs/goformation/v5/cloudformation/dynamodb"
+	"github.com/awslabs/goformation/v5/cloudformation/rds"
 
-	"github.com/awslabs/goformation/v4/cloudformation/ecs"
-	"github.com/awslabs/goformation/v4/cloudformation/logs"
+	"github.com/awslabs/goformation/v5/cloudformation/ecs"
+	"github.com/awslabs/goformation/v5/cloudformation/logs"
 
 	"github.com/accurics/terrascan/pkg/iac-providers/output"
 	"github.com/accurics/terrascan/pkg/mapper/core"
 	"github.com/accurics/terrascan/pkg/mapper/iac-providers/cft/config"
 	"github.com/accurics/terrascan/pkg/mapper/iac-providers/cft/store"
 	"github.com/accurics/terrascan/pkg/utils"
-	"github.com/awslabs/goformation/v4/cloudformation"
-	"github.com/awslabs/goformation/v4/cloudformation/amazonmq"
-	"github.com/awslabs/goformation/v4/cloudformation/apigateway"
-	"github.com/awslabs/goformation/v4/cloudformation/apigatewayv2"
-	"github.com/awslabs/goformation/v4/cloudformation/docdb"
-	"github.com/awslabs/goformation/v4/cloudformation/elasticloadbalancing"
-	"github.com/awslabs/goformation/v4/cloudformation/elasticloadbalancingv2"
-	"github.com/awslabs/goformation/v4/cloudformation/elasticsearch"
-	"github.com/awslabs/goformation/v4/cloudformation/guardduty"
-	"github.com/awslabs/goformation/v4/cloudformation/iam"
-	"github.com/awslabs/goformation/v4/cloudformation/kinesis"
-	"github.com/awslabs/goformation/v4/cloudformation/kinesisfirehose"
-	"github.com/awslabs/goformation/v4/cloudformation/kms"
-	"github.com/awslabs/goformation/v4/cloudformation/redshift"
-	"github.com/awslabs/goformation/v4/cloudformation/route53"
-	"github.com/awslabs/goformation/v4/cloudformation/s3"
+	"github.com/awslabs/goformation/v5/cloudformation"
+	"github.com/awslabs/goformation/v5/cloudformation/amazonmq"
+	"github.com/awslabs/goformation/v5/cloudformation/apigateway"
+	"github.com/awslabs/goformation/v5/cloudformation/apigatewayv2"
+	"github.com/awslabs/goformation/v5/cloudformation/docdb"
+	"github.com/awslabs/goformation/v5/cloudformation/elasticloadbalancing"
+	"github.com/awslabs/goformation/v5/cloudformation/elasticloadbalancingv2"
+	"github.com/awslabs/goformation/v5/cloudformation/elasticsearch"
+	"github.com/awslabs/goformation/v5/cloudformation/guardduty"
+	"github.com/awslabs/goformation/v5/cloudformation/iam"
+	"github.com/awslabs/goformation/v5/cloudformation/kinesis"
+	"github.com/awslabs/goformation/v5/cloudformation/kinesisfirehose"
+	"github.com/awslabs/goformation/v5/cloudformation/kms"
+	"github.com/awslabs/goformation/v5/cloudformation/redshift"
+	"github.com/awslabs/goformation/v5/cloudformation/route53"
+	"github.com/awslabs/goformation/v5/cloudformation/s3"
 )
 
 const errUnsupportedDoc = "unsupported document type"
@@ -169,6 +170,8 @@ func (m cftMapper) mapConfigForResource(r cloudformation.Resource, resourceName
 		return config.GetSecurityGroupConfig(resource)
 	case *ec2.Volume:
 		return config.GetEbsVolumeConfig(resource)
+	case *ec2.VPC:
+		return config.GetEc2VpcConfig(resource)
 	case *efs.FileSystem:
 		return config.GetEfsFileSystemConfig(resource)
 	case *elasticache.CacheCluster:
@@ -253,6 +256,8 @@ func (m cftMapper) mapConfigForResource(r cloudformation.Resource, resourceName
 		return config.GetEmrClusterConfig(resource)
 	case *msk.Cluster:
 		return config.GetMskClusterConfig(resource)
+	case *eks.Cluster:
+		return config.GetEksClusterConfig(resource)
 	default:
 	}
 	return []config.AWSResourceConfig{}
diff --git a/pkg/mapper/iac-providers/cft/config/api-gateway-rest-api.go b/pkg/mapper/iac-providers/cft/config/api-gateway-rest-api.go
index d11a67e77..b8e94b917 100644
--- a/pkg/mapper/iac-providers/cft/config/api-gateway-rest-api.go
+++ b/pkg/mapper/iac-providers/cft/config/api-gateway-rest-api.go
@@ -17,7 +17,7 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/apigateway"
+	"github.com/awslabs/goformation/v5/cloudformation/apigateway"
 )
 
 // APIGatewayRestAPIConfig holds config for aws_api_gateway_rest_api
diff --git a/pkg/mapper/iac-providers/cft/config/api-gateway-stage.go b/pkg/mapper/iac-providers/cft/config/api-gateway-stage.go
index 456ee8b46..cdf412584 100644
--- a/pkg/mapper/iac-providers/cft/config/api-gateway-stage.go
+++ b/pkg/mapper/iac-providers/cft/config/api-gateway-stage.go
@@ -19,7 +19,7 @@ package config
 import (
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/apigateway"
+	"github.com/awslabs/goformation/v5/cloudformation/apigateway"
 )
 
 const (
diff --git a/pkg/mapper/iac-providers/cft/config/api-gatewayv2-stage.go b/pkg/mapper/iac-providers/cft/config/api-gatewayv2-stage.go
index 4e69a42fa..008c6321f 100644
--- a/pkg/mapper/iac-providers/cft/config/api-gatewayv2-stage.go
+++ b/pkg/mapper/iac-providers/cft/config/api-gatewayv2-stage.go
@@ -17,7 +17,7 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/apigatewayv2"
+	"github.com/awslabs/goformation/v5/cloudformation/apigatewayv2"
 )
 
 // APIGatewayV2StageConfig holds config for aws_api_gatewayv2_stage
diff --git a/pkg/mapper/iac-providers/cft/config/autoscaling-launch-configuration.go b/pkg/mapper/iac-providers/cft/config/autoscaling-launch-configuration.go
index 502a8af78..a25ce0064 100644
--- a/pkg/mapper/iac-providers/cft/config/autoscaling-launch-configuration.go
+++ b/pkg/mapper/iac-providers/cft/config/autoscaling-launch-configuration.go
@@ -20,7 +20,7 @@ import (
 	"encoding/base64"
 	"unicode"
 
-	"github.com/awslabs/goformation/v4/cloudformation/autoscaling"
+	"github.com/awslabs/goformation/v5/cloudformation/autoscaling"
 )
 
 // EbsBlockDeviceBlock holds config for EbsBlockDevice
diff --git a/pkg/mapper/iac-providers/cft/config/certificatemanager-certificate.go b/pkg/mapper/iac-providers/cft/config/certificatemanager-certificate.go
index 6d0283326..c609c05d4 100644
--- a/pkg/mapper/iac-providers/cft/config/certificatemanager-certificate.go
+++ b/pkg/mapper/iac-providers/cft/config/certificatemanager-certificate.go
@@ -16,7 +16,7 @@
 
 package config
 
-import "github.com/awslabs/goformation/v4/cloudformation/certificatemanager"
+import "github.com/awslabs/goformation/v5/cloudformation/certificatemanager"
 
 // CertificateManagerCertificateConfig holds config for CertificateManagerCertificate
 type CertificateManagerCertificateConfig struct {
diff --git a/pkg/mapper/iac-providers/cft/config/cloudformation-stack.go b/pkg/mapper/iac-providers/cft/config/cloudformation-stack.go
index 9ef941b85..28e6d4c0c 100644
--- a/pkg/mapper/iac-providers/cft/config/cloudformation-stack.go
+++ b/pkg/mapper/iac-providers/cft/config/cloudformation-stack.go
@@ -18,7 +18,7 @@ package config
 
 import (
 	fn "github.com/accurics/terrascan/pkg/mapper/iac-providers/cft/functions"
-	"github.com/awslabs/goformation/v4/cloudformation/cloudformation"
+	"github.com/awslabs/goformation/v5/cloudformation/cloudformation"
 )
 
 // CloudFormationStackConfig holds config for aws_cloudformation_stack
diff --git a/pkg/mapper/iac-providers/cft/config/cloudfront-distribution.go b/pkg/mapper/iac-providers/cft/config/cloudfront-distribution.go
index 92e9ea2ea..ce24eb322 100644
--- a/pkg/mapper/iac-providers/cft/config/cloudfront-distribution.go
+++ b/pkg/mapper/iac-providers/cft/config/cloudfront-distribution.go
@@ -17,7 +17,7 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/cloudfront"
+	"github.com/awslabs/goformation/v5/cloudformation/cloudfront"
 )
 
 // CloudFrontDistributionConfig holds config for aws_cloudfront_distribution
diff --git a/pkg/mapper/iac-providers/cft/config/cloudtrail.go b/pkg/mapper/iac-providers/cft/config/cloudtrail.go
index f3905aca3..f0b90ed14 100644
--- a/pkg/mapper/iac-providers/cft/config/cloudtrail.go
+++ b/pkg/mapper/iac-providers/cft/config/cloudtrail.go
@@ -17,7 +17,7 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/cloudtrail"
+	"github.com/awslabs/goformation/v5/cloudformation/cloudtrail"
 )
 
 // CloudTrailConfig holds config for aws_cloudtrail
diff --git a/pkg/mapper/iac-providers/cft/config/cloudwatch-log-group.go b/pkg/mapper/iac-providers/cft/config/cloudwatch-log-group.go
index 6c80d2053..86878d623 100644
--- a/pkg/mapper/iac-providers/cft/config/cloudwatch-log-group.go
+++ b/pkg/mapper/iac-providers/cft/config/cloudwatch-log-group.go
@@ -17,7 +17,7 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/logs"
+	"github.com/awslabs/goformation/v5/cloudformation/logs"
 )
 
 // LogCloudWatchGroupConfig holds config for aws_cloudwatch_log_group
diff --git a/pkg/mapper/iac-providers/cft/config/codebuild-project.go b/pkg/mapper/iac-providers/cft/config/codebuild-project.go
index 3708262a7..a47dc9f81 100644
--- a/pkg/mapper/iac-providers/cft/config/codebuild-project.go
+++ b/pkg/mapper/iac-providers/cft/config/codebuild-project.go
@@ -16,7 +16,7 @@
 
 package config
 
-import "github.com/awslabs/goformation/v4/cloudformation/codebuild"
+import "github.com/awslabs/goformation/v5/cloudformation/codebuild"
 
 // ArtifactBlock holds config for ArtifactBlock
 type ArtifactBlock struct {
diff --git a/pkg/mapper/iac-providers/cft/config/cognito-user-pool.go b/pkg/mapper/iac-providers/cft/config/cognito-user-pool.go
index 6745d2aa9..2dbd770be 100644
--- a/pkg/mapper/iac-providers/cft/config/cognito-user-pool.go
+++ b/pkg/mapper/iac-providers/cft/config/cognito-user-pool.go
@@ -16,7 +16,7 @@
 
 package config
 
-import "github.com/awslabs/goformation/v4/cloudformation/cognito"
+import "github.com/awslabs/goformation/v5/cloudformation/cognito"
 
 // PasswordPolicyBlock holds config for PasswordPolicy
 type PasswordPolicyBlock struct {
diff --git a/pkg/mapper/iac-providers/cft/config/config-configrule.go b/pkg/mapper/iac-providers/cft/config/config-configrule.go
index 2ff820b15..3ad176c3f 100644
--- a/pkg/mapper/iac-providers/cft/config/config-configrule.go
+++ b/pkg/mapper/iac-providers/cft/config/config-configrule.go
@@ -17,7 +17,7 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/config"
+	"github.com/awslabs/goformation/v5/cloudformation/config"
 )
 
 // AWSConfigConfigRuleConfig holds config for aws_config_config_rule
diff --git a/pkg/mapper/iac-providers/cft/config/config-configurationaggregator.go b/pkg/mapper/iac-providers/cft/config/config-configurationaggregator.go
index e9bbc59ed..bd25c44ba 100644
--- a/pkg/mapper/iac-providers/cft/config/config-configurationaggregator.go
+++ b/pkg/mapper/iac-providers/cft/config/config-configurationaggregator.go
@@ -17,7 +17,7 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/config"
+	"github.com/awslabs/goformation/v5/cloudformation/config"
 )
 
 // ConfigurationAggregatorConfig holds config for aws_config_configuration_aggregator
diff --git a/pkg/mapper/iac-providers/cft/config/dax-cluster.go b/pkg/mapper/iac-providers/cft/config/dax-cluster.go
index a61b4cf29..aaf2e32f0 100644
--- a/pkg/mapper/iac-providers/cft/config/dax-cluster.go
+++ b/pkg/mapper/iac-providers/cft/config/dax-cluster.go
@@ -17,7 +17,7 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/dax"
+	"github.com/awslabs/goformation/v5/cloudformation/dax"
 )
 
 // DaxClusterConfig holds config for aws_dax_cluster
diff --git a/pkg/mapper/iac-providers/cft/config/db-instance.go b/pkg/mapper/iac-providers/cft/config/db-instance.go
index 083d9b481..03ac67a10 100644
--- a/pkg/mapper/iac-providers/cft/config/db-instance.go
+++ b/pkg/mapper/iac-providers/cft/config/db-instance.go
@@ -17,7 +17,7 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/rds"
+	"github.com/awslabs/goformation/v5/cloudformation/rds"
 )
 
 // DBInstanceConfig holds config for aws_db_instance
diff --git a/pkg/mapper/iac-providers/cft/config/db-security-group.go b/pkg/mapper/iac-providers/cft/config/db-security-group.go
index 4b4d4a658..9ff351269 100644
--- a/pkg/mapper/iac-providers/cft/config/db-security-group.go
+++ b/pkg/mapper/iac-providers/cft/config/db-security-group.go
@@ -17,7 +17,7 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/rds"
+	"github.com/awslabs/goformation/v5/cloudformation/rds"
 )
 
 // DBSecurityGroupConfig holds config for aws_db_security_group
diff --git a/pkg/mapper/iac-providers/cft/config/dms-replication-instance.go b/pkg/mapper/iac-providers/cft/config/dms-replication-instance.go
index 79601a21e..f25cc4ceb 100644
--- a/pkg/mapper/iac-providers/cft/config/dms-replication-instance.go
+++ b/pkg/mapper/iac-providers/cft/config/dms-replication-instance.go
@@ -16,7 +16,7 @@
 
 package config
 
-import "github.com/awslabs/goformation/v4/cloudformation/dms"
+import "github.com/awslabs/goformation/v5/cloudformation/dms"
 
 // DmsReplicationInstanceConfig holds config for DmsReplicationInstance
 type DmsReplicationInstanceConfig struct {
diff --git a/pkg/mapper/iac-providers/cft/config/docdb-cluster.go b/pkg/mapper/iac-providers/cft/config/docdb-cluster.go
index 0bdb19b8d..b54e45ade 100644
--- a/pkg/mapper/iac-providers/cft/config/docdb-cluster.go
+++ b/pkg/mapper/iac-providers/cft/config/docdb-cluster.go
@@ -17,7 +17,7 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/docdb"
+	"github.com/awslabs/goformation/v5/cloudformation/docdb"
 )
 
 // DocDBClusterConfig holds config for aws_docdb_cluster
diff --git a/pkg/mapper/iac-providers/cft/config/dynamodb-table.go b/pkg/mapper/iac-providers/cft/config/dynamodb-table.go
index 623911ebb..9f8afd524 100644
--- a/pkg/mapper/iac-providers/cft/config/dynamodb-table.go
+++ b/pkg/mapper/iac-providers/cft/config/dynamodb-table.go
@@ -17,7 +17,7 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/dynamodb"
+	"github.com/awslabs/goformation/v5/cloudformation/dynamodb"
 )
 
 // DynamoDBTableConfig holds config for aws_dynamodb_table
diff --git a/pkg/mapper/iac-providers/cft/config/ebs-volume.go b/pkg/mapper/iac-providers/cft/config/ebs-volume.go
index 5db08c190..aa3ac0784 100644
--- a/pkg/mapper/iac-providers/cft/config/ebs-volume.go
+++ b/pkg/mapper/iac-providers/cft/config/ebs-volume.go
@@ -17,7 +17,7 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/ec2"
+	"github.com/awslabs/goformation/v5/cloudformation/ec2"
 )
 
 // EbsVolumeConfig holds config for aws_ebs_volume
diff --git a/pkg/mapper/iac-providers/cft/config/ec2-instance.go b/pkg/mapper/iac-providers/cft/config/ec2-instance.go
index 6fe23f6e3..b8dedaeb9 100644
--- a/pkg/mapper/iac-providers/cft/config/ec2-instance.go
+++ b/pkg/mapper/iac-providers/cft/config/ec2-instance.go
@@ -21,7 +21,7 @@ import (
 	"strconv"
 
 	"github.com/accurics/terrascan/pkg/mapper/iac-providers/cft/store"
-	"github.com/awslabs/goformation/v4/cloudformation/ec2"
+	"github.com/awslabs/goformation/v5/cloudformation/ec2"
 )
 
 // GetNetworkInterface represents subresource aws_network_interface for NetworkInterface attribute
diff --git a/pkg/mapper/iac-providers/cft/config/ec2-vpc.go b/pkg/mapper/iac-providers/cft/config/ec2-vpc.go
new file mode 100644
index 000000000..699774910
--- /dev/null
+++ b/pkg/mapper/iac-providers/cft/config/ec2-vpc.go
@@ -0,0 +1,46 @@
+/*
+    Copyright (C) 2022 Accurics, Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+		http://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+package config
+
+import "github.com/awslabs/goformation/v5/cloudformation/ec2"
+
+// Ec2VpcConfig holds config for Ec2Vpc
+type Ec2VpcConfig struct {
+	Config
+	CIDRBlock          string `json:"cidr_block"`
+	EnableDNSSupport   bool   `json:"enable_dns_support"`
+	EnableDNSHostnames bool   `json:"enable_dns_hostnames"`
+	InstanceTenancy    string `json:"instance_tenancy"`
+}
+
+// GetEc2VpcConfig returns config for Ec2Vpc
+func GetEc2VpcConfig(v *ec2.VPC) []AWSResourceConfig {
+	cf := Ec2VpcConfig{
+		Config: Config{
+			Tags: v.Tags,
+		},
+		CIDRBlock:          v.CidrBlock,
+		EnableDNSSupport:   v.EnableDnsSupport,
+		EnableDNSHostnames: v.EnableDnsHostnames,
+		InstanceTenancy:    v.InstanceTenancy,
+	}
+
+	return []AWSResourceConfig{{
+		Resource: cf,
+		Metadata: v.AWSCloudFormationMetadata,
+	}}
+}
diff --git a/pkg/mapper/iac-providers/cft/config/ecr-repository.go b/pkg/mapper/iac-providers/cft/config/ecr-repository.go
index 5abcfd409..96be8839c 100644
--- a/pkg/mapper/iac-providers/cft/config/ecr-repository.go
+++ b/pkg/mapper/iac-providers/cft/config/ecr-repository.go
@@ -17,41 +17,37 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/ecr"
+	"github.com/awslabs/goformation/v5/cloudformation/ecr"
 )
 
 // EcrRepositoryConfig holds config for aws_ecr_repository
 type EcrRepositoryConfig struct {
 	Config
-	ISC  []map[string]interface{} `json:"image_scanning_configuration"`
-	AERP interface{}              `json:"aws_ecr_repository_policy,omitempty"`
+	ImageScanningConfiguration []ImageScanningConfigurationBlock `json:"image_scanning_configuration"`
+	AERP                       interface{}                       `json:"aws_ecr_repository_policy,omitempty"`
 }
 
-// ISC holds config for image_scanning_configuration attribute
-type ISC struct {
+// ImageScanningConfigurationBlock holds config for image_scanning_configuration attribute
+type ImageScanningConfigurationBlock struct {
 	ScanOnPush bool `json:"scan_on_push"`
 }
 
 // GetEcrRepositoryConfig returns config for aws_ecr_repository
 func GetEcrRepositoryConfig(r *ecr.Repository) []AWSResourceConfig {
+	var imageScanningConfiguration []ImageScanningConfigurationBlock
+	if r.ImageScanningConfiguration != nil {
+		imageScanningConfiguration = make([]ImageScanningConfigurationBlock, 1)
+		imageScanningConfiguration[0].ScanOnPush = r.ImageScanningConfiguration.ScanOnPush
+	}
+
 	cf := EcrRepositoryConfig{
 		Config: Config{
 			Tags: r.Tags,
 			Name: r.RepositoryName,
 		},
+		ImageScanningConfiguration: imageScanningConfiguration,
 	}
-	if r.ImageScanningConfiguration != nil {
-		m := r.ImageScanningConfiguration.(map[string]interface{})
-		if m["ScanOnPush"] != nil {
-			sop := make(map[string]interface{})
-			sop["scan_on_push"] = m["ScanOnPush"]
-			cf.ISC = []map[string]interface{}{sop}
-		} else {
-			cf.ISC = make([]map[string]interface{}, 0)
-		}
-	} else {
-		cf.ISC = make([]map[string]interface{}, 0)
-	}
+
 	cf.AERP = r.RepositoryPolicyText
 	return []AWSResourceConfig{{
 		Resource: cf,
diff --git a/pkg/mapper/iac-providers/cft/config/ecs-service.go b/pkg/mapper/iac-providers/cft/config/ecs-service.go
index cdc57fe9a..dcc6114b0 100644
--- a/pkg/mapper/iac-providers/cft/config/ecs-service.go
+++ b/pkg/mapper/iac-providers/cft/config/ecs-service.go
@@ -17,7 +17,7 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/ecs"
+	"github.com/awslabs/goformation/v5/cloudformation/ecs"
 )
 
 // EcsServiceConfig holds config for aws_ecs_service
diff --git a/pkg/mapper/iac-providers/cft/config/ecs-task-definition.go b/pkg/mapper/iac-providers/cft/config/ecs-task-definition.go
index 005b771d9..fbd8e1a2a 100644
--- a/pkg/mapper/iac-providers/cft/config/ecs-task-definition.go
+++ b/pkg/mapper/iac-providers/cft/config/ecs-task-definition.go
@@ -19,7 +19,7 @@ package config
 import (
 	"encoding/json"
 
-	"github.com/awslabs/goformation/v4/cloudformation/ecs"
+	"github.com/awslabs/goformation/v5/cloudformation/ecs"
 )
 
 // EcsTaskDefinitionConfig holds config for aws_ecs_task_definition
diff --git a/pkg/mapper/iac-providers/cft/config/efs-file-system.go b/pkg/mapper/iac-providers/cft/config/efs-file-system.go
index 9335c0622..bfcea986d 100644
--- a/pkg/mapper/iac-providers/cft/config/efs-file-system.go
+++ b/pkg/mapper/iac-providers/cft/config/efs-file-system.go
@@ -19,7 +19,7 @@ package config
 import (
 	"encoding/json"
 
-	"github.com/awslabs/goformation/v4/cloudformation/efs"
+	"github.com/awslabs/goformation/v5/cloudformation/efs"
 )
 
 const (
diff --git a/pkg/mapper/iac-providers/cft/config/eks-cluster.go b/pkg/mapper/iac-providers/cft/config/eks-cluster.go
new file mode 100644
index 000000000..b248343e6
--- /dev/null
+++ b/pkg/mapper/iac-providers/cft/config/eks-cluster.go
@@ -0,0 +1,69 @@
+/*
+    Copyright (C) 2022 Accurics, Inc.
+
+	Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+		http://www.apache.org/licenses/LICENSE-2.0
+
+	Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+package config
+
+import "github.com/awslabs/goformation/v5/cloudformation/eks"
+
+// EKSVPCConfigBlock holds config for EKSVPCConfig
+type EKSVPCConfigBlock struct {
+	SubnetIDs             []string `json:"subnet_ids"`
+	SecurityGroupIDs      []string `json:"security_group_ids"`
+	EndpointPrivateAccess bool     `json:"endpoint_private_access"`
+	EndpointPublicAccess  bool     `json:"endpoint_public_access"`
+}
+
+// EksClusterConfig holds config for EksCluster
+type EksClusterConfig struct {
+	Config
+	Name                   string              `json:"name"`
+	RoleARN                string              `json:"role_arn"`
+	VPCConfig              []EKSVPCConfigBlock `json:"vpc_config"`
+	EnabledClusterLogTypes []string            `json:"enabled_cluster_log_types"`
+}
+
+// GetEksClusterConfig returns config for EksCluster
+func GetEksClusterConfig(c *eks.Cluster) []AWSResourceConfig {
+	var vpcConfig []EKSVPCConfigBlock
+	if c.ResourcesVpcConfig != nil {
+		vpcConfig := make([]EKSVPCConfigBlock, 1)
+
+		vpcConfig[0].SubnetIDs = c.ResourcesVpcConfig.SubnetIds
+		vpcConfig[0].SecurityGroupIDs = c.ResourcesVpcConfig.SecurityGroupIds
+		vpcConfig[0].EndpointPrivateAccess = c.ResourcesVpcConfig.EndpointPrivateAccess
+		vpcConfig[0].EndpointPublicAccess = c.ResourcesVpcConfig.EndpointPublicAccess
+	}
+
+	enabledClusterLogTypes := make([]string, len(c.Logging.ClusterLogging.EnabledTypes))
+	for i := range c.Logging.ClusterLogging.EnabledTypes {
+		enabledClusterLogTypes[i] = c.Logging.ClusterLogging.EnabledTypes[i].Type
+	}
+
+	cf := EksClusterConfig{
+		Config: Config{
+			Name: c.Name,
+		},
+		Name:                   c.Name,
+		RoleARN:                c.RoleArn,
+		VPCConfig:              vpcConfig,
+		EnabledClusterLogTypes: enabledClusterLogTypes,
+	}
+
+	return []AWSResourceConfig{{
+		Resource: cf,
+		Metadata: c.AWSCloudFormationMetadata,
+	}}
+}
diff --git a/pkg/mapper/iac-providers/cft/config/elasticache-cluster.go b/pkg/mapper/iac-providers/cft/config/elasticache-cluster.go
index 50dfa096e..dbe200077 100644
--- a/pkg/mapper/iac-providers/cft/config/elasticache-cluster.go
+++ b/pkg/mapper/iac-providers/cft/config/elasticache-cluster.go
@@ -17,7 +17,7 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/elasticache"
+	"github.com/awslabs/goformation/v5/cloudformation/elasticache"
 )
 
 // ElastiCacheClusterConfig holds config for aws_elasticache_cluster
diff --git a/pkg/mapper/iac-providers/cft/config/elasticache-replicationgroup.go b/pkg/mapper/iac-providers/cft/config/elasticache-replicationgroup.go
index 884f3f7ae..351e42ab7 100644
--- a/pkg/mapper/iac-providers/cft/config/elasticache-replicationgroup.go
+++ b/pkg/mapper/iac-providers/cft/config/elasticache-replicationgroup.go
@@ -17,7 +17,7 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/elasticache"
+	"github.com/awslabs/goformation/v5/cloudformation/elasticache"
 )
 
 // ElastiCacheReplicationGroupConfig holds config for aws_elasticache_replication_group
diff --git a/pkg/mapper/iac-providers/cft/config/elasticloadbalancing-loadbalancer.go b/pkg/mapper/iac-providers/cft/config/elasticloadbalancing-loadbalancer.go
index 1a3956d42..375c8f139 100644
--- a/pkg/mapper/iac-providers/cft/config/elasticloadbalancing-loadbalancer.go
+++ b/pkg/mapper/iac-providers/cft/config/elasticloadbalancing-loadbalancer.go
@@ -19,7 +19,7 @@ package config
 import (
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/elasticloadbalancing"
+	"github.com/awslabs/goformation/v5/cloudformation/elasticloadbalancing"
 )
 
 // GetPolicies represents subresource aws_load_balancer_policy for Policies attribute
diff --git a/pkg/mapper/iac-providers/cft/config/elasticloadbalancingv2-listener.go b/pkg/mapper/iac-providers/cft/config/elasticloadbalancingv2-listener.go
index 686479c51..24d4b60ee 100644
--- a/pkg/mapper/iac-providers/cft/config/elasticloadbalancingv2-listener.go
+++ b/pkg/mapper/iac-providers/cft/config/elasticloadbalancingv2-listener.go
@@ -17,7 +17,7 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/elasticloadbalancingv2"
+	"github.com/awslabs/goformation/v5/cloudformation/elasticloadbalancingv2"
 )
 
 // ElasticLoadBalancingV2ListenerConfig holds config for aws_lb_listener
diff --git a/pkg/mapper/iac-providers/cft/config/elasticloadbalancingv2-target-group.go b/pkg/mapper/iac-providers/cft/config/elasticloadbalancingv2-target-group.go
index 2035d503a..9879a0600 100644
--- a/pkg/mapper/iac-providers/cft/config/elasticloadbalancingv2-target-group.go
+++ b/pkg/mapper/iac-providers/cft/config/elasticloadbalancingv2-target-group.go
@@ -17,7 +17,7 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/elasticloadbalancingv2"
+	"github.com/awslabs/goformation/v5/cloudformation/elasticloadbalancingv2"
 )
 
 // ElasticLoadBalancingV2TargetGroupConfig holds config for aws_lb_target_group
diff --git a/pkg/mapper/iac-providers/cft/config/elasticsearch-domain.go b/pkg/mapper/iac-providers/cft/config/elasticsearch-domain.go
index a85078bae..0b53f9381 100644
--- a/pkg/mapper/iac-providers/cft/config/elasticsearch-domain.go
+++ b/pkg/mapper/iac-providers/cft/config/elasticsearch-domain.go
@@ -19,7 +19,7 @@ package config
 import (
 	"encoding/json"
 
-	"github.com/awslabs/goformation/v4/cloudformation/elasticsearch"
+	"github.com/awslabs/goformation/v5/cloudformation/elasticsearch"
 )
 
 const (
diff --git a/pkg/mapper/iac-providers/cft/config/emr-cluster.go b/pkg/mapper/iac-providers/cft/config/emr-cluster.go
index 689bc1196..a1e78d6cc 100644
--- a/pkg/mapper/iac-providers/cft/config/emr-cluster.go
+++ b/pkg/mapper/iac-providers/cft/config/emr-cluster.go
@@ -16,7 +16,7 @@
 
 package config
 
-import "github.com/awslabs/goformation/v4/cloudformation/emr"
+import "github.com/awslabs/goformation/v5/cloudformation/emr"
 
 // KerberosAttributesBlock holds config for KerberosAttributes
 type KerberosAttributesBlock struct {
diff --git a/pkg/mapper/iac-providers/cft/config/guardduty-detector.go b/pkg/mapper/iac-providers/cft/config/guardduty-detector.go
index 5782ae48b..04bd62cff 100644
--- a/pkg/mapper/iac-providers/cft/config/guardduty-detector.go
+++ b/pkg/mapper/iac-providers/cft/config/guardduty-detector.go
@@ -17,7 +17,7 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/guardduty"
+	"github.com/awslabs/goformation/v5/cloudformation/guardduty"
 )
 
 // GuardDutyDetectorConfig holds config for aws_guardduty_detector
diff --git a/pkg/mapper/iac-providers/cft/config/iam-access-key.go b/pkg/mapper/iac-providers/cft/config/iam-access-key.go
index 2bce1a7ff..d1589f02a 100644
--- a/pkg/mapper/iac-providers/cft/config/iam-access-key.go
+++ b/pkg/mapper/iac-providers/cft/config/iam-access-key.go
@@ -17,7 +17,7 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/iam"
+	"github.com/awslabs/goformation/v5/cloudformation/iam"
 )
 
 // IamAccessKeyConfig holds config for aws_iam_access_key
diff --git a/pkg/mapper/iac-providers/cft/config/iam-group.go b/pkg/mapper/iac-providers/cft/config/iam-group.go
index 878666866..390837e1f 100644
--- a/pkg/mapper/iac-providers/cft/config/iam-group.go
+++ b/pkg/mapper/iac-providers/cft/config/iam-group.go
@@ -20,7 +20,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/iam"
+	"github.com/awslabs/goformation/v5/cloudformation/iam"
 )
 
 const (
diff --git a/pkg/mapper/iac-providers/cft/config/iam-policy.go b/pkg/mapper/iac-providers/cft/config/iam-policy.go
index 6018f79d7..cce991500 100644
--- a/pkg/mapper/iac-providers/cft/config/iam-policy.go
+++ b/pkg/mapper/iac-providers/cft/config/iam-policy.go
@@ -19,7 +19,7 @@ package config
 import (
 	"encoding/json"
 
-	"github.com/awslabs/goformation/v4/cloudformation/iam"
+	"github.com/awslabs/goformation/v5/cloudformation/iam"
 )
 
 // IamPolicyConfig holds config for aws_iam_policy
diff --git a/pkg/mapper/iac-providers/cft/config/iam-role.go b/pkg/mapper/iac-providers/cft/config/iam-role.go
index 8addb4f25..f352972b7 100644
--- a/pkg/mapper/iac-providers/cft/config/iam-role.go
+++ b/pkg/mapper/iac-providers/cft/config/iam-role.go
@@ -20,7 +20,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/iam"
+	"github.com/awslabs/goformation/v5/cloudformation/iam"
 )
 
 const (
diff --git a/pkg/mapper/iac-providers/cft/config/iam-user.go b/pkg/mapper/iac-providers/cft/config/iam-user.go
index 1ddb8d1af..4654270a4 100644
--- a/pkg/mapper/iac-providers/cft/config/iam-user.go
+++ b/pkg/mapper/iac-providers/cft/config/iam-user.go
@@ -20,7 +20,7 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/awslabs/goformation/v4/cloudformation/iam"
+	"github.com/awslabs/goformation/v5/cloudformation/iam"
 )
 
 const (
diff --git a/pkg/mapper/iac-providers/cft/config/kinesis-firehose-delivery-stream.go b/pkg/mapper/iac-providers/cft/config/kinesis-firehose-delivery-stream.go
index fa59dd5c3..e2115a06e 100644
--- a/pkg/mapper/iac-providers/cft/config/kinesis-firehose-delivery-stream.go
+++ b/pkg/mapper/iac-providers/cft/config/kinesis-firehose-delivery-stream.go
@@ -17,7 +17,7 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/kinesisfirehose"
+	"github.com/awslabs/goformation/v5/cloudformation/kinesisfirehose"
 )
 
 // KinesisFirehoseDeliveryStreamConfig holds config for aws_kinesis_firehose_delivery_stream
diff --git a/pkg/mapper/iac-providers/cft/config/kinesis-stream.go b/pkg/mapper/iac-providers/cft/config/kinesis-stream.go
index f54659fa9..cbd45f236 100644
--- a/pkg/mapper/iac-providers/cft/config/kinesis-stream.go
+++ b/pkg/mapper/iac-providers/cft/config/kinesis-stream.go
@@ -17,7 +17,7 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/kinesis"
+	"github.com/awslabs/goformation/v5/cloudformation/kinesis"
 )
 
 // KinesisStreamConfig holds config for aws_kinesis_stream
diff --git a/pkg/mapper/iac-providers/cft/config/kms-key.go b/pkg/mapper/iac-providers/cft/config/kms-key.go
index 8162b18a5..e5dbe262c 100644
--- a/pkg/mapper/iac-providers/cft/config/kms-key.go
+++ b/pkg/mapper/iac-providers/cft/config/kms-key.go
@@ -19,7 +19,7 @@ package config
 import (
 	"encoding/json"
 
-	"github.com/awslabs/goformation/v4/cloudformation/kms"
+	"github.com/awslabs/goformation/v5/cloudformation/kms"
 )
 
 // KmsKeyConfig holds config for aws_kms_key
diff --git a/pkg/mapper/iac-providers/cft/config/lambda-function.go b/pkg/mapper/iac-providers/cft/config/lambda-function.go
index 5fad7fdd9..ed17ad7ad 100644
--- a/pkg/mapper/iac-providers/cft/config/lambda-function.go
+++ b/pkg/mapper/iac-providers/cft/config/lambda-function.go
@@ -21,7 +21,7 @@ import (
 	"encoding/base64"
 	"io/ioutil"
 
-	"github.com/awslabs/goformation/v4/cloudformation/lambda"
+	"github.com/awslabs/goformation/v5/cloudformation/lambda"
 )
 
 // TracingConfigBlock holds config for TracingConfig
diff --git a/pkg/mapper/iac-providers/cft/config/mq-broker.go b/pkg/mapper/iac-providers/cft/config/mq-broker.go
index 0bcaae22b..12c5d2c71 100644
--- a/pkg/mapper/iac-providers/cft/config/mq-broker.go
+++ b/pkg/mapper/iac-providers/cft/config/mq-broker.go
@@ -17,7 +17,7 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/amazonmq"
+	"github.com/awslabs/goformation/v5/cloudformation/amazonmq"
 )
 
 // MqBrokerConfig holds config for aws_mq_broker
diff --git a/pkg/mapper/iac-providers/cft/config/msk-cluster.go b/pkg/mapper/iac-providers/cft/config/msk-cluster.go
index d5a54d716..f088bfb96 100644
--- a/pkg/mapper/iac-providers/cft/config/msk-cluster.go
+++ b/pkg/mapper/iac-providers/cft/config/msk-cluster.go
@@ -16,7 +16,7 @@
 
 package config
 
-import "github.com/awslabs/goformation/v4/cloudformation/msk"
+import "github.com/awslabs/goformation/v5/cloudformation/msk"
 
 // EncryptionInTransitBlock holds config for EncryptionInTransit
 type EncryptionInTransitBlock struct {
@@ -26,7 +26,8 @@ type EncryptionInTransitBlock struct {
 
 // EncryptionInfoBlock holds config for EncryptionInfo
 type EncryptionInfoBlock struct {
-	EncryptionInTransit []EncryptionInTransitBlock `json:"encryption_in_transit"`
+	EncryptionAtRestKmsKeyArn string                     `json:"encryption_at_rest_kms_key_arn"`
+	EncryptionInTransit       []EncryptionInTransitBlock `json:"encryption_in_transit"`
 }
 
 // BrokerNodeGroupInfoBlock holds config for BrokerNodeGroupInfo
@@ -63,6 +64,10 @@ func GetMskClusterConfig(c *msk.Cluster) []AWSResourceConfig {
 	if c.EncryptionInfo != nil {
 		encryptionInfo = make([]EncryptionInfoBlock, 1)
 
+		if c.EncryptionInfo.EncryptionAtRest != nil {
+			encryptionInfo[0].EncryptionAtRestKmsKeyArn = c.EncryptionInfo.EncryptionAtRest.DataVolumeKMSKeyId
+		}
+
 		if c.EncryptionInfo.EncryptionInTransit != nil {
 			encryptionInfo[0].EncryptionInTransit = make([]EncryptionInTransitBlock, 1)
 
diff --git a/pkg/mapper/iac-providers/cft/config/neptune-cluster.go b/pkg/mapper/iac-providers/cft/config/neptune-cluster.go
index 801ef0d39..b47cc2c85 100644
--- a/pkg/mapper/iac-providers/cft/config/neptune-cluster.go
+++ b/pkg/mapper/iac-providers/cft/config/neptune-cluster.go
@@ -17,7 +17,7 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/neptune"
+	"github.com/awslabs/goformation/v5/cloudformation/neptune"
 )
 
 // NeptuneClusterConfig holds config for aws_neptune_cluster
diff --git a/pkg/mapper/iac-providers/cft/config/rds-cluster.go b/pkg/mapper/iac-providers/cft/config/rds-cluster.go
index 69b0fc93b..8660e98cd 100644
--- a/pkg/mapper/iac-providers/cft/config/rds-cluster.go
+++ b/pkg/mapper/iac-providers/cft/config/rds-cluster.go
@@ -17,7 +17,7 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/rds"
+	"github.com/awslabs/goformation/v5/cloudformation/rds"
 )
 
 // RDSClusterConfig holds config for aws_rds_cluster
diff --git a/pkg/mapper/iac-providers/cft/config/redshift-cluster.go b/pkg/mapper/iac-providers/cft/config/redshift-cluster.go
index dcc765e22..efb4522da 100644
--- a/pkg/mapper/iac-providers/cft/config/redshift-cluster.go
+++ b/pkg/mapper/iac-providers/cft/config/redshift-cluster.go
@@ -17,7 +17,7 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/redshift"
+	"github.com/awslabs/goformation/v5/cloudformation/redshift"
 )
 
 // RedshiftClusterConfig holds config for aws_redshift_cluster
diff --git a/pkg/mapper/iac-providers/cft/config/route53-record.go b/pkg/mapper/iac-providers/cft/config/route53-record.go
index 890759465..096b941bd 100644
--- a/pkg/mapper/iac-providers/cft/config/route53-record.go
+++ b/pkg/mapper/iac-providers/cft/config/route53-record.go
@@ -17,7 +17,7 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/route53"
+	"github.com/awslabs/goformation/v5/cloudformation/route53"
 )
 
 // Route53RecordConfig holds config for aws_route53_record
diff --git a/pkg/mapper/iac-providers/cft/config/s3-bucket-policy.go b/pkg/mapper/iac-providers/cft/config/s3-bucket-policy.go
index 7f074bdf6..f224ec15e 100644
--- a/pkg/mapper/iac-providers/cft/config/s3-bucket-policy.go
+++ b/pkg/mapper/iac-providers/cft/config/s3-bucket-policy.go
@@ -19,7 +19,7 @@ package config
 import (
 	"encoding/json"
 
-	"github.com/awslabs/goformation/v4/cloudformation/s3"
+	"github.com/awslabs/goformation/v5/cloudformation/s3"
 )
 
 // S3BucketPolicyConfig holds config for aws_s3_bucket_policy
diff --git a/pkg/mapper/iac-providers/cft/config/s3-bucket.go b/pkg/mapper/iac-providers/cft/config/s3-bucket.go
index d5037abd8..dfbec721d 100644
--- a/pkg/mapper/iac-providers/cft/config/s3-bucket.go
+++ b/pkg/mapper/iac-providers/cft/config/s3-bucket.go
@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/awslabs/goformation/v4/cloudformation/s3"
+	"github.com/awslabs/goformation/v5/cloudformation/s3"
 )
 
 const (
diff --git a/pkg/mapper/iac-providers/cft/config/sagemaker-notebookinstance.go b/pkg/mapper/iac-providers/cft/config/sagemaker-notebookinstance.go
index 299a22d11..fd50cf1df 100644
--- a/pkg/mapper/iac-providers/cft/config/sagemaker-notebookinstance.go
+++ b/pkg/mapper/iac-providers/cft/config/sagemaker-notebookinstance.go
@@ -16,7 +16,7 @@
 
 package config
 
-import "github.com/awslabs/goformation/v4/cloudformation/sagemaker"
+import "github.com/awslabs/goformation/v5/cloudformation/sagemaker"
 
 // SagemakerNotebookInstanceConfig holds config for SagemakerNotebookInstance
 type SagemakerNotebookInstanceConfig struct {
diff --git a/pkg/mapper/iac-providers/cft/config/secretsmanager-secret-policy.go b/pkg/mapper/iac-providers/cft/config/secretsmanager-secret-policy.go
index 079046d16..6b3af8008 100644
--- a/pkg/mapper/iac-providers/cft/config/secretsmanager-secret-policy.go
+++ b/pkg/mapper/iac-providers/cft/config/secretsmanager-secret-policy.go
@@ -19,7 +19,7 @@ package config
 import (
 	"encoding/json"
 
-	"github.com/awslabs/goformation/v4/cloudformation/secretsmanager"
+	"github.com/awslabs/goformation/v5/cloudformation/secretsmanager"
 )
 
 // SecretsManagerSecretPolicyConfig holds config for aws_secretsmanager_secret_policy
diff --git a/pkg/mapper/iac-providers/cft/config/secretsmanager-secret.go b/pkg/mapper/iac-providers/cft/config/secretsmanager-secret.go
index 7e9a7acf7..334f0853e 100644
--- a/pkg/mapper/iac-providers/cft/config/secretsmanager-secret.go
+++ b/pkg/mapper/iac-providers/cft/config/secretsmanager-secret.go
@@ -17,7 +17,7 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/secretsmanager"
+	"github.com/awslabs/goformation/v5/cloudformation/secretsmanager"
 )
 
 // SecretsManagerSecretConfig holds config for aws_secretsmanager_secret
diff --git a/pkg/mapper/iac-providers/cft/config/security-group.go b/pkg/mapper/iac-providers/cft/config/security-group.go
index b20390e3d..f1d6011e0 100644
--- a/pkg/mapper/iac-providers/cft/config/security-group.go
+++ b/pkg/mapper/iac-providers/cft/config/security-group.go
@@ -17,7 +17,7 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/ec2"
+	"github.com/awslabs/goformation/v5/cloudformation/ec2"
 )
 
 // IngressEgress holds config for SecurityGroupEgress, SecurityGroupIngress attributes of SecurityGroupConfig
diff --git a/pkg/mapper/iac-providers/cft/config/sns-topic-policy.go b/pkg/mapper/iac-providers/cft/config/sns-topic-policy.go
index a7e3b6e10..c5f70fb11 100644
--- a/pkg/mapper/iac-providers/cft/config/sns-topic-policy.go
+++ b/pkg/mapper/iac-providers/cft/config/sns-topic-policy.go
@@ -19,7 +19,7 @@ package config
 import (
 	"encoding/json"
 
-	"github.com/awslabs/goformation/v4/cloudformation/sns"
+	"github.com/awslabs/goformation/v5/cloudformation/sns"
 )
 
 // SnsTopicPolicyConfig holds config for SnsTopicPolicy
diff --git a/pkg/mapper/iac-providers/cft/config/sns-topic.go b/pkg/mapper/iac-providers/cft/config/sns-topic.go
index 4d17ffd2a..a3c5b7f14 100644
--- a/pkg/mapper/iac-providers/cft/config/sns-topic.go
+++ b/pkg/mapper/iac-providers/cft/config/sns-topic.go
@@ -16,7 +16,7 @@
 
 package config
 
-import "github.com/awslabs/goformation/v4/cloudformation/sns"
+import "github.com/awslabs/goformation/v5/cloudformation/sns"
 
 // SnsTopicConfig holds config for SnsTopic
 type SnsTopicConfig struct {
diff --git a/pkg/mapper/iac-providers/cft/config/sqs-queue-policy.go b/pkg/mapper/iac-providers/cft/config/sqs-queue-policy.go
index 1730a63d0..7b7550a42 100644
--- a/pkg/mapper/iac-providers/cft/config/sqs-queue-policy.go
+++ b/pkg/mapper/iac-providers/cft/config/sqs-queue-policy.go
@@ -19,7 +19,7 @@ package config
 import (
 	"encoding/json"
 
-	"github.com/awslabs/goformation/v4/cloudformation/sqs"
+	"github.com/awslabs/goformation/v5/cloudformation/sqs"
 )
 
 // SqsQueuePolicyConfig holds config for SqsQueuePolicy
diff --git a/pkg/mapper/iac-providers/cft/config/sqs-queue.go b/pkg/mapper/iac-providers/cft/config/sqs-queue.go
index d1999bff1..3c49885ba 100644
--- a/pkg/mapper/iac-providers/cft/config/sqs-queue.go
+++ b/pkg/mapper/iac-providers/cft/config/sqs-queue.go
@@ -17,7 +17,7 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/sqs"
+	"github.com/awslabs/goformation/v5/cloudformation/sqs"
 )
 
 // SqsQueueConfig holds config for SqsQueue
diff --git a/pkg/mapper/iac-providers/cft/config/workspaces-workspace.go b/pkg/mapper/iac-providers/cft/config/workspaces-workspace.go
index 4caa77244..a5e2134bb 100644
--- a/pkg/mapper/iac-providers/cft/config/workspaces-workspace.go
+++ b/pkg/mapper/iac-providers/cft/config/workspaces-workspace.go
@@ -17,7 +17,7 @@
 package config
 
 import (
-	"github.com/awslabs/goformation/v4/cloudformation/workspaces"
+	"github.com/awslabs/goformation/v5/cloudformation/workspaces"
 )
 
 // WorkspacesWorkspaceConfig holds config for aws_workspaces_workspace