1
0
mirror of https://github.com/etcd-io/etcd.git synced 2026-02-05 06:46:49 +01:00

fix: Create scripts/fix/mod-tidy.sh and refactor test.sh

- Create scripts/fix/mod-tidy.sh with proper workspace module iteration
- Remove go.sum files before tidy to ensure clean state (regenerated by go mod tidy)
- Use run wrapper for consistent command execution and logging
- Update Makefile fix-mod-tidy target to use the new script
- Add ETCD_ROOT_DIR support for dynamic path resolution
- Delete module_mod_tidy_fix and mod_tidy_fix_pass functions from scripts/test.sh
  (functionality moved to scripts/fix/mod-tidy.sh)

Signed-off-by: Himanshu Singh <himanshuich20@gmail.com>
This commit is contained in:
Himanshu Singh
2026-01-12 19:34:39 +00:00
parent a438759bf0
commit c7ad57fd24
3 changed files with 25 additions and 10 deletions

24
scripts/fix/mod-tidy.sh Executable file
View File

@@ -0,0 +1,24 @@
#!/usr/bin/env bash
# Copyright 2026 The etcd Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
set -euo pipefail
ETCD_ROOT_DIR=${ETCD_ROOT_DIR:-$(git rev-parse --show-toplevel)}
source "${ETCD_ROOT_DIR}/scripts/test_lib.sh"
log_callout "Tidying go.mod files"
run_for_workspace_modules run sh -c "rm -f ./go.sum && go mod tidy"
log_success "go.mod files tidied"

View File

@@ -627,15 +627,6 @@ function mod_tidy_pass {
run_for_workspace_modules run go mod tidy -diff
}
function module_mod_tidy_fix {
run rm ./go.sum
run go mod tidy || return 2
}
function mod_tidy_fix_pass {
run_for_workspace_modules module_mod_tidy_fix
}
function proto_annotations_pass {
"${ETCD_ROOT_DIR}/scripts/verify_proto_annotations.sh"
}