trying with the real replace

argoproj-labs · Oct 17, 2023 · 1b5e33d · 1b5e33d
1 parent adf434f
commit 1b5e33d
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 11 deletions.
diff --git a/build/ci.yml b/build/ci.yml
@@ -117,12 +117,12 @@ steps:
       - SNYK_TOKEN=${{SNYK_TOKEN}}
       - LOCAL_IMAGE_REF=${{IMAGE_NAME}}:${{CF_BRANCH_TAG_NORMALIZED_LOWER_CASE}}
     commands:
-      - sleep 600
-      - exit 1
-      # - |
-      #   snyk test --severity-threshold=${{SNYK_SEVERITY_THRESHOLD}} || fail=1
-      #   snyk container test --severity-threshold=${{SNYK_SEVERITY_THRESHOLD}} --file=Dockerfile ${LOCAL_IMAGE_REF}
-      #   if [ "$fail" == "1" ]; then exit 1; fi
+      # - sleep 600
+      # - exit 1
+      - |
+        snyk test --severity-threshold=${{SNYK_SEVERITY_THRESHOLD}} || fail=1
+        snyk container test --severity-threshold=${{SNYK_SEVERITY_THRESHOLD}} --file=Dockerfile ${LOCAL_IMAGE_REF}
+        if [ "$fail" == "1" ]; then exit 1; fi
     when:
       steps:
         - name: build

diff --git a/go.mod b/go.mod
@@ -218,7 +218,7 @@ require (
 	google.golang.org/genproto v0.0.0-20230530153820-e85fd2cbaebc // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20230530153820-e85fd2cbaebc // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20230530153820-e85fd2cbaebc // indirect
-	google.golang.org/grpc v1.56.1 // indirect
+	google.golang.org/grpc v1.56.3 // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
 	gopkg.in/go-playground/webhooks.v5 v5.17.0 // indirect
@@ -253,8 +253,6 @@ replace (
 	github.com/grpc-ecosystem/grpc-gateway => github.com/grpc-ecosystem/grpc-gateway v1.16.0
 	github.com/improbable-eng/grpc-web => github.com/improbable-eng/grpc-web v0.0.0-20181111100011-16092bd1d58a
 
-	google.golang.org/grpc => google.golang.org/grpc v1.56.3
-
 	// Avoid CVE-2022-3064
 	gopkg.in/yaml.v2 => gopkg.in/yaml.v2 v2.4.0