Fix generator issue

seconroy · Oct 2, 2024 · f277ee3 · f277ee3
1 parent 315037e
commit f277ee3
Show file tree

Hide file tree

Showing 3 changed files with 955 additions and 731 deletions.
diff --git a/gen/generator.go b/gen/generator.go
@@ -710,7 +710,6 @@ func parseProfileParcelAttribute(attr *YamlConfigAttribute, model gjson.Result,
 	if attr.ModelName == "" {
 		return
 	}
-
 	path := ""
 	prefix := "properties."
 	for i, e := range attr.DataPath {
@@ -922,9 +921,12 @@ func augmentProfileParcelConfig(config *YamlConfig) {
 	model := gjson.ParseBytes(modelBytes)
 
 	for ia := range config.Attributes {
-		parseProfileParcelAttribute(&config.Attributes[ia], model.Get("request.properties.data"), false)
+		if model.Get("request.properties.data.oneOf").Exists() {
+			parseProfileParcelAttribute(&config.Attributes[ia], model.Get("request.properties.data.oneOf.0"), false)
+		} else {
+			parseProfileParcelAttribute(&config.Attributes[ia], model.Get("request.properties.data"), false)
+		}
 	}
-
 	if config.DsDescription == "" {
 		config.DsDescription = fmt.Sprintf("This data source can read the %s %s.", config.Name, CamelCase(config.ParcelType))
 	}