codegen: fix scalar error message and parse directories recursively (#175)

Author: hgiasac

cmd/hasura-ndc-go/command/internal/connector.go

@@ -11,6 +11,7 @@ import (
 	"os"
 	"path"
 	"runtime/trace"
+	"slices"
 	"strings"
 
 	"github.com/hasura/ndc-sdk-go/schema"
@@ -221,6 +222,8 @@ func (cg *connectorGenerator) renderOperationHandlers(values []string) string {
 	}
 	var sb strings.Builder
 	sb.WriteRune('{')
+	slices.Sort(values)
+
 	for i, v := range values {
 		if i > 0 {
 			sb.WriteString(", ")
@@ -402,7 +405,7 @@ var enumValues_%s = []%s{%s}
 func Parse%s(input string) (%s, error) {
   result := %s(input)
   if !slices.Contains(enumValues_%s, result) {
-    return %s(""), errors.New("failed to parse %s, expect one of %s")
+    return %s(""), errors.New("failed to parse %s, expect one of [%s]")
   }
 
   return result, nil
@@ -446,7 +449,7 @@ func (s *%s) FromValue(value any) error {
   *s = result
   return nil
 }
-`, pascalName, scalarKey, pascalName, scalarKey, scalarKey, pascalName, scalarKey, scalarKey, strings.Join(enumConstants, ", "),
+`, pascalName, scalarKey, pascalName, scalarKey, scalarKey, pascalName, scalarKey, scalarKey, strings.Join(scalarRep.OneOf, ", "),
 				scalarKey, pascalName, scalarKey, pascalName, scalarKey, pascalName,
 			))
 		default:

cmd/hasura-ndc-go/command/internal/connector_test.go

@@ -2,8 +2,10 @@ package internal
 
 import (
 	"encoding/json"
+	"log"
 	"os"
 	"path"
+	"path/filepath"
 	"regexp"
 	"strings"
 	"testing"
@@ -50,7 +52,7 @@ func TestConnectorGeneration(t *testing.T) {
 			BasePath:     "./testdata/subdir",
 			ConnectorDir: "connector",
 			ModuleName:   "github.com/hasura/ndc-codegen-subdir-test",
-			Directories:  []string{"connector/functions"},
+			Directories:  []string{"connector"},
 		},
 		{
 			Name:        "snake_case",
@@ -116,7 +118,20 @@ func TestConnectorGeneration(t *testing.T) {
 			for _, td := range tc.Directories {
 				expectedFunctionTypesBytes, err := os.ReadFile(path.Join("expected", "functions.go.tmpl"))
 				if err == nil {
-					functionTypesBytes, err := os.ReadFile(path.Join("source", td, "types.generated.go"))
+					var generatedPath string
+					for _, globPath := range []string{filepath.Join("source", td, "types.generated.go"), filepath.Join("source", td, "**", "types.generated.go")} {
+						goFiles, err := filepath.Glob(globPath)
+						assert.NilError(t, err)
+						log.Println(globPath, goFiles)
+						if len(goFiles) > 0 {
+							generatedPath = goFiles[0]
+
+							break
+						}
+					}
+
+					assert.Assert(t, generatedPath != "")
+					functionTypesBytes, err := os.ReadFile(generatedPath)
 					assert.NilError(t, err)
 					expected := formatTextContent(string(expectedFunctionTypesBytes))
 					reality := formatTextContent(string(functionTypesBytes))

cmd/hasura-ndc-go/command/internal/schema_parser.go

@@ -69,28 +69,26 @@ func parseRawConnectorSchemaFromGoCode(ctx context.Context, moduleName string, f
 			tempDirs = append(tempDirs, entry.Name())
 		}
 	}
-	var directories []string
+
+	directories := make(map[string]bool)
 	for _, dir := range tempDirs {
 		for _, globPath := range []string{path.Join(filePath, dir, "*.go"), path.Join(filePath, dir, "**", "*.go")} {
 			goFiles, err := filepath.Glob(globPath)
 			if err != nil {
 				return nil, fmt.Errorf("failed to read subdirectories of %s/%s: %w", filePath, dir, err)
 			}
-			// cleanup types.generated.go files
-			fileCount := 0
+
 			for _, fp := range goFiles {
 				if !strings.HasSuffix(fp, typeMethodsOutputFile) {
-					fileCount++
+					directories[filepath.Dir(fp)] = true
 					continue
 				}
-				if err := os.Remove(fp); err != nil {
+
+				// cleanup types.generated.go files
+				if err := os.Remove(fp); err != nil && !os.IsNotExist(err) {
 					return nil, fmt.Errorf("failed to delete %s: %w", fp, err)
 				}
 			}
-			if fileCount > 0 {
-				directories = append(directories, dir)
-				break
-			}
 		}
 	}
 
@@ -99,7 +97,7 @@ func parseRawConnectorSchemaFromGoCode(ctx context.Context, moduleName string, f
 
 		var packageList []*packages.Package
 		fset := token.NewFileSet()
-		for _, folder := range directories {
+		for folder := range directories {
 			_, parseCodeTask := trace.NewTask(ctx, fmt.Sprintf("parse_%s_code", folder))
 			folderPath := path.Join(filePath, folder)
 			cfg := &packages.Config{

cmd/hasura-ndc-go/command/internal/templates/new/.hasura-connector/Dockerfile.tmpl

@@ -1,5 +1,5 @@
 # build context at repo root: docker build -f Dockerfile .
-FROM golang:1.22 AS builder
+FROM golang:1.23 AS builder
 
 WORKDIR /app
 COPY go.mod go.sum ./

cmd/hasura-ndc-go/command/internal/templates/new/.hasura-connector/connector-metadata.yaml.tmpl

@@ -11,6 +11,7 @@ supportedEnvironmentVariables:
     required: false
 commands:
   update: hasura-ndc-go update
+  upgradeConfiguration: hasura-ndc-go update
 cliPlugin:
   name: ndc-go
   version: {{.Version}}

cmd/hasura-ndc-go/command/internal/testdata/basic/expected/functions.go.tmpl

@@ -1142,7 +1142,7 @@ var enumValues_SomeEnum = []SomeEnum{SomeEnumFoo, SomeEnumBar}
 func ParseSomeEnum(input string) (SomeEnum, error) {
   result := SomeEnum(input)
   if !slices.Contains(enumValues_SomeEnum, result) {
-    return SomeEnum(""), errors.New("failed to parse SomeEnum, expect one of SomeEnumFoo, SomeEnumBar")
+    return SomeEnum(""), errors.New("failed to parse SomeEnum, expect one of [foo, bar]")
   }
 
   return result, nil

cmd/hasura-ndc-go/command/internal/testdata/snake_case/expected/functions.go.tmpl

@@ -836,7 +836,7 @@ var enumValues_SomeEnum = []SomeEnum{SomeEnumFoo, SomeEnumBar}
 func ParseSomeEnum(input string) (SomeEnum, error) {
   result := SomeEnum(input)
   if !slices.Contains(enumValues_SomeEnum, result) {
-    return SomeEnum(""), errors.New("failed to parse SomeEnum, expect one of SomeEnumFoo, SomeEnumBar")
+    return SomeEnum(""), errors.New("failed to parse SomeEnum, expect one of [foo, bar]")
   }
 
   return result, nil