chore: bazel run //:format

aspect-build · Dec 9, 2023 · 7458b24 · 7458b24
1 parent 69fe0d9
commit 7458b24
Show file tree

Hide file tree

Showing 24 changed files with 292 additions and 291 deletions.
diff --git a/.aspect/workflows/terraform/workflows.tf b/.aspect/workflows/terraform/workflows.tf
@@ -42,7 +42,7 @@ module "aspect_workflows" {
 
   # Warming set definitions
   warming_sets = {
-    default  = {}
+    default = {}
   }
 
   # Resource types for use by runner groups

diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,3 @@
+[*.sh]
+indent_style = space
+indent_size = 4
diff --git a/.github/workflows/release_prep.sh b/.github/workflows/release_prep.sh
@@ -7,18 +7,18 @@ echo >.git/info/attributes "examples export-ignore"
 # But **do** include e2e/bzlmod since the BCR wants to run presubmit test
 # and it only sees our release artifact.
 # shellcheck disable=2010
-ls e2e | grep -v bzlmod | awk 'NF{print "e2e/" $0 " export-ignore"}' >> .git/info/attributes
+ls e2e | grep -v bzlmod | awk 'NF{print "e2e/" $0 " export-ignore"}' >>.git/info/attributes
 
 # Set by GH actions, see
 # https://docs.github.com/en/actions/learn-github-actions/environment-variables#default-environment-variables
 TAG=${GITHUB_REF_NAME}
 # The prefix is chosen to match what GitHub generates for source archives
 PREFIX="rules_js-${TAG:1}"
 ARCHIVE="rules_js-$TAG.tar.gz"
-git archive --format=tar --prefix="${PREFIX}/" "${TAG}" | gzip > "$ARCHIVE"
+git archive --format=tar --prefix="${PREFIX}/" "${TAG}" | gzip >"$ARCHIVE"
 SHA=$(shasum -a 256 "$ARCHIVE" | awk '{print $1}')
 
-cat << EOF
+cat <<EOF
 
 Many companies are successfully building with rules_js.
 If you're getting value from the project, please let us know!
@@ -65,9 +65,9 @@ http_archive(
 EOF
 
 awk 'f;/--SNIP--/{f=1}' e2e/workspace/WORKSPACE
-echo "\`\`\`" 
+echo "\`\`\`"
 
-cat << EOF
+cat <<EOF
 
 To use rules_js with bazel-lib 2.x, you must additionally register the coreutils toolchain.
 

diff --git a/e2e/js_image_docker/test.sh b/e2e/js_image_docker/test.sh
@@ -5,6 +5,6 @@ BZLMOD_FLAG="${BZLMOD_FLAG:-}"
 
 # shellcheck disable=SC2086
 if ! bazel test $BZLMOD_FLAG --nobuild_runfile_links //...; then
-  echo "ERROR: expected 'bazel test $BZLMOD_FLAG --nobuild_runfile_links //...' to pass"
-  exit 1
+    echo "ERROR: expected 'bazel test $BZLMOD_FLAG --nobuild_runfile_links //...' to pass"
+    exit 1
 fi
diff --git a/e2e/js_image_oci/test.sh b/e2e/js_image_oci/test.sh
@@ -5,6 +5,6 @@ BZLMOD_FLAG="${BZLMOD_FLAG:-}"
 
 # shellcheck disable=SC2086
 if ! bazel test $BZLMOD_FLAG --nobuild_runfile_links //...; then
-  echo "ERROR: expected 'bazel test $BZLMOD_FLAG --nobuild_runfile_links //...' to pass"
-  exit 1
+    echo "ERROR: expected 'bazel test $BZLMOD_FLAG --nobuild_runfile_links //...' to pass"
+    exit 1
 fi
diff --git a/e2e/js_run_devserver/multirun_test.sh b/e2e/js_run_devserver/multirun_test.sh
@@ -10,13 +10,13 @@ PORT2=8081
 
 # sedi makes `sed -i` work on both OSX & Linux
 # See https://stackoverflow.com/questions/2320564/i-need-my-sed-i-command-for-in-place-editing-to-work-with-both-gnu-sed-and-bsd
-_sedi () {
-  case $(uname) in
+_sedi() {
+    case $(uname) in
     Darwin*) sedi=('-i' '') ;;
     *) sedi=('-i') ;;
-  esac
+    esac
 
-  sed "${sedi[@]}" "$@"
+    sed "${sedi[@]}" "$@"
 }
 
 echo "$$: TEST - $0: $TARGET @ $PORT1 & $PORT2"
@@ -25,11 +25,11 @@ echo "$$: TEST - $0: $TARGET @ $PORT1 & $PORT2"
 ibazel_pid="$!"
 
 function _exit {
-  echo "$$: Cleanup..."
-  kill "$ibazel_pid"
-  wait "$ibazel_pid"
-  git checkout src/index.html src/BUILD.bazel
-  rm -f src/new.html
+    echo "$$: Cleanup..."
+    kill "$ibazel_pid"
+    wait "$ibazel_pid"
+    git checkout src/index.html src/BUILD.bazel
+    rm -f src/new.html
 }
 trap _exit EXIT
 
@@ -38,118 +38,117 @@ echo "$$: Waiting for $TARGET devserver to launch on $PORT1..."
 # Wait for $PORT1 to start the http server
 n=0
 while ! nc -z localhost $PORT1; do
-  if [ $n -gt 100 ]; then
-    echo "$$: ERROR: Expected http://localhost:$PORT1 to be available"
-    exit 1
-  fi
-  sleep 1 # wait before check again
-  ((n=n+1))
+    if [ $n -gt 100 ]; then
+        echo "$$: ERROR: Expected http://localhost:$PORT1 to be available"
+        exit 1
+    fi
+    sleep 1 # wait before check again
+    ((n = n + 1))
 done
 
 echo "$$: Waiting for $TARGET devserver to launch on $PORT2..."
 
 # Wait for $PORT2 to start the http server
 n=0
 while ! nc -z localhost $PORT2; do
-  if [ $n -gt 100 ]; then
-    echo "$$: ERROR: Expected http://localhost:$PORT2 to be available"
-    exit 1
-  fi
-  sleep 1 # wait before check again
-  ((n=n+1))
+    if [ $n -gt 100 ]; then
+        echo "$$: ERROR: Expected http://localhost:$PORT2 to be available"
+        exit 1
+    fi
+    sleep 1 # wait before check again
+    ((n = n + 1))
 done
 
-
 # Verify the initial state of $PORT1 and $PORT2
 echo "$$: Devservers ready"
 
 if ! curl http://localhost:$PORT1/index.html --fail 2>/dev/null | grep "My first website"; then
-  echo "$$: ERROR: Expected http://localhost:$PORT1/index.html to contain 'My first website'"
-  exit 1
+    echo "$$: ERROR: Expected http://localhost:$PORT1/index.html to contain 'My first website'"
+    exit 1
 fi
 
 if ! curl http://localhost:$PORT2/index.html --fail 2>/dev/null | grep "My first website"; then
-  echo "$$: ERROR: Expected http://localhost:$PORT2/index.html to contain 'My first website'"
-  exit 1
+    echo "$$: ERROR: Expected http://localhost:$PORT2/index.html to contain 'My first website'"
+    exit 1
 fi
 
 if ! curl http://localhost:$PORT1/other.html --fail 2>/dev/null | grep "My other website"; then
-  echo "$$: ERROR: Expected http://localhost:$PORT1/other.html to contain 'My other website'"
-  exit 1
+    echo "$$: ERROR: Expected http://localhost:$PORT1/other.html to contain 'My other website'"
+    exit 1
 fi
 
 if ! curl http://localhost:$PORT2/other.html --fail 2>/dev/null | grep "My other website"; then
-  echo "$$: ERROR: Expected http://localhost:$PORT2/other.html to contain 'My other website'"
-  exit 1
+    echo "$$: ERROR: Expected http://localhost:$PORT2/other.html to contain 'My other website'"
+    exit 1
 fi
 
 if curl http://localhost:$PORT1/new.html --fail 2>/dev/null; then
-  echo "$$: ERROR: Expected http://localhost:$PORT1/new.html to fail with 404"
-  exit 1
+    echo "$$: ERROR: Expected http://localhost:$PORT1/new.html to fail with 404"
+    exit 1
 fi
 
 if curl http://localhost:$PORT2/new.html --fail 2>/dev/null; then
-  echo "$$: ERROR: Expected http://localhost:$PORT2/new.html to fail with 404"
-  exit 1
+    echo "$$: ERROR: Expected http://localhost:$PORT2/new.html to fail with 404"
+    exit 1
 fi
 
 if curl http://localhost:$PORT1/index.html --fail 2>/dev/null | grep "A second line"; then
-  echo "$$: ERROR: Expected http://localhost:$PORT1/index.html to NOT contain 'A second line'"
-  exit 1
+    echo "$$: ERROR: Expected http://localhost:$PORT1/index.html to NOT contain 'A second line'"
+    exit 1
 fi
 
 if curl http://localhost:$PORT2/index.html --fail 2>/dev/null | grep "A second line"; then
-  echo "$$: ERROR: Expected http://localhost:$PORT2/index.html to NOT contain 'A second line'"
-  exit 1
+    echo "$$: ERROR: Expected http://localhost:$PORT2/index.html to NOT contain 'A second line'"
+    exit 1
 fi
 
-echo "<div>A second line</div>" >> src/index.html
+echo "<div>A second line</div>" >>src/index.html
 
 # Wait for $PORT1 to show the updated file
 n=0
 while ! curl http://localhost:$PORT1/index.html --fail 2>/dev/null | grep "A second line"; do
-  if [ $n -gt 30 ]; then
-    echo "$$: ERROR: Expected http://localhost:$PORT1/index.html to contain 'A second line'"
-    exit 1
-  fi
-  sleep 1 # wait before check again
-  ((n=n+1))
+    if [ $n -gt 30 ]; then
+        echo "$$: ERROR: Expected http://localhost:$PORT1/index.html to contain 'A second line'"
+        exit 1
+    fi
+    sleep 1 # wait before check again
+    ((n = n + 1))
 done
 
 # Wait for $PORT2 to show the updated file
 n=0
 while ! curl http://localhost:$PORT2/index.html --fail 2>/dev/null | grep "A second line"; do
-  if [ $n -gt 30 ]; then
-    echo "$$: ERROR: Expected http://localhost:$PORT2/index.html to contain 'A second line'"
-    exit 1
-  fi
-  sleep 1 # wait before check again
-  ((n=n+1))
+    if [ $n -gt 30 ]; then
+        echo "$$: ERROR: Expected http://localhost:$PORT2/index.html to contain 'A second line'"
+        exit 1
+    fi
+    sleep 1 # wait before check again
+    ((n = n + 1))
 done
 
-echo "<div>A new file</div>" > src/new.html
+echo "<div>A new file</div>" >src/new.html
 _sedi 's#"other.html"#"other.html", "new.html"#' src/BUILD.bazel
 
 # Wait for $PORT1 to show the new file
 n=0
 while ! curl http://localhost:$PORT1/new.html --fail 2>/dev/null | grep "A new file"; do
-  if [ $n -gt 30 ]; then
-    echo "$$: ERROR: Expected http://localhost:$PORT1/new.html to contain 'A new file'"
-    exit 1
-  fi
-  sleep 1 # wait before check again
-  ((n=n+1))
+    if [ $n -gt 30 ]; then
+        echo "$$: ERROR: Expected http://localhost:$PORT1/new.html to contain 'A new file'"
+        exit 1
+    fi
+    sleep 1 # wait before check again
+    ((n = n + 1))
 done
 
 # Wait for $PORT2 to show the new file
 n=0
 while ! curl http://localhost:$PORT2/new.html --fail 2>/dev/null | grep "A new file"; do
-  if [ $n -gt 30 ]; then
-    echo "$$: ERROR: Expected http://localhost:$PORT2/new.html to contain 'A new file'"
-    exit 1
-  fi
-  sleep 1 # wait before check again
-  ((n=n+1))
+    if [ $n -gt 30 ]; then
+        echo "$$: ERROR: Expected http://localhost:$PORT2/new.html to contain 'A new file'"
+        exit 1
+    fi
+    sleep 1 # wait before check again
+    ((n = n + 1))
 done
 
 echo "$$: All tests passed"