From ffdf9abb5eeefd98a045e4983c5e0bfffc98e931 Mon Sep 17 00:00:00 2001
From: Brett <nekolny.brett@gmail.com>
Date: Sat, 16 Nov 2024 16:44:14 +0000
Subject: [PATCH 1/4] push gosec image, tag latest

---
 cloudbuild/cloudbuild-images.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/cloudbuild/cloudbuild-images.yaml b/cloudbuild/cloudbuild-images.yaml
index ffc7ca2..c433155 100644
--- a/cloudbuild/cloudbuild-images.yaml
+++ b/cloudbuild/cloudbuild-images.yaml
@@ -34,13 +34,16 @@ steps:
   name: 'gcr.io/cloud-builders/docker'
   script: |
     #!/bin/sh
-    docker build -t us-central-docker.pkg.dev/$PROJECT_ID/docker/gosec:vv -f- . <<EOF
+    docker build -t us-central-docker.pkg.dev/$PROJECT_ID/docker/gosec:latest -f- . <<EOF
     FROM golang:1.22-alpine
     RUN wget -O - -q https://raw.githubusercontent.com/securego/gosec/master/install.sh | sh -s v2.20.0
     ENTRYPOINT ["./bin/gosec"]
     CMD ["-quiet", "./..."]
     EOF
 
+    docker push us-central1-docker.pkg.dev/$PROJECT_ID/docker/gosec:latest
+  waitFor:['-']
+
 options:
   automapSubstitutions: true
   logging: CLOUD_LOGGING_ONLY

From 4ca3ad567a450f841e9b505a7e41ee1944bd4951 Mon Sep 17 00:00:00 2001
From: Brett <nekolny.brett@gmail.com>
Date: Sat, 16 Nov 2024 16:47:12 +0000
Subject: [PATCH 2/4] waitFor: needs a space

---
 cloudbuild/cloudbuild-images.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cloudbuild/cloudbuild-images.yaml b/cloudbuild/cloudbuild-images.yaml
index c433155..2f31e4d 100644
--- a/cloudbuild/cloudbuild-images.yaml
+++ b/cloudbuild/cloudbuild-images.yaml
@@ -42,7 +42,7 @@ steps:
     EOF
 
     docker push us-central1-docker.pkg.dev/$PROJECT_ID/docker/gosec:latest
-  waitFor:['-']
+  waitFor: ['-']
 
 options:
   automapSubstitutions: true

From a3708108fb7dee296c7f0efdb8342aaa2ef5b6b4 Mon Sep 17 00:00:00 2001
From: Brett <nekolny.brett@gmail.com>
Date: Sat, 16 Nov 2024 16:49:32 +0000
Subject: [PATCH 3/4] fix a typo in the docker registry url

---
 cloudbuild/cloudbuild-images.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cloudbuild/cloudbuild-images.yaml b/cloudbuild/cloudbuild-images.yaml
index 2f31e4d..4b8c879 100644
--- a/cloudbuild/cloudbuild-images.yaml
+++ b/cloudbuild/cloudbuild-images.yaml
@@ -34,7 +34,7 @@ steps:
   name: 'gcr.io/cloud-builders/docker'
   script: |
     #!/bin/sh
-    docker build -t us-central-docker.pkg.dev/$PROJECT_ID/docker/gosec:latest -f- . <<EOF
+    docker build -t us-central1-docker.pkg.dev/$PROJECT_ID/docker/gosec:latest -f- . <<EOF
     FROM golang:1.22-alpine
     RUN wget -O - -q https://raw.githubusercontent.com/securego/gosec/master/install.sh | sh -s v2.20.0
     ENTRYPOINT ["./bin/gosec"]

From 02a70eea1a5d9746046c28117b97ca2e39eb12fa Mon Sep 17 00:00:00 2001
From: Brett <nekolny.brett@gmail.com>
Date: Sat, 16 Nov 2024 16:50:58 +0000
Subject: [PATCH 4/4] modify security.yaml gosec step

---
 cloudbuild/security.yaml | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/cloudbuild/security.yaml b/cloudbuild/security.yaml
index 15d04c5..471492d 100644
--- a/cloudbuild/security.yaml
+++ b/cloudbuild/security.yaml
@@ -2,12 +2,7 @@ steps:
 # use this instead of securego/gosec due to frequency of golang updates
 - id: securego/gosec
   name: golang:1.22-alpine
-  script: |
-    #!/bin/sh
-    cd src
-    wget -O - -q https://raw.githubusercontent.com/securego/gosec/master/install.sh | sh -s v2.20.0
-    echo "running gosec..."
-    ./bin/gosec -quiet ./...
+  name: 'us-central1-docker.pkg.dev/chatparser/docker/gosec:latest'
   waitFor: ['-']
 
 - id: semgrep/code