- Robot test fix.

Author: general-kroll-4-life

pkg/docval/docval_fs.go

@@ -66,7 +66,10 @@ func (v *fileValidator) rewriteSchemaRefsToFileURLs(schemaPath string) ([]byte,
 	}
 
 	// walk and rewrite
-	rewriteRefs(m, rootPath)
+	rewriteErr := rewriteRefs(m, rootPath)
+	if rewriteErr != nil {
+		return nil, rewriteErr
+	}
 
 	// marshal back to JSON
 
@@ -93,7 +96,7 @@ func readJSONSchema(path string, out *map[string]any) error {
 	return nil
 }
 
-func rewriteRefs(v any, baseDir string) {
+func rewriteRefs(v any, baseDir string) error {
 	switch t := v.(type) {
 	case map[string]any:
 		if raw, ok := t["$ref"]; ok {
@@ -109,6 +112,11 @@ func rewriteRefs(v any, baseDir string) {
 					if path != "" {
 						abs := filepath.Join(baseDir, filepath.FromSlash(path))
 						abs = filepath.Clean(abs)
+						abs, absErr := filepath.Abs(abs)
+						if absErr != nil {
+							// leave as-is on error
+							return absErr
+						}
 						// Construct file:// URL with platform-independent separators
 						url := "file://" + filepath.ToSlash(abs)
 						if frag != "" {
@@ -121,15 +129,22 @@ func rewriteRefs(v any, baseDir string) {
 		}
 		// walk children
 		for k, child := range t {
-			rewriteRefs(child, baseDir)
+			err := rewriteRefs(child, baseDir)
+			if err != nil {
+				return err
+			}
 			t[k] = child
 		}
 	case []any:
 		for i, child := range t {
-			rewriteRefs(child, baseDir)
+			err := rewriteRefs(child, baseDir)
+			if err != nil {
+				return err
+			}
 			t[i] = child
 		}
 	}
+	return nil
 }
 
 func splitRef(ref string) (path string, frag string) {

public/discovery/static_analyzer.go

@@ -978,7 +978,7 @@ func (osa *genericStaticAnalyzer) Analyze() error {
 	// --- DOCVAL ANALYSIS ---
 	schemaDir := osa.schemaDir
 	if !osa.cfg.IsSkipSchemaValidation() {
-		result, err := osa.validator.ValidateAndParseFile(osa.cfg.GetDocRoot(), filepath.Join(schemaDir, "provider.schema.json"))
+		result, err := osa.validator.ValidateAndParseFile(osa.cfg.GetDocRoot(), "provider.schema.json")
 		if err != nil {
 			osa.errors = append(osa.errors, fmt.Errorf("docval error in provider file: %v", err))
 		}
@@ -994,7 +994,7 @@ func (osa *genericStaticAnalyzer) Analyze() error {
 			}
 			svcRelativePath := svc.GetServiceRefRef()
 			svcPath := filepath.Join(osa.cfg.GetRegistryRootDir(), svcRelativePath)
-			schemaPath := filepath.Join(schemaDir, "service-resource.schema.json")
+			schemaPath := "service-resource.schema.json"
 			if protocolType == client.LocalTemplated {
 				schemaPath = filepath.Join(schemaDir, "local-templated-service-resource.schema.json")
 			}

test/robot/cli/aot/aot_adhoc.robot

@@ -11,6 +11,8 @@ Simple AOT Analysis Google Provider with CLI
     ...    aot
     ...    \./test/registry
     ...    \./test/registry/src/googleapis\.com/v0\.1\.2/provider\.yaml
+    ...    \-\-schema-dir 
+    ...    cicd/schema-definitions
     ...    cwd=${CWD_FOR_EXEC}
     ...    stdout=${CURDIR}${/}/tmp${/}Simple-AOT-Analysis-Google-Provider-with-CLI.txt
     ...    stderr=${CURDIR}${/}/tmp${/}Simple-AOT-Analysis-Google-Provider-with-CLI_stderr.txt
@@ -30,6 +32,8 @@ Simple AOT Analysis AWS Provider with CLI
     ...    \./test/registry
     ...    \./test/registry/src/aws/v0\.1\.0/provider\.yaml
     ...    \-v
+    ...    \-\-schema-dir 
+    ...    cicd/schema-definitions
     ...    cwd=${CWD_FOR_EXEC}
     ...    stdout=${CURDIR}${/}/tmp${/}Simple-AOT-Analysis-AWS-Provider-with-CLI.txt
     ...    stderr=${CURDIR}${/}/tmp${/}Simple-AOT-Analysis-AWS-Provider-with-CLI_stderr.txt
@@ -50,6 +54,8 @@ Simple AOT Service Level Analysis AWS EC2 with CLI
     ...    \./test/registry
     ...    \./test/registry/src/aws/v0\.1\.0/provider\.yaml
     ...    ec2
+    ...    \-\-schema-dir 
+    ...    cicd/schema-definitions
     ...    cwd=${CWD_FOR_EXEC}
     ...    stdout=${CURDIR}${/}/tmp${/}Simple-AOT-Service-Level-Analysis-AWS-EC2-with-CLI.txt
     ...    stderr=${CURDIR}${/}/tmp${/}Simple-AOT-Service-Level-Analysis-AWS-EC2-with-CLI_stderr.txt