update feature generation for newest SDK

s-urbaniak · s-urbaniak · commit bc6edcc4fbeb · 2025-12-02T13:42:23.000+01:00
# Conflicts:
#	config/openapi2crd.yaml
diff --git a/config/openapi2crd.yaml b/config/openapi2crd.yaml
@@ -52,7 +52,7 @@ spec:
 
   openapi:
     - name: v20250312
-      package: go.mongodb.org/atlas-sdk/v20250312006/admin
+      package: go.mongodb.org/atlas-sdk/v20250312009/admin
 
   crd:
     - gvk:
@@ -100,6 +100,9 @@ spec:
               verb: post
             references:
               - *groupRef
+            filters:
+              skipProperties:
+                - $.Use-Effective-Instance-Fields
           entry:
             schema: 'ClusterDescription20240805'
             filters:
diff --git a/internal/generated/controller/cluster/cluster_controller.go b/internal/generated/controller/cluster/cluster_controller.go
@@ -17,7 +17,7 @@ package cluster
 import (
 	"fmt"
 
-	v20250312sdk "go.mongodb.org/atlas-sdk/v20250312006/admin"
+	v20250312sdk "go.mongodb.org/atlas-sdk/v20250312009/admin"
 	zap "go.uber.org/zap"
 	client "sigs.k8s.io/controller-runtime/pkg/client"
 	cluster "sigs.k8s.io/controller-runtime/pkg/cluster"
diff --git a/internal/generated/controller/cluster/handler.go b/internal/generated/controller/cluster/handler.go
@@ -53,7 +53,7 @@ func (h *Handler) getHandlerForResource(ctx context.Context, cluster *akov2gener
 			return nil, errors.New("unsupported version v20250312 set in CR")
 		}
 		versionCount++
-		selectedHandler = h.handlerv20250312(h.Client, atlasClients.SdkClient20250312006, translator, h.deletionProtection)
+		selectedHandler = h.handlerv20250312(h.Client, atlasClients.SdkClient20250312009, translator, h.deletionProtection)
 	}
 
 	if versionCount == 0 {
diff --git a/internal/generated/controller/cluster/handler_v20250312.go b/internal/generated/controller/cluster/handler_v20250312.go
@@ -17,7 +17,7 @@ package cluster
 import (
 	"context"
 
-	v20250312sdk "go.mongodb.org/atlas-sdk/v20250312006/admin"
+	v20250312sdk "go.mongodb.org/atlas-sdk/v20250312009/admin"
 	controllerruntime "sigs.k8s.io/controller-runtime"
 	builder "sigs.k8s.io/controller-runtime/pkg/builder"
 	client "sigs.k8s.io/controller-runtime/pkg/client"
diff --git a/internal/generated/controller/databaseuser/databaseuser_controller.go b/internal/generated/controller/databaseuser/databaseuser_controller.go
@@ -17,7 +17,7 @@ package databaseuser
 import (
 	"fmt"
 
-	v20250312sdk "go.mongodb.org/atlas-sdk/v20250312006/admin"
+	v20250312sdk "go.mongodb.org/atlas-sdk/v20250312009/admin"
 	zap "go.uber.org/zap"
 	client "sigs.k8s.io/controller-runtime/pkg/client"
 	cluster "sigs.k8s.io/controller-runtime/pkg/cluster"
diff --git a/internal/generated/controller/databaseuser/handler.go b/internal/generated/controller/databaseuser/handler.go
@@ -53,7 +53,7 @@ func (h *Handler) getHandlerForResource(ctx context.Context, databaseuser *akov2
 			return nil, errors.New("unsupported version v20250312 set in CR")
 		}
 		versionCount++
-		selectedHandler = h.handlerv20250312(h.Client, atlasClients.SdkClient20250312006, translator, h.deletionProtection)
+		selectedHandler = h.handlerv20250312(h.Client, atlasClients.SdkClient20250312009, translator, h.deletionProtection)
 	}
 
 	if versionCount == 0 {
diff --git a/internal/generated/controller/databaseuser/handler_v20250312.go b/internal/generated/controller/databaseuser/handler_v20250312.go
@@ -17,7 +17,7 @@ package databaseuser
 import (
 	"context"
 
-	v20250312sdk "go.mongodb.org/atlas-sdk/v20250312006/admin"
+	v20250312sdk "go.mongodb.org/atlas-sdk/v20250312009/admin"
 	controllerruntime "sigs.k8s.io/controller-runtime"
 	builder "sigs.k8s.io/controller-runtime/pkg/builder"
 	client "sigs.k8s.io/controller-runtime/pkg/client"
diff --git a/internal/generated/controller/flexcluster/flexcluster_controller.go b/internal/generated/controller/flexcluster/flexcluster_controller.go
@@ -17,7 +17,7 @@ package flexcluster
 import (
 	"fmt"
 
-	v20250312sdk "go.mongodb.org/atlas-sdk/v20250312006/admin"
+	v20250312sdk "go.mongodb.org/atlas-sdk/v20250312009/admin"
 	zap "go.uber.org/zap"
 	client "sigs.k8s.io/controller-runtime/pkg/client"
 	cluster "sigs.k8s.io/controller-runtime/pkg/cluster"
diff --git a/internal/generated/controller/flexcluster/handler.go b/internal/generated/controller/flexcluster/handler.go
@@ -53,7 +53,7 @@ func (h *Handler) getHandlerForResource(ctx context.Context, flexcluster *akov2g
 			return nil, errors.New("unsupported version v20250312 set in CR")
 		}
 		versionCount++
-		selectedHandler = h.handlerv20250312(h.Client, atlasClients.SdkClient20250312006, translator, h.deletionProtection)
+		selectedHandler = h.handlerv20250312(h.Client, atlasClients.SdkClient20250312009, translator, h.deletionProtection)
 	}
 
 	if versionCount == 0 {
diff --git a/internal/generated/controller/group/group_controller.go b/internal/generated/controller/group/group_controller.go
@@ -17,7 +17,7 @@ package group
 import (
 	"fmt"
 
-	v20250312sdk "go.mongodb.org/atlas-sdk/v20250312006/admin"
+	v20250312sdk "go.mongodb.org/atlas-sdk/v20250312009/admin"
 	zap "go.uber.org/zap"
 	client "sigs.k8s.io/controller-runtime/pkg/client"
 	cluster "sigs.k8s.io/controller-runtime/pkg/cluster"
diff --git a/internal/generated/controller/group/handler.go b/internal/generated/controller/group/handler.go
@@ -49,7 +49,7 @@ func (h *Handler) getHandlerForResource(ctx context.Context, group *akov2generat
 			return nil, errors.New("unsupported version v20250312 set in CR")
 		}
 		versionCount++
-		selectedHandler = h.handlerv20250312(h.Client, atlasClients.SdkClient20250312006, translator, h.deletionProtection)
+		selectedHandler = h.handlerv20250312(h.Client, atlasClients.SdkClient20250312009, translator, h.deletionProtection)
 	}
 
 	if versionCount == 0 {
diff --git a/internal/generated/controller/group/handler_v20250312.go b/internal/generated/controller/group/handler_v20250312.go
@@ -19,7 +19,7 @@ import (
 	"errors"
 	"fmt"
 
-	v20250312sdk "go.mongodb.org/atlas-sdk/v20250312006/admin"
+	v20250312sdk "go.mongodb.org/atlas-sdk/v20250312009/admin"
 	controllerruntime "sigs.k8s.io/controller-runtime"
 	builder "sigs.k8s.io/controller-runtime/pkg/builder"
 	client "sigs.k8s.io/controller-runtime/pkg/client"
@@ -58,8 +58,8 @@ func (h *Handlerv20250312) HandleInitial(ctx context.Context, group *akov2genera
 		return result.Error(state.StateInitial, fmt.Errorf("failed to translate group to Atlas: %w", err))
 	}
 
-	params := &v20250312sdk.CreateProjectApiParams{Group: atlasGroup, ProjectOwnerId: group.Spec.V20250312.ProjectOwnerId}
-	response, _, err := h.atlasClient.ProjectsApi.CreateProjectWithParams(ctx, params).Execute()
+	params := &v20250312sdk.CreateGroupApiParams{Group: atlasGroup, ProjectOwnerId: group.Spec.V20250312.ProjectOwnerId}
+	response, _, err := h.atlasClient.ProjectsApi.CreateGroupWithParams(ctx, params).Execute()
 	if err != nil {
 		return result.Error(state.StateInitial, fmt.Errorf("failed to create group: %w", err))
 	}
@@ -85,7 +85,7 @@ func (h *Handlerv20250312) HandleImportRequested(ctx context.Context, group *ako
 		return result.Error(state.StateImportRequested, errors.New("missing annotation mongodb.com/external-id"))
 	}
 
-	response, _, err := h.atlasClient.ProjectsApi.GetProject(ctx, id).Execute()
+	response, _, err := h.atlasClient.ProjectsApi.GetGroup(ctx, id).Execute()
 	if err != nil {
 		return result.Error(state.StateImportRequested, fmt.Errorf("failed to get Group with id %s: %w", id, err))
 	}
@@ -136,7 +136,7 @@ func (h *Handlerv20250312) HandleDeletionRequested(ctx context.Context, group *a
 		return result.NextState(state.StateDeleted, "Group deleted.")
 	}
 
-	_, err := h.atlasClient.ProjectsApi.DeleteProject(ctx, *group.Status.V20250312.Id).Execute()
+	_, err := h.atlasClient.ProjectsApi.DeleteGroup(ctx, *group.Status.V20250312.Id).Execute()
 	if v20250312sdk.IsErrorCode(err, "GROUP_NOT_FOUND") {
 		return result.NextState(state.StateDeleted, "Group deleted.")
 	}
@@ -149,7 +149,7 @@ func (h *Handlerv20250312) HandleDeletionRequested(ctx context.Context, group *a
 
 // HandleDeleting handles the deleting state for version v20250312
 func (h *Handlerv20250312) HandleDeleting(ctx context.Context, group *akov2generated.Group) (ctrlstate.Result, error) {
-	_, _, err := h.atlasClient.ProjectsApi.GetProject(ctx, *group.Status.V20250312.Id).Execute()
+	_, _, err := h.atlasClient.ProjectsApi.GetGroup(ctx, *group.Status.V20250312.Id).Execute()
 	switch {
 	case v20250312sdk.IsErrorCode(err, "GROUP_NOT_FOUND"):
 		return result.NextState(state.StateDeleted, "Deleted")
@@ -186,12 +186,12 @@ func (h *Handlerv20250312) handleUpserted(ctx context.Context, currentState stat
 		return result.Error(currentState, err)
 	}
 
-	params := &v20250312sdk.UpdateProjectApiParams{
+	params := &v20250312sdk.UpdateGroupApiParams{
 		GroupId:     *group.Status.V20250312.Id,
 		GroupUpdate: atlasGroupUpdate,
 	}
 
-	response, _, err := h.atlasClient.ProjectsApi.UpdateProjectWithParams(ctx, params).Execute()
+	response, _, err := h.atlasClient.ProjectsApi.UpdateGroupWithParams(ctx, params).Execute()
 	if err != nil {
 		return result.Error(currentState, err)
 	}
diff --git a/internal/generated/crds/crds.yaml b/internal/generated/crds/crds.yaml
diff --git a/internal/nextapi/generated/v1/cluster.go b/internal/nextapi/generated/v1/cluster.go
diff --git a/internal/nextapi/generated/v1/databaseuser.go b/internal/nextapi/generated/v1/databaseuser.go
diff --git a/internal/nextapi/generated/v1/zz_generated.deepcopy.go b/internal/nextapi/generated/v1/zz_generated.deepcopy.go
diff --git a/tools/openapi2crd/go.mod b/tools/openapi2crd/go.mod
diff --git a/tools/openapi2crd/go.sum b/tools/openapi2crd/go.sum

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ func (h Handler) getHandlerForResource(ctx context.Context, cluster akov2gener`
`53`	`53`	`return nil, errors.New("unsupported version v20250312 set in CR")`
`54`	`54`	`}`
`55`	`55`	`versionCount++`
`56`		`- selectedHandler = h.handlerv20250312(h.Client, atlasClients.SdkClient20250312006, translator, h.deletionProtection)`
	`56`	`+ selectedHandler = h.handlerv20250312(h.Client, atlasClients.SdkClient20250312009, translator, h.deletionProtection)`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`if versionCount == 0 {`