Merge pull request GoogleCloudPlatform#3186 from yuwenma/go-client-lib

feat: migrate the problematic go-client
nb-goog · Nov 15, 2024 · 3ddbfd3 · 3ddbfd3
2 parents 3479289 + 7e04ed7
commit 3ddbfd3
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 1 deletion.
diff --git a/pkg/clients/generated/README.md b/pkg/clients/generated/README.md
diff --git a/scripts/unit-test.sh b/scripts/unit-test.sh
@@ -18,7 +18,7 @@ set -o pipefail
 REPO_ROOT="$(git rev-parse --show-toplevel)"
 cd "${REPO_ROOT}"
 make -C operator test
-UNIT_TEST_PACKAGES=$(go list ./pkg/... ./cmd/... ./config/tests/... ./scripts/generate-go-crd-clients/... ./scripts/resource-autogen/... ./tests/... ./mockgcp/... | grep -v tests/e2e)
+UNIT_TEST_PACKAGES=$(go list ./pkg/... ./cmd/... ./config/tests/...  ./scripts/resource-autogen/... ./tests/... ./mockgcp/... | grep -v tests/e2e)
 if [ -z ${GITHUB_ACTION+x} ]; then
     go run gotest.tools/gotestsum@latest --format testname -- ${UNIT_TEST_PACKAGES} -coverprofile cover.out -count=1
 else

diff --git a/scripts/validate-prereqs.sh b/scripts/validate-prereqs.sh
@@ -50,6 +50,8 @@ if [[ "${changed_file_count}" != "0" ]] || [[ "${added_config_file_count}" != "0
     git ls-files --others --exclude-standard config/
     exit 1
 fi
+
+<<'###issues/3037: Drop problematic go-client check from PRESUBMIT'
 make generate-go-client
 changed_file_count=$(git diff --name-only | wc -l)
 added_go_client_file_count=$(git ls-files --others --exclude-standard pkg/clients/generated/ | wc -l)
@@ -64,6 +66,8 @@ if [[ "${changed_file_count}" != "0" ]] || [[ "${added_go_client_file_count}" !=
     git diff | head -n100
     exit 1
 fi
+###issues/3037: Drop problematic go-client check from PRESUBMIT
+
 make ensure
 if [[ $? -ne 0 ]]; then
   echo "'make ensure' failed. Please validate the override patch files."