From deafd675b7ea9d986164dd0e1e10732150bf40e9 Mon Sep 17 00:00:00 2001
From: Doug Fawley <dfawley@google.com>
Date: Wed, 23 Oct 2024 13:18:46 -0700
Subject: [PATCH] testing

---
 .github/workflows/deps.yml | 25 ++++++++-----------------
 encoding/encoding.go       |  1 +
 scripts/gen-deps.sh        |  4 ++--
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/.github/workflows/deps.yml b/.github/workflows/deps.yml
index 97bb757432fc..e4e4fbe1e987 100644
--- a/.github/workflows/deps.yml
+++ b/.github/workflows/deps.yml
@@ -33,22 +33,13 @@ jobs:
           BEFORE="$(mktemp -d)"
           AFTER="$(mktemp -d)"
 
-          OUTPUT_DIR="${AFTER}"
-          git ls-files -- '*.go' | grep -v '\(^\|/\)\(internal\|examples\|benchmark\|interop\|test\|testdata\)\(/\|$\)' | xargs dirname | sort -u | while read d; do
-            pushd "$d"
-            pkg="$(echo "$d" | sed 's;\.;grpc;' | sed 's;/;_;g')"
-            go list -deps . | sort > "${OUTPUT_DIR}/$pkg"
-            popd
-          done
-
+          cp scripts/gen-deps.sh /tmp/  # TODO: delete
+          scrips/gen-deps.sh "${AFTER}"
           git checkout origin/master
+          cp /tmp/gen-deps.sh scripts/  # TODO: delete
+          scripts/gen-deps.sh "${BEFORE}"
 
-          OUTPUT_DIR="${BEFORE}"
-          git ls-files -- '*.go' | grep -v '\(^\|/\)\(internal\|examples\|benchmark\|interop\|test\|testdata\)\(/\|$\)' | xargs dirname | sort -u | while read d; do
-            pushd "$d"
-            pkg="$(echo "$d" | sed 's;\.;grpc;' | sed 's;/;_;g')"
-            go list -deps . | sort > "${OUTPUT_DIR}/$pkg"
-            popd
-          done
-
-          diff --recursive "${BEFORE}" "${AFTER}" || exit 1
+          echo "Comparing dependencies..."
+          # Run grep in a sub-shell since bash does not support ! in the middle of a pipe
+          diff -u0 -r "${BEFORE}" "${AFTER}" | bash -c '! grep -v "@@"'
+          echo "No changes detected."
diff --git a/encoding/encoding.go b/encoding/encoding.go
index 11d0ae142c42..e173fb8d5001 100644
--- a/encoding/encoding.go
+++ b/encoding/encoding.go
@@ -30,6 +30,7 @@ import (
 	"strings"
 
 	"google.golang.org/grpc/internal/grpcutil"
+	_ "google.golang.org/grpc/status"
 )
 
 // Identity specifies the optional encoding for uncompressed streams.
diff --git a/scripts/gen-deps.sh b/scripts/gen-deps.sh
index de7d0045e58a..bc647c4d8cba 100755
--- a/scripts/gen-deps.sh
+++ b/scripts/gen-deps.sh
@@ -14,8 +14,8 @@ OUTPUT_DIR="$1"
 cd "${SCRIPTS_DIR}/.."
 
 git ls-files -- '*.go' | grep -v '\(^\|/\)\(internal\|examples\|benchmark\|interop\|test\|testdata\)\(/\|$\)' | xargs dirname | sort -u | while read d; do
-  pushd "$d"
+  pushd "$d" > /dev/null
   pkg="$(echo "$d" | sed 's;\.;grpc;' | sed 's;/;_;g')"
   go list -deps . | sort >| "${OUTPUT_DIR}/$pkg"
-  popd
+  popd > /dev/null
 done