Merge pull request #12421 from ptabor/20201026-fix-ws-shell

Unify tabs vs. spaces in the shell scripts
etcd-io · Oct 26, 2020 · eee8dec · eee8dec
2 parents bc3a77d + 0ba16d8
commit eee8dec
Show file tree

Hide file tree

Showing 21 changed files with 290 additions and 265 deletions.
diff --git a/build b/build
@@ -4,7 +4,7 @@ source ./scripts/test_lib.sh
 
 GIT_SHA=$(git rev-parse --short HEAD || echo "GitNotFound")
 if [[ -n "$FAILPOINTS" ]]; then
-	GIT_SHA="$GIT_SHA"-FAILPOINTS
+  GIT_SHA="$GIT_SHA"-FAILPOINTS
 fi
 
 VERSION_SYMBOL="go.etcd.io/etcd/api/v3/version.GitSHA"
@@ -16,107 +16,107 @@ GO_BUILD_ENV=("CGO_ENABLED=0" "GO_BUILD_FLAGS=${GO_BUILD_FLAGS}" "GOOS=${GOOS}"
 
 # enable/disable failpoints
 toggle_failpoints() {
-	mode="$1"
-	if command -v gofail >/dev/null 2>&1; then
-		run gofail "$mode" etcdserver/ mvcc/backend/
-	elif [[ "$mode" != "disable" ]]; then
-		log_error "FAILPOINTS set but gofail not found"
-		exit 1
-	fi
+  mode="$1"
+  if command -v gofail >/dev/null 2>&1; then
+    run gofail "$mode" etcdserver/ mvcc/backend/
+  elif [[ "$mode" != "disable" ]]; then
+    log_error "FAILPOINTS set but gofail not found"
+    exit 1
+  fi
 }
 
 toggle_failpoints_default() {
-	mode="disable"
-	if [[ -n "$FAILPOINTS" ]]; then mode="enable"; fi
-	toggle_failpoints "$mode"
+  mode="disable"
+  if [[ -n "$FAILPOINTS" ]]; then mode="enable"; fi
+  toggle_failpoints "$mode"
 }
 
 etcd_build() {
-	out="bin"
-	if [[ -n "${BINDIR}" ]]; then out="${BINDIR}"; fi
-	toggle_failpoints_default
+  out="bin"
+  if [[ -n "${BINDIR}" ]]; then out="${BINDIR}"; fi
+  toggle_failpoints_default
 
-	run rm -f "${out}/etcd"
-	# Static compilation is useful when etcd is run in a container. $GO_BUILD_FLAGS is OK
-	# shellcheck disable=SC2086
-	run env "${GO_BUILD_ENV[@]}" go build $GO_BUILD_FLAGS \
-		-installsuffix=cgo \
-		"-ldflags=${GO_LDFLAGS[*]}" \
-		-o="${out}/etcd" . || return 2
+  run rm -f "${out}/etcd"
+  # Static compilation is useful when etcd is run in a container. $GO_BUILD_FLAGS is OK
+  # shellcheck disable=SC2086
+  run env "${GO_BUILD_ENV[@]}" go build $GO_BUILD_FLAGS \
+    -installsuffix=cgo \
+    "-ldflags=${GO_LDFLAGS[*]}" \
+    -o="${out}/etcd" . || return 2
 
-	run rm -f "${out}/etcdctl"
-	# shellcheck disable=SC2086
-	(
-		cd ./etcdctl
-		run env CGO_ENABLED=0 GO_BUILD_FLAGS="${GO_BUILD_FLAGS}" go build $GO_BUILD_FLAGS \
-			-installsuffix=cgo \
-			"-ldflags=${GO_LDFLAGS[*]}" \
-			-o="../${out}/etcdctl" . || return 2
-	) || return 2
-	# Verify whether symbol we overriden exists
-	# For cross-compiling we cannot run: ${out}/etcd --version | grep -q "Git SHA: ${GIT_SHA}"
+  run rm -f "${out}/etcdctl"
+  # shellcheck disable=SC2086
+  (
+    cd ./etcdctl
+    run env CGO_ENABLED=0 GO_BUILD_FLAGS="${GO_BUILD_FLAGS}" go build $GO_BUILD_FLAGS \
+      -installsuffix=cgo \
+      "-ldflags=${GO_LDFLAGS[*]}" \
+      -o="../${out}/etcdctl" . || return 2
+  ) || return 2
+  # Verify whether symbol we overriden exists
+  # For cross-compiling we cannot run: ${out}/etcd --version | grep -q "Git SHA: ${GIT_SHA}"
 
-	# We need symbols to do this check:
-	if [[ "${GO_LDFLAGS[*]}" != *"-s"* ]]; then
-		go tool nm "${out}/etcd" | grep "${VERSION_SYMBOL}" > /dev/null
-		if [[ "${PIPESTATUS[*]}" != "0 0" ]]; then
-			log_error "FAIL: Symbol ${VERSION_SYMBOL} not found in binary: ${out}/etcd"
-			return 2
-		fi
-	fi
+  # We need symbols to do this check:
+  if [[ "${GO_LDFLAGS[*]}" != *"-s"* ]]; then
+    go tool nm "${out}/etcd" | grep "${VERSION_SYMBOL}" > /dev/null
+    if [[ "${PIPESTATUS[*]}" != "0 0" ]]; then
+      log_error "FAIL: Symbol ${VERSION_SYMBOL} not found in binary: ${out}/etcd"
+      return 2
+    fi
+  fi
 }
 
 tools_build() {
-	out="bin"
-	if [[ -n "${BINDIR}" ]]; then out="${BINDIR}"; fi
-	tools_path="tools/benchmark
-		tools/etcd-dump-db
-		tools/etcd-dump-logs
-		tools/local-tester/bridge"
-	for tool in ${tools_path}
-	do
-		echo "Building" "'${tool}'"...
-		run rm -f "${out}/${tool}"
-		# shellcheck disable=SC2086
-		run env GO_BUILD_FLAGS="${GO_BUILD_FLAGS}" CGO_ENABLED=0 go build ${GO_BUILD_FLAGS} \
-			-installsuffix=cgo \
-			"-ldflags='${GO_LDFLAGS[*]}'" \
-			-o="${out}/${tool}" "./${tool}" || return 2
-	done
-	tests_build "${@}"
+  out="bin"
+  if [[ -n "${BINDIR}" ]]; then out="${BINDIR}"; fi
+  tools_path="tools/benchmark
+    tools/etcd-dump-db
+    tools/etcd-dump-logs
+    tools/local-tester/bridge"
+  for tool in ${tools_path}
+  do
+    echo "Building" "'${tool}'"...
+    run rm -f "${out}/${tool}"
+    # shellcheck disable=SC2086
+    run env GO_BUILD_FLAGS="${GO_BUILD_FLAGS}" CGO_ENABLED=0 go build ${GO_BUILD_FLAGS} \
+      -installsuffix=cgo \
+      "-ldflags='${GO_LDFLAGS[*]}'" \
+      -o="${out}/${tool}" "./${tool}" || return 2
+  done
+  tests_build "${@}"
 }
 
 tests_build() {
-	out="bin"
-	if [[ -n "${BINDIR}" ]]; then out="${BINDIR}"; fi
-	tools_path="
-		functional/cmd/etcd-agent
-		functional/cmd/etcd-proxy
-		functional/cmd/etcd-runner
-		functional/cmd/etcd-tester"
-	(
-		cd tests || exit 2
-		for tool in ${tools_path}; do
-			echo "Building" "'${tool}'"...
-			run rm -f "../${out}/${tool}"
+  out="bin"
+  if [[ -n "${BINDIR}" ]]; then out="${BINDIR}"; fi
+  tools_path="
+    functional/cmd/etcd-agent
+    functional/cmd/etcd-proxy
+    functional/cmd/etcd-runner
+    functional/cmd/etcd-tester"
+  (
+    cd tests || exit 2
+    for tool in ${tools_path}; do
+      echo "Building" "'${tool}'"...
+      run rm -f "../${out}/${tool}"
 
-			# shellcheck disable=SC2086
-			run env CGO_ENABLED=0 GO_BUILD_FLAGS="${GO_BUILD_FLAGS}" go build ${GO_BUILD_FLAGS} \
-				-installsuffix=cgo \
-				"-ldflags='${GO_LDFLAGS[*]}'" \
-				-o="../${out}/${tool}" "./${tool}" || return 2
-		done
-	) || return 2
+      # shellcheck disable=SC2086
+      run env CGO_ENABLED=0 GO_BUILD_FLAGS="${GO_BUILD_FLAGS}" go build ${GO_BUILD_FLAGS} \
+        -installsuffix=cgo \
+        "-ldflags='${GO_LDFLAGS[*]}'" \
+        -o="../${out}/${tool}" "./${tool}" || return 2
+    done
+  ) || return 2
 }
 
 toggle_failpoints_default
 
 # only build when called directly, not sourced
 if echo "$0" | grep "build$" >/dev/null; then
-	if etcd_build; then
-		log_success "SUCCESS: etcd_build"
-	else
-		log_error "FAIL: etcd_build"
-		exit 2
+  if etcd_build; then
+    log_success "SUCCESS: etcd_build"
+  else
+    log_error "FAIL: etcd_build"
+    exit 2
   fi
 fi
diff --git a/pkg/proxy/fixtures/gencerts.sh b/pkg/proxy/fixtures/gencerts.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 
 if ! [[ "$0" =~ "./gencerts.sh" ]]; then
-	echo "must be run from 'fixtures'"
-	exit 255
+  echo "must be run from 'fixtures'"
+  exit 255
 fi
 
 if ! which cfssl; then
-	echo "cfssl is not installed"
-	exit 255
+  echo "cfssl is not installed"
+  exit 255
 fi
 
 cfssl gencert --initca=true ./ca-csr.json | cfssljson --bare ./ca

diff --git a/scripts/build-release.sh b/scripts/build-release.sh
@@ -7,8 +7,8 @@ set -e
 
 VERSION=$1
 if [ -z "${VERSION}" ]; then
-	echo "Usage: ${0} VERSION" >> /dev/stderr
-	exit 255
+  echo "Usage: ${0} VERSION" >> /dev/stderr
+  exit 255
 fi
 
 if ! command -v docker >/dev/null; then
@@ -19,11 +19,11 @@ fi
 ETCD_ROOT=$(dirname "${BASH_SOURCE[0]}")/..
 
 pushd "${ETCD_ROOT}" >/dev/null
-	echo Building etcd binary...
-	./scripts/build-binary "${VERSION}"
+  echo Building etcd binary...
+  ./scripts/build-binary "${VERSION}"
 
-	for TARGET_ARCH in "amd64" "arm64" "ppc64le" "s390x"; do
-		echo Building ${TARGET_ARCH} docker image...
-		GOOS=linux GOARCH=${TARGET_ARCH} BINARYDIR=release/etcd-${VERSION}-linux-${TARGET_ARCH} BUILDDIR=release ./scripts/build-docker "${VERSION}"
-	done
+  for TARGET_ARCH in "amd64" "arm64" "ppc64le" "s390x"; do
+    echo Building ${TARGET_ARCH} docker image...
+    GOOS=linux GOARCH=${TARGET_ARCH} BINARYDIR=release/etcd-${VERSION}-linux-${TARGET_ARCH} BUILDDIR=release ./scripts/build-docker "${VERSION}"
+  done
 popd >/dev/null
diff --git a/scripts/fix.sh b/scripts/fix.sh
@@ -10,10 +10,18 @@ function mod_tidy_fix {
   run go mod tidy || return 2
 }
 
+function bash_ws_fix {
+  log_callout "Fixing whitespaces in the bash scripts"
+  # Makes sure all bash scripts do use '  ' (double space) for indention. 
+  log_cmd "% find ./ -name '*.sh' | xargs sed --follow-symlinks -i 's|\t|  |g'"
+  find ./ -print0 -name '*.sh' | xargs -0 sed --follow-symlinks -i 's|\t|  |g'
+}
+
 log_callout -e "\nFixing etcd code for you...\n"
 
 run_for_modules run go fmt || exit 2
 run_for_modules mod_tidy_fix || exit 2
 run_for_module tests bom_fix || exit 2
+bash_ws_fix || exit 2
 
 log_success -e "\nSUCCESS: etcd code is fixed :)"