Merge pull request #15672 from fuweid/cleanup-15514

chore: cleanup #15514 (Rewrite etcd scripts in strict mode)
etcd-io · Apr 13, 2023 · 22f3e50 · 22f3e50
2 parents 29e7971 + 9f034fb
commit 22f3e50
Show file tree

Hide file tree

Showing 132 changed files with 144 additions and 3,502 deletions.
diff --git a/pkg/proxy/fixtures/gencerts.sh b/pkg/proxy/fixtures/gencerts.sh
@@ -1,12 +1,21 @@
 #!/bin/bash
 
+set -euo pipefail
+
 if ! [[ "$0" =~ "./gencerts.sh" ]]; then
   echo "must be run from 'fixtures'"
   exit 255
 fi
 
-if ! which cfssl; then
+if ! command -v cfssl; then
   echo "cfssl is not installed"
+  echo 'use: bash -c "cd ../../../tools/mod; go install github.com/cloudflare/cfssl/cmd/cfssl"'
+  exit 255
+fi
+
+if ! command -v cfssljson; then
+  echo "cfssljson is not installed"
+  echo 'use: bash -c "cd ../../../tools/mod; go install github.com/cloudflare/cfssl/cmd/cfssljson"'
   exit 255
 fi
 

diff --git a/scripts/test_lib.sh b/scripts/test_lib.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+set -euo pipefail
+
 ROOT_MODULE="go.etcd.io/etcd"
 
 if [[ "$(go list)" != "${ROOT_MODULE}/v3" ]]; then

diff --git a/tests/fixtures/gencerts.sh b/tests/fixtures/gencerts.sh
@@ -1,15 +1,21 @@
 #!/bin/bash
 
-set -e
+set -euo pipefail
 
 if ! [[ "$0" =~ "./gencerts.sh" ]]; then
   echo "must be run from 'fixtures'"
   exit 255
 fi
 
-if ! which cfssl; then
+if ! command -v cfssl; then
   echo "cfssl is not installed"
-  echo "use: go install -mod mod github.com/cloudflare/cfssl/cmd/cfssl github.com/cloudflare/cfssl/cmd/cfssljson"
+  echo 'use: bash -c "cd ../../tools/mod; go install github.com/cloudflare/cfssl/cmd/cfssl"'
+  exit 255
+fi
+
+if ! command -v cfssljson; then
+  echo "cfssljson is not installed"
+  echo 'use: bash -c "cd ../../tools/mod; go install github.com/cloudflare/cfssl/cmd/cfssljson"'
   exit 255
 fi
 

diff --git a/tests/integration/fixtures-expired/gencerts.sh b/tests/integration/fixtures-expired/gencerts.sh
@@ -1,12 +1,21 @@
 #!/bin/bash
 
+set -euo pipefail
+
 if ! [[ "$0" =~ "./gencerts.sh" ]]; then
   echo "must be run from 'fixtures'"
   exit 255
 fi
 
-if ! which cfssl; then
+if ! command -v cfssl; then
   echo "cfssl is not installed"
+  echo 'use: bash -c "cd ../../../tools/mod; go install github.com/cloudflare/cfssl/cmd/cfssl"'
+  exit 255
+fi
+
+if ! command -v cfssljson; then
+  echo "cfssljson is not installed"
+  echo 'use: bash -c "cd ../../../tools/mod; go install github.com/cloudflare/cfssl/cmd/cfssljson"'
   exit 255
 fi
 

diff --git a/tests/manual/Makefile b/tests/manual/Makefile