- Changed interface.

Author: general-kroll-4-life

pkg/docval/docval_fs.go

@@ -5,24 +5,39 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
+	"path"
 	"path/filepath"
 	"strings"
 )
 
+type FileValidator interface {
+	ValidateAndParseFile(docPath string, schemaPath string) (map[string]any, error)
+}
+
+type fileValidator struct {
+	rootSchemaDir string
+}
+
+func NewFileValidator(rootSchemaDir string) FileValidator {
+	return &fileValidator{
+		rootSchemaDir: rootSchemaDir,
+	}
+}
+
 // ValidateAndParseFile loads a document and its schema from the local filesystem,
 // rewrites external $ref values to absolute file:// URLs, and delegates to ValidateAndParse().
 //
 // Example:
 //
 //	parsed, err := docval.ValidateAndParseFile("fragment.yaml", "fragmented-resources.schema.json", "fragment")
-func ValidateAndParseFile(docPath string, schemaPath string) (map[string]any, error) {
+func (v *fileValidator) ValidateAndParseFile(docPath string, schemaPath string) (map[string]any, error) {
 	docType := "" // reserved for future use
 	docBytes, err := os.ReadFile(docPath)
 	if err != nil {
 		return nil, fmt.Errorf("read document %q: %w", docPath, err)
 	}
 
-	rewritten, err := rewriteSchemaRefsToFileURLs(schemaPath)
+	rewritten, err := v.rewriteSchemaRefsToFileURLs(schemaPath)
 	if err != nil {
 		return nil, fmt.Errorf("prepare schema %q: %w", schemaPath, err)
 	}
@@ -35,20 +50,26 @@ func ValidateAndParseFile(docPath string, schemaPath string) (map[string]any, er
 // rewriteSchemaRefsToFileURLs loads a JSON schema, finds all objects with a "$ref" string,
 // and for refs that are *external* (not starting with "#", not http/https, not file://),
 // rewrites them into absolute file:// URLs using schemaPath as the base.
-func rewriteSchemaRefsToFileURLs(schemaPath string) ([]byte, error) {
-	absSchema, err := filepath.Abs(schemaPath)
+func (v *fileValidator) rewriteSchemaRefsToFileURLs(schemaPath string) ([]byte, error) {
+	absSchema, err := filepath.Abs(path.Join(v.rootSchemaDir, schemaPath))
+	if err != nil {
+		return nil, err
+	}
+
+	rootPath, err := filepath.Abs(v.rootSchemaDir)
 	if err != nil {
 		return nil, err
 	}
-	rootDir := filepath.Dir(absSchema)
 
 	var m map[string]any
 	if err := readJSONSchema(absSchema, &m); err != nil {
 		return nil, err
 	}
 
 	// walk and rewrite
-	rewriteRefs(m, rootDir)
+	rewriteRefs(m, rootPath)
+
+	// marshal back to JSON
 
 	// re-encode pretty
 	var buf bytes.Buffer

pkg/docval/docval_test.go

@@ -6,6 +6,10 @@ import (
 	"github.com/stackql/any-sdk/pkg/docval"
 )
 
+var (
+	validator docval.FileValidator = docval.NewFileValidator("testdata/schema-definitions")
+)
+
 func TestValidateAndParse_ValidJSON(t *testing.T) {
 	jsonDoc := []byte(`{"name": "Alice", "age": 30}`)
 	jsonSchema := []byte(`{
@@ -27,7 +31,7 @@ func TestValidateAndParse_ValidJSON(t *testing.T) {
 }
 
 func TestLocalValidateAndParseValidProviderFile(t *testing.T) {
-	rv, err := docval.ValidateAndParseFile("testdata/docs/local_openssl/v0.1.0/provider.yaml", "testdata/schema-definitions/provider.schema.json")
+	rv, err := validator.ValidateAndParseFile("testdata/docs/local_openssl/v0.1.0/provider.yaml", "provider.schema.json")
 	if err != nil {
 		t.Fatalf("expected no error, got %v", err)
 	}
@@ -37,7 +41,7 @@ func TestLocalValidateAndParseValidProviderFile(t *testing.T) {
 }
 
 func TestValidateAndParseGoogleProviderFile(t *testing.T) {
-	rv, err := docval.ValidateAndParseFile("testdata/docs/googleapis.com/v0.1.2/provider.yaml", "testdata/schema-definitions/provider.schema.json")
+	rv, err := validator.ValidateAndParseFile("testdata/docs/googleapis.com/v0.1.2/provider.yaml", "provider.schema.json")
 	if err == nil {
 		t.Fatalf("expected an error, got none")
 	}
@@ -47,7 +51,7 @@ func TestValidateAndParseGoogleProviderFile(t *testing.T) {
 }
 
 func TestFragmentedResourcesFile(t *testing.T) {
-	rv, err := docval.ValidateAndParseFile("testdata/docs/googleapis.com/v0.1.2/resources/compute-v1.yaml", "testdata/schema-definitions/fragmented-resources.schema.json")
+	rv, err := validator.ValidateAndParseFile("testdata/docs/googleapis.com/v0.1.2/resources/compute-v1.yaml", "fragmented-resources.schema.json")
 	if err != nil {
 		t.Fatalf("expected no error, got %v", err)
 	}
@@ -61,7 +65,7 @@ func TestFragmentedResourcesFile(t *testing.T) {
 }
 
 func TestMonolithicCompositeServiceFile(t *testing.T) {
-	rv, err := docval.ValidateAndParseFile("testdata/docs/googleapis.com/v0.1.2/services/bigquery-v2.yaml", "testdata/schema-definitions/service-resources.schema.json")
+	rv, err := validator.ValidateAndParseFile("testdata/docs/googleapis.com/v0.1.2/services/bigquery-v2.yaml", "service-resources.schema.json")
 	if err != nil {
 		t.Fatalf("expected no error, got %v", err)
 	}
@@ -71,7 +75,7 @@ func TestMonolithicCompositeServiceFile(t *testing.T) {
 }
 
 func TestSplitCompositeServiceFile(t *testing.T) {
-	rv, err := docval.ValidateAndParseFile("testdata/docs/googleapis.com/v0.1.2/services-split/compute/compute-disks-v1.yaml", "testdata/schema-definitions/service-resources.schema.json")
+	rv, err := validator.ValidateAndParseFile("testdata/docs/googleapis.com/v0.1.2/services-split/compute/compute-disks-v1.yaml", "service-resources.schema.json")
 	if err != nil {
 		t.Fatalf("expected no error, got %v", err)
 	}
@@ -81,7 +85,7 @@ func TestSplitCompositeServiceFile(t *testing.T) {
 }
 
 func TestLocalTemplatedCompositeServiceFile(t *testing.T) {
-	rv, err := docval.ValidateAndParseFile("testdata/docs/local_openssl/v0.1.0/services/keys.yaml", "testdata/schema-definitions/local-templated.service-resources.schema.json")
+	rv, err := validator.ValidateAndParseFile("testdata/docs/local_openssl/v0.1.0/services/keys.yaml", "local-templated.service-resources.schema.json")
 	if err != nil {
 		t.Fatalf("expected no error, got %v", err)
 	}

public/discovery/shallow_discovery_test.go

@@ -135,7 +135,7 @@ func TestDiscoveryAWS(t *testing.T) {
 		t.Fatal("Expected 'aws' provider to be available")
 	}
 	awsProviderPath := "testdata/registry/basic/src/aws/v0.1.0/provider.yaml"
-	analysisCfg := discovery.NewAnalyzerCfg("openapi", "testdata/registry/basic/src", awsProviderPath, schemaLocalPath, false)
+	analysisCfg := discovery.NewAnalyzerCfg("openapi", "testdata/registry/basic/src", awsProviderPath, schemaLocalPath, true)
 	analysisCfg.SetIsProviderServicesMustExpand(true) // not always the case
 	rtCtx := dto.RuntimeCtx{CLISchemaDir: "testdata/schema-definitions"}
 	staticAnalyzer, analyzerErr := discovery.NewStaticAnalyzer(

public/discovery/static_analyzer.go

@@ -126,6 +126,7 @@ func newGenericStaticAnalyzer(
 		discoveryAdapter:  discoveryAdapter,
 		registryAPI:       registryAPI,
 		schemaDir:         schemaDir,
+		validator:         docval.NewFileValidator(schemaDir),
 	}
 }
 
@@ -945,6 +946,7 @@ type genericStaticAnalyzer struct {
 	discoveryStore    IDiscoveryStore
 	registryAPI       anysdk.RegistryAPI
 	schemaDir         string
+	validator         docval.FileValidator
 }
 
 // For each operation store in each resource:
@@ -976,7 +978,7 @@ func (osa *genericStaticAnalyzer) Analyze() error {
 	// --- DOCVAL ANALYSIS ---
 	schemaDir := osa.schemaDir
 	if !osa.cfg.IsSkipSchemaValidation() {
-		result, err := docval.ValidateAndParseFile(osa.cfg.GetDocRoot(), path.Join(schemaDir, "provider.schema.json"))
+		result, err := osa.validator.ValidateAndParseFile(osa.cfg.GetDocRoot(), path.Join(schemaDir, "provider.schema.json"))
 		if err != nil {
 			osa.errors = append(osa.errors, fmt.Errorf("docval error in provider file: %v", err))
 		}
@@ -997,7 +999,7 @@ func (osa *genericStaticAnalyzer) Analyze() error {
 				schemaPath = path.Join(schemaDir, "local-templated-service-resource.schema.json")
 			}
 			if svcPath != "" {
-				result, err := docval.ValidateAndParseFile(svcPath, schemaPath)
+				result, err := osa.validator.ValidateAndParseFile(svcPath, schemaPath)
 				if err != nil {
 					osa.errors = append(osa.errors, fmt.Errorf("docval error in service file %s: %v", svcPath, err))
 				}