From 2838f4171f70a1f6ab01ebdc4a06cc7f5a90f5c4 Mon Sep 17 00:00:00 2001 From: Boming Zhang Date: Sat, 29 Jun 2024 15:43:03 -0400 Subject: [PATCH] chore: rename check --- cmd/healthcheck/main.go | 2 +- pkg/healthcheck/forbidden.go | 7 ++++--- pkg/healthcheck/{release.go => tag.go} | 5 ++--- 3 files changed, 7 insertions(+), 7 deletions(-) rename pkg/healthcheck/{release.go => tag.go} (83%) diff --git a/cmd/healthcheck/main.go b/cmd/healthcheck/main.go index 3ff8733..7fe98bc 100644 --- a/cmd/healthcheck/main.go +++ b/cmd/healthcheck/main.go @@ -73,7 +73,7 @@ func main() { fmt.Printf("## Non-ASCII Characters Commit Message Check Failed:\n%s\n", err.Error()) } // TODO: find a way to test the release tag - err = healthcheck.CheckReleases(*rootDir, *releaseCategories, *releaseNumber) + err = healthcheck.CheckTags(*rootDir, *releaseCategories, *releaseNumber) if err != nil { fmt.Printf("## Release Tag Check Failed:\n%s\n", err.Error()) } diff --git a/pkg/healthcheck/forbidden.go b/pkg/healthcheck/forbidden.go index 0cbb21b..f700b74 100644 --- a/pkg/healthcheck/forbidden.go +++ b/pkg/healthcheck/forbidden.go @@ -54,13 +54,14 @@ func getForbiddens(root string, fileList []string, localList string) ([]string, } if info.IsDir() { - if info.Name() == ".git" || info.Name() == ".gitea" || info.Name() == "ci" { + switch { + case info.Name() == ".git" || info.Name() == ".gitea" || info.Name() == "ci": return filepath.SkipDir - } else if localList != "" { + case localList != "": if inString(info.Name(), dirs) { return filepath.SkipDir } - } else { + default: return nil } } diff --git a/pkg/healthcheck/release.go b/pkg/healthcheck/tag.go similarity index 83% rename from pkg/healthcheck/release.go rename to pkg/healthcheck/tag.go index 924d782..46e2b89 100644 --- a/pkg/healthcheck/release.go +++ b/pkg/healthcheck/tag.go @@ -2,7 +2,6 @@ package healthcheck import ( "fmt" - "strings" "github.com/go-git/go-git/v5" "github.com/go-git/go-git/v5/plumbing" @@ -31,7 +30,7 @@ func getTagsFromRepo(repoPath string) ([]string, error) { return tags, nil } -func CheckReleases(repoPath string, category string, n int) error { +func CheckTags(repoPath string, category string, n int) error { tags, err := getTagsFromRepo(repoPath) if err != nil { return fmt.Errorf("error getting tags: %v", err) @@ -56,7 +55,7 @@ func CheckReleases(repoPath string, category string, n int) error { } } if !found { - return fmt.Errorf("Wrong release tag '%s' or missing release tags. Please use one of '%s'.", target, strings.Join(tags, "', '")) + return fmt.Errorf("Expected tag '%s' not found.", target) } return nil }