add -check flag to gen-accessors.go, gen-iterators.go, and gen-stringify-test.go

Author: Not-Dhananjay-Mishra

github/gen-accessors.go

@@ -40,6 +40,7 @@ const (
 
 var (
 	verbose = flag.Bool("v", false, "Print verbose log messages")
+	check   = flag.Bool("check", false, "check wheather generated files are update or not")
 
 	sourceTmpl = template.Must(template.New("source").Parse(source))
 	testTmpl   = template.Must(template.New("test").Parse(test))
@@ -67,6 +68,10 @@ var (
 	}
 )
 
+func isCheck() bool {
+	return *check || os.Getenv("CHECK") == "1"
+}
+
 func logf(fmt string, args ...any) {
 	if *verbose {
 		log.Printf(fmt, args...)
@@ -233,6 +238,23 @@ func (t *templateData) dump() error {
 			return fmt.Errorf("format.Source:\n%v\n%v", buf.String(), err)
 		}
 
+		if isCheck() {
+			logf("Checking %v...", filename)
+			old, err := os.ReadFile(filename)
+			if err != nil {
+				if os.IsNotExist(err) {
+					return fmt.Errorf("Missing file: %v\n", t.filename)
+				} else {
+					return err
+				}
+			}
+
+			if !bytes.Equal(old, clean) {
+				return fmt.Errorf("Generated files are out of date. Please run go generate ./... and commit the results")
+			}
+			return nil
+		}
+
 		logf("Writing %v...", filename)
 		if err := os.Chmod(filename, 0o644); err != nil {
 			return fmt.Errorf("os.Chmod(%q, 0644): %v", filename, err)

github/gen-iterators.go

@@ -35,6 +35,7 @@ const (
 
 var (
 	verbose = flag.Bool("v", false, "Print verbose log messages")
+	check   = flag.Bool("check", false, "check wheather generated files are update or not")
 
 	sourceTmpl = template.Must(template.New("source").Funcs(template.FuncMap{
 		"hasPrefix": strings.HasPrefix,
@@ -43,6 +44,10 @@ var (
 	testTmpl = template.Must(template.New("test").Parse(test))
 )
 
+func isCheck() bool {
+	return *check || os.Getenv("CHECK") == "1"
+}
+
 func logf(fmt string, args ...any) {
 	if *verbose {
 		log.Printf(fmt, args...)
@@ -599,8 +604,26 @@ func (t *templateData) dump() error {
 		if err != nil {
 			return fmt.Errorf("format.Source: %v\n%s", err, buf.String())
 		}
+		if isCheck() {
+			logf("Checking %v...", filename)
+			old, err := os.ReadFile(filename)
+			if err != nil {
+				if os.IsNotExist(err) {
+					return fmt.Errorf("Missing file: %v\n", t.filename)
+				} else {
+					return err
+				}
+			}
+
+			if !bytes.Equal(old, clean) {
+				return fmt.Errorf("Generated files are out of date. Please run go generate ./... and commit the results")
+			}
+			return nil
+		}
+
 		logf("Writing %v...", filename)
-		return os.WriteFile(filename, clean, 0o644)
+		err = os.WriteFile(filename, clean, 0o644)
+		return err
 	}
 
 	if err := processTemplate(sourceTmpl, t.filename); err != nil {

github/gen-stringify-test.go

@@ -37,6 +37,7 @@ const (
 
 var (
 	verbose = flag.Bool("v", false, "Print verbose log messages")
+	check   = flag.Bool("check", false, "check wheather generated files are update or not")
 
 	// skipStructMethods lists "struct.method" combos to skip.
 	skipStructMethods = map[string]bool{}
@@ -83,6 +84,10 @@ var (
 	sourceTmpl = template.Must(template.New("source").Funcs(funcMap).Parse(source))
 )
 
+func isCheck() bool {
+	return *check || os.Getenv("CHECK") == "1"
+}
+
 func main() {
 	flag.Parse()
 	fset := token.NewFileSet()
@@ -353,19 +358,29 @@ func (t *templateData) dump() error {
 		return err
 	}
 
-	logf("Writing %v...", t.filename)
-	if err := os.Chmod(t.filename, 0o644); err != nil {
-		return fmt.Errorf("os.Chmod(%q, 0644): %v", t.filename, err)
+	if isCheck() {
+		logf("Checking %v...", t.filename)
+		old, err := os.ReadFile(t.filename)
+		if err != nil {
+			if os.IsNotExist(err) {
+				return fmt.Errorf("Missing file: %v\n", t.filename)
+			} else {
+				return err
+			}
+		}
+
+		if !bytes.Equal(old, clean) {
+			return fmt.Errorf("Generated files are out of date. Please run go generate ./... and commit the results")
+		}
+		return nil
 	}
 
+	logf("Writing %v...", t.filename)
+
 	if err := os.WriteFile(t.filename, clean, 0o444); err != nil {
 		return err
 	}
 
-	if err := os.Chmod(t.filename, 0o444); err != nil {
-		return fmt.Errorf("os.Chmod(%q, 0444): %v", t.filename, err)
-	}
-
 	return nil
 }
 

script/generate.sh

@@ -1,54 +1,17 @@
-#!/bin/sh
-#/ `script/generate.sh` runs `go generate` on all modules in this repo.
-#/ It also runs `script/run-check-structfield-settings.sh -fix` to keep linter
-#/ exceptions in `.golangci.yml` up to date.
-#/ `script/generate.sh --check` checks that the generated files are up to date.
+  #!/bin/sh
+  #/ `script/generate.sh` runs `go generate` on repo.
+  #/ It also runs `script/run-check-structfield-settings.sh -fix` to keep linter
+  #/ exceptions in `.golangci.yml` up to date.
+  #/ `script/generate.sh --check` checks that the generated files are up to date.
 
 set -e
 
 CDPATH="" cd -- "$(dirname -- "$0")/.."
 
 if [ "$1" = "--check" ]; then
-  GENTEMP="$(mktemp -d)"
-  git worktree add -q --detach "$GENTEMP"
-  trap 'git worktree remove -f "$GENTEMP"; rm -rf "$GENTEMP"' EXIT
-  git diff --name-only --diff-filter=D --no-renames HEAD | while read -r f; do
-    rm -f "$GENTEMP/$f"
-  done
-  git ls-files -com --exclude-standard | while read -r f; do
-    target="$GENTEMP/$f"
-    mkdir -p "$(dirname -- "$target")"
-    cp "$f" "$target"
-  done
-  if [ -f "$(pwd)"/bin ]; then
-    ln -s "$(pwd)"/bin "$GENTEMP"/bin
-  fi
-  (
-    cd "$GENTEMP"
-    git add .
-    git -c user.name='bot' -c user.email='bot@localhost' -c commit.gpgsign=false commit -m "generate" -q --allow-empty
-    script/generate.sh
-    [ -z "$(git status --porcelain)" ] || {
-      msg="Generated files are out of date. Please run script/generate.sh and commit the results"
-      if [ -n "$GITHUB_ACTIONS" ]; then
-        echo "::error ::$msg"
-      else
-        echo "$msg" 1>&2
-      fi
-      git diff
-      exit 1
-    }
-  )
-  exit 0
+  export CHECK=1
 fi
 
-MOD_DIRS="$(git ls-files '*go.mod' | xargs dirname | sort)"
+go generate ./...
 
-for dir in $MOD_DIRS; do
-  (
-    cd "$dir"
-    go generate ./...
-    go mod tidy
-  )
-done
-script/run-check-structfield-settings.sh -fix
+script/run-check-structfield-settings.sh -fix