From 0366569aa2c781cd66f212c360ecf6d615f733f4 Mon Sep 17 00:00:00 2001
From: Nitin More <nmore@tenable.com>
Date: Thu, 23 Nov 2023 19:31:51 +0530
Subject: [PATCH 1/3] fix for crash in lambda function cft yaml if code key is
 not present

---
 pkg/mapper/iac-providers/cft/config/lambda-function.go | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg/mapper/iac-providers/cft/config/lambda-function.go b/pkg/mapper/iac-providers/cft/config/lambda-function.go
index 661872063..df2f82f14 100644
--- a/pkg/mapper/iac-providers/cft/config/lambda-function.go
+++ b/pkg/mapper/iac-providers/cft/config/lambda-function.go
@@ -195,10 +195,10 @@ func getLambdaConfig(lf *lambda.Function) []AWSResourceConfig {
 func setLambdaCodePackage(cf LambdaFunctionConfig, f *lambda.Function) LambdaFunctionConfig {
 	if f.Code != nil {
 		cf.ImageURI = functions.GetVal(f.Code.ImageUri)
+		cf.S3Bucket = functions.GetVal(f.Code.S3Bucket)
+		cf.S3Key = functions.GetVal(f.Code.S3Key)
+		cf.S3ObjectVersion = functions.GetVal(f.Code.S3ObjectVersion)
 		return cf
 	}
-	cf.S3Bucket = functions.GetVal(f.Code.S3Bucket)
-	cf.S3Key = functions.GetVal(f.Code.S3Key)
-	cf.S3ObjectVersion = functions.GetVal(f.Code.S3ObjectVersion)
 	return cf
 }

From f5cb7e0acfc943360a5d955911b125f152fa4a0a Mon Sep 17 00:00:00 2001
From: Nitin More <nmore@tenable.com>
Date: Wed, 29 Nov 2023 17:52:50 +0530
Subject: [PATCH 2/3] removed duplicate tag image tag

---
 .github/workflows/gobuild.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/gobuild.yml b/.github/workflows/gobuild.yml
index c1e462ee3..145ab0cd0 100644
--- a/.github/workflows/gobuild.yml
+++ b/.github/workflows/gobuild.yml
@@ -82,4 +82,4 @@ jobs:
       - name: Run scan
         run: |
           image_tag=$(<dockerhub-image-label.txt)
-          docker run -e JKN_USERNAME=${{ secrets.JKN_USERNAME }} -e JKN_PASSWORD=${{ secrets.JKN_PASSWORD }} -t docker-terrascan-local.artifactory.eng.tenable.com/tenb-cb:latest jobs execute-job  --credential-mode env -n teams-deleng-terraform -p deleng-terraform/dockerhub-publish -d "{\"APPID\":\"2054\", \"IMAGE\":\"docker-terrascan-local.artifactory.eng.tenable.com/terrascan:${image_tag}\", \"TARGETS\": \"tenable/terrascan:${image_tag},tenable/terrascan:latest\", \"MULTIARCH\":\"true\"}" --cloudflare-access-secret ${{ secrets.CF_ACCESS_TOKEN }}:${{ secrets.CF_SECRET }}
+          docker run -e JKN_USERNAME=${{ secrets.JKN_USERNAME }} -e JKN_PASSWORD=${{ secrets.JKN_PASSWORD }} -t docker-terrascan-local.artifactory.eng.tenable.com/tenb-cb:latest jobs execute-job  --credential-mode env -n teams-deleng-terraform -p deleng-terraform/dockerhub-publish -d "{\"APPID\":\"2054\", \"IMAGE\":\"docker-terrascan-local.artifactory.eng.tenable.com/terrascan:${image_tag}\", \"TARGETS\": \"tenable/terrascan:latest\", \"MULTIARCH\":\"true\"}" --cloudflare-access-secret ${{ secrets.CF_ACCESS_TOKEN }}:${{ secrets.CF_SECRET }}

From 679e8c555b418969b59a64e3482e50fe32f82f70 Mon Sep 17 00:00:00 2001
From: Nitin More <nmore@tenable.com>
Date: Thu, 30 Nov 2023 16:02:45 +0530
Subject: [PATCH 3/3] bump up the version to 1.18.5

---
 pkg/version/version.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/version/version.go b/pkg/version/version.go
index 683b8e8ae..d9b3cf8ba 100644
--- a/pkg/version/version.go
+++ b/pkg/version/version.go
@@ -19,7 +19,7 @@ package version
 import "fmt"
 
 // Terrascan The Terrascan version
-const Terrascan = "1.18.3"
+const Terrascan = "1.18.5"
 
 // Get returns the terrascan version
 func Get() string {