fix(scrape-datasource): adds additional deferred parent-child setters

alserom · Jan 30, 2024 · 6bed2a7 · 6bed2a7
1 parent 4c48d7e
commit 6bed2a7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 4 deletions.
diff --git a/cmd/to-repo-data/main.go b/cmd/to-repo-data/main.go
@@ -3,7 +3,6 @@ package main
 import (
 	"flag"
 	"fmt"
-	"io/ioutil"
 	"os"
 	"path/filepath"
 	"runtime"
@@ -97,7 +96,7 @@ func execute(source, dir string) error {
 	}
 
 	outVersion := out + "/version.json"
-	err = ioutil.WriteFile(outVersion, []byte(fmt.Sprintf(`{"version":"%s"}`, spec.GetVersion())), 0644)
+	err = os.WriteFile(outVersion, []byte(fmt.Sprintf(`{"version":"%s"}`, spec.GetVersion())), 0644)
 	fmt.Println("saving: " + outVersion)
 	if err != nil {
 		return err

diff --git a/internal/datasource/scrape/datasource.go b/internal/datasource/scrape/datasource.go
@@ -108,10 +108,20 @@ func (s *Scraper) FillApiSpec(as *spec.ApiSpec) error {
 		}
 	}
 
+	if len(childToParent) > 0 {
+		for childName, parent := range childToParent {
+			if child, ok := as.GetType(childName); ok {
+				child.SetParent(parent)
+				parent.AddChild(child)
+				delete(childToParent, childName)
+			}
+		}
+	}
+
 	if len(childToParent) > 0 {
 		msg := "some types were not added to the spec:"
-		for name := range childToParent {
-			msg += "\n- " + name
+		for childName := range childToParent {
+			msg += "\n- " + childName
 		}
 		return errors.New(msg)
 	}