From 1ae9c1a5376c10a5fe4df7c83170fe745de337ac Mon Sep 17 00:00:00 2001
From: Matthieu Evrin <6630779+lekaf974@users.noreply.github.com>
Date: Thu, 2 Jan 2025 13:04:39 -0500
Subject: [PATCH] Move script/util/* to script/utils/* (#6465)

## Which problem is this PR solving?

Part of #6429

## Description of the changes
- move scripts util/* => utils/

## How was this change tested?
-

## Checklist
- [ ] I have read
https://github.com/jaegertracing/jaeger/blob/master/CONTRIBUTING_GUIDELINES.md
- [x] I have signed all commits
- [ ] I have added unit tests for the new functionality
- [ ] I have run lint and test steps successfully
  - for `jaeger`: `make lint test`
  - for `jaeger-ui`: `npm run lint` and `npm run test`

Signed-off-by: lekaf974 <matthieu.evrin@gmail.com>
---
 .github/workflows/ci-lint-checks.yaml        | 2 +-
 scripts/build/build-crossdock.sh             | 4 ++--
 scripts/build/build-upload-a-docker-image.sh | 4 ++--
 scripts/{util => utils}/compute-tags.sh      | 0
 scripts/{util => utils}/compute-tags.test.sh | 0
 scripts/{util => utils}/docker-login.sh      | 0
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename scripts/{util => utils}/compute-tags.sh (100%)
 rename scripts/{util => utils}/compute-tags.test.sh (100%)
 rename scripts/{util => utils}/docker-login.sh (100%)

diff --git a/.github/workflows/ci-lint-checks.yaml b/.github/workflows/ci-lint-checks.yaml
index 9de71b05382..36cc8236bc2 100644
--- a/.github/workflows/ci-lint-checks.yaml
+++ b/.github/workflows/ci-lint-checks.yaml
@@ -116,4 +116,4 @@ jobs:
 
     - name: Run unit tests for scripts
       run: |
-        SHUNIT2=.tools/shunit2 bash scripts/util/compute-tags.test.sh
+        SHUNIT2=.tools/shunit2 bash scripts/utils/compute-tags.test.sh
diff --git a/scripts/build/build-crossdock.sh b/scripts/build/build-crossdock.sh
index a638d6ebb04..b9e8b0d1ba4 100755
--- a/scripts/build/build-crossdock.sh
+++ b/scripts/build/build-crossdock.sh
@@ -14,9 +14,9 @@ make build-and-run-crossdock
 if [[ "$BRANCH" == "main" ]]; then
   echo 'upload images to dockerhub/quay.io'
   REPO=jaegertracing/test-driver
-  IFS=" " read -r -a IMAGE_TAGS <<< "$(bash scripts/util/compute-tags.sh ${REPO})"
+  IFS=" " read -r -a IMAGE_TAGS <<< "$(bash scripts/utils/compute-tags.sh ${REPO})"
   IMAGE_TAGS+=("--tag" "docker.io/${REPO}:${COMMIT}" "--tag" "quay.io/${REPO}:${COMMIT}")
-  bash scripts/util/docker-login.sh
+  bash scripts/utils/docker-login.sh
 
   docker buildx build --push \
     --progress=plain \
diff --git a/scripts/build/build-upload-a-docker-image.sh b/scripts/build/build-upload-a-docker-image.sh
index 7bd90d879d8..28bbcba1a8e 100755
--- a/scripts/build/build-upload-a-docker-image.sh
+++ b/scripts/build/build-upload-a-docker-image.sh
@@ -96,13 +96,13 @@ if [[ "${local_test_only}" = "Y" ]]; then
 else
     echo "::group:: compute tags ${component_name}"
     # shellcheck disable=SC2086
-    IFS=" " read -r -a IMAGE_TAGS <<< "$(bash scripts/util/compute-tags.sh ${namespace}/${component_name})"
+    IFS=" " read -r -a IMAGE_TAGS <<< "$(bash scripts/utils/compute-tags.sh ${namespace}/${component_name})"
     echo "::endgroup::"
 
     # Only push multi-arch images to dockerhub/quay.io for main branch or for release tags vM.N.P{-rcX}
     if [[ "$BRANCH" == "main" || $BRANCH =~ ^v[0-9]+\.[0-9]+\.[0-9]+(-rc[0-9]+)?$ ]]; then
 	    echo "will build docker images and upload to dockerhub/quay.io, BRANCH=$BRANCH"
-	    bash scripts/util/docker-login.sh
+	    bash scripts/utils/docker-login.sh
 	    PUSHTAG="type=image,push=true"
 	    upload_comment=" and uploading"
 	    if [[ "$overwrite" == 'N' ]]; then
diff --git a/scripts/util/compute-tags.sh b/scripts/utils/compute-tags.sh
similarity index 100%
rename from scripts/util/compute-tags.sh
rename to scripts/utils/compute-tags.sh
diff --git a/scripts/util/compute-tags.test.sh b/scripts/utils/compute-tags.test.sh
similarity index 100%
rename from scripts/util/compute-tags.test.sh
rename to scripts/utils/compute-tags.test.sh
diff --git a/scripts/util/docker-login.sh b/scripts/utils/docker-login.sh
similarity index 100%
rename from scripts/util/docker-login.sh
rename to scripts/utils/docker-login.sh