Improve the generator file handling

Signed-off-by: Andrea Frittoli <andrea.frittoli@gmail.com>

hack/generate.sh

@@ -2,42 +2,56 @@
 
 set -e
 
+REPO_PATH="$(cd "$(dirname "$0")/.."; pwd)"
+
 RED='\033[0;31m'
 GREEN='\033[0;32m'
 RESET='\033[0m'
 
-if ! [ -x "$(command -v goimports)" ]; then
+if ! [[ -x "$(command -v goimports)" ]]; then
 	echo "Installing goimports"
     go get golang.org/x/tools/cmd/goimports
 fi
 
 echo "Running validation scripts..."
 
-function cleanupGenerateAndCheck() {
+function cleanup() {
+    # Cleanup
     find . -name 'zz_*' -exec rm {} +
-    go run tools/generator.go
+}
+
+function generate() {
+    # Generate code
+    go run tools/generator.go --resources "${REPO_PATH}"
+}
+
+function check() {
+    # Check if code was up to date
     GIT_STATUS=$(git status -s)
-    if [[ ! -z $GIT_STATUS ]]; then
+    if [[ ! -z "${GIT_STATUS}" ]]; then
         echo -e "Changes detected:\n$GIT_STATUS"
         return 1
     fi
 }
 
 scripts=(
-    cleanupGenerateAndCheck
+    cleanup
+    generate
+    check
 )
+
 fail=0
 for s in "${scripts[@]}"; do
     echo "RUN ${s}"
     set +e
-    $s
+    ${s}
     result=$?
     set -e
-    if [[ $result  -eq 0 ]]; then
+    if [[ "${result}"  -eq 0 ]]; then
         echo -e "${GREEN}PASSED${RESET} ${s}"
     else
         echo -e "${RED}FAILED${RESET} ${s}"
         fail=1
     fi
 done
-exit $fail
+exit "${fail}"

tools/generator.go

@@ -24,6 +24,7 @@ import (
 	"flag"
 	"fmt"
 	"go/format"
+	"io/fs"
 	"log"
 	"os"
 	"path/filepath"
@@ -33,18 +34,23 @@ import (
 
 	cdevents "github.com/cdevents/sdk-go/pkg/api"
 	jsonschema "github.com/santhosh-tekuri/jsonschema/v5"
+	_ "github.com/santhosh-tekuri/jsonschema/v5/httploader" // loads the HTTP loader
 	"golang.org/x/mod/semver"
 	"golang.org/x/text/cases"
 	"golang.org/x/text/language"
 )
 
 var (
 	TEMPLATES          = "tools/templates/*.tmpl"
-	PROJECT_ROOT       = "./pkg/api"
+	CODE               = "./pkg/api"
+	GEN_CODE           = "./pkg/api"
+	REPO_ROOT string
+	TEMPLATES_FOLDER string
+	CODE_FOLDER string
+	GEN_CODE_FOLDER string
 	SPEC_FOLDER_PREFIX = "spec-"
 	SPEC_VERSIONS      = []string{"0.3.0"}
 	SCHEMA_FOLDER      = "schemas"
-	GEN_CODE_FOLDER    = "./pkg/api"
 	TEST_SCHEMA_FOLDER = "tests"
 	TEST_OUTPUT_PREFIX = "ztest_"
 
@@ -72,6 +78,9 @@ var (
 
 	// Tool
 	capitalizer cases.Caser
+
+	// Flags
+	RESOURCES_PATH = flag.String("resources", "", "the path to the generator resources root folder")
 )
 
 const REFERENCE_TYPE = "Reference"
@@ -135,27 +144,42 @@ func GoTypeName(schemaName string, mappings map[string]string) string {
 }
 
 func main() {
+	var err error
+	var ex string
+
 	// Parse input parameters
 	log.SetFlags(0)
 	log.SetPrefix("generator: ")
 	flag.Parse()
 
-	var err error
+	if *RESOURCES_PATH == "" {
+		ex, err = os.Executable()
+		if err != nil {
+			panic(err)
+		}
+		toolPath := filepath.Clean(filepath.Dir(filepath.Join(ex, "..")))
+		RESOURCES_PATH = &toolPath
+	}
+
+	// Setup folder variables
+	TEMPLATES_FOLDER = filepath.Join(*RESOURCES_PATH, TEMPLATES)
+	CODE_FOLDER = filepath.Join(*RESOURCES_PATH, CODE)
+	GEN_CODE_FOLDER = filepath.Join(*RESOURCES_PATH, GEN_CODE)
 
 	// Generate SDK files
 	for _, version := range SPEC_VERSIONS {
 		shortVersion := semver.MajorMinor("v" + version)
-		versioned_schema_folder := filepath.Join(PROJECT_ROOT, SPEC_FOLDER_PREFIX+shortVersion, SCHEMA_FOLDER)
-		log.Printf("Generating SDK files from templates: %s and schemas: %s into %s", TEMPLATES, versioned_schema_folder, GEN_CODE_FOLDER)
+		versioned_schema_folder := filepath.Join(CODE_FOLDER, SPEC_FOLDER_PREFIX+shortVersion, SCHEMA_FOLDER)
+		log.Printf("Generating SDK files from templates: %s and schemas: %s into %s", TEMPLATES_FOLDER, versioned_schema_folder, GEN_CODE_FOLDER)
 		err = generate(versioned_schema_folder, GEN_CODE_FOLDER, "", version, GO_TYPES_NAMES, false)
 		if err != nil {
 			log.Fatalf("%s", err.Error())
 		}
 	}
 
 	// Generate SDK test files
-	test_schema_folder := filepath.Join(PROJECT_ROOT, TEST_SCHEMA_FOLDER, SCHEMA_FOLDER)
-	log.Printf("Generating Test SDK files from templates: %s and schemas: %s into %s", TEMPLATES, test_schema_folder, GEN_CODE_FOLDER)
+	test_schema_folder := filepath.Join(CODE_FOLDER, TEST_SCHEMA_FOLDER, SCHEMA_FOLDER)
+	log.Printf("Generating Test SDK files from templates: %s and schemas: %s into %s", TEMPLATES_FOLDER, test_schema_folder, GEN_CODE_FOLDER)
 	err = generate(test_schema_folder, GEN_CODE_FOLDER, TEST_OUTPUT_PREFIX, "99.0.0", GO_TYPES_TEST_NAMES, true)
 	if err != nil {
 		log.Fatalf("%s", err.Error())
@@ -174,14 +198,14 @@ func generate(schemaFolder, genFolder, prefix, specVersion string, goTypes map[s
 		IsTestData:       isTestMode,
 	}
 
-	allTemplates, err := template.ParseGlob(TEMPLATES)
+	allTemplates, err := template.ParseGlob(TEMPLATES_FOLDER)
 	if err != nil {
 		return err
 	}
 
 	// Walk the jsonschemas folder, process each ".json" file
-	walkProcessor := getWalkProcessor(allTemplates, genFolder, goTypes, &allData, prefix, isTestMode)
-	err = filepath.Walk(schemaFolder, walkProcessor)
+	walkProcessor := getWalkProcessor(schemaFolder, allTemplates, genFolder, goTypes, &allData, prefix, isTestMode)
+	err = fs.WalkDir(os.DirFS(schemaFolder), ".", walkProcessor)
 	if err != nil {
 		return err
 	}
@@ -243,21 +267,26 @@ func executeTemplate(allTemplates *template.Template, templateName, outputFileNa
 	return os.WriteFile(outputFileName, src, 0644)
 }
 
-func getWalkProcessor(allTemplates *template.Template, genFolder string, goTypes map[string]string, allData *AllData, prefix string, isTestMode bool) filepath.WalkFunc {
-	return func(path string, info os.FileInfo, err error) error {
+func getWalkProcessor(rootDir string, allTemplates *template.Template, genFolder string, goTypes map[string]string, allData *AllData, prefix string, isTestMode bool) fs.WalkDirFunc {
+	return func(path string, info fs.DirEntry, err error) error {
 		if err != nil {
 			return err
 		}
-		// Nothing to do with folders
+		// Do not go into sub-folders
 		if info.IsDir() {
-			return nil
+			if info.Name() == "." {
+				return nil
+			}
+			return fs.SkipDir
 		}
 		if !strings.HasSuffix(info.Name(), ".json") {
 			// This should not happen, but ignore just in case
 			return nil
 		}
+		// Set the whole path
+		schemaPath := filepath.Join(rootDir, path)
 		// Load the jsonschema from the spec
-		sch, err := jsonschema.Compile(path)
+		sch, err := jsonschema.Compile(schemaPath)
 		if err != nil {
 			return err
 		}
@@ -270,7 +299,7 @@ func getWalkProcessor(allTemplates *template.Template, genFolder string, goTypes
 		data.Prefix = prefix
 		data.IsTestData = isTestMode
 		// Load the raw schema data
-		rawSchema, err := os.ReadFile(path)
+		rawSchema, err := os.ReadFile(schemaPath)
 		if err != nil {
 			return err
 		}