Fixed indexers generation

Author: igor-karpukhin

tools/.DS_Store

@@ -38,6 +38,8 @@ spec:
   openapi:
     - name: v20250312
       package: go.mongodb.org/atlas-sdk/v20250312005/admin
+    - name: v20250313
+      package: go.mongodb.org/atlas-sdk/v20250312006/admin
 
   crd:
     - gvk:
@@ -60,7 +62,17 @@ spec:
               skipProperties:
                 - $.apiKey
                 - $.organization.links
-
+        - majorVersion: v20250313
+          openAPIRef:
+            name: v20250313
+          entry:
+            schema: "CreateOrganizationRequest"
+          status:
+            schema: "CreateOrganizationResponse"
+            filters:
+              skipProperties:
+                - $.apiKey
+                - $.organization.links
     - gvk:
         version: v1
         kind: Group

tools/openapi2crd/config.yaml

@@ -74,6 +74,7 @@ require (
 	github.com/stretchr/objx v0.5.2 // indirect
 	github.com/subosito/gotenv v1.2.0 // indirect
 	github.com/x448/float16 v0.8.4 // indirect
+	go.mongodb.org/atlas-sdk/v20250312006 v20250312006.1.0 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
 	go.opentelemetry.io/otel v1.28.0 // indirect
 	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect

tools/openapi2crd/go.mod

@@ -388,6 +388,8 @@ go.etcd.io/etcd/client/v3 v3.5.16 h1:sSmVYOAHeC9doqi0gv7v86oY/BTld0SEFGaxsU9eRhE
 go.etcd.io/etcd/client/v3 v3.5.16/go.mod h1:X+rExSGkyqxvu276cr2OwPLBaeqFu1cIl4vmRjAD/50=
 go.mongodb.org/atlas-sdk/v20250312005 v20250312005.0.0 h1:uKOtHXCP/Gwuj+IF1hsKtIAxNSVjKNo+o4Z+ulgCEXw=
 go.mongodb.org/atlas-sdk/v20250312005 v20250312005.0.0/go.mod h1:UeRE741z+kDGH00qQasZmthQxJMeA6PmAtY/2dStW+Q=
+go.mongodb.org/atlas-sdk/v20250312006 v20250312006.1.0 h1:PcVxslw4G7/I9SbUi5y81i4YZnL1dKRnGpeHVyNSTh4=
+go.mongodb.org/atlas-sdk/v20250312006 v20250312006.1.0/go.mod h1:UZYSaCimjGs3j+wMwgHSKUSIvoJXzmy/xrer0t5TLgo=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=

tools/openapi2crd/go.sum

@@ -1,6 +1,13 @@
-
 build:
 	go build -o bin/scaffolder cmd/main.go
 
-generate:
-	controller-gen object:headerFile="hack/boilerplate.go.txt" paths="./pkg/api/..."
+list: build
+	./bin/scaffolder --input ../openapi2crd/result.yaml --list
+
+generate: build
+	./bin/scaffolder --input ../openapi2crd/result.yaml --crd $(CRD_NAME) \
+		--indexer-out ../../internal/indexer \
+		--controller-out ../../internal/controller \
+		--translation-out ../../internal/translation
+
+

tools/output

@@ -65,9 +65,8 @@ func ParseReferenceFields(resultPath, crdKind string) ([]ReferenceField, error)
 			continue
 		}
 
-		if refs != nil {
-			return refs, nil
-		}
+		// We found the target CRD, return the references (even if empty)
+		return refs, nil
 	}
 
 	return nil, fmt.Errorf("CRD kind '%s' not found in result file", crdKind)
@@ -103,9 +102,13 @@ func parseNextCRDReferences(scanner *bufio.Scanner, targetKind string) ([]Refere
 	if buffer.Len() > 0 {
 		refs, err := extractReferencesFromCRD(buffer.Bytes(), targetKind)
 		if err != nil {
-			return nil, err
+			// Ignore "not target CRD" errors, just like in the loop above
+			if err.Error() != "not target CRD" {
+				return nil, err
+			}
+		} else {
+			return refs, nil
 		}
-		return refs, nil
 	}
 
 	return nil, io.EOF
@@ -130,6 +133,7 @@ func extractReferencesFromCRD(content []byte, targetKind string) ([]ReferenceFie
 		}
 	}
 
+	// Return empty slice for CRDs with no references (this is valid)
 	return references, nil
 }