Update ruler.

Author: tonymeehan

Makefile

@@ -7,25 +7,36 @@ LD_FLAGS_GITHASH := -X 'github.com/prequel-dev/cre/pkg/ruler.Githash=$(GITHASH)'
 LD_FLAGS_VERSION := -X 'github.com/prequel-dev/cre/pkg/ruler.Version=$(VERSION)'
 LD_FLAGS := $(LD_FLAGS_GITHASH) $(LD_FLAGS_VERSION) 
 
+BINDIR := ./bin
+
 .PHONY: all
 all: clean ruler rules
 
+.PHONY: bindir
+bindir:
+	mkdir -p $(BINDIR)
+
 .PHONY: ruler
-ruler:
-	@mkdir -p bin/
-	@env CGO_ENABLED=0 go build -ldflags "${LD_FLAGS}" -o ./bin/ruler ./cmd/ruler/ruler.go
+ruler: bindir
+	@env CGO_ENABLED=0 go build -ldflags "${LD_FLAGS}" -o ./bin/ruler-${SEMVER} ./cmd/ruler/ruler.go
+
+.PHONY: linux
+linux: bindir
+	@env GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -buildmode=pie -trimpath -ldflags "${LD_FLAGS}" -o ./bin/ruler-${SEMVER}-linux-amd64 ./cmd/ruler/ruler.go
+	@env GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -buildmode=pie -trimpath -ldflags "${LD_FLAGS}" -o ./bin/ruler-${SEMVER}-linux-arm64 ./cmd/ruler/ruler.go
+
+.PHONY: darwin
+darwin: bindir
+	@env GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 go build -buildmode=pie -trimpath -ldflags "${LD_FLAGS}" -o ./bin/ruler-${SEMVER}-darwin-arm64 ./cmd/ruler/ruler.go
 
-.PHONY: cross-compile
-cross-compile:
-	@env GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build -buildmode=pie -trimpath -ldflags "${LD_FLAGS}" -o ./bin/ruler-linux-amd64 ./cmd/ruler/ruler.go
-	@env GOOS=linux GOARCH=arm64 CGO_ENABLED=0 go build -buildmode=pie -trimpath -ldflags "${LD_FLAGS}" -o ./bin/ruler-linux-arm64 ./cmd/ruler/ruler.go
-	@env GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 go build -buildmode=pie -trimpath -ldflags "${LD_FLAGS}" -o ./bin/ruler-darwin-arm64 ./cmd/ruler/ruler.go
-	@env GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -buildmode=pie -trimpath -ldflags "${LD_FLAGS}" -o ./bin/ruler-windows-amd64 ./cmd/ruler/ruler.go
+.PHONY: windows
+windows: bindir
+	@env GOOS=windows GOARCH=amd64 CGO_ENABLED=0 go build -buildmode=pie -trimpath -ldflags "${LD_FLAGS}" -o ./bin/ruler-${SEMVER}-windows-amd64 ./cmd/ruler/ruler.go
 
 .PHONY: rules
 rules:
 	@mkdir -p bin/rules/
-	@./bin/ruler build -p rules  -o ./bin
+	@./bin/ruler-${SEMVER} build -p rules -o ./bin
 
 .PHONY: clean
 clean:

pkg/ruler/build.go

@@ -2,8 +2,6 @@ package ruler
 
 import (
 	"bytes"
-	"crypto/sha256"
-	"encoding/hex"
 	"errors"
 	"fmt"
 	"os"
@@ -246,31 +244,18 @@ func _build(vers, inPath, outPath, packageName string) error {
 		return err
 	}
 
-	hash := _sha256(doc)
-
-	fileName := makeFilename(packageName, vers, hash)
+	fileName := makeFilename(packageName, vers)
 	fullPath := filepath.Join(outPath, fileName)
 
 	if err = writeFile(fullPath, doc); err != nil {
 		return err
 	}
 
-	hashPath := fmt.Sprintf("%s.sha256", fullPath)
-	if err = writeFile(hashPath, []byte(hash)); err != nil {
-		return err
-	}
-
-	fmt.Printf("Wrote file [sha256 %s]: %s\n", hash, fileName)
-	fmt.Printf("Wrote hash file: %s\n", hashPath)
+	fmt.Printf("Wrote file: %s\n", fileName)
 
 	return nil
 }
 
-func _sha256(data []byte) string {
-	sum := sha256.Sum256(data)
-	return hex.EncodeToString(sum[:])
-}
-
 func writeFile(fn string, data []byte) error {
 	fh, err := os.OpenFile(fn, os.O_RDWR|os.O_CREATE, 0644)
 	if err != nil {
@@ -284,23 +269,17 @@ func writeFile(fn string, data []byte) error {
 	return fh.Close()
 }
 
-func makeFilename(name, vers, hash string) string {
+func makeFilename(name, vers string) string {
 	name = strings.TrimSuffix(name, ".yaml")
 	vers = strings.TrimPrefix(vers, "v")
 
-	buildMeta := fmt.Sprintf(".%s", hash[:8])
-
-	return fmt.Sprintf("%s.%s%s.yaml", name, vers, buildMeta)
+	return fmt.Sprintf("%s.%s.yaml", name, vers)
 }
 
 // Convert to document per section
 
 func generateDocument(rules map[string]parser.ParseRuleT, terms map[string]parser.ParseTermT) ([]byte, error) {
 
-	type docT struct {
-		Rules []any `yaml:"rules,omitempty"`
-	}
-
 	// Gather keys to produce consistent order output
 	ruleKeys := make([]string, 0, len(rules))
 	for k := range rules {

pkg/ruler/validate.go

@@ -27,8 +27,6 @@ var (
 
 type dupesT map[string]struct{}
 type tagsT dupesT
-type rulesT dupesT
-type termsT dupesT
 
 func validateTagsFields(t RuleIncludeT, tags tagsT) error {