From 0af0123dbbcd5575b4e154fe64b49692529be985 Mon Sep 17 00:00:00 2001 From: Miguel Soriano Date: Tue, 2 Jun 2026 10:54:10 +0200 Subject: [PATCH 1/7] feat: prepare internal api attributes related to async cluster deletion trigger in backend This commit adds the DeletionTimestamp and ClusterServiceDeletionTimestamp in the Cluster internal API type. DeletionTimestamp is the the timestamp at which the Cluster deletion was requested. A nil value indicates that the Cluster deletion has not been requested. ClusterServiceDeletionTimestamp is written when a dispatch of a Cluster Service Delete Cluster request against Cluster Service for this cluster has been handled. It is set after a successful DeleteCluster call to Cluster Service, but also when it's determined that no delete call is needed but we consider we should behave as if the delete call was successfully issued (for example, if the parent cluster of the cluster is already being uninstalled, because cluster-service will already take care of deleting the cluster as part of the cluster teardown). A nil value indicates that the Cluster Service Deletion has not been requested. These two attributes are not used on the backend side yet. This commit also adds the UsesNewClusterDeletionApproach attribute for both Cluster and Operation internal api types. This will be used as a gate when we decide to switch cluster deletion to be with async deletion trigger in backend. --- frontend/pkg/frontend/cluster.go | 4 ++++ internal/api/types_cluster.go | 23 +++++++++++++++++++ internal/api/types_operation.go | 7 ++++++ .../v20240610preview/conversion_fuzz_test.go | 2 ++ .../v20251223preview/conversion_fuzz_test.go | 2 ++ internal/api/zz_generated.deepcopy.go | 8 +++++++ .../01-cluster.json | 6 +++-- .../01-cluster.json | 6 +++-- .../01-cluster.json | 6 +++-- .../01-cluster.json | 6 +++-- .../00-load-initial-state/cluster.json | 6 +++-- .../00-load-initial-state/cluster.json | 6 +++-- .../99-cosmosCompare-end-state/cluster.json | 6 +++-- .../00-load-initial-state/cluster-safe.json | 6 +++-- .../00-load-initial-state/cluster.json | 6 +++-- .../cluster-safe.json | 6 +++-- .../00-load-initial-state/cluster.json | 6 +++-- .../99-cosmosCompare-end-state/cluster.json | 6 +++-- .../00-load-initial-state/cluster.json | 6 +++-- .../99-cosmosCompare-end-state/cluster.json | 6 +++-- .../00-load-initial-state/cluster.json | 6 +++-- .../99-cosmosCompare-end-state/cluster.json | 6 +++-- .../00-load-initial-state/cluster.json | 6 +++-- .../99-cosmosCompare-end-state/cluster.json | 6 +++-- .../00-load-initial-state/cluster.json | 6 +++-- .../99-cosmosCompare-end-state/cluster.json | 6 +++-- .../00-load-initial-state/cluster.json | 6 +++-- .../99-cosmosCompare-end-state/cluster.json | 6 +++-- ...external-auth-operation-external-auth.json | 1 + .../create-with-tags-cluster.json | 6 +++-- .../create-with-tags-operation.json | 1 + .../immutability-operation-for-node-pool.json | 1 + .../01-load-initial/operation-3-new.json | 1 + .../create-with-tags-cluster.json | 6 +++-- ...external-auth-operation-external-auth.json | 1 + .../create-with-tags-cluster.json | 6 +++-- .../create-with-tags-operation.json | 1 + .../immutability-operation-for-node-pool.json | 1 + .../operation-3-new.json | 1 + .../create-with-tags-cluster.json | 6 +++-- .../create-with-tags-cluster.json | 6 +++-- .../create-with-tags-cluster.json | 6 +++-- .../01-cluster.json | 3 ++- .../01-cluster.json | 3 ++- .../00-key.json | 1 + .../01-cluster.json | 3 ++- .../01-cluster.json | 3 ++- .../01-cluster.json | 6 +++-- .../01-cluster.json | 3 ++- .../00-key.json | 1 + .../cluster-create-with-tags.json | 6 +++-- ...ation-cluster-create-with-tags-create.json | 1 + .../00-key.json | 1 + .../cluster-create-with-tags.json | 6 +++-- .../cluster-test-cluster.json | 6 +++-- .../operation-cluster-create-canceled.json | 1 + .../operation-cluster-delete.json | 1 + .../cluster-test-cluster.json | 6 +++-- .../operation-cluster-create.json | 1 + .../operation-cluster-delete.json | 1 + .../operation-nodepool-create-canceled.json | 1 + .../operation-nodepool-delete.json | 1 + .../01-load-old-data/create-with-tags.json | 6 +++-- ..._90b2322c-2c26-47ca-b6f9-d9b1a8385cbc.json | 1 + .../00-key.json | 1 + .../cluster-create-with-tags.json | 6 +++-- .../cosmos-01-cluster.json | 3 ++- .../cosmos-01-cluster.json | 3 ++- .../cluster-create-with-tags.json | 6 +++-- ...ation-cluster-create-create-with-tags.json | 1 + ...operation-externalauth-create-default.json | 1 + .../cluster-create-with-tags.json | 6 +++-- ...ation-cluster-create-with-tags-create.json | 1 + ...operation-externalauth-create-default.json | 1 + .../cluster-create-with-tags.json | 6 +++-- ...ation-cluster-create-create-with-tags.json | 1 + ...operation-externalauth-create-default.json | 1 + ...operation-externalauth-update-default.json | 1 + .../cluster-create-with-tags.json | 6 +++-- ...ation-cluster-create-with-tags-create.json | 1 + .../operation-create-basicnodepool.json | 1 + .../operation-create-nodepool-02.json | 1 + ...operation-externalauth-create-default.json | 1 + .../cluster-create-with-tags.json | 6 +++-- ...ation-cluster-create-with-tags-create.json | 1 + .../operation-create-basicnodepool.json | 1 + .../operation-create-nodepool-02.json | 1 + ...operation-externalauth-create-default.json | 1 + .../cluster-create-with-tags.json | 6 +++-- ...ation-cluster-create-with-tags-create.json | 1 + .../operation-create-basicnodepool.json | 1 + .../operation-create-nodepool-02.json | 1 + ...operation-externalauth-create-default.json | 1 + .../cluster-create-with-tags.json | 6 +++-- ...ation-cluster-create-with-tags-create.json | 1 + .../operation-create-basicnodepool.json | 1 + .../operation-create-nodepool-02.json | 1 + ...operation-externalauth-create-default.json | 1 + .../cosmos-01-cluster.json | 3 ++- .../cosmos-01-cluster.json | 3 ++- .../cluster-create-with-tags.json | 6 +++-- ...ation-cluster-create-with-tags-create.json | 1 + .../cluster-create-with-tags.json | 6 +++-- ...ation-cluster-create-with-tags-create.json | 1 + .../operation-create-basicnodepool.json | 1 + .../operation-create-nodepool-02.json | 1 + .../cluster-create-with-tags.json | 6 +++-- .../operation-create-cluster.json | 1 + .../operation-create-nodepool-02.json | 1 + .../operation-create-nodepool-basic.json | 1 + .../operation-update-nodepool-basic.json | 1 + .../01-load-new-data/operation.json | 1 + 112 files changed, 296 insertions(+), 99 deletions(-) diff --git a/frontend/pkg/frontend/cluster.go b/frontend/pkg/frontend/cluster.go index 8da5b1f3be9..de0c7ad118f 100644 --- a/frontend/pkg/frontend/cluster.go +++ b/frontend/pkg/frontend/cluster.go @@ -25,6 +25,7 @@ import ( "time" "k8s.io/apimachinery/pkg/api/operation" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/sets" "k8s.io/utils/ptr" @@ -784,6 +785,9 @@ func (f *Frontend) addDeleteClusterToTransaction(ctx context.Context, writer htt return utils.TrackError(err) } + if cluster.ServiceProviderProperties.DeletionTimestamp == nil { + cluster.ServiceProviderProperties.DeletionTimestamp = &metav1.Time{Time: time.Now().UTC()} + } cluster.ServiceProviderProperties.ActiveOperationID = operationDoc.ResourceID.Name cluster.ServiceProviderProperties.ProvisioningState = operationDoc.Status _, err = f.resourcesDBClient.HCPClusters(cluster.ID.SubscriptionID, cluster.ID.ResourceGroupName). diff --git a/internal/api/types_cluster.go b/internal/api/types_cluster.go index c764fd2c8fd..2bdfca17ca4 100644 --- a/internal/api/types_cluster.go +++ b/internal/api/types_cluster.go @@ -15,6 +15,8 @@ package api import ( + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + azcorearm "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" "github.com/Azure/ARO-HCP/internal/api/arm" @@ -76,6 +78,27 @@ type HCPOpenShiftClusterServiceProviderProperties struct { // associated with this cluster. It is set when the billing document is created // and used to avoid redundant creation attempts. BillingDocumentCosmosID string `json:"billingDocumentCosmosID,omitempty"` + // DeletionTimestamp is the timestamp at which the Cluster deletion was requested. + // The timestamp is in UTC. + // A nil value indicates that the Cluster deletion has not been requested. + DeletionTimestamp *metav1.Time `json:"deletionTimestamp,omitempty"` + // ClusterServiceDeletionTimestamp is written when a dispatch of a Cluster + // Service Delete Cluster request against Cluster Service for this cluster + // has been handled. It is set after a successful DeleteCluster call to + // Cluster Service, but also when it's determined that no delete call is + // needed but we consider we should behave as if the delete call was + // successfully issued. + // A nil value indicates that the Cluster Service Deletion has not been requested. + // The timestamp is in UTC. + // TODO this attribute is not in use yet. Do not rely on it. + ClusterServiceDeletionTimestamp *metav1.Time `json:"clusterServiceDeletionTimestamp,omitempty"` + + // TODO Temporary field to track whether the cluster operation is using the new deletion approach. + // We are migrating from the cluster CS deletion synchronous in frontend to the backend, to be fully asynchronous. + // This boolean is true for Cluster delete operations that are created with new deletion approach. + // This will be removed once all clusters whose deletion was triggered before the new approach is fully rolled out have been + // fully deleted in all ARO-HCP permanent environments, for all regions. + UsesNewClusterDeletionApproach bool `json:"usesNewClusterDeletionApproach"` } // VersionProfile represents the cluster control plane version. diff --git a/internal/api/types_operation.go b/internal/api/types_operation.go index 35ca9e8a971..d1df83e4150 100644 --- a/internal/api/types_operation.go +++ b/internal/api/types_operation.go @@ -84,6 +84,13 @@ type Operation struct { // This will be removed once all external auths whose deletion was triggered before the new approach is fully rolled out have been // fully deleted in all ARO-HCP permanent environments, for all regions. UsesNewExternalAuthDeletionApproach bool `json:"usesNewExternalAuthDeletionApproach"` + + // TODO Temporary field to track whether the cluster operation is using the new deletion approach. + // We are migrating from the cluster CS deletion synchronous in frontend to the backend, to be fully asynchronous. + // This boolean is true for Cluster delete operations that are created with new deletion approach. + // This will be removed once all clusters whose deletion was triggered before the new approach is fully rolled out have been + // fully deleted in all ARO-HCP permanent environments, for all regions. + UsesNewClusterDeletionApproach bool `json:"usesNewClusterDeletionApproach"` } func (o *Operation) ComputeLogicalResourceID() *azcorearm.ResourceID { diff --git a/internal/api/v20240610preview/conversion_fuzz_test.go b/internal/api/v20240610preview/conversion_fuzz_test.go index 1639d41ddb9..dfe1c664245 100644 --- a/internal/api/v20240610preview/conversion_fuzz_test.go +++ b/internal/api/v20240610preview/conversion_fuzz_test.go @@ -72,6 +72,8 @@ func TestRoundTripInternalExternalInternal(t *testing.T) { j.ClusterUID = "" // BillingDocumentCosmosID does not roundtrip through the external type because it is purely an internal detail j.BillingDocumentCosmosID = "" + // UsesNewClusterDeletionApproach does not roundtrip through the external type because it is purely an internal detail + j.UsesNewClusterDeletionApproach = false }, func(j *api.HCPOpenShiftClusterNodePoolServiceProviderProperties, c randfill.Continue) { c.FillNoCustom(j) diff --git a/internal/api/v20251223preview/conversion_fuzz_test.go b/internal/api/v20251223preview/conversion_fuzz_test.go index c9a3e6899ba..11c1b9b300b 100644 --- a/internal/api/v20251223preview/conversion_fuzz_test.go +++ b/internal/api/v20251223preview/conversion_fuzz_test.go @@ -70,6 +70,8 @@ func TestRoundTripInternalExternalInternal(t *testing.T) { j.ClusterUID = "" // BillingDocumentCosmosID does not roundtrip through the external type because it is purely an internal detail j.BillingDocumentCosmosID = "" + // UsesNewClusterDeletionApproach does not roundtrip through the external type because it is purely an internal detail + j.UsesNewClusterDeletionApproach = false }, func(j *api.HCPOpenShiftClusterNodePoolServiceProviderProperties, c randfill.Continue) { c.FillNoCustom(j) diff --git a/internal/api/zz_generated.deepcopy.go b/internal/api/zz_generated.deepcopy.go index f8a13a66e1d..f8948795fc4 100644 --- a/internal/api/zz_generated.deepcopy.go +++ b/internal/api/zz_generated.deepcopy.go @@ -801,6 +801,14 @@ func (in *HCPOpenShiftClusterServiceProviderProperties) DeepCopyInto(out *HCPOpe out.API = in.API out.Platform = in.Platform out.ExperimentalFeatures = in.ExperimentalFeatures + if in.DeletionTimestamp != nil { + in, out := &in.DeletionTimestamp, &out.DeletionTimestamp + *out = (*in).DeepCopy() + } + if in.ClusterServiceDeletionTimestamp != nil { + in, out := &in.ClusterServiceDeletionTimestamp, &out.ClusterServiceDeletionTimestamp + *out = (*in).DeepCopy() + } return } diff --git a/test-integration/admin/artifacts/AdminCRUD/HCP/breakglass/00-load-initial-cosmos-state/01-cluster.json b/test-integration/admin/artifacts/AdminCRUD/HCP/breakglass/00-load-initial-cosmos-state/01-cluster.json index df797d0cd94..1de8976a413 100644 --- a/test-integration/admin/artifacts/AdminCRUD/HCP/breakglass/00-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/admin/artifacts/AdminCRUD/HCP/breakglass/00-load-initial-cosmos-state/01-cluster.json @@ -31,7 +31,8 @@ "name": "some-hcp-cluster", "serviceProviderProperties": { "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/fixed-value", - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "usesNewClusterDeletionApproach": false }, "tags": { "foo": "bar" @@ -43,7 +44,8 @@ "name": "some-hcp-cluster", "serviceProviderProperties": { "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/fixed-value", - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "usesNewClusterDeletionApproach": false }, "tags": { "foo": "bar" diff --git a/test-integration/admin/artifacts/AdminCRUD/HCP/cosmosdump/00-load-initial-cosmos-state/01-cluster.json b/test-integration/admin/artifacts/AdminCRUD/HCP/cosmosdump/00-load-initial-cosmos-state/01-cluster.json index 50790056402..a19e39fefda 100644 --- a/test-integration/admin/artifacts/AdminCRUD/HCP/cosmosdump/00-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/admin/artifacts/AdminCRUD/HCP/cosmosdump/00-load-initial-cosmos-state/01-cluster.json @@ -36,7 +36,8 @@ "name": "some-hcp-cluster", "serviceProviderProperties": { "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/fixed-value", - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -54,7 +55,8 @@ "name": "some-hcp-cluster", "serviceProviderProperties": { "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/fixed-value", - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/admin/artifacts/AdminCRUD/HCP/hello-world/00-load-initial-cosmos-state/01-cluster.json b/test-integration/admin/artifacts/AdminCRUD/HCP/hello-world/00-load-initial-cosmos-state/01-cluster.json index 50790056402..a19e39fefda 100644 --- a/test-integration/admin/artifacts/AdminCRUD/HCP/hello-world/00-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/admin/artifacts/AdminCRUD/HCP/hello-world/00-load-initial-cosmos-state/01-cluster.json @@ -36,7 +36,8 @@ "name": "some-hcp-cluster", "serviceProviderProperties": { "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/fixed-value", - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -54,7 +55,8 @@ "name": "some-hcp-cluster", "serviceProviderProperties": { "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/fixed-value", - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/admin/artifacts/AdminCRUD/HCP/lowercase-middleware/00-load-initial-cosmos-state/01-cluster.json b/test-integration/admin/artifacts/AdminCRUD/HCP/lowercase-middleware/00-load-initial-cosmos-state/01-cluster.json index 50790056402..a19e39fefda 100644 --- a/test-integration/admin/artifacts/AdminCRUD/HCP/lowercase-middleware/00-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/admin/artifacts/AdminCRUD/HCP/lowercase-middleware/00-load-initial-cosmos-state/01-cluster.json @@ -36,7 +36,8 @@ "name": "some-hcp-cluster", "serviceProviderProperties": { "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/fixed-value", - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -54,7 +55,8 @@ "name": "some-hcp-cluster", "serviceProviderProperties": { "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/fixed-value", - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/backend/controllers/do_nothing/artifacts/sync_cluster/00-load-initial-state/cluster.json b/test-integration/backend/controllers/do_nothing/artifacts/sync_cluster/00-load-initial-state/cluster.json index d2abf8d5758..e7968b2d7e2 100644 --- a/test-integration/backend/controllers/do_nothing/artifacts/sync_cluster/00-load-initial-state/cluster.json +++ b/test-integration/backend/controllers/do_nothing/artifacts/sync_cluster/00-load-initial-state/cluster.json @@ -139,7 +139,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -159,7 +160,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/backend/controllers/mismatches/artifacts/cluster/present_cluster/00-load-initial-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/cluster/present_cluster/00-load-initial-state/cluster.json index b93039a54e6..0fa2f81ef8e 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/cluster/present_cluster/00-load-initial-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/cluster/present_cluster/00-load-initial-state/cluster.json @@ -139,7 +139,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -159,7 +160,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/backend/controllers/mismatches/artifacts/cluster/present_cluster/99-cosmosCompare-end-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/cluster/present_cluster/99-cosmosCompare-end-state/cluster.json index b93039a54e6..0fa2f81ef8e 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/cluster/present_cluster/99-cosmosCompare-end-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/cluster/present_cluster/99-cosmosCompare-end-state/cluster.json @@ -139,7 +139,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -159,7 +160,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/cluster-safe.json b/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/cluster-safe.json index d2abf8d5758..e7968b2d7e2 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/cluster-safe.json +++ b/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/cluster-safe.json @@ -139,7 +139,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -159,7 +160,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/cluster.json index b93039a54e6..0fa2f81ef8e 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/cluster.json @@ -139,7 +139,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -159,7 +160,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/99-cosmosCompare-end-state/cluster-safe.json b/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/99-cosmosCompare-end-state/cluster-safe.json index d2abf8d5758..e7968b2d7e2 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/99-cosmosCompare-end-state/cluster-safe.json +++ b/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/99-cosmosCompare-end-state/cluster-safe.json @@ -139,7 +139,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -159,7 +160,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/00-load-initial-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/00-load-initial-state/cluster.json index cf23e04131c..adf19cecc54 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/00-load-initial-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/00-load-initial-state/cluster.json @@ -79,7 +79,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -99,7 +100,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/99-cosmosCompare-end-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/99-cosmosCompare-end-state/cluster.json index cf23e04131c..adf19cecc54 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/99-cosmosCompare-end-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/99-cosmosCompare-end-state/cluster.json @@ -79,7 +79,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -99,7 +100,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/controller_under_missing_nodepool_deleted/00-load-initial-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/controller_under_missing_nodepool_deleted/00-load-initial-state/cluster.json index cf23e04131c..adf19cecc54 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/controller_under_missing_nodepool_deleted/00-load-initial-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/controller_under_missing_nodepool_deleted/00-load-initial-state/cluster.json @@ -79,7 +79,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -99,7 +100,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/controller_under_missing_nodepool_deleted/99-cosmosCompare-end-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/controller_under_missing_nodepool_deleted/99-cosmosCompare-end-state/cluster.json index cf23e04131c..adf19cecc54 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/controller_under_missing_nodepool_deleted/99-cosmosCompare-end-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/controller_under_missing_nodepool_deleted/99-cosmosCompare-end-state/cluster.json @@ -79,7 +79,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -99,7 +100,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/00-load-initial-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/00-load-initial-state/cluster.json index b93039a54e6..0fa2f81ef8e 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/00-load-initial-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/00-load-initial-state/cluster.json @@ -139,7 +139,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -159,7 +160,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/99-cosmosCompare-end-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/99-cosmosCompare-end-state/cluster.json index b93039a54e6..0fa2f81ef8e 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/99-cosmosCompare-end-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/99-cosmosCompare-end-state/cluster.json @@ -139,7 +139,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -159,7 +160,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/00-load-initial-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/00-load-initial-state/cluster.json index b93039a54e6..0fa2f81ef8e 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/00-load-initial-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/00-load-initial-state/cluster.json @@ -139,7 +139,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -159,7 +160,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/99-cosmosCompare-end-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/99-cosmosCompare-end-state/cluster.json index b93039a54e6..0fa2f81ef8e 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/99-cosmosCompare-end-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/99-cosmosCompare-end-state/cluster.json @@ -139,7 +139,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -159,7 +160,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/00-load-initial-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/00-load-initial-state/cluster.json index b93039a54e6..0fa2f81ef8e 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/00-load-initial-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/00-load-initial-state/cluster.json @@ -139,7 +139,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -159,7 +160,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/99-cosmosCompare-end-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/99-cosmosCompare-end-state/cluster.json index b93039a54e6..0fa2f81ef8e 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/99-cosmosCompare-end-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/99-cosmosCompare-end-state/cluster.json @@ -139,7 +139,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -159,7 +160,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/00-load-initial-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/00-load-initial-state/cluster.json index b93039a54e6..0fa2f81ef8e 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/00-load-initial-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/00-load-initial-state/cluster.json @@ -139,7 +139,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -159,7 +160,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/99-cosmosCompare-end-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/99-cosmosCompare-end-state/cluster.json index b93039a54e6..0fa2f81ef8e 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/99-cosmosCompare-end-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/99-cosmosCompare-end-state/cluster.json @@ -139,7 +139,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -159,7 +160,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/basic-external-auth-operation-external-auth.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/basic-external-auth-operation-external-auth.json index b1d2032854c..007c54a16f0 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/basic-external-auth-operation-external-auth.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/basic-external-auth-operation-external-auth.json @@ -15,6 +15,7 @@ "startTime": "2025-12-05T20:30:10.966609337Z", "status": "Succeeded", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/create-with-tags-cluster.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/create-with-tags-cluster.json index e004965a3e6..4739184fa70 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/create-with-tags-cluster.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/create-with-tags-cluster.json @@ -124,7 +124,8 @@ "api": {}, "console": {}, "dns": {}, - "platform": {} + "platform": {}, + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -146,7 +147,8 @@ "api": {}, "console": {}, "dns": {}, - "platform": {} + "platform": {}, + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/create-with-tags-operation.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/create-with-tags-operation.json index 30936940371..203054a10bc 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/create-with-tags-operation.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/create-with-tags-operation.json @@ -15,6 +15,7 @@ "startTime": "2025-12-05T20:29:59.734335781Z", "status": "Accepted", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/immutability-operation-for-node-pool.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/immutability-operation-for-node-pool.json index 2f8a3398c62..aea37d8708c 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/immutability-operation-for-node-pool.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/immutability-operation-for-node-pool.json @@ -15,6 +15,7 @@ "startTime": "2025-12-05T20:30:25.067364685Z", "status": "Succeeded", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/operation-3-new.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/operation-3-new.json index 68343e7c479..e872b954b56 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/operation-3-new.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/operation-3-new.json @@ -16,6 +16,7 @@ "startTime": "2025-12-05T20:30:25.067364685Z", "status": "Accepted", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/04-untypedListRecursive-resourcegroup/create-with-tags-cluster.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/04-untypedListRecursive-resourcegroup/create-with-tags-cluster.json index d68e63268d8..6d3c372d76c 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/04-untypedListRecursive-resourcegroup/create-with-tags-cluster.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/04-untypedListRecursive-resourcegroup/create-with-tags-cluster.json @@ -124,7 +124,8 @@ "api": {}, "console": {}, "dns": {}, - "platform": {} + "platform": {}, + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -146,7 +147,8 @@ "api": {}, "console": {}, "dns": {}, - "platform": {} + "platform": {}, + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/basic-external-auth-operation-external-auth.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/basic-external-auth-operation-external-auth.json index b1d2032854c..007c54a16f0 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/basic-external-auth-operation-external-auth.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/basic-external-auth-operation-external-auth.json @@ -15,6 +15,7 @@ "startTime": "2025-12-05T20:30:10.966609337Z", "status": "Succeeded", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/create-with-tags-cluster.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/create-with-tags-cluster.json index d68e63268d8..6d3c372d76c 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/create-with-tags-cluster.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/create-with-tags-cluster.json @@ -124,7 +124,8 @@ "api": {}, "console": {}, "dns": {}, - "platform": {} + "platform": {}, + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -146,7 +147,8 @@ "api": {}, "console": {}, "dns": {}, - "platform": {} + "platform": {}, + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/create-with-tags-operation.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/create-with-tags-operation.json index 30936940371..203054a10bc 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/create-with-tags-operation.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/create-with-tags-operation.json @@ -15,6 +15,7 @@ "startTime": "2025-12-05T20:29:59.734335781Z", "status": "Accepted", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/immutability-operation-for-node-pool.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/immutability-operation-for-node-pool.json index 2f8a3398c62..aea37d8708c 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/immutability-operation-for-node-pool.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/immutability-operation-for-node-pool.json @@ -15,6 +15,7 @@ "startTime": "2025-12-05T20:30:25.067364685Z", "status": "Succeeded", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/operation-3-new.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/operation-3-new.json index 5fb048ffb87..abf7f502688 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/operation-3-new.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/operation-3-new.json @@ -16,6 +16,7 @@ "startTime": "2025-12-05T20:30:25.067364685Z", "status": "Accepted", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/07-untypedListRecursive-resourcegroup-via-child/create-with-tags-cluster.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/07-untypedListRecursive-resourcegroup-via-child/create-with-tags-cluster.json index d68e63268d8..6d3c372d76c 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/07-untypedListRecursive-resourcegroup-via-child/create-with-tags-cluster.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/07-untypedListRecursive-resourcegroup-via-child/create-with-tags-cluster.json @@ -124,7 +124,8 @@ "api": {}, "console": {}, "dns": {}, - "platform": {} + "platform": {}, + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -146,7 +147,8 @@ "api": {}, "console": {}, "dns": {}, - "platform": {} + "platform": {}, + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/10-untypedList-resourcegroup/create-with-tags-cluster.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/10-untypedList-resourcegroup/create-with-tags-cluster.json index d68e63268d8..6d3c372d76c 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/10-untypedList-resourcegroup/create-with-tags-cluster.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/10-untypedList-resourcegroup/create-with-tags-cluster.json @@ -124,7 +124,8 @@ "api": {}, "console": {}, "dns": {}, - "platform": {} + "platform": {}, + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -146,7 +147,8 @@ "api": {}, "console": {}, "dns": {}, - "platform": {} + "platform": {}, + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/12-untypedList-resourcegroup/create-with-tags-cluster.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/12-untypedList-resourcegroup/create-with-tags-cluster.json index d68e63268d8..6d3c372d76c 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/12-untypedList-resourcegroup/create-with-tags-cluster.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/12-untypedList-resourcegroup/create-with-tags-cluster.json @@ -124,7 +124,8 @@ "api": {}, "console": {}, "dns": {}, - "platform": {} + "platform": {}, + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -146,7 +147,8 @@ "api": {}, "console": {}, "dns": {}, - "platform": {} + "platform": {}, + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/request-provisioning-conflict/01-load-initial-cosmos-state/01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/request-provisioning-conflict/01-load-initial-cosmos-state/01-cluster.json index 0a5457d64a0..bba29676a9b 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/request-provisioning-conflict/01-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/request-provisioning-conflict/01-load-initial-cosmos-state/01-cluster.json @@ -13,7 +13,8 @@ }, "serviceProviderProperties": { "clusterServiceID": "/api/clusters_mgmt/v1/clusters/fixed-value", - "provisioningState": "Provisioning" + "provisioningState": "Provisioning", + "usesNewClusterDeletionApproach": false } }, "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/request/01-load-initial-cosmos-state/01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/request/01-load-initial-cosmos-state/01-cluster.json index 619c0119993..f27f1cf8ba9 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/request/01-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/request/01-load-initial-cosmos-state/01-cluster.json @@ -13,7 +13,8 @@ }, "serviceProviderProperties": { "clusterServiceID": "/api/clusters_mgmt/v1/clusters/fixed-value", - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "usesNewClusterDeletionApproach": false } }, "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/request/03-listActiveOperations-request-credentials/00-key.json b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/request/03-listActiveOperations-request-credentials/00-key.json index 8377769ee30..816def597e7 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/request/03-listActiveOperations-request-credentials/00-key.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/request/03-listActiveOperations-request-credentials/00-key.json @@ -1,6 +1,7 @@ { "parentResourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6", "properties": { + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-forbidden-afec-missing/01-load-initial-cosmos-state/01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-forbidden-afec-missing/01-load-initial-cosmos-state/01-cluster.json index d840efb96b7..5bdbe4d0d1a 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-forbidden-afec-missing/01-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-forbidden-afec-missing/01-load-initial-cosmos-state/01-cluster.json @@ -16,7 +16,8 @@ }, "serviceProviderProperties": { "clusterServiceID": "/api/clusters_mgmt/v1/clusters/fixed-value", - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "usesNewClusterDeletionApproach": false } }, "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-forbidden-afec-pending/01-load-initial-cosmos-state/01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-forbidden-afec-pending/01-load-initial-cosmos-state/01-cluster.json index d840efb96b7..5bdbe4d0d1a 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-forbidden-afec-pending/01-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-forbidden-afec-pending/01-load-initial-cosmos-state/01-cluster.json @@ -16,7 +16,8 @@ }, "serviceProviderProperties": { "clusterServiceID": "/api/clusters_mgmt/v1/clusters/fixed-value", - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "usesNewClusterDeletionApproach": false } }, "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-provisioning-conflict/01-load-initial-cosmos-state/01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-provisioning-conflict/01-load-initial-cosmos-state/01-cluster.json index 04f84414c93..e0d24e6c9f4 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-provisioning-conflict/01-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-provisioning-conflict/01-load-initial-cosmos-state/01-cluster.json @@ -36,7 +36,8 @@ "name": "some-hcp-cluster", "serviceProviderProperties": { "clusterServiceID": "/api/clusters_mgmt/v1/clusters/fixed-value", - "provisioningState": "Provisioning" + "provisioningState": "Provisioning", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -54,7 +55,8 @@ "name": "some-hcp-cluster", "serviceProviderProperties": { "clusterServiceID": "/api/clusters_mgmt/v1/clusters/fixed-value", - "provisioningState": "Provisioning" + "provisioningState": "Provisioning", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke/01-load-initial-cosmos-state/01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke/01-load-initial-cosmos-state/01-cluster.json index d840efb96b7..5bdbe4d0d1a 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke/01-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke/01-load-initial-cosmos-state/01-cluster.json @@ -16,7 +16,8 @@ }, "serviceProviderProperties": { "clusterServiceID": "/api/clusters_mgmt/v1/clusters/fixed-value", - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "usesNewClusterDeletionApproach": false } }, "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke/03-listActiveOperations-revoke-credentials/00-key.json b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke/03-listActiveOperations-revoke-credentials/00-key.json index 8377769ee30..816def597e7 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke/03-listActiveOperations-revoke-credentials/00-key.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke/03-listActiveOperations-revoke-credentials/00-key.json @@ -1,6 +1,7 @@ { "parentResourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6", "properties": { + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/02-cosmosCompare-confirm-content/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/02-cosmosCompare-confirm-content/cluster-create-with-tags.json index 0f016eec4d3..75ee72e5597 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/02-cosmosCompare-confirm-content/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/02-cosmosCompare-confirm-content/cluster-create-with-tags.json @@ -148,7 +148,8 @@ "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -172,7 +173,8 @@ "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/02-cosmosCompare-confirm-content/operation-cluster-create-with-tags-create.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/02-cosmosCompare-confirm-content/operation-cluster-create-with-tags-create.json index c5e3d1153ae..cc012711745 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/02-cosmosCompare-confirm-content/operation-cluster-create-with-tags-create.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/02-cosmosCompare-confirm-content/operation-cluster-create-with-tags-create.json @@ -19,6 +19,7 @@ "startTime": "2025-12-19T19:59:30.714826736Z", "status": "Accepted", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/05-listActiveOperations-cluster-create/00-key.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/05-listActiveOperations-cluster-create/00-key.json index 34e9582ff83..2d01a4703a7 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/05-listActiveOperations-cluster-create/00-key.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/05-listActiveOperations-cluster-create/00-key.json @@ -1,6 +1,7 @@ { "parentResourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/09-cosmosCompare-confirm-update/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/09-cosmosCompare-confirm-update/cluster-create-with-tags.json index 3f9d1bc46ba..6600943e30f 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/09-cosmosCompare-confirm-update/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/09-cosmosCompare-confirm-update/cluster-create-with-tags.json @@ -149,7 +149,8 @@ "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -174,7 +175,8 @@ "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-cluster-operation/03-cosmosCompare-final-state/cluster-test-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-cluster-operation/03-cosmosCompare-final-state/cluster-test-cluster.json index 42bf2bc191a..04a94a2a2aa 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-cluster-operation/03-cosmosCompare-final-state/cluster-test-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-cluster-operation/03-cosmosCompare-final-state/cluster-test-cluster.json @@ -136,7 +136,8 @@ "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", "platform": {}, - "provisioningState": "Deleting" + "provisioningState": "Deleting", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -155,7 +156,8 @@ "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", "platform": {}, - "provisioningState": "Deleting" + "provisioningState": "Deleting", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-cluster-operation/03-cosmosCompare-final-state/operation-cluster-create-canceled.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-cluster-operation/03-cosmosCompare-final-state/operation-cluster-create-canceled.json index 0627b429e4a..f195eb1725c 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-cluster-operation/03-cosmosCompare-final-state/operation-cluster-create-canceled.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-cluster-operation/03-cosmosCompare-final-state/operation-cluster-create-canceled.json @@ -9,6 +9,7 @@ "request": "Create", "status": "Canceled", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-cluster-operation/03-cosmosCompare-final-state/operation-cluster-delete.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-cluster-operation/03-cosmosCompare-final-state/operation-cluster-delete.json index a4467f34242..2ad87eef73c 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-cluster-operation/03-cosmosCompare-final-state/operation-cluster-delete.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-cluster-operation/03-cosmosCompare-final-state/operation-cluster-delete.json @@ -5,6 +5,7 @@ "request": "Delete", "status": "Deleting", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-nodepool-operation/05-cosmosCompare-final-state/cluster-test-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-nodepool-operation/05-cosmosCompare-final-state/cluster-test-cluster.json index 42bf2bc191a..04a94a2a2aa 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-nodepool-operation/05-cosmosCompare-final-state/cluster-test-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-nodepool-operation/05-cosmosCompare-final-state/cluster-test-cluster.json @@ -136,7 +136,8 @@ "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", "platform": {}, - "provisioningState": "Deleting" + "provisioningState": "Deleting", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -155,7 +156,8 @@ "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", "platform": {}, - "provisioningState": "Deleting" + "provisioningState": "Deleting", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-nodepool-operation/05-cosmosCompare-final-state/operation-cluster-create.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-nodepool-operation/05-cosmosCompare-final-state/operation-cluster-create.json index 43584856c25..21e3b16aca1 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-nodepool-operation/05-cosmosCompare-final-state/operation-cluster-create.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-nodepool-operation/05-cosmosCompare-final-state/operation-cluster-create.json @@ -5,6 +5,7 @@ "request": "Create", "status": "Succeeded", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-nodepool-operation/05-cosmosCompare-final-state/operation-cluster-delete.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-nodepool-operation/05-cosmosCompare-final-state/operation-cluster-delete.json index a4467f34242..2ad87eef73c 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-nodepool-operation/05-cosmosCompare-final-state/operation-cluster-delete.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-nodepool-operation/05-cosmosCompare-final-state/operation-cluster-delete.json @@ -5,6 +5,7 @@ "request": "Delete", "status": "Deleting", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-nodepool-operation/05-cosmosCompare-final-state/operation-nodepool-create-canceled.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-nodepool-operation/05-cosmosCompare-final-state/operation-nodepool-create-canceled.json index 0d747b87dc2..b4d1c97a854 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-nodepool-operation/05-cosmosCompare-final-state/operation-nodepool-create-canceled.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-nodepool-operation/05-cosmosCompare-final-state/operation-nodepool-create-canceled.json @@ -9,6 +9,7 @@ "request": "Create", "status": "Canceled", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-nodepool-operation/05-cosmosCompare-final-state/operation-nodepool-delete.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-nodepool-operation/05-cosmosCompare-final-state/operation-nodepool-delete.json index cb1d7451621..d025084ab0c 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-nodepool-operation/05-cosmosCompare-final-state/operation-nodepool-delete.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-nodepool-operation/05-cosmosCompare-final-state/operation-nodepool-delete.json @@ -4,6 +4,7 @@ "externalId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/test-cluster/nodePools/test-nodepool", "request": "Delete", "status": "Deleting", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/01-load-old-data/create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/01-load-old-data/create-with-tags.json index 7b793736b78..db61c30b0d0 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/01-load-old-data/create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/01-load-old-data/create-with-tags.json @@ -144,7 +144,8 @@ "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -168,7 +169,8 @@ "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/01-load-old-data/hcpoperationstatuses_Create_90b2322c-2c26-47ca-b6f9-d9b1a8385cbc.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/01-load-old-data/hcpoperationstatuses_Create_90b2322c-2c26-47ca-b6f9-d9b1a8385cbc.json index 8b2988719fa..bd02e7dd3ce 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/01-load-old-data/hcpoperationstatuses_Create_90b2322c-2c26-47ca-b6f9-d9b1a8385cbc.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/01-load-old-data/hcpoperationstatuses_Create_90b2322c-2c26-47ca-b6f9-d9b1a8385cbc.json @@ -19,6 +19,7 @@ "startTime": "2026-01-05T18:29:58.181047849Z", "status": "Accepted", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/04-listActiveOperations-cluster-create/00-key.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/04-listActiveOperations-cluster-create/00-key.json index 34e9582ff83..2d01a4703a7 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/04-listActiveOperations-cluster-create/00-key.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/04-listActiveOperations-cluster-create/00-key.json @@ -1,6 +1,7 @@ { "parentResourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json index b06265dc897..13690bcbfcc 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json @@ -147,7 +147,8 @@ "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -172,7 +173,8 @@ "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", "platform": {}, - "provisioningState": "Accepted" + "provisioningState": "Accepted", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/cluster-creating/02-loadCosmos-cluster/cosmos-01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/cluster-creating/02-loadCosmos-cluster/cosmos-01-cluster.json index 76a0029fbad..40c9054ba31 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/cluster-creating/02-loadCosmos-cluster/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/cluster-creating/02-loadCosmos-cluster/cosmos-01-cluster.json @@ -22,7 +22,8 @@ }, "serviceProviderProperties": { "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/cs-cluster-creating", - "provisioningState": "Provisioning" + "provisioningState": "Provisioning", + "usesNewClusterDeletionApproach": false }, "serviceProviderState": null }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/cluster-deleting/02-loadCosmos-cluster/cosmos-01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/cluster-deleting/02-loadCosmos-cluster/cosmos-01-cluster.json index 02ac22e874d..e7a3730c447 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/cluster-deleting/02-loadCosmos-cluster/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/cluster-deleting/02-loadCosmos-cluster/cosmos-01-cluster.json @@ -22,7 +22,8 @@ }, "serviceProviderProperties": { "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/cs-cluster-deleting", - "provisioningState": "Deleting" + "provisioningState": "Deleting", + "usesNewClusterDeletionApproach": false }, "serviceProviderState": null }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/create-current/06-cosmosCompare-ending-content/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/create-current/06-cosmosCompare-ending-content/cluster-create-with-tags.json index 202c883baa2..f9582def9c4 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/create-current/06-cosmosCompare-ending-content/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/create-current/06-cosmosCompare-ending-content/cluster-create-with-tags.json @@ -146,7 +146,8 @@ "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", "platform": {}, - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -169,7 +170,8 @@ "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", "platform": {}, - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/create-current/06-cosmosCompare-ending-content/operation-cluster-create-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/create-current/06-cosmosCompare-ending-content/operation-cluster-create-create-with-tags.json index 06572d09b94..efee65526d8 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/create-current/06-cosmosCompare-ending-content/operation-cluster-create-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/create-current/06-cosmosCompare-ending-content/operation-cluster-create-create-with-tags.json @@ -16,6 +16,7 @@ "startTime": "2025-12-19T19:59:30.714826736Z", "status": "Succeeded", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/create-current/06-cosmosCompare-ending-content/operation-externalauth-create-default.json b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/create-current/06-cosmosCompare-ending-content/operation-externalauth-create-default.json index 13198c45a56..5a2c4d5c567 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/create-current/06-cosmosCompare-ending-content/operation-externalauth-create-default.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/create-current/06-cosmosCompare-ending-content/operation-externalauth-create-default.json @@ -19,6 +19,7 @@ "startTime": "2026-01-09T18:30:03.439824696Z", "status": "Accepted", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/01-load-old-data/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/01-load-old-data/cluster-create-with-tags.json index c141ded29f5..7b83d724882 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/01-load-old-data/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/01-load-old-data/cluster-create-with-tags.json @@ -142,7 +142,8 @@ "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", "platform": {}, - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -165,7 +166,8 @@ "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", "platform": {}, - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/01-load-old-data/operation-cluster-create-with-tags-create.json b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/01-load-old-data/operation-cluster-create-with-tags-create.json index 815c120382c..24994aa953e 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/01-load-old-data/operation-cluster-create-with-tags-create.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/01-load-old-data/operation-cluster-create-with-tags-create.json @@ -19,6 +19,7 @@ "startTime": "2026-01-09T18:32:10.15007222Z", "status": "Succeeded", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/01-load-old-data/operation-externalauth-create-default.json b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/01-load-old-data/operation-externalauth-create-default.json index 69742489c5d..be27f5dcb58 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/01-load-old-data/operation-externalauth-create-default.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/01-load-old-data/operation-externalauth-create-default.json @@ -19,6 +19,7 @@ "startTime": "2026-01-09T18:32:10.835814057Z", "status": "Accepted", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json index 37030891ccf..c0c75e64939 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json @@ -142,7 +142,8 @@ "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", "platform": {}, - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -165,7 +166,8 @@ "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", "platform": {}, - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/09-cosmosCompare-confirm-update/operation-cluster-create-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/09-cosmosCompare-confirm-update/operation-cluster-create-create-with-tags.json index eac42e90413..31690bd1d01 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/09-cosmosCompare-confirm-update/operation-cluster-create-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/09-cosmosCompare-confirm-update/operation-cluster-create-create-with-tags.json @@ -16,6 +16,7 @@ "startTime": "2026-01-09T18:32:10.15007222Z", "status": "Succeeded", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/09-cosmosCompare-confirm-update/operation-externalauth-create-default.json b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/09-cosmosCompare-confirm-update/operation-externalauth-create-default.json index 5d84de2dc5a..5ed143492cd 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/09-cosmosCompare-confirm-update/operation-externalauth-create-default.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/09-cosmosCompare-confirm-update/operation-externalauth-create-default.json @@ -16,6 +16,7 @@ "startTime": "2026-01-09T18:32:10.835814057Z", "status": "Succeeded", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/09-cosmosCompare-confirm-update/operation-externalauth-update-default.json b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/09-cosmosCompare-confirm-update/operation-externalauth-update-default.json index 2554c0370cb..0f68013cef4 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/09-cosmosCompare-confirm-update/operation-externalauth-update-default.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/09-cosmosCompare-confirm-update/operation-externalauth-update-default.json @@ -16,6 +16,7 @@ "startTime": "2026-01-09T18:44:19.757910778Z", "status": "Accepted", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/cluster-create-with-tags.json index ece0e5aa806..bea899a906b 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/cluster-create-with-tags.json @@ -144,7 +144,8 @@ "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", "platform": {}, - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -168,7 +169,8 @@ "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", "platform": {}, - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/operation-cluster-create-with-tags-create.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/operation-cluster-create-with-tags-create.json index d9442a3a129..efaf8710035 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/operation-cluster-create-with-tags-create.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/operation-cluster-create-with-tags-create.json @@ -16,6 +16,7 @@ "startTime": "2025-12-19T19:59:30.714826736Z", "status": "Succeeded", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/operation-create-basicnodepool.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/operation-create-basicnodepool.json index 78cb95f4d6a..f61bdfbeb90 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/operation-create-basicnodepool.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/operation-create-basicnodepool.json @@ -16,6 +16,7 @@ "startTime": "2026-01-08T20:04:05.054190978Z", "status": "Accepted", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/operation-create-nodepool-02.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/operation-create-nodepool-02.json index 4eccbb77b1d..a1225d00401 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/operation-create-nodepool-02.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/operation-create-nodepool-02.json @@ -16,6 +16,7 @@ "startTime": "2026-01-08T20:04:05.330050272Z", "status": "Accepted", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/operation-externalauth-create-default.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/operation-externalauth-create-default.json index ef3f52c4cac..a91a88aadfa 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/operation-externalauth-create-default.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/operation-externalauth-create-default.json @@ -16,6 +16,7 @@ "startTime": "2026-01-09T18:32:10.835814057Z", "status": "Accepted", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/cluster-create-with-tags.json index 92a305be4dd..05755b6ee75 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/cluster-create-with-tags.json @@ -146,7 +146,8 @@ "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", "platform": {}, - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -170,7 +171,8 @@ "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", "platform": {}, - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/operation-cluster-create-with-tags-create.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/operation-cluster-create-with-tags-create.json index d9442a3a129..efaf8710035 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/operation-cluster-create-with-tags-create.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/operation-cluster-create-with-tags-create.json @@ -16,6 +16,7 @@ "startTime": "2025-12-19T19:59:30.714826736Z", "status": "Succeeded", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/operation-create-basicnodepool.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/operation-create-basicnodepool.json index 78cb95f4d6a..f61bdfbeb90 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/operation-create-basicnodepool.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/operation-create-basicnodepool.json @@ -16,6 +16,7 @@ "startTime": "2026-01-08T20:04:05.054190978Z", "status": "Accepted", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/operation-create-nodepool-02.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/operation-create-nodepool-02.json index 4eccbb77b1d..a1225d00401 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/operation-create-nodepool-02.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/operation-create-nodepool-02.json @@ -16,6 +16,7 @@ "startTime": "2026-01-08T20:04:05.330050272Z", "status": "Accepted", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/operation-externalauth-create-default.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/operation-externalauth-create-default.json index ef3f52c4cac..a91a88aadfa 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/operation-externalauth-create-default.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/operation-externalauth-create-default.json @@ -16,6 +16,7 @@ "startTime": "2026-01-09T18:32:10.835814057Z", "status": "Accepted", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/cluster-create-with-tags.json index 67cb2f1778a..5773cf2039c 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/cluster-create-with-tags.json @@ -143,7 +143,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -166,7 +167,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/operation-cluster-create-with-tags-create.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/operation-cluster-create-with-tags-create.json index d9442a3a129..efaf8710035 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/operation-cluster-create-with-tags-create.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/operation-cluster-create-with-tags-create.json @@ -16,6 +16,7 @@ "startTime": "2025-12-19T19:59:30.714826736Z", "status": "Succeeded", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/operation-create-basicnodepool.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/operation-create-basicnodepool.json index 2a9c42aed21..c709cb60597 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/operation-create-basicnodepool.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/operation-create-basicnodepool.json @@ -19,6 +19,7 @@ "startTime": "2026-01-08T20:04:05.054190978Z", "status": "Accepted", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/operation-create-nodepool-02.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/operation-create-nodepool-02.json index d4e447acff2..5bd06e444f0 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/operation-create-nodepool-02.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/operation-create-nodepool-02.json @@ -19,6 +19,7 @@ "startTime": "2026-01-08T20:04:05.330050272Z", "status": "Accepted", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/operation-externalauth-create-default.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/operation-externalauth-create-default.json index 69742489c5d..be27f5dcb58 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/operation-externalauth-create-default.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/operation-externalauth-create-default.json @@ -19,6 +19,7 @@ "startTime": "2026-01-09T18:32:10.835814057Z", "status": "Accepted", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/cluster-create-with-tags.json index 67cb2f1778a..5773cf2039c 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/cluster-create-with-tags.json @@ -143,7 +143,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -166,7 +167,8 @@ "console": {}, "dns": {}, "platform": {}, - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/operation-cluster-create-with-tags-create.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/operation-cluster-create-with-tags-create.json index d9442a3a129..efaf8710035 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/operation-cluster-create-with-tags-create.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/operation-cluster-create-with-tags-create.json @@ -16,6 +16,7 @@ "startTime": "2025-12-19T19:59:30.714826736Z", "status": "Succeeded", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/operation-create-basicnodepool.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/operation-create-basicnodepool.json index 78cb95f4d6a..f61bdfbeb90 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/operation-create-basicnodepool.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/operation-create-basicnodepool.json @@ -16,6 +16,7 @@ "startTime": "2026-01-08T20:04:05.054190978Z", "status": "Accepted", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/operation-create-nodepool-02.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/operation-create-nodepool-02.json index 6ac6a854c48..3078f188a06 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/operation-create-nodepool-02.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/operation-create-nodepool-02.json @@ -16,6 +16,7 @@ "startTime": "2026-01-08T20:04:05.330050272Z", "status": "Succeeded", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/operation-externalauth-create-default.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/operation-externalauth-create-default.json index cd3be5a342e..78a6dff13c0 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/operation-externalauth-create-default.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/operation-externalauth-create-default.json @@ -16,6 +16,7 @@ "startTime": "2026-01-09T18:32:10.835814057Z", "status": "Succeeded", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/cluster-creating/02-loadCosmos-cluster/cosmos-01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/cluster-creating/02-loadCosmos-cluster/cosmos-01-cluster.json index dc6321536e1..bfa4d4de84d 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/cluster-creating/02-loadCosmos-cluster/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/cluster-creating/02-loadCosmos-cluster/cosmos-01-cluster.json @@ -36,7 +36,8 @@ }, "serviceProviderProperties": { "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/cs-cluster-creating", - "provisioningState": "Provisioning" + "provisioningState": "Provisioning", + "usesNewClusterDeletionApproach": false } }, "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-creating", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/cluster-deleting/02-loadCosmos-cluster/cosmos-01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/cluster-deleting/02-loadCosmos-cluster/cosmos-01-cluster.json index 7d0db4d2e0a..cc75c4f0245 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/cluster-deleting/02-loadCosmos-cluster/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/cluster-deleting/02-loadCosmos-cluster/cosmos-01-cluster.json @@ -36,7 +36,8 @@ }, "serviceProviderProperties": { "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/cs-cluster-deleting", - "provisioningState": "Deleting" + "provisioningState": "Deleting", + "usesNewClusterDeletionApproach": false } }, "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-deleting", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/create-current/06-cosmosCompare-confirm-content/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/create-current/06-cosmosCompare-confirm-content/cluster-create-with-tags.json index 6105660da1e..3844d4ed6b1 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/create-current/06-cosmosCompare-confirm-content/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/create-current/06-cosmosCompare-confirm-content/cluster-create-with-tags.json @@ -146,7 +146,8 @@ "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", "platform": {}, - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -169,7 +170,8 @@ "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", "platform": {}, - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/create-current/06-cosmosCompare-confirm-content/operation-cluster-create-with-tags-create.json b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/create-current/06-cosmosCompare-confirm-content/operation-cluster-create-with-tags-create.json index e1a6f694e21..6f43977c9e9 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/create-current/06-cosmosCompare-confirm-content/operation-cluster-create-with-tags-create.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/create-current/06-cosmosCompare-confirm-content/operation-cluster-create-with-tags-create.json @@ -19,6 +19,7 @@ "startTime": "2025-12-19T19:59:30.714826736Z", "status": "Succeeded", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/cluster-create-with-tags.json index ece0e5aa806..bea899a906b 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/cluster-create-with-tags.json @@ -144,7 +144,8 @@ "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", "platform": {}, - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -168,7 +169,8 @@ "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", "platform": {}, - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/operation-cluster-create-with-tags-create.json b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/operation-cluster-create-with-tags-create.json index d9442a3a129..efaf8710035 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/operation-cluster-create-with-tags-create.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/operation-cluster-create-with-tags-create.json @@ -16,6 +16,7 @@ "startTime": "2025-12-19T19:59:30.714826736Z", "status": "Succeeded", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/operation-create-basicnodepool.json b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/operation-create-basicnodepool.json index 2a9c42aed21..c709cb60597 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/operation-create-basicnodepool.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/operation-create-basicnodepool.json @@ -19,6 +19,7 @@ "startTime": "2026-01-08T20:04:05.054190978Z", "status": "Accepted", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/operation-create-nodepool-02.json b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/operation-create-nodepool-02.json index d4e447acff2..5bd06e444f0 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/operation-create-nodepool-02.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/operation-create-nodepool-02.json @@ -19,6 +19,7 @@ "startTime": "2026-01-08T20:04:05.330050272Z", "status": "Accepted", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json index 03db3af16a6..76efdf8b0fc 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json @@ -144,7 +144,8 @@ "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", "platform": {}, - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", @@ -168,7 +169,8 @@ "dns": {}, "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", "platform": {}, - "provisioningState": "Succeeded" + "provisioningState": "Succeeded", + "usesNewClusterDeletionApproach": false }, "systemData": { "createdBy": "Unknown-ARO-HCP-frontend", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/operation-create-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/operation-create-cluster.json index d21183ae848..3722b4bb351 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/operation-create-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/operation-create-cluster.json @@ -16,6 +16,7 @@ "startTime": "2025-12-19T19:59:30.714826736Z", "status": "Succeeded", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/operation-create-nodepool-02.json b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/operation-create-nodepool-02.json index ae0cb2472b1..cd92f5a3052 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/operation-create-nodepool-02.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/operation-create-nodepool-02.json @@ -16,6 +16,7 @@ "startTime": "2026-01-08T20:04:05.330050272Z", "status": "Accepted", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/operation-create-nodepool-basic.json b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/operation-create-nodepool-basic.json index 80144cc7c13..c135d541e17 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/operation-create-nodepool-basic.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/operation-create-nodepool-basic.json @@ -16,6 +16,7 @@ "startTime": "2026-01-08T20:04:05.054190978Z", "status": "Succeeded", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/operation-update-nodepool-basic.json b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/operation-update-nodepool-basic.json index e08e55973a8..ddc209d0ed6 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/operation-update-nodepool-basic.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/operation-update-nodepool-basic.json @@ -16,6 +16,7 @@ "startTime": "2026-01-08T20:09:32.571015378Z", "status": "Accepted", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Operations/read-new-data/01-load-new-data/operation.json b/test-integration/frontend/artifacts/FrontendCRUD/Operations/read-new-data/01-load-new-data/operation.json index c6f156037e5..b429b58a2f9 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Operations/read-new-data/01-load-new-data/operation.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Operations/read-new-data/01-load-new-data/operation.json @@ -17,6 +17,7 @@ "startTime": "2026-01-08T19:02:35.73640117Z", "status": "Succeeded", "tenantId": "00000000-0000-0000-0000-000000000000", + "usesNewClusterDeletionApproach": false, "usesNewExternalAuthDeletionApproach": false, "usesNewNodePoolDeletionApproach": false }, From 9272d13c62d6898e1008ad7d42e193c861e1edc7 Mon Sep 17 00:00:00 2001 From: David Eads Date: Thu, 7 May 2026 11:14:46 -0400 Subject: [PATCH 2/7] stop serializing old cluster fields --- internal/database/convert_cluster.go | 16 --- internal/database/convert_cluster_test.go | 3 - .../convert_defaults_consistency_test.go | 20 ++-- internal/database/types_hcpcluster.go | 18 +--- .../01-cluster.json | 31 ------ .../01-cluster.json | 42 -------- .../01-cluster.json | 42 -------- .../01-cluster.json | 42 -------- .../00-load-initial-state/cluster.json | 92 ---------------- .../00-load-initial-state/cluster.json | 92 ---------------- .../99-cosmosCompare-end-state/cluster.json | 92 ---------------- .../00-load-initial-state/cluster-safe.json | 92 ---------------- .../00-load-initial-state/cluster.json | 92 ---------------- .../cluster-safe.json | 92 ---------------- .../00-load-initial-state/cluster.json | 62 ----------- .../99-cosmosCompare-end-state/cluster.json | 62 ----------- .../00-load-initial-state/cluster.json | 62 ----------- .../99-cosmosCompare-end-state/cluster.json | 62 ----------- .../00-load-initial-state/cluster.json | 92 ---------------- .../99-cosmosCompare-end-state/cluster.json | 92 ---------------- .../00-load-initial-state/cluster.json | 92 ---------------- .../99-cosmosCompare-end-state/cluster.json | 92 ---------------- .../00-load-initial-state/cluster.json | 92 ---------------- .../99-cosmosCompare-end-state/cluster.json | 92 ---------------- .../00-load-initial-state/cluster.json | 92 ---------------- .../99-cosmosCompare-end-state/cluster.json | 92 ---------------- .../create-with-tags-cluster.json | 75 ------------- .../create-with-tags-cluster.json | 75 ------------- .../create-with-tags-cluster.json | 75 ------------- .../create-with-tags-cluster.json | 75 ------------- .../create-with-tags-cluster.json | 75 ------------- .../create-with-tags-cluster.json | 75 ------------- .../01-cluster.json | 5 - .../01-cluster.json | 5 - .../01-cluster.json | 8 -- .../01-cluster.json | 8 -- .../01-cluster.json | 42 -------- .../01-cluster.json | 8 -- .../cluster-create-with-tags.json | 99 ----------------- .../cluster-create-with-tags.json | 101 ------------------ .../cluster-test-cluster.json | 89 --------------- .../cluster-test-cluster.json | 89 --------------- .../01-load-old-data/create-with-tags.json | 97 ----------------- .../cluster-create-with-tags.json | 100 ----------------- .../cosmos-01-cluster.json | 13 --- .../cosmos-01-cluster.json | 13 --- .../cluster-create-with-tags.json | 97 ----------------- .../cluster-create-with-tags.json | 95 ---------------- .../cluster-create-with-tags.json | 95 ---------------- .../cluster-create-with-tags.json | 97 ----------------- .../cluster-create-with-tags.json | 98 ----------------- .../cluster-create-with-tags.json | 96 ----------------- .../cluster-create-with-tags.json | 96 ----------------- .../cosmos-01-cluster.json | 23 ---- .../cosmos-01-cluster.json | 23 ---- .../cluster-create-with-tags.json | 97 ----------------- .../cluster-create-with-tags.json | 97 ----------------- .../cluster-create-with-tags.json | 97 ----------------- 58 files changed, 13 insertions(+), 3875 deletions(-) diff --git a/internal/database/convert_cluster.go b/internal/database/convert_cluster.go index 90c17b14584..8fbf64d6f9c 100644 --- a/internal/database/convert_cluster.go +++ b/internal/database/convert_cluster.go @@ -18,8 +18,6 @@ import ( "fmt" "strings" - "k8s.io/utils/ptr" - "github.com/Azure/ARO-HCP/internal/api" ) @@ -46,23 +44,9 @@ func InternalToCosmosCluster(internalObj *api.HCPOpenShiftCluster) (*HCPCluster, }, HCPClusterProperties: HCPClusterProperties{ HCPOpenShiftCluster: *internalObj, - IntermediateResourceDoc: &ResourceDocument{ - ResourceID: cosmosResourceID, - InternalID: ptr.Deref(internalObj.ServiceProviderProperties.ClusterServiceID, api.InternalID{}), - ActiveOperationID: internalObj.ServiceProviderProperties.ActiveOperationID, - ProvisioningState: internalObj.ServiceProviderProperties.ProvisioningState, - Identity: internalObj.Identity.DeepCopy(), - SystemData: internalObj.SystemData, - Tags: copyTags(internalObj.Tags), - }, - InternalState: ClusterInternalState{ - InternalAPI: *internalObj, - }, }, } - cosmosObj.InternalState.InternalAPI.CosmosMetadata = api.CosmosMetadata{} - return cosmosObj, nil } diff --git a/internal/database/convert_cluster_test.go b/internal/database/convert_cluster_test.go index b1761f3e08d..3044389858b 100644 --- a/internal/database/convert_cluster_test.go +++ b/internal/database/convert_cluster_test.go @@ -189,9 +189,6 @@ func TestCosmosToInternalClusterPreservesETag(t *testing.T) { ResourceID: resourceID, }, }, - IntermediateResourceDoc: &ResourceDocument{ - ResourceID: resourceID, - }, }, } diff --git a/internal/database/convert_defaults_consistency_test.go b/internal/database/convert_defaults_consistency_test.go index 0953007fda1..b8951ff5ff2 100644 --- a/internal/database/convert_defaults_consistency_test.go +++ b/internal/database/convert_defaults_consistency_test.go @@ -211,16 +211,16 @@ func TestPreExistingDataCluster(t *testing.T) { ResourceID: resourceID, }, HCPClusterProperties: HCPClusterProperties{ - IntermediateResourceDoc: &ResourceDocument{ - ResourceID: resourceID, - InternalID: api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/test-cluster")), - ProvisioningState: arm.ProvisioningStateSucceeded, - }, - InternalState: ClusterInternalState{ - InternalAPI: api.HCPOpenShiftCluster{ - // All canonically-defaulted fields are intentionally zero-valued: - // NetworkType, Visibility, OutboundType, - // ClusterImageRegistry.State, Etcd.DataEncryption.KeyManagementMode + HCPOpenShiftCluster: api.HCPOpenShiftCluster{ + // All canonically-defaulted fields are intentionally zero-valued: + // NetworkType, Visibility, OutboundType, + // ClusterImageRegistry.State, Etcd.DataEncryption.KeyManagementMode + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: resourceID, + }, + ServiceProviderProperties: api.HCPOpenShiftClusterServiceProviderProperties{ + ClusterServiceID: ptr.To(api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/test-cluster"))), + ProvisioningState: arm.ProvisioningStateSucceeded, }, }, }, diff --git a/internal/database/types_hcpcluster.go b/internal/database/types_hcpcluster.go index 5b569708865..d8e984236f4 100644 --- a/internal/database/types_hcpcluster.go +++ b/internal/database/types_hcpcluster.go @@ -25,22 +25,10 @@ type HCPCluster struct { } type HCPClusterProperties struct { - // HCPOpenShiftCluster is the inline serialization that mirrors GenericDocument[api.HCPOpenShiftCluster] - // (the destination shape for cluster documents). The reading path now uses these inline fields as the - // source of truth; the IntermediateResourceDoc/InternalState siblings are still written for compatibility - // with old readers, but will be removed once all readers have migrated. + // HCPOpenShiftCluster is inlined directly. The on-disk shape now matches + // GenericDocument[api.HCPOpenShiftCluster] and HCPCluster only exists as a + // distinct type while the migration to that generic surface completes. api.HCPOpenShiftCluster `json:",inline"` - - // IntermediateResourceDoc exists so that we can stop inlining the resource document so that we can directly - // embed the InternalAPIType which has colliding serialization fields. - IntermediateResourceDoc *ResourceDocument `json:"intermediateResourceDoc"` - - // TODO we may need look-aside data that we want to store in the same place. Build the nesting to allow it - InternalState ClusterInternalState `json:"internalState"` -} - -type ClusterInternalState struct { - InternalAPI api.HCPOpenShiftCluster `json:"internalAPI"` } func (o *HCPCluster) GetTypedDocument() *TypedDocument { diff --git a/test-integration/admin/artifacts/AdminCRUD/HCP/breakglass/00-load-initial-cosmos-state/01-cluster.json b/test-integration/admin/artifacts/AdminCRUD/HCP/breakglass/00-load-initial-cosmos-state/01-cluster.json index 1de8976a413..c98212abc4f 100644 --- a/test-integration/admin/artifacts/AdminCRUD/HCP/breakglass/00-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/admin/artifacts/AdminCRUD/HCP/breakglass/00-load-initial-cosmos-state/01-cluster.json @@ -9,37 +9,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/aro_hcp/v1alpha1/clusters/fixed-value", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "systemData": {}, - "tags": { - "foo": "bar" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "identity": { - "type": "UserAssigned" - }, - "location": "eastus", - "name": "some-hcp-cluster", - "serviceProviderProperties": { - "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/fixed-value", - "provisioningState": "Succeeded", - "usesNewClusterDeletionApproach": false - }, - "tags": { - "foo": "bar" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "eastus", "name": "some-hcp-cluster", "serviceProviderProperties": { diff --git a/test-integration/admin/artifacts/AdminCRUD/HCP/cosmosdump/00-load-initial-cosmos-state/01-cluster.json b/test-integration/admin/artifacts/AdminCRUD/HCP/cosmosdump/00-load-initial-cosmos-state/01-cluster.json index a19e39fefda..08d0511bb69 100644 --- a/test-integration/admin/artifacts/AdminCRUD/HCP/cosmosdump/00-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/admin/artifacts/AdminCRUD/HCP/cosmosdump/00-load-initial-cosmos-state/01-cluster.json @@ -9,48 +9,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/aro_hcp/v1alpha1/clusters/fixed-value", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "foo": "bar" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "identity": { - "type": "UserAssigned" - }, - "location": "eastus", - "name": "some-hcp-cluster", - "serviceProviderProperties": { - "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/fixed-value", - "provisioningState": "Succeeded", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "foo": "bar" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "eastus", "name": "some-hcp-cluster", "serviceProviderProperties": { diff --git a/test-integration/admin/artifacts/AdminCRUD/HCP/hello-world/00-load-initial-cosmos-state/01-cluster.json b/test-integration/admin/artifacts/AdminCRUD/HCP/hello-world/00-load-initial-cosmos-state/01-cluster.json index a19e39fefda..08d0511bb69 100644 --- a/test-integration/admin/artifacts/AdminCRUD/HCP/hello-world/00-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/admin/artifacts/AdminCRUD/HCP/hello-world/00-load-initial-cosmos-state/01-cluster.json @@ -9,48 +9,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/aro_hcp/v1alpha1/clusters/fixed-value", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "foo": "bar" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "identity": { - "type": "UserAssigned" - }, - "location": "eastus", - "name": "some-hcp-cluster", - "serviceProviderProperties": { - "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/fixed-value", - "provisioningState": "Succeeded", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "foo": "bar" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "eastus", "name": "some-hcp-cluster", "serviceProviderProperties": { diff --git a/test-integration/admin/artifacts/AdminCRUD/HCP/lowercase-middleware/00-load-initial-cosmos-state/01-cluster.json b/test-integration/admin/artifacts/AdminCRUD/HCP/lowercase-middleware/00-load-initial-cosmos-state/01-cluster.json index a19e39fefda..08d0511bb69 100644 --- a/test-integration/admin/artifacts/AdminCRUD/HCP/lowercase-middleware/00-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/admin/artifacts/AdminCRUD/HCP/lowercase-middleware/00-load-initial-cosmos-state/01-cluster.json @@ -9,48 +9,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/aro_hcp/v1alpha1/clusters/fixed-value", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "foo": "bar" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "identity": { - "type": "UserAssigned" - }, - "location": "eastus", - "name": "some-hcp-cluster", - "serviceProviderProperties": { - "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/fixed-value", - "provisioningState": "Succeeded", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "foo": "bar" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "eastus", "name": "some-hcp-cluster", "serviceProviderProperties": { diff --git a/test-integration/backend/controllers/do_nothing/artifacts/sync_cluster/00-load-initial-state/cluster.json b/test-integration/backend/controllers/do_nothing/artifacts/sync_cluster/00-load-initial-state/cluster.json index e7968b2d7e2..dde65ba97d3 100644 --- a/test-integration/backend/controllers/do_nothing/artifacts/sync_cluster/00-load-initial-state/cluster.json +++ b/test-integration/backend/controllers/do_nothing/artifacts/sync_cluster/00-load-initial-state/cluster.json @@ -59,98 +59,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/shrillEffectiveness/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/lavishUnhappiness", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "uprightPairing", - "networkSecurityGroupId": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/shrillEffectiveness/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": { - "serviceManagedIdentity": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" - } - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/shrillEffectiveness/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/lavishUnhappiness", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "lavishUnhappiness", - "serviceProviderProperties": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Accepted", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "lavishUnhappiness", "serviceProviderProperties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/cluster/present_cluster/00-load-initial-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/cluster/present_cluster/00-load-initial-state/cluster.json index 0fa2f81ef8e..837700c0176 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/cluster/present_cluster/00-load-initial-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/cluster/present_cluster/00-load-initial-state/cluster.json @@ -59,98 +59,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "uprightPairing", - "networkSecurityGroupId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": { - "serviceManagedIdentity": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" - } - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "monstrousPrecinct", - "serviceProviderProperties": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Accepted", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "monstrousPrecinct", "serviceProviderProperties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/cluster/present_cluster/99-cosmosCompare-end-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/cluster/present_cluster/99-cosmosCompare-end-state/cluster.json index 0fa2f81ef8e..837700c0176 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/cluster/present_cluster/99-cosmosCompare-end-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/cluster/present_cluster/99-cosmosCompare-end-state/cluster.json @@ -59,98 +59,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "uprightPairing", - "networkSecurityGroupId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": { - "serviceManagedIdentity": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" - } - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "monstrousPrecinct", - "serviceProviderProperties": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Accepted", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "monstrousPrecinct", "serviceProviderProperties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/cluster-safe.json b/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/cluster-safe.json index e7968b2d7e2..dde65ba97d3 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/cluster-safe.json +++ b/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/cluster-safe.json @@ -59,98 +59,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/shrillEffectiveness/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/lavishUnhappiness", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "uprightPairing", - "networkSecurityGroupId": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/shrillEffectiveness/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": { - "serviceManagedIdentity": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" - } - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/shrillEffectiveness/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/lavishUnhappiness", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "lavishUnhappiness", - "serviceProviderProperties": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Accepted", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "lavishUnhappiness", "serviceProviderProperties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/cluster.json index 0fa2f81ef8e..837700c0176 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/cluster.json @@ -59,98 +59,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "uprightPairing", - "networkSecurityGroupId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": { - "serviceManagedIdentity": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" - } - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "monstrousPrecinct", - "serviceProviderProperties": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Accepted", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "monstrousPrecinct", "serviceProviderProperties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/99-cosmosCompare-end-state/cluster-safe.json b/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/99-cosmosCompare-end-state/cluster-safe.json index e7968b2d7e2..dde65ba97d3 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/99-cosmosCompare-end-state/cluster-safe.json +++ b/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/99-cosmosCompare-end-state/cluster-safe.json @@ -59,98 +59,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/shrillEffectiveness/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/lavishUnhappiness", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "uprightPairing", - "networkSecurityGroupId": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/shrillEffectiveness/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": { - "serviceManagedIdentity": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" - } - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/shrillEffectiveness/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/lavishUnhappiness", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "lavishUnhappiness", - "serviceProviderProperties": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Accepted", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "lavishUnhappiness", "serviceProviderProperties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/00-load-initial-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/00-load-initial-state/cluster.json index adf19cecc54..0340d79ea75 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/00-load-initial-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/00-load-initial-state/cluster.json @@ -29,68 +29,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "uprightPairing", - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "monstrousPrecinct", - "serviceProviderProperties": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Accepted", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "monstrousPrecinct", "serviceProviderProperties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/99-cosmosCompare-end-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/99-cosmosCompare-end-state/cluster.json index adf19cecc54..0340d79ea75 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/99-cosmosCompare-end-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/99-cosmosCompare-end-state/cluster.json @@ -29,68 +29,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "uprightPairing", - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "monstrousPrecinct", - "serviceProviderProperties": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Accepted", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "monstrousPrecinct", "serviceProviderProperties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/controller_under_missing_nodepool_deleted/00-load-initial-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/controller_under_missing_nodepool_deleted/00-load-initial-state/cluster.json index adf19cecc54..0340d79ea75 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/controller_under_missing_nodepool_deleted/00-load-initial-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/controller_under_missing_nodepool_deleted/00-load-initial-state/cluster.json @@ -29,68 +29,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "uprightPairing", - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "monstrousPrecinct", - "serviceProviderProperties": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Accepted", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "monstrousPrecinct", "serviceProviderProperties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/controller_under_missing_nodepool_deleted/99-cosmosCompare-end-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/controller_under_missing_nodepool_deleted/99-cosmosCompare-end-state/cluster.json index adf19cecc54..0340d79ea75 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/controller_under_missing_nodepool_deleted/99-cosmosCompare-end-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/controller_under_missing_nodepool_deleted/99-cosmosCompare-end-state/cluster.json @@ -29,68 +29,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "uprightPairing", - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "monstrousPrecinct", - "serviceProviderProperties": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Accepted", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "monstrousPrecinct", "serviceProviderProperties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/00-load-initial-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/00-load-initial-state/cluster.json index 0fa2f81ef8e..837700c0176 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/00-load-initial-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/00-load-initial-state/cluster.json @@ -59,98 +59,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "uprightPairing", - "networkSecurityGroupId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": { - "serviceManagedIdentity": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" - } - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "monstrousPrecinct", - "serviceProviderProperties": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Accepted", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "monstrousPrecinct", "serviceProviderProperties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/99-cosmosCompare-end-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/99-cosmosCompare-end-state/cluster.json index 0fa2f81ef8e..837700c0176 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/99-cosmosCompare-end-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/99-cosmosCompare-end-state/cluster.json @@ -59,98 +59,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "uprightPairing", - "networkSecurityGroupId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": { - "serviceManagedIdentity": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" - } - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "monstrousPrecinct", - "serviceProviderProperties": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Accepted", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "monstrousPrecinct", "serviceProviderProperties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/00-load-initial-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/00-load-initial-state/cluster.json index 0fa2f81ef8e..837700c0176 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/00-load-initial-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/00-load-initial-state/cluster.json @@ -59,98 +59,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "uprightPairing", - "networkSecurityGroupId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": { - "serviceManagedIdentity": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" - } - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "monstrousPrecinct", - "serviceProviderProperties": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Accepted", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "monstrousPrecinct", "serviceProviderProperties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/99-cosmosCompare-end-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/99-cosmosCompare-end-state/cluster.json index 0fa2f81ef8e..837700c0176 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/99-cosmosCompare-end-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/99-cosmosCompare-end-state/cluster.json @@ -59,98 +59,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "uprightPairing", - "networkSecurityGroupId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": { - "serviceManagedIdentity": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" - } - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "monstrousPrecinct", - "serviceProviderProperties": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Accepted", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "monstrousPrecinct", "serviceProviderProperties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/00-load-initial-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/00-load-initial-state/cluster.json index 0fa2f81ef8e..837700c0176 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/00-load-initial-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/00-load-initial-state/cluster.json @@ -59,98 +59,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "uprightPairing", - "networkSecurityGroupId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": { - "serviceManagedIdentity": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" - } - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "monstrousPrecinct", - "serviceProviderProperties": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Accepted", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "monstrousPrecinct", "serviceProviderProperties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/99-cosmosCompare-end-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/99-cosmosCompare-end-state/cluster.json index 0fa2f81ef8e..837700c0176 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/99-cosmosCompare-end-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/99-cosmosCompare-end-state/cluster.json @@ -59,98 +59,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "uprightPairing", - "networkSecurityGroupId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": { - "serviceManagedIdentity": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" - } - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "monstrousPrecinct", - "serviceProviderProperties": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Accepted", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "monstrousPrecinct", "serviceProviderProperties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/00-load-initial-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/00-load-initial-state/cluster.json index 0fa2f81ef8e..837700c0176 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/00-load-initial-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/00-load-initial-state/cluster.json @@ -59,98 +59,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "uprightPairing", - "networkSecurityGroupId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": { - "serviceManagedIdentity": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" - } - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "monstrousPrecinct", - "serviceProviderProperties": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Accepted", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "monstrousPrecinct", "serviceProviderProperties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/99-cosmosCompare-end-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/99-cosmosCompare-end-state/cluster.json index 0fa2f81ef8e..837700c0176 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/99-cosmosCompare-end-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/99-cosmosCompare-end-state/cluster.json @@ -59,98 +59,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "uprightPairing", - "networkSecurityGroupId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": { - "serviceManagedIdentity": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" - } - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "monstrousPrecinct", - "serviceProviderProperties": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Accepted", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "monstrousPrecinct", "serviceProviderProperties": { diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/create-with-tags-cluster.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/create-with-tags-cluster.json index 4739184fa70..972a7a8b117 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/create-with-tags-cluster.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/create-with-tags-cluster.json @@ -64,81 +64,6 @@ "type": "UserAssigned" }, "internalId": "/api/clusters_mgmt/v1/clusters/dv8blqb5g9", - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "api": {}, - "console": {}, - "dns": {}, - "platform": {}, - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "provisioningState": "Accepted", diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/04-untypedListRecursive-resourcegroup/create-with-tags-cluster.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/04-untypedListRecursive-resourcegroup/create-with-tags-cluster.json index 6d3c372d76c..6702943c743 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/04-untypedListRecursive-resourcegroup/create-with-tags-cluster.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/04-untypedListRecursive-resourcegroup/create-with-tags-cluster.json @@ -64,81 +64,6 @@ "type": "UserAssigned" }, "internalId": "/api/clusters_mgmt/v1/clusters/dv8blqb5g9", - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "api": {}, - "console": {}, - "dns": {}, - "platform": {}, - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "provisioningState": "Accepted", diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/create-with-tags-cluster.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/create-with-tags-cluster.json index 6d3c372d76c..6702943c743 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/create-with-tags-cluster.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/create-with-tags-cluster.json @@ -64,81 +64,6 @@ "type": "UserAssigned" }, "internalId": "/api/clusters_mgmt/v1/clusters/dv8blqb5g9", - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "api": {}, - "console": {}, - "dns": {}, - "platform": {}, - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "provisioningState": "Accepted", diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/07-untypedListRecursive-resourcegroup-via-child/create-with-tags-cluster.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/07-untypedListRecursive-resourcegroup-via-child/create-with-tags-cluster.json index 6d3c372d76c..6702943c743 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/07-untypedListRecursive-resourcegroup-via-child/create-with-tags-cluster.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/07-untypedListRecursive-resourcegroup-via-child/create-with-tags-cluster.json @@ -64,81 +64,6 @@ "type": "UserAssigned" }, "internalId": "/api/clusters_mgmt/v1/clusters/dv8blqb5g9", - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "api": {}, - "console": {}, - "dns": {}, - "platform": {}, - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "provisioningState": "Accepted", diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/10-untypedList-resourcegroup/create-with-tags-cluster.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/10-untypedList-resourcegroup/create-with-tags-cluster.json index 6d3c372d76c..6702943c743 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/10-untypedList-resourcegroup/create-with-tags-cluster.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/10-untypedList-resourcegroup/create-with-tags-cluster.json @@ -64,81 +64,6 @@ "type": "UserAssigned" }, "internalId": "/api/clusters_mgmt/v1/clusters/dv8blqb5g9", - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "api": {}, - "console": {}, - "dns": {}, - "platform": {}, - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "provisioningState": "Accepted", diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/12-untypedList-resourcegroup/create-with-tags-cluster.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/12-untypedList-resourcegroup/create-with-tags-cluster.json index 6d3c372d76c..6702943c743 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/12-untypedList-resourcegroup/create-with-tags-cluster.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/12-untypedList-resourcegroup/create-with-tags-cluster.json @@ -64,81 +64,6 @@ "type": "UserAssigned" }, "internalId": "/api/clusters_mgmt/v1/clusters/dv8blqb5g9", - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "api": {}, - "console": {}, - "dns": {}, - "platform": {}, - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "provisioningState": "Accepted", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/request-provisioning-conflict/01-load-initial-cosmos-state/01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/request-provisioning-conflict/01-load-initial-cosmos-state/01-cluster.json index bba29676a9b..08474430fad 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/request-provisioning-conflict/01-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/request-provisioning-conflict/01-load-initial-cosmos-state/01-cluster.json @@ -6,11 +6,6 @@ "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster" }, "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "intermediateResourceDoc": { - "internalId": "/api/clusters_mgmt/v1/clusters/fixed-value", - "provisioningState": "Provisioning", - "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster" - }, "serviceProviderProperties": { "clusterServiceID": "/api/clusters_mgmt/v1/clusters/fixed-value", "provisioningState": "Provisioning", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/request/01-load-initial-cosmos-state/01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/request/01-load-initial-cosmos-state/01-cluster.json index f27f1cf8ba9..c4239ce8203 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/request/01-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/request/01-load-initial-cosmos-state/01-cluster.json @@ -6,11 +6,6 @@ "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster" }, "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "intermediateResourceDoc": { - "internalId": "/api/clusters_mgmt/v1/clusters/fixed-value", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster" - }, "serviceProviderProperties": { "clusterServiceID": "/api/clusters_mgmt/v1/clusters/fixed-value", "provisioningState": "Succeeded", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-forbidden-afec-missing/01-load-initial-cosmos-state/01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-forbidden-afec-missing/01-load-initial-cosmos-state/01-cluster.json index 5bdbe4d0d1a..c4239ce8203 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-forbidden-afec-missing/01-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-forbidden-afec-missing/01-load-initial-cosmos-state/01-cluster.json @@ -6,14 +6,6 @@ "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster" }, "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "intermediateResourceDoc": { - "internalId": "/api/clusters_mgmt/v1/clusters/fixed-value", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "tags": { - "foo": "bar" - } - }, "serviceProviderProperties": { "clusterServiceID": "/api/clusters_mgmt/v1/clusters/fixed-value", "provisioningState": "Succeeded", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-forbidden-afec-pending/01-load-initial-cosmos-state/01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-forbidden-afec-pending/01-load-initial-cosmos-state/01-cluster.json index 5bdbe4d0d1a..c4239ce8203 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-forbidden-afec-pending/01-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-forbidden-afec-pending/01-load-initial-cosmos-state/01-cluster.json @@ -6,14 +6,6 @@ "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster" }, "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "intermediateResourceDoc": { - "internalId": "/api/clusters_mgmt/v1/clusters/fixed-value", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "tags": { - "foo": "bar" - } - }, "serviceProviderProperties": { "clusterServiceID": "/api/clusters_mgmt/v1/clusters/fixed-value", "provisioningState": "Succeeded", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-provisioning-conflict/01-load-initial-cosmos-state/01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-provisioning-conflict/01-load-initial-cosmos-state/01-cluster.json index e0d24e6c9f4..1b213936a0e 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-provisioning-conflict/01-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-provisioning-conflict/01-load-initial-cosmos-state/01-cluster.json @@ -9,48 +9,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/fixed-value", - "provisioningState": "Provisioning", - "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "foo": "bar" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "identity": { - "type": "UserAssigned" - }, - "location": "eastus", - "name": "some-hcp-cluster", - "serviceProviderProperties": { - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/fixed-value", - "provisioningState": "Provisioning", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "foo": "bar" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "eastus", "name": "some-hcp-cluster", "serviceProviderProperties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke/01-load-initial-cosmos-state/01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke/01-load-initial-cosmos-state/01-cluster.json index 5bdbe4d0d1a..c4239ce8203 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke/01-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke/01-load-initial-cosmos-state/01-cluster.json @@ -6,14 +6,6 @@ "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster" }, "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "intermediateResourceDoc": { - "internalId": "/api/clusters_mgmt/v1/clusters/fixed-value", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "tags": { - "foo": "bar" - } - }, "serviceProviderProperties": { "clusterServiceID": "/api/clusters_mgmt/v1/clusters/fixed-value", "provisioningState": "Succeeded", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/02-cosmosCompare-confirm-content/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/02-cosmosCompare-confirm-content/cluster-create-with-tags.json index 75ee72e5597..1a9fd33763f 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/02-cosmosCompare-confirm-content/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/02-cosmosCompare-confirm-content/cluster-create-with-tags.json @@ -64,105 +64,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "bb83a448-9eb0-431c-9fd3-9cec8699ea5f", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/fhlllh5lkl", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - }, - "visibility": "Public" - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable", - "id": "4.20" - } - }, - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "activeOperationId": "bb83a448-9eb0-431c-9fd3-9cec8699ea5f", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/fhlllh5lkl", - "console": {}, - "dns": {}, - "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {}, - "provisioningState": "Accepted", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "serviceProviderProperties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/09-cosmosCompare-confirm-update/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/09-cosmosCompare-confirm-update/cluster-create-with-tags.json index 6600943e30f..3063cc94f97 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/09-cosmosCompare-confirm-update/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/09-cosmosCompare-confirm-update/cluster-create-with-tags.json @@ -64,107 +64,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "bb83a448-9eb0-431c-9fd3-9cec8699ea5f", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/fhlllh5lkl", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple", - "two": "banana" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 47, - "maxPodGracePeriodSeconds": 73, - "podPriorityThreshold": -6 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - }, - "visibility": "Public" - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable", - "id": "4.20" - } - }, - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "activeOperationId": "bb83a448-9eb0-431c-9fd3-9cec8699ea5f", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/fhlllh5lkl", - "console": {}, - "dns": {}, - "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {}, - "provisioningState": "Accepted", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple", - "two": "banana" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "serviceProviderProperties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-cluster-operation/03-cosmosCompare-final-state/cluster-test-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-cluster-operation/03-cosmosCompare-final-state/cluster-test-cluster.json index 04a94a2a2aa..bc0cbe2279c 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-cluster-operation/03-cosmosCompare-final-state/cluster-test-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-cluster-operation/03-cosmosCompare-final-state/cluster-test-cluster.json @@ -59,95 +59,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "identity": { - "type": "UserAssigned" - }, - "provisioningState": "Deleting", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/test-cluster", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - }, - "visibility": "Public" - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable", - "id": "4.20" - } - }, - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/test-cluster", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "test-cluster", - "serviceProviderProperties": { - "api": {}, - "console": {}, - "dns": {}, - "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {}, - "provisioningState": "Deleting", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "test-cluster", "serviceProviderProperties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-nodepool-operation/05-cosmosCompare-final-state/cluster-test-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-nodepool-operation/05-cosmosCompare-final-state/cluster-test-cluster.json index 04a94a2a2aa..bc0cbe2279c 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-nodepool-operation/05-cosmosCompare-final-state/cluster-test-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-nodepool-operation/05-cosmosCompare-final-state/cluster-test-cluster.json @@ -59,95 +59,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "identity": { - "type": "UserAssigned" - }, - "provisioningState": "Deleting", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/test-cluster", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - }, - "visibility": "Public" - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable", - "id": "4.20" - } - }, - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/test-cluster", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "test-cluster", - "serviceProviderProperties": { - "api": {}, - "console": {}, - "dns": {}, - "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {}, - "provisioningState": "Deleting", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "test-cluster", "serviceProviderProperties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/01-load-old-data/create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/01-load-old-data/create-with-tags.json index db61c30b0d0..41059059930 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/01-load-old-data/create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/01-load-old-data/create-with-tags.json @@ -62,103 +62,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "90b2322c-2c26-47ca-b6f9-d9b1a8385cbc", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "activeOperationId": "90b2322c-2c26-47ca-b6f9-d9b1a8385cbc", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", - "console": {}, - "dns": {}, - "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {}, - "provisioningState": "Accepted", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "serviceProviderProperties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json index 13690bcbfcc..c72998dfa4b 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json @@ -63,106 +63,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "c01d4815-566a-4f10-ad8c-de1667682c5b", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple", - "two": "banana" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 47, - "maxPodGracePeriodSeconds": 73, - "podPriorityThreshold": -6 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - }, - "visibility": "Public" - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "activeOperationId": "c01d4815-566a-4f10-ad8c-de1667682c5b", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", - "console": {}, - "dns": {}, - "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {}, - "provisioningState": "Accepted", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple", - "two": "banana" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "serviceProviderProperties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/cluster-creating/02-loadCosmos-cluster/cosmos-01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/cluster-creating/02-loadCosmos-cluster/cosmos-01-cluster.json index 40c9054ba31..e6f02fdb113 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/cluster-creating/02-loadCosmos-cluster/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/cluster-creating/02-loadCosmos-cluster/cosmos-01-cluster.json @@ -7,19 +7,6 @@ }, "customerDesiredState": null, "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-creating", - "intermediateResourceDoc": { - "identity": { - "principalId": "the-principal", - "tenantId": "the-tenant", - "type": "" - }, - "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-cluster-creating", - "provisioningState": "Provisioning", - "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-creating", - "tags": { - "foo": "bar" - } - }, "serviceProviderProperties": { "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/cs-cluster-creating", "provisioningState": "Provisioning", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/cluster-deleting/02-loadCosmos-cluster/cosmos-01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/cluster-deleting/02-loadCosmos-cluster/cosmos-01-cluster.json index e7a3730c447..f56e2a4f6b2 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/cluster-deleting/02-loadCosmos-cluster/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/cluster-deleting/02-loadCosmos-cluster/cosmos-01-cluster.json @@ -7,19 +7,6 @@ }, "customerDesiredState": null, "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-deleting", - "intermediateResourceDoc": { - "identity": { - "principalId": "the-principal", - "tenantId": "the-tenant", - "type": "" - }, - "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-cluster-deleting", - "provisioningState": "Deleting", - "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-deleting", - "tags": { - "foo": "bar" - } - }, "serviceProviderProperties": { "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/cs-cluster-deleting", "provisioningState": "Deleting", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/create-current/06-cosmosCompare-ending-content/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/create-current/06-cosmosCompare-ending-content/cluster-create-with-tags.json index f9582def9c4..cfd988ed1ff 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/create-current/06-cosmosCompare-ending-content/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/create-current/06-cosmosCompare-ending-content/cluster-create-with-tags.json @@ -64,103 +64,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/tqqtpctbpj", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - }, - "visibility": "Public" - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable", - "id": "4.20" - } - }, - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/tqqtpctbpj", - "console": {}, - "dns": {}, - "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {}, - "provisioningState": "Succeeded", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "serviceProviderProperties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/01-load-old-data/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/01-load-old-data/cluster-create-with-tags.json index 7b83d724882..94169d51d06 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/01-load-old-data/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/01-load-old-data/cluster-create-with-tags.json @@ -62,101 +62,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/m6bpjxtlqf", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/m6bpjxtlqf", - "console": {}, - "dns": {}, - "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {}, - "provisioningState": "Succeeded", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "serviceProviderProperties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json index c0c75e64939..51855856fa6 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json @@ -62,101 +62,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/m6bpjxtlqf", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/m6bpjxtlqf", - "console": {}, - "dns": {}, - "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {}, - "provisioningState": "Succeeded", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "serviceProviderProperties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/cluster-create-with-tags.json index bea899a906b..84b4254b56d 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/cluster-create-with-tags.json @@ -62,103 +62,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", - "console": {}, - "dns": {}, - "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {}, - "provisioningState": "Succeeded", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "serviceProviderProperties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/cluster-create-with-tags.json index 05755b6ee75..ce6e6a6850c 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/cluster-create-with-tags.json @@ -63,104 +63,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - }, - "visibility": "Public" - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", - "console": {}, - "dns": {}, - "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {}, - "provisioningState": "Succeeded", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "serviceProviderProperties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/cluster-create-with-tags.json index 5773cf2039c..4cb8e1c5f92 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/cluster-create-with-tags.json @@ -62,102 +62,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Succeeded", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "serviceProviderProperties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/cluster-create-with-tags.json index 5773cf2039c..4cb8e1c5f92 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/cluster-create-with-tags.json @@ -62,102 +62,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Succeeded", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "serviceProviderProperties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/cluster-creating/02-loadCosmos-cluster/cosmos-01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/cluster-creating/02-loadCosmos-cluster/cosmos-01-cluster.json index bfa4d4de84d..ba4200fed9d 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/cluster-creating/02-loadCosmos-cluster/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/cluster-creating/02-loadCosmos-cluster/cosmos-01-cluster.json @@ -11,29 +11,6 @@ } }, "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-creating", - "intermediateResourceDoc": { - "identity": { - "principalId": "the-principal", - "tenantId": "the-tenant", - "type": "" - }, - "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-cluster-creating", - "provisioningState": "Provisioning", - "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-creating", - "tags": { - "foo": "bar" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-creating" - } - }, "serviceProviderProperties": { "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/cs-cluster-creating", "provisioningState": "Provisioning", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/cluster-deleting/02-loadCosmos-cluster/cosmos-01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/cluster-deleting/02-loadCosmos-cluster/cosmos-01-cluster.json index cc75c4f0245..e60c31f7932 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/cluster-deleting/02-loadCosmos-cluster/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/cluster-deleting/02-loadCosmos-cluster/cosmos-01-cluster.json @@ -11,29 +11,6 @@ } }, "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-deleting", - "intermediateResourceDoc": { - "identity": { - "principalId": "the-principal", - "tenantId": "the-tenant", - "type": "" - }, - "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-cluster-deleting", - "provisioningState": "Deleting", - "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-deleting", - "tags": { - "foo": "bar" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-deleting" - } - }, "serviceProviderProperties": { "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/cs-cluster-deleting", "provisioningState": "Deleting", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/create-current/06-cosmosCompare-confirm-content/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/create-current/06-cosmosCompare-confirm-content/cluster-create-with-tags.json index 3844d4ed6b1..ab84a0ca799 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/create-current/06-cosmosCompare-confirm-content/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/create-current/06-cosmosCompare-confirm-content/cluster-create-with-tags.json @@ -64,103 +64,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/dl7f9px2f2", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - }, - "visibility": "Public" - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable", - "id": "4.20" - } - }, - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/dl7f9px2f2", - "console": {}, - "dns": {}, - "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {}, - "provisioningState": "Succeeded", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "serviceProviderProperties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/cluster-create-with-tags.json index bea899a906b..84b4254b56d 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/cluster-create-with-tags.json @@ -62,103 +62,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", - "console": {}, - "dns": {}, - "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {}, - "provisioningState": "Succeeded", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "serviceProviderProperties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json index 76efdf8b0fc..6c24b85df6e 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json @@ -62,103 +62,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", - "console": {}, - "dns": {}, - "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {}, - "provisioningState": "Succeeded", - "usesNewClusterDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "serviceProviderProperties": { From f840d6e99839656ad934ea279270598eca356e0e Mon Sep 17 00:00:00 2001 From: David Eads Date: Thu, 7 May 2026 12:06:11 -0400 Subject: [PATCH 3/7] switch to using generic storage for clusters --- internal/database/convert_any.go | 6 - internal/database/convert_cluster.go | 57 --------- internal/database/convert_cluster_test.go | 111 ------------------ .../convert_defaults_consistency_test.go | 74 ++++++------ internal/database/convert_generic.go | 8 ++ internal/database/crud_hcpcluster.go | 4 +- internal/database/global_lister.go | 2 +- internal/database/transaction.go | 2 +- internal/database/types_hcpcluster.go | 36 ------ .../databasetesting/mock_resources_crud.go | 4 +- .../mock_resources_db_client.go | 4 +- .../mock_resources_global_lister.go | 2 +- 12 files changed, 52 insertions(+), 258 deletions(-) delete mode 100644 internal/database/types_hcpcluster.go diff --git a/internal/database/convert_any.go b/internal/database/convert_any.go index 3ef0cb1f322..18d935cf29f 100644 --- a/internal/database/convert_any.go +++ b/internal/database/convert_any.go @@ -33,9 +33,6 @@ func CosmosToInternal[InternalAPIType, CosmosAPIType any](obj *CosmosAPIType) (* case *ExternalAuth: internalObj, err = CosmosToInternalExternalAuth(cosmosObj) - case *HCPCluster: - internalObj, err = CosmosToInternalCluster(cosmosObj) - case *NodePool: internalObj, err = CosmosToInternalNodePool(cosmosObj) @@ -89,9 +86,6 @@ func InternalToCosmos[InternalAPIType, CosmosAPIType any](obj *InternalAPIType) case *api.HCPOpenShiftClusterExternalAuth: cosmosObj, err = InternalToCosmosExternalAuth(internalObj) - case *api.HCPOpenShiftCluster: - cosmosObj, err = InternalToCosmosCluster(internalObj) - case *api.HCPOpenShiftClusterNodePool: cosmosObj, err = InternalToCosmosNodePool(internalObj) diff --git a/internal/database/convert_cluster.go b/internal/database/convert_cluster.go index 8fbf64d6f9c..ea67524843c 100644 --- a/internal/database/convert_cluster.go +++ b/internal/database/convert_cluster.go @@ -14,42 +14,6 @@ package database -import ( - "fmt" - "strings" - - "github.com/Azure/ARO-HCP/internal/api" -) - -func InternalToCosmosCluster(internalObj *api.HCPOpenShiftCluster) (*HCPCluster, error) { - if internalObj == nil { - return nil, nil - } - - // CosmosMetadata.ResourceID is the canonical identifier for cosmos-side - // concerns (partitioning, document UID, resource-type indexing). Use it - // instead of the TrackedResource.ID, which is an ARM-surface concern. - cosmosResourceID := internalObj.GetCosmosData().ResourceID - if cosmosResourceID == nil { - return nil, fmt.Errorf("internalObj is missing CosmosMetadata.ResourceID") - } - cosmosObj := &HCPCluster{ - TypedDocument: TypedDocument{ - BaseDocument: BaseDocument{ - ID: internalObj.GetCosmosData().GetCosmosUID(), - }, - PartitionKey: strings.ToLower(cosmosResourceID.SubscriptionID), - ResourceID: cosmosResourceID, - ResourceType: cosmosResourceID.ResourceType.String(), - }, - HCPClusterProperties: HCPClusterProperties{ - HCPOpenShiftCluster: *internalObj, - }, - } - - return cosmosObj, nil -} - func copyTags(src map[string]string) map[string]string { if src == nil { return nil @@ -61,24 +25,3 @@ func copyTags(src map[string]string) map[string]string { return tags } - -func CosmosToInternalCluster(cosmosObj *HCPCluster) (*api.HCPOpenShiftCluster, error) { - if cosmosObj == nil { - return nil, nil - } - - internalObj := cosmosObj.DeepCopy() - internalObj.ExistingCosmosUID = cosmosObj.ID - internalObj.SetEtag(cosmosObj.CosmosETag) - if internalObj.GetResourceID() == nil { - if cosmosObj.ResourceID != nil { - internalObj.SetResourceID(cosmosObj.ResourceID) - } else { - return nil, fmt.Errorf("internalObj is missing a resourceID: %T: %q", cosmosObj, cosmosObj.ID) - } - } - - internalObj.EnsureDefaults() - - return internalObj, nil -} diff --git a/internal/database/convert_cluster_test.go b/internal/database/convert_cluster_test.go index 3044389858b..a3d64727f5a 100644 --- a/internal/database/convert_cluster_test.go +++ b/internal/database/convert_cluster_test.go @@ -18,7 +18,6 @@ import ( "bytes" "encoding/json" "math/rand" - "strings" "testing" "github.com/google/go-cmp/cmp" @@ -28,11 +27,7 @@ import ( "sigs.k8s.io/randfill" - "github.com/Azure/azure-sdk-for-go/sdk/azcore" - azcorearm "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/Azure/ARO-HCP/internal/api" - "github.com/Azure/ARO-HCP/internal/api/arm" ) // fuzzerFor can randomly populate api objects that are destined for version. @@ -45,88 +40,6 @@ func fuzzerFor(funcs []interface{}, src rand.Source) *randfill.Filler { return f } -func TestRoundTripClusterInternalCosmosInternal(t *testing.T) { - seed := rand.Int63() - t.Logf("seed: %d", seed) - - fuzzer := fuzzerFor([]interface{}{ - func(j *azcorearm.ResourceID, c randfill.Continue) { - *j = *api.Must(azcorearm.ParseResourceID("/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myRg")) - }, - func(j *arm.Resource, c randfill.Continue) { - c.FillNoCustom(j) - j.ID = api.Must(azcorearm.ParseResourceID("/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/change-channel")) - j.Name = "change-channel" - j.Type = "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - }, - func(j *api.HCPOpenShiftClusterServiceProviderProperties, c randfill.Continue) { - c.FillNoCustom(j) - if j == nil { - return - } - // we must always have an internal ID - foo := api.Must(api.NewInternalID("/api/clusters_mgmt/v1/clusters/r" + strings.ReplaceAll(c.String(10), "/", "-"))) - j.ClusterServiceID = &foo - }, - func(j *api.CosmosMetadata, c randfill.Continue) { - c.FillNoCustom(j) - j.ResourceID = api.Must(azcorearm.ParseResourceID("/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myRg")) - j.ExistingCosmosUID = "" - j.CosmosETag = "" - }, - func(j *api.HCPOpenShiftCluster, c randfill.Continue) { - c.FillNoCustom(j) - if j == nil { - return - } - // Canonical defaults are applied on Cosmos read, so ensure - // defaulted fields are never zero during round-trip testing. - if len(j.CustomerProperties.Network.NetworkType) == 0 { - j.CustomerProperties.Network.NetworkType = api.NetworkTypeOVNKubernetes - } - if len(j.CustomerProperties.API.Visibility) == 0 { - j.CustomerProperties.API.Visibility = api.VisibilityPublic - } - if len(j.CustomerProperties.Platform.OutboundType) == 0 { - j.CustomerProperties.Platform.OutboundType = api.OutboundTypeLoadBalancer - } - if len(j.CustomerProperties.ClusterImageRegistry.State) == 0 { - j.CustomerProperties.ClusterImageRegistry.State = api.ClusterImageRegistryStateEnabled - } - if len(j.CustomerProperties.Etcd.DataEncryption.KeyManagementMode) == 0 { - j.CustomerProperties.Etcd.DataEncryption.KeyManagementMode = api.EtcdDataEncryptionKeyManagementModeTypePlatformManaged - } - if j.CustomerProperties.Etcd.DataEncryption.CustomerManaged != nil && - j.CustomerProperties.Etcd.DataEncryption.CustomerManaged.Kms != nil && - len(j.CustomerProperties.Etcd.DataEncryption.CustomerManaged.Kms.Visibility) == 0 { - j.CustomerProperties.Etcd.DataEncryption.CustomerManaged.Kms.Visibility = api.KeyVaultVisibilityPublic - } - for i := range j.CustomerProperties.ImageDigestMirrors { - if len(j.CustomerProperties.ImageDigestMirrors[i].MirrorSourcePolicy) == 0 { - j.CustomerProperties.ImageDigestMirrors[i].MirrorSourcePolicy = api.MirrorSourcePolicyAllowContactingSource - } - } - }, - func(j *arm.ManagedServiceIdentity, c randfill.Continue) { - c.FillNoCustom(j) - - // we only round trip keys, so only fill in keys - if j != nil && j.UserAssignedIdentities != nil { - for k := range j.UserAssignedIdentities { - j.UserAssignedIdentities[k] = nil - } - } - }, - }, rand.NewSource(seed)) - - // Try a few times, since runTest uses random values. - for i := 0; i < 20; i++ { - original := &api.HCPOpenShiftCluster{} - fuzzer.Fill(original) - roundTripInternalToCosmosToInternal[api.HCPOpenShiftCluster, HCPCluster](t, original) - } -} - func roundTripInternalToCosmosToInternal[InternalAPIType, CosmosAPIType any](t *testing.T, original *InternalAPIType) { originalBeforeJSON, _ := json.MarshalIndent(original, "", " ") @@ -173,30 +86,6 @@ func roundTripInternalToCosmosToInternal[InternalAPIType, CosmosAPIType any](t * } } -func TestCosmosToInternalClusterPreservesETag(t *testing.T) { - expectedETag := azcore.ETag("test-etag-value-12345") - resourceID := api.Must(azcorearm.ParseResourceID("/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/rg/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/my-cluster")) - - cosmosObj := &HCPCluster{ - TypedDocument: TypedDocument{ - BaseDocument: BaseDocument{ - CosmosETag: expectedETag, - }, - }, - HCPClusterProperties: HCPClusterProperties{ - HCPOpenShiftCluster: api.HCPOpenShiftCluster{ - CosmosMetadata: arm.CosmosMetadata{ - ResourceID: resourceID, - }, - }, - }, - } - - internalObj, err := CosmosToInternalCluster(cosmosObj) - require.NoError(t, err) - require.Equal(t, expectedETag, internalObj.GetCosmosData().CosmosETag) -} - func TestClusterEnsureDefaults(t *testing.T) { tests := []struct { name string diff --git a/internal/database/convert_defaults_consistency_test.go b/internal/database/convert_defaults_consistency_test.go index b8951ff5ff2..18974b165ae 100644 --- a/internal/database/convert_defaults_consistency_test.go +++ b/internal/database/convert_defaults_consistency_test.go @@ -205,28 +205,26 @@ func TestPreExistingDataCluster(t *testing.T) { // Simulate a pre-existing Cosmos document: all canonically-defaulted fields // are zero-valued (empty strings), as if the document was created before // these fields were added to the API. - preExistingDoc := &HCPCluster{ + preExistingDoc := &GenericDocument[api.HCPOpenShiftCluster]{ TypedDocument: TypedDocument{ BaseDocument: BaseDocument{ID: "test-doc-id"}, ResourceID: resourceID, }, - HCPClusterProperties: HCPClusterProperties{ - HCPOpenShiftCluster: api.HCPOpenShiftCluster{ - // All canonically-defaulted fields are intentionally zero-valued: - // NetworkType, Visibility, OutboundType, - // ClusterImageRegistry.State, Etcd.DataEncryption.KeyManagementMode - CosmosMetadata: arm.CosmosMetadata{ - ResourceID: resourceID, - }, - ServiceProviderProperties: api.HCPOpenShiftClusterServiceProviderProperties{ - ClusterServiceID: ptr.To(api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/test-cluster"))), - ProvisioningState: arm.ProvisioningStateSucceeded, - }, + Content: api.HCPOpenShiftCluster{ + // All canonically-defaulted fields are intentionally zero-valued: + // NetworkType, Visibility, OutboundType, + // ClusterImageRegistry.State, Etcd.DataEncryption.KeyManagementMode + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: resourceID, + }, + ServiceProviderProperties: api.HCPOpenShiftClusterServiceProviderProperties{ + ClusterServiceID: ptr.To(api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/test-cluster"))), + ProvisioningState: arm.ProvisioningStateSucceeded, }, }, } - internalCluster, err := CosmosToInternalCluster(preExistingDoc) + internalCluster, err := CosmosGenericToInternal(preExistingDoc) if err != nil { t.Fatalf("CosmosToInternalCluster failed: %v", err) } @@ -263,44 +261,42 @@ func TestKMSVisibilityDefaultsToPublic(t *testing.T) { // Simulate a cluster created via v2024_06_10_preview with KMS encryption // but no visibility field (since that version doesn't have it). - preExistingDoc := &HCPCluster{ + preExistingDoc := &GenericDocument[api.HCPOpenShiftCluster]{ TypedDocument: TypedDocument{ BaseDocument: BaseDocument{ID: "test-doc-id"}, ResourceID: resourceID, }, - HCPClusterProperties: HCPClusterProperties{ - HCPOpenShiftCluster: api.HCPOpenShiftCluster{ - CosmosMetadata: arm.CosmosMetadata{ - ResourceID: resourceID, - }, - CustomerProperties: api.HCPOpenShiftClusterCustomerProperties{ - Etcd: api.EtcdProfile{ - DataEncryption: api.EtcdDataEncryptionProfile{ - KeyManagementMode: api.EtcdDataEncryptionKeyManagementModeTypeCustomerManaged, - CustomerManaged: &api.CustomerManagedEncryptionProfile{ - EncryptionType: api.CustomerManagedEncryptionTypeKMS, - Kms: &api.KmsEncryptionProfile{ - ActiveKey: api.KmsKey{ - Name: "test-key", - VaultName: "test-vault", - Version: "v1", - }, - // Visibility intentionally not set (empty string) - Visibility: "", + Content: api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: resourceID, + }, + CustomerProperties: api.HCPOpenShiftClusterCustomerProperties{ + Etcd: api.EtcdProfile{ + DataEncryption: api.EtcdDataEncryptionProfile{ + KeyManagementMode: api.EtcdDataEncryptionKeyManagementModeTypeCustomerManaged, + CustomerManaged: &api.CustomerManagedEncryptionProfile{ + EncryptionType: api.CustomerManagedEncryptionTypeKMS, + Kms: &api.KmsEncryptionProfile{ + ActiveKey: api.KmsKey{ + Name: "test-key", + VaultName: "test-vault", + Version: "v1", }, + // Visibility intentionally not set (empty string) + Visibility: "", }, }, }, }, - ServiceProviderProperties: api.HCPOpenShiftClusterServiceProviderProperties{ - ClusterServiceID: ptr.To(api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/test-cluster"))), - ProvisioningState: arm.ProvisioningStateSucceeded, - }, + }, + ServiceProviderProperties: api.HCPOpenShiftClusterServiceProviderProperties{ + ClusterServiceID: ptr.To(api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/test-cluster"))), + ProvisioningState: arm.ProvisioningStateSucceeded, }, }, } - internalCluster, err := CosmosToInternalCluster(preExistingDoc) + internalCluster, err := CosmosGenericToInternal(preExistingDoc) if err != nil { t.Fatalf("CosmosToInternalCluster failed: %v", err) } diff --git a/internal/database/convert_generic.go b/internal/database/convert_generic.go index d3b061ef063..3e01799ff28 100644 --- a/internal/database/convert_generic.go +++ b/internal/database/convert_generic.go @@ -69,6 +69,10 @@ func CosmosGenericToInternal[InternalAPIType any](cosmosObj *GenericDocument[Int cosmosData.ExistingCosmosUID = cosmosObj.ID ret.SetEtag(cosmosObj.CosmosETag) + if defaulter, ok := ret.(Defaulter); ok { + defaulter.EnsureDefaults() + } + // this isn't pretty, but on balance it's a better choice so that we can share all the rest. switch castObj := any(ret).(type) { case *arm.Subscription: @@ -93,3 +97,7 @@ func CosmosGenericToInternal[InternalAPIType any](cosmosObj *GenericDocument[Int return &cosmosObj.Content, nil } + +type Defaulter interface { + EnsureDefaults() +} diff --git a/internal/database/crud_hcpcluster.go b/internal/database/crud_hcpcluster.go index b31f4868b1b..ab578789928 100644 --- a/internal/database/crud_hcpcluster.go +++ b/internal/database/crud_hcpcluster.go @@ -128,7 +128,7 @@ func NewHCPClusterCRUD(containerClient *azcosmos.ContainerClient, subscriptionID parentResourceID := api.Must(azcorearm.ParseResourceID(strings.ToLower(path.Join(parts...)))) return &hcpClusterCRUD{ - nestedCosmosResourceCRUD: NewCosmosResourceCRUD[api.HCPOpenShiftCluster, HCPCluster](containerClient, parentResourceID, api.ClusterResourceType), + nestedCosmosResourceCRUD: NewCosmosResourceCRUD[api.HCPOpenShiftCluster, GenericDocument[api.HCPOpenShiftCluster]](containerClient, parentResourceID, api.ClusterResourceType), } } @@ -144,7 +144,7 @@ type ExternalAuthsCRUD interface { } type hcpClusterCRUD struct { - *nestedCosmosResourceCRUD[api.HCPOpenShiftCluster, HCPCluster] + *nestedCosmosResourceCRUD[api.HCPOpenShiftCluster, GenericDocument[api.HCPOpenShiftCluster]] } var _ HCPClusterCRUD = &hcpClusterCRUD{} diff --git a/internal/database/global_lister.go b/internal/database/global_lister.go index 330d77c0f81..499cf20d9c1 100644 --- a/internal/database/global_lister.go +++ b/internal/database/global_lister.go @@ -72,7 +72,7 @@ func (g *cosmosResourcesGlobalListers) Subscriptions() GlobalLister[arm.Subscrip } func (g *cosmosResourcesGlobalListers) Clusters() GlobalLister[api.HCPOpenShiftCluster] { - return &cosmosGlobalLister[api.HCPOpenShiftCluster, HCPCluster]{ + return &cosmosGlobalLister[api.HCPOpenShiftCluster, GenericDocument[api.HCPOpenShiftCluster]]{ containerClient: g.resources, resourceType: api.ClusterResourceType, } diff --git a/internal/database/transaction.go b/internal/database/transaction.go index dbbd713e00d..8c84bc4c54e 100644 --- a/internal/database/transaction.go +++ b/internal/database/transaction.go @@ -206,7 +206,7 @@ func (r *cosmosDBTransactionResult) GetItem(cosmosUID string) (any, error) { switch strings.ToLower(typedDoc.ResourceType) { case strings.ToLower(api.ClusterResourceType.String()): - return getCastResult[api.HCPOpenShiftCluster, HCPCluster](r, cosmosUID) + return getCastResult[api.HCPOpenShiftCluster, GenericDocument[api.HCPOpenShiftCluster]](r, cosmosUID) case strings.ToLower(api.NodePoolResourceType.String()): return getCastResult[api.HCPOpenShiftClusterNodePool, NodePool](r, cosmosUID) case strings.ToLower(api.ExternalAuthResourceType.String()): diff --git a/internal/database/types_hcpcluster.go b/internal/database/types_hcpcluster.go deleted file mode 100644 index d8e984236f4..00000000000 --- a/internal/database/types_hcpcluster.go +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright 2025 Microsoft Corporation -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package database - -import ( - "github.com/Azure/ARO-HCP/internal/api" -) - -type HCPCluster struct { - TypedDocument `json:",inline"` - - HCPClusterProperties `json:"properties"` -} - -type HCPClusterProperties struct { - // HCPOpenShiftCluster is inlined directly. The on-disk shape now matches - // GenericDocument[api.HCPOpenShiftCluster] and HCPCluster only exists as a - // distinct type while the migration to that generic surface completes. - api.HCPOpenShiftCluster `json:",inline"` -} - -func (o *HCPCluster) GetTypedDocument() *TypedDocument { - return &o.TypedDocument -} diff --git a/internal/databasetesting/mock_resources_crud.go b/internal/databasetesting/mock_resources_crud.go index 4712d5bb71e..cb4341e4139 100644 --- a/internal/databasetesting/mock_resources_crud.go +++ b/internal/databasetesting/mock_resources_crud.go @@ -448,12 +448,12 @@ func (m *mockResourceCRUD[InternalAPIType, CosmosAPIType]) AddReplaceToTransacti // mockHCPClusterCRUD implements database.HCPClusterCRUD. type mockHCPClusterCRUD struct { - *mockResourceCRUD[api.HCPOpenShiftCluster, database.HCPCluster] + *mockResourceCRUD[api.HCPOpenShiftCluster, database.GenericDocument[api.HCPOpenShiftCluster]] } func newMockHCPClusterCRUD(client *MockResourcesDBClient, parentResourceID *azcorearm.ResourceID) *mockHCPClusterCRUD { return &mockHCPClusterCRUD{ - mockResourceCRUD: newMockResourceCRUD[api.HCPOpenShiftCluster, database.HCPCluster](client, parentResourceID, api.ClusterResourceType), + mockResourceCRUD: newMockResourceCRUD[api.HCPOpenShiftCluster, database.GenericDocument[api.HCPOpenShiftCluster]](client, parentResourceID, api.ClusterResourceType), } } diff --git a/internal/databasetesting/mock_resources_db_client.go b/internal/databasetesting/mock_resources_db_client.go index c517c59270e..0ad54483d46 100644 --- a/internal/databasetesting/mock_resources_db_client.go +++ b/internal/databasetesting/mock_resources_db_client.go @@ -365,11 +365,11 @@ func (r *mockTransactionResult) GetItem(cosmosUID string) (any, error) { switch strings.ToLower(typedDoc.ResourceType) { case strings.ToLower(api.ClusterResourceType.String()): - var cosmosObj database.HCPCluster + var cosmosObj database.GenericDocument[api.HCPOpenShiftCluster] if err := json.Unmarshal(data, &cosmosObj); err != nil { return nil, err } - return database.CosmosToInternalCluster(&cosmosObj) + return database.CosmosGenericToInternal(&cosmosObj) case strings.ToLower(api.NodePoolResourceType.String()): var cosmosObj database.NodePool if err := json.Unmarshal(data, &cosmosObj); err != nil { diff --git a/internal/databasetesting/mock_resources_global_lister.go b/internal/databasetesting/mock_resources_global_lister.go index 7cffbf988a7..b641194e32d 100644 --- a/internal/databasetesting/mock_resources_global_lister.go +++ b/internal/databasetesting/mock_resources_global_lister.go @@ -38,7 +38,7 @@ func (g *mockResourcesGlobalListers) Subscriptions() database.GlobalLister[arm.S } func (g *mockResourcesGlobalListers) Clusters() database.GlobalLister[api.HCPOpenShiftCluster] { - return &mockTypedGlobalLister[api.HCPOpenShiftCluster, database.HCPCluster]{ + return &mockTypedGlobalLister[api.HCPOpenShiftCluster, database.GenericDocument[api.HCPOpenShiftCluster]]{ client: g.client, resourceType: api.ClusterResourceType, } From 0efc1054c2e1371784dcba8b289434811188ae99 Mon Sep 17 00:00:00 2001 From: David Eads Date: Fri, 8 May 2026 16:41:13 -0400 Subject: [PATCH 4/7] stop serializing old nodepool fields Co-Authored-By: Claude Opus 4.7 (1M context) --- internal/database/convert_cluster.go | 27 -------- .../convert_defaults_consistency_test.go | 26 ++++---- internal/database/convert_nodepool.go | 16 ----- internal/database/convert_nodepool_test.go | 3 - internal/database/types_nodepool.go | 18 +----- .../00-load-initial-state/nodepool-basic.json | 61 ------------------ .../00-load-initial-state/nodepool-basic.json | 41 ------------ .../nodepool-basic.json | 41 ------------ .../00-load-initial-state/nodepool-basic.json | 61 ------------------ .../nodepool-basic.json | 61 ------------------ .../00-load-initial-state/nodepool-basic.json | 61 ------------------ .../nodepool-basic.json | 61 ------------------ .../00-load-initial-state/nodepool-basic.json | 61 ------------------ .../01-load-initial/immutability-np.json | 23 ------- .../immutability-np.json | 23 ------- .../immutability-np.json | 23 ------- .../immutability-np.json | 23 ------- .../immutability-np.json | 23 ------- .../immutability-np.json | 23 ------- .../immutability-np.json | 23 ------- .../nodepool-test-nodepool.json | 61 ------------------ .../nodepool-basic-node-pool.json | 61 ------------------ .../nodepool-node-pool-02.json | 61 ------------------ .../nodepool-basic-node-pool.json | 62 ------------------ .../nodepool-node-pool-02.json | 62 ------------------ .../nodepool-basic-node-pool.json | 61 ------------------ .../nodepool-node-pool-02.json | 61 ------------------ .../nodepool-basic-node-pool.json | 61 ------------------ .../nodepool-node-pool-02.json | 60 ----------------- .../nodepool-basic-node-pool.json | 64 ------------------- .../nodepool-node-pool-02.json | 64 ------------------- .../nodepool-basic-node-pool.json | 61 ------------------ .../nodepool-node-pool-02.json | 61 ------------------ .../nodepool-02.json | 61 ------------------ .../nodepool-basic-node-pool.json | 62 ------------------ 35 files changed, 16 insertions(+), 1606 deletions(-) delete mode 100644 internal/database/convert_cluster.go diff --git a/internal/database/convert_cluster.go b/internal/database/convert_cluster.go deleted file mode 100644 index ea67524843c..00000000000 --- a/internal/database/convert_cluster.go +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright 2025 Microsoft Corporation -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package database - -func copyTags(src map[string]string) map[string]string { - if src == nil { - return nil - } - tags := map[string]string{} - for k, v := range src { - tags[k] = v - } - - return tags -} diff --git a/internal/database/convert_defaults_consistency_test.go b/internal/database/convert_defaults_consistency_test.go index 18974b165ae..bd17c4bea42 100644 --- a/internal/database/convert_defaults_consistency_test.go +++ b/internal/database/convert_defaults_consistency_test.go @@ -330,22 +330,22 @@ func TestPreExistingDataNodePool(t *testing.T) { ResourceID: resourceID, }, NodePoolProperties: NodePoolProperties{ - IntermediateResourceDoc: &ResourceDocument{ - ResourceID: resourceID, - InternalID: api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/test-cluster/node_pools/test-np")), - ProvisioningState: arm.ProvisioningStateSucceeded, - }, - InternalState: NodePoolInternalState{ - InternalAPI: api.HCPOpenShiftClusterNodePool{ - // DiskStorageAccountType is intentionally zero-valued - Properties: api.HCPOpenShiftClusterNodePoolProperties{ - Platform: api.NodePoolPlatformProfile{ - OSDisk: api.OSDiskProfile{ - // DiskStorageAccountType: "" — simulates pre-existing document - }, + HCPOpenShiftClusterNodePool: api.HCPOpenShiftClusterNodePool{ + // DiskStorageAccountType is intentionally zero-valued + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: resourceID, + }, + Properties: api.HCPOpenShiftClusterNodePoolProperties{ + ProvisioningState: arm.ProvisioningStateSucceeded, + Platform: api.NodePoolPlatformProfile{ + OSDisk: api.OSDiskProfile{ + // DiskStorageAccountType: "" — simulates pre-existing document }, }, }, + ServiceProviderProperties: api.HCPOpenShiftClusterNodePoolServiceProviderProperties{ + ClusterServiceID: ptr.To(api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/test-cluster/node_pools/test-np"))), + }, }, }, } diff --git a/internal/database/convert_nodepool.go b/internal/database/convert_nodepool.go index c02dc62cefc..05e32962d83 100644 --- a/internal/database/convert_nodepool.go +++ b/internal/database/convert_nodepool.go @@ -18,8 +18,6 @@ import ( "fmt" "strings" - "k8s.io/utils/ptr" - "github.com/Azure/ARO-HCP/internal/api" ) @@ -46,23 +44,9 @@ func InternalToCosmosNodePool(internalObj *api.HCPOpenShiftClusterNodePool) (*No }, NodePoolProperties: NodePoolProperties{ HCPOpenShiftClusterNodePool: *internalObj, - IntermediateResourceDoc: &ResourceDocument{ - ResourceID: cosmosResourceID, - InternalID: ptr.Deref(internalObj.ServiceProviderProperties.ClusterServiceID, api.InternalID{}), - ActiveOperationID: internalObj.ServiceProviderProperties.ActiveOperationID, - ProvisioningState: internalObj.Properties.ProvisioningState, - Identity: internalObj.Identity.DeepCopy(), - SystemData: internalObj.SystemData, - Tags: copyTags(internalObj.Tags), - }, - InternalState: NodePoolInternalState{ - InternalAPI: *internalObj, - }, }, } - cosmosObj.InternalState.InternalAPI.CosmosMetadata = api.CosmosMetadata{} - return cosmosObj, nil } diff --git a/internal/database/convert_nodepool_test.go b/internal/database/convert_nodepool_test.go index 35d4ed0fc33..3131a589d3e 100644 --- a/internal/database/convert_nodepool_test.go +++ b/internal/database/convert_nodepool_test.go @@ -112,9 +112,6 @@ func TestCosmosToInternalNodePoolPreservesETag(t *testing.T) { ResourceID: resourceID, }, }, - IntermediateResourceDoc: &ResourceDocument{ - ResourceID: resourceID, - }, }, } diff --git a/internal/database/types_nodepool.go b/internal/database/types_nodepool.go index 4c24ac8e084..33c533b4019 100644 --- a/internal/database/types_nodepool.go +++ b/internal/database/types_nodepool.go @@ -25,22 +25,10 @@ type NodePool struct { } type NodePoolProperties struct { - // HCPOpenShiftClusterNodePool is the inline serialization that mirrors GenericDocument[api.HCPOpenShiftClusterNodePool] - // (the destination shape for nodepool documents). The reading path now uses these inline fields as the - // source of truth; the IntermediateResourceDoc/InternalState siblings are still written for compatibility - // with old readers, but will be removed once all readers have migrated. + // HCPOpenShiftClusterNodePool is inlined directly. The on-disk shape now matches + // GenericDocument[api.HCPOpenShiftClusterNodePool] and NodePool only exists as a + // distinct type while the migration to that generic surface completes. api.HCPOpenShiftClusterNodePool `json:",inline"` - - // IntermediateResourceDoc exists so that we can stop inlining the resource document so that we can directly - // embed the InternalAPIType which has colliding serialization fields. - IntermediateResourceDoc *ResourceDocument `json:"intermediateResourceDoc"` - - // TODO we may need look-aside data that we want to store in the same place. Build the nesting to allow it - InternalState NodePoolInternalState `json:"internalState"` -} - -type NodePoolInternalState struct { - InternalAPI api.HCPOpenShiftClusterNodePool `json:"internalAPI"` } func (o *NodePool) GetTypedDocument() *TypedDocument { diff --git a/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/nodepool-basic.json b/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/nodepool-basic.json index d709dc99f22..1531c0e6740 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/nodepool-basic.json +++ b/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/nodepool-basic.json @@ -8,67 +8,6 @@ "partitionKey": "a433a095-1277-44f1-8453-8d61a4d848c2", "properties": { "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/nodePools/basic", - "intermediateResourceDoc": { - "activeOperationId": "a7b69c90-242b-4a85-8187-0b3bd4979155", - "internalId": "/api/clusters_mgmt/v1/clusters/w9xhwccbjp/node_pools/k9xp9ghzh2", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/nodePools/basic", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/nodePools/basic", - "location": "fake-location", - "name": "basic", - "properties": { - "autoRepair": true, - "autoScaling": { - "max": 5, - "min": 1 - }, - "labels": { - "label-ky": "label-value" - }, - "nodeDrainTimeoutMinutes": 2, - "platform": { - "enableEncryptionAtHost": false, - "osDisk": { - "diskStorageAccountType": "Premium_LRS", - "sizeGiB": 64 - }, - "vmSize": "large" - }, - "provisioningState": "Accepted", - "taints": [ - { - "effect": "NoExecute", - "key": "foo.com/key", - "value": "valid" - } - ], - "version": { - "channelGroup": "stable" - } - }, - "serviceProviderProperties": { - "activeOperationId": "a7b69c90-242b-4a85-8187-0b3bd4979155", - "clusterServiceID": "", - "usesNewNodePoolDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters/nodePools" - } - }, "location": "fake-location", "name": "basic", "properties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/00-load-initial-state/nodepool-basic.json b/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/00-load-initial-state/nodepool-basic.json index b19e7f9efe2..24b84e50357 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/00-load-initial-state/nodepool-basic.json +++ b/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/00-load-initial-state/nodepool-basic.json @@ -3,47 +3,6 @@ "partitionKey": "a433a095-1277-44f1-8453-8d61a4d848c2", "properties": { "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/nodePools/basic", - "intermediateResourceDoc": { - "activeOperationId": "a7b69c90-242b-4a85-8187-0b3bd4979155", - "internalId": "/api/clusters_mgmt/v1/clusters/w9xhwccbjp/node_pools/k9xp9ghzh2", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/nodePools/basic", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/nodePools/basic", - "location": "fake-location", - "name": "basic", - "properties": { - "autoRepair": true, - "platform": { - "vmSize": "large" - }, - "provisioningState": "Accepted", - "version": { - "channelGroup": "stable" - } - }, - "serviceProviderProperties": { - "activeOperationId": "a7b69c90-242b-4a85-8187-0b3bd4979155", - "clusterServiceID": "", - "usesNewNodePoolDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters/nodePools" - } - }, "location": "fake-location", "name": "basic", "properties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/99-cosmosCompare-end-state/nodepool-basic.json b/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/99-cosmosCompare-end-state/nodepool-basic.json index b19e7f9efe2..24b84e50357 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/99-cosmosCompare-end-state/nodepool-basic.json +++ b/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/99-cosmosCompare-end-state/nodepool-basic.json @@ -3,47 +3,6 @@ "partitionKey": "a433a095-1277-44f1-8453-8d61a4d848c2", "properties": { "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/nodePools/basic", - "intermediateResourceDoc": { - "activeOperationId": "a7b69c90-242b-4a85-8187-0b3bd4979155", - "internalId": "/api/clusters_mgmt/v1/clusters/w9xhwccbjp/node_pools/k9xp9ghzh2", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/nodePools/basic", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/nodePools/basic", - "location": "fake-location", - "name": "basic", - "properties": { - "autoRepair": true, - "platform": { - "vmSize": "large" - }, - "provisioningState": "Accepted", - "version": { - "channelGroup": "stable" - } - }, - "serviceProviderProperties": { - "activeOperationId": "a7b69c90-242b-4a85-8187-0b3bd4979155", - "clusterServiceID": "", - "usesNewNodePoolDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters/nodePools" - } - }, "location": "fake-location", "name": "basic", "properties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/00-load-initial-state/nodepool-basic.json b/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/00-load-initial-state/nodepool-basic.json index 8da3ff14c3f..f5b3acb446b 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/00-load-initial-state/nodepool-basic.json +++ b/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/00-load-initial-state/nodepool-basic.json @@ -8,67 +8,6 @@ "partitionKey": "a433a095-1277-44f1-8453-8d61a4d848c2", "properties": { "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/nodePools/basic", - "intermediateResourceDoc": { - "activeOperationId": "a7b69c90-242b-4a85-8187-0b3bd4979155", - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0/node_pools/k9xp9ghzh2", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/nodePools/basic", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/nodePools/basic", - "location": "fake-location", - "name": "basic", - "properties": { - "autoRepair": true, - "autoScaling": { - "max": 5, - "min": 1 - }, - "labels": { - "label-ky": "label-value" - }, - "nodeDrainTimeoutMinutes": 2, - "platform": { - "enableEncryptionAtHost": false, - "osDisk": { - "diskStorageAccountType": "Premium_LRS", - "sizeGiB": 64 - }, - "vmSize": "large" - }, - "provisioningState": "Accepted", - "taints": [ - { - "effect": "NoExecute", - "key": "foo.com/key", - "value": "valid" - } - ], - "version": { - "channelGroup": "stable" - } - }, - "serviceProviderProperties": { - "activeOperationId": "a7b69c90-242b-4a85-8187-0b3bd4979155", - "clusterServiceID": "", - "usesNewNodePoolDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters/nodePools" - } - }, "location": "fake-location", "name": "basic", "properties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/99-cosmosCompare-end-state/nodepool-basic.json b/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/99-cosmosCompare-end-state/nodepool-basic.json index 8da3ff14c3f..f5b3acb446b 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/99-cosmosCompare-end-state/nodepool-basic.json +++ b/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/99-cosmosCompare-end-state/nodepool-basic.json @@ -8,67 +8,6 @@ "partitionKey": "a433a095-1277-44f1-8453-8d61a4d848c2", "properties": { "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/nodePools/basic", - "intermediateResourceDoc": { - "activeOperationId": "a7b69c90-242b-4a85-8187-0b3bd4979155", - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0/node_pools/k9xp9ghzh2", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/nodePools/basic", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/nodePools/basic", - "location": "fake-location", - "name": "basic", - "properties": { - "autoRepair": true, - "autoScaling": { - "max": 5, - "min": 1 - }, - "labels": { - "label-ky": "label-value" - }, - "nodeDrainTimeoutMinutes": 2, - "platform": { - "enableEncryptionAtHost": false, - "osDisk": { - "diskStorageAccountType": "Premium_LRS", - "sizeGiB": 64 - }, - "vmSize": "large" - }, - "provisioningState": "Accepted", - "taints": [ - { - "effect": "NoExecute", - "key": "foo.com/key", - "value": "valid" - } - ], - "version": { - "channelGroup": "stable" - } - }, - "serviceProviderProperties": { - "activeOperationId": "a7b69c90-242b-4a85-8187-0b3bd4979155", - "clusterServiceID": "", - "usesNewNodePoolDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters/nodePools" - } - }, "location": "fake-location", "name": "basic", "properties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/00-load-initial-state/nodepool-basic.json b/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/00-load-initial-state/nodepool-basic.json index 8da3ff14c3f..f5b3acb446b 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/00-load-initial-state/nodepool-basic.json +++ b/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/00-load-initial-state/nodepool-basic.json @@ -8,67 +8,6 @@ "partitionKey": "a433a095-1277-44f1-8453-8d61a4d848c2", "properties": { "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/nodePools/basic", - "intermediateResourceDoc": { - "activeOperationId": "a7b69c90-242b-4a85-8187-0b3bd4979155", - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0/node_pools/k9xp9ghzh2", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/nodePools/basic", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/nodePools/basic", - "location": "fake-location", - "name": "basic", - "properties": { - "autoRepair": true, - "autoScaling": { - "max": 5, - "min": 1 - }, - "labels": { - "label-ky": "label-value" - }, - "nodeDrainTimeoutMinutes": 2, - "platform": { - "enableEncryptionAtHost": false, - "osDisk": { - "diskStorageAccountType": "Premium_LRS", - "sizeGiB": 64 - }, - "vmSize": "large" - }, - "provisioningState": "Accepted", - "taints": [ - { - "effect": "NoExecute", - "key": "foo.com/key", - "value": "valid" - } - ], - "version": { - "channelGroup": "stable" - } - }, - "serviceProviderProperties": { - "activeOperationId": "a7b69c90-242b-4a85-8187-0b3bd4979155", - "clusterServiceID": "", - "usesNewNodePoolDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters/nodePools" - } - }, "location": "fake-location", "name": "basic", "properties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/99-cosmosCompare-end-state/nodepool-basic.json b/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/99-cosmosCompare-end-state/nodepool-basic.json index d709dc99f22..1531c0e6740 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/99-cosmosCompare-end-state/nodepool-basic.json +++ b/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/99-cosmosCompare-end-state/nodepool-basic.json @@ -8,67 +8,6 @@ "partitionKey": "a433a095-1277-44f1-8453-8d61a4d848c2", "properties": { "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/nodePools/basic", - "intermediateResourceDoc": { - "activeOperationId": "a7b69c90-242b-4a85-8187-0b3bd4979155", - "internalId": "/api/clusters_mgmt/v1/clusters/w9xhwccbjp/node_pools/k9xp9ghzh2", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/nodePools/basic", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/nodePools/basic", - "location": "fake-location", - "name": "basic", - "properties": { - "autoRepair": true, - "autoScaling": { - "max": 5, - "min": 1 - }, - "labels": { - "label-ky": "label-value" - }, - "nodeDrainTimeoutMinutes": 2, - "platform": { - "enableEncryptionAtHost": false, - "osDisk": { - "diskStorageAccountType": "Premium_LRS", - "sizeGiB": 64 - }, - "vmSize": "large" - }, - "provisioningState": "Accepted", - "taints": [ - { - "effect": "NoExecute", - "key": "foo.com/key", - "value": "valid" - } - ], - "version": { - "channelGroup": "stable" - } - }, - "serviceProviderProperties": { - "activeOperationId": "a7b69c90-242b-4a85-8187-0b3bd4979155", - "clusterServiceID": "", - "usesNewNodePoolDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters/nodePools" - } - }, "location": "fake-location", "name": "basic", "properties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/00-load-initial-state/nodepool-basic.json b/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/00-load-initial-state/nodepool-basic.json index d709dc99f22..1531c0e6740 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/00-load-initial-state/nodepool-basic.json +++ b/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/00-load-initial-state/nodepool-basic.json @@ -8,67 +8,6 @@ "partitionKey": "a433a095-1277-44f1-8453-8d61a4d848c2", "properties": { "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/nodePools/basic", - "intermediateResourceDoc": { - "activeOperationId": "a7b69c90-242b-4a85-8187-0b3bd4979155", - "internalId": "/api/clusters_mgmt/v1/clusters/w9xhwccbjp/node_pools/k9xp9ghzh2", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/nodePools/basic", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/nodePools/basic", - "location": "fake-location", - "name": "basic", - "properties": { - "autoRepair": true, - "autoScaling": { - "max": 5, - "min": 1 - }, - "labels": { - "label-ky": "label-value" - }, - "nodeDrainTimeoutMinutes": 2, - "platform": { - "enableEncryptionAtHost": false, - "osDisk": { - "diskStorageAccountType": "Premium_LRS", - "sizeGiB": 64 - }, - "vmSize": "large" - }, - "provisioningState": "Accepted", - "taints": [ - { - "effect": "NoExecute", - "key": "foo.com/key", - "value": "valid" - } - ], - "version": { - "channelGroup": "stable" - } - }, - "serviceProviderProperties": { - "activeOperationId": "a7b69c90-242b-4a85-8187-0b3bd4979155", - "clusterServiceID": "", - "usesNewNodePoolDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters/nodePools" - } - }, "location": "fake-location", "name": "basic", "properties": { diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/immutability-np.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/immutability-np.json index 1ef2bc5bcc5..591500eab56 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/immutability-np.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/immutability-np.json @@ -8,29 +8,6 @@ "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-immutability/node_pools/4nd28q7n8q", - "internalState": { - "internalAPI": { - "location": "fake-location", - "properties": { - "autoRepair": true, - "platform": { - "enableEncryptionAtHost": false, - "osDisk": { - "diskStorageAccountType": "Premium_LRS", - "sizeGiB": 64 - }, - "vmSize": "large" - }, - "version": { - "channelGroup": "stable" - } - }, - "serviceProviderProperties": { - "clusterServiceID": "", - "usesNewNodePoolDeletionApproach": false - } - } - }, "provisioningState": "Succeeded", "resourceId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/immutability/nodePools/immutability-np", "systemData": { diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/02-untypedListRecursive-immutability/immutability-np.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/02-untypedListRecursive-immutability/immutability-np.json index ca6e6a07a2e..2b192996d64 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/02-untypedListRecursive-immutability/immutability-np.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/02-untypedListRecursive-immutability/immutability-np.json @@ -3,29 +3,6 @@ "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-immutability/node_pools/4nd28q7n8q", - "internalState": { - "internalAPI": { - "location": "fake-location", - "properties": { - "autoRepair": true, - "platform": { - "enableEncryptionAtHost": false, - "osDisk": { - "diskStorageAccountType": "Premium_LRS", - "sizeGiB": 64 - }, - "vmSize": "large" - }, - "version": { - "channelGroup": "stable" - } - }, - "serviceProviderProperties": { - "clusterServiceID": "", - "usesNewNodePoolDeletionApproach": false - } - } - }, "provisioningState": "Succeeded", "resourceId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/immutability/nodePools/immutability-np", "systemData": { diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/04-untypedListRecursive-resourcegroup/immutability-np.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/04-untypedListRecursive-resourcegroup/immutability-np.json index ca6e6a07a2e..2b192996d64 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/04-untypedListRecursive-resourcegroup/immutability-np.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/04-untypedListRecursive-resourcegroup/immutability-np.json @@ -3,29 +3,6 @@ "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-immutability/node_pools/4nd28q7n8q", - "internalState": { - "internalAPI": { - "location": "fake-location", - "properties": { - "autoRepair": true, - "platform": { - "enableEncryptionAtHost": false, - "osDisk": { - "diskStorageAccountType": "Premium_LRS", - "sizeGiB": 64 - }, - "vmSize": "large" - }, - "version": { - "channelGroup": "stable" - } - }, - "serviceProviderProperties": { - "clusterServiceID": "", - "usesNewNodePoolDeletionApproach": false - } - } - }, "provisioningState": "Succeeded", "resourceId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/immutability/nodePools/immutability-np", "systemData": { diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/immutability-np.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/immutability-np.json index ca6e6a07a2e..2b192996d64 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/immutability-np.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/immutability-np.json @@ -3,29 +3,6 @@ "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-immutability/node_pools/4nd28q7n8q", - "internalState": { - "internalAPI": { - "location": "fake-location", - "properties": { - "autoRepair": true, - "platform": { - "enableEncryptionAtHost": false, - "osDisk": { - "diskStorageAccountType": "Premium_LRS", - "sizeGiB": 64 - }, - "vmSize": "large" - }, - "version": { - "channelGroup": "stable" - } - }, - "serviceProviderProperties": { - "clusterServiceID": "", - "usesNewNodePoolDeletionApproach": false - } - } - }, "provisioningState": "Succeeded", "resourceId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/immutability/nodePools/immutability-np", "systemData": { diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/07-untypedListRecursive-resourcegroup-via-child/immutability-np.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/07-untypedListRecursive-resourcegroup-via-child/immutability-np.json index ca6e6a07a2e..2b192996d64 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/07-untypedListRecursive-resourcegroup-via-child/immutability-np.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/07-untypedListRecursive-resourcegroup-via-child/immutability-np.json @@ -3,29 +3,6 @@ "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-immutability/node_pools/4nd28q7n8q", - "internalState": { - "internalAPI": { - "location": "fake-location", - "properties": { - "autoRepair": true, - "platform": { - "enableEncryptionAtHost": false, - "osDisk": { - "diskStorageAccountType": "Premium_LRS", - "sizeGiB": 64 - }, - "vmSize": "large" - }, - "version": { - "channelGroup": "stable" - } - }, - "serviceProviderProperties": { - "clusterServiceID": "", - "usesNewNodePoolDeletionApproach": false - } - } - }, "provisioningState": "Succeeded", "resourceId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/immutability/nodePools/immutability-np", "systemData": { diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/08-untypedListRecursive-immutability-cluster/immutability-np.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/08-untypedListRecursive-immutability-cluster/immutability-np.json index ca6e6a07a2e..2b192996d64 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/08-untypedListRecursive-immutability-cluster/immutability-np.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/08-untypedListRecursive-immutability-cluster/immutability-np.json @@ -3,29 +3,6 @@ "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-immutability/node_pools/4nd28q7n8q", - "internalState": { - "internalAPI": { - "location": "fake-location", - "properties": { - "autoRepair": true, - "platform": { - "enableEncryptionAtHost": false, - "osDisk": { - "diskStorageAccountType": "Premium_LRS", - "sizeGiB": 64 - }, - "vmSize": "large" - }, - "version": { - "channelGroup": "stable" - } - }, - "serviceProviderProperties": { - "clusterServiceID": "", - "usesNewNodePoolDeletionApproach": false - } - } - }, "provisioningState": "Succeeded", "resourceId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/immutability/nodePools/immutability-np", "systemData": { diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/09-untypedList-immutability-cluster/immutability-np.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/09-untypedList-immutability-cluster/immutability-np.json index ca6e6a07a2e..2b192996d64 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/09-untypedList-immutability-cluster/immutability-np.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/09-untypedList-immutability-cluster/immutability-np.json @@ -3,29 +3,6 @@ "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-immutability/node_pools/4nd28q7n8q", - "internalState": { - "internalAPI": { - "location": "fake-location", - "properties": { - "autoRepair": true, - "platform": { - "enableEncryptionAtHost": false, - "osDisk": { - "diskStorageAccountType": "Premium_LRS", - "sizeGiB": 64 - }, - "vmSize": "large" - }, - "version": { - "channelGroup": "stable" - } - }, - "serviceProviderProperties": { - "clusterServiceID": "", - "usesNewNodePoolDeletionApproach": false - } - } - }, "provisioningState": "Succeeded", "resourceId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/immutability/nodePools/immutability-np", "systemData": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-nodepool-operation/05-cosmosCompare-final-state/nodepool-test-nodepool.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-nodepool-operation/05-cosmosCompare-final-state/nodepool-test-nodepool.json index 5d93d55951d..52a1b75949c 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-nodepool-operation/05-cosmosCompare-final-state/nodepool-test-nodepool.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-nodepool-operation/05-cosmosCompare-final-state/nodepool-test-nodepool.json @@ -6,67 +6,6 @@ "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/test-cluster/nodePools/test-nodepool" }, "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/test-cluster/nodePools/test-nodepool", - "intermediateResourceDoc": { - "provisioningState": "Deleting", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/test-cluster/nodePools/test-nodepool", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/test-cluster/nodePools/test-nodepool", - "location": "fake-location", - "name": "test-nodepool", - "properties": { - "autoRepair": true, - "autoScaling": { - "max": 5, - "min": 1 - }, - "labels": { - "label-key": "label-value" - }, - "nodeDrainTimeoutMinutes": 2, - "platform": { - "enableEncryptionAtHost": false, - "osDisk": { - "diskStorageAccountType": "Premium_LRS", - "diskType": "Managed", - "sizeGiB": 64 - }, - "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet", - "vmSize": "large" - }, - "provisioningState": "Deleting", - "taints": [ - { - "effect": "NoExecute", - "key": "foo.com/key", - "value": "valid" - } - ], - "version": { - "channelGroup": "stable", - "id": "4.20.8" - } - }, - "serviceProviderProperties": { - "clusterServiceID": "", - "usesNewNodePoolDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters/nodePools" - } - }, "location": "fake-location", "name": "test-nodepool", "properties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/nodepool-basic-node-pool.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/nodepool-basic-node-pool.json index 41db1ee73cd..3cd1631e8e6 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/nodepool-basic-node-pool.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/nodepool-basic-node-pool.json @@ -8,67 +8,6 @@ "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/basic-node-pool", - "intermediateResourceDoc": { - "activeOperationId": "cdfb496e-6e70-4022-9f8d-b0dacf6d2ff5", - "internalId": "/api/clusters_mgmt/v1/clusters/9p2sk955gj/node_pools/59mkgdzg9s", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/basic-node-pool", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/basic-node-pool", - "location": "fake-location", - "name": "basic-node-pool", - "properties": { - "autoRepair": true, - "autoScaling": { - "max": 5, - "min": 1 - }, - "labels": { - "label-ky": "label-value" - }, - "nodeDrainTimeoutMinutes": 2, - "platform": { - "enableEncryptionAtHost": false, - "osDisk": { - "diskStorageAccountType": "Premium_LRS", - "sizeGiB": 64 - }, - "vmSize": "large" - }, - "provisioningState": "Accepted", - "taints": [ - { - "effect": "NoExecute", - "key": "foo.com/key", - "value": "valid" - } - ], - "version": { - "channelGroup": "stable" - } - }, - "serviceProviderProperties": { - "activeOperationId": "cdfb496e-6e70-4022-9f8d-b0dacf6d2ff5", - "clusterServiceID": "", - "usesNewNodePoolDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters/nodePools" - } - }, "location": "fake-location", "name": "basic-node-pool", "properties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/nodepool-node-pool-02.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/nodepool-node-pool-02.json index 33c747b77ac..c235217a5ab 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/nodepool-node-pool-02.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/nodepool-node-pool-02.json @@ -8,67 +8,6 @@ "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/node-pool-02", - "intermediateResourceDoc": { - "activeOperationId": "4067756a-fcc1-4732-a211-d785d888203c", - "internalId": "/api/clusters_mgmt/v1/clusters/9p2sk955gj/node_pools/v4lx7rv2r4", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/node-pool-02", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/node-pool-02", - "location": "fake-location", - "name": "node-pool-02", - "properties": { - "autoRepair": true, - "autoScaling": { - "max": 5, - "min": 1 - }, - "labels": { - "label-ky": "label-value" - }, - "nodeDrainTimeoutMinutes": 2, - "platform": { - "enableEncryptionAtHost": false, - "osDisk": { - "diskStorageAccountType": "Premium_LRS", - "sizeGiB": 64 - }, - "vmSize": "large" - }, - "provisioningState": "Accepted", - "taints": [ - { - "effect": "NoExecute", - "key": "foo.com/key", - "value": "valid" - } - ], - "version": { - "channelGroup": "stable" - } - }, - "serviceProviderProperties": { - "activeOperationId": "4067756a-fcc1-4732-a211-d785d888203c", - "clusterServiceID": "", - "usesNewNodePoolDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters/nodePools" - } - }, "location": "fake-location", "name": "node-pool-02", "properties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/nodepool-basic-node-pool.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/nodepool-basic-node-pool.json index 3507c9454cb..d2ca4ea8146 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/nodepool-basic-node-pool.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/nodepool-basic-node-pool.json @@ -11,68 +11,6 @@ "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/basic-node-pool" }, "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/basic-node-pool", - "intermediateResourceDoc": { - "activeOperationId": "cdfb496e-6e70-4022-9f8d-b0dacf6d2ff5", - "internalId": "/api/clusters_mgmt/v1/clusters/9p2sk955gj/node_pools/59mkgdzg9s", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/basic-node-pool", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/basic-node-pool", - "location": "fake-location", - "name": "basic-node-pool", - "properties": { - "autoRepair": true, - "autoScaling": { - "max": 5, - "min": 1 - }, - "labels": { - "label-ky": "label-value" - }, - "nodeDrainTimeoutMinutes": 2, - "platform": { - "enableEncryptionAtHost": false, - "osDisk": { - "diskStorageAccountType": "Premium_LRS", - "diskType": "Managed", - "sizeGiB": 64 - }, - "vmSize": "large" - }, - "provisioningState": "Accepted", - "taints": [ - { - "effect": "NoExecute", - "key": "foo.com/key", - "value": "valid" - } - ], - "version": { - "channelGroup": "stable" - } - }, - "serviceProviderProperties": { - "activeOperationId": "cdfb496e-6e70-4022-9f8d-b0dacf6d2ff5", - "clusterServiceID": "", - "usesNewNodePoolDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters/nodePools" - } - }, "location": "fake-location", "name": "basic-node-pool", "properties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/nodepool-node-pool-02.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/nodepool-node-pool-02.json index 0b49b209ce7..a61b7a30759 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/nodepool-node-pool-02.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/nodepool-node-pool-02.json @@ -11,68 +11,6 @@ "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/node-pool-02" }, "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/node-pool-02", - "intermediateResourceDoc": { - "activeOperationId": "4067756a-fcc1-4732-a211-d785d888203c", - "internalId": "/api/clusters_mgmt/v1/clusters/9p2sk955gj/node_pools/v4lx7rv2r4", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/node-pool-02", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/node-pool-02", - "location": "fake-location", - "name": "node-pool-02", - "properties": { - "autoRepair": true, - "autoScaling": { - "max": 5, - "min": 1 - }, - "labels": { - "label-ky": "label-value" - }, - "nodeDrainTimeoutMinutes": 2, - "platform": { - "enableEncryptionAtHost": false, - "osDisk": { - "diskStorageAccountType": "Premium_LRS", - "diskType": "Managed", - "sizeGiB": 64 - }, - "vmSize": "large" - }, - "provisioningState": "Accepted", - "taints": [ - { - "effect": "NoExecute", - "key": "foo.com/key", - "value": "valid" - } - ], - "version": { - "channelGroup": "stable" - } - }, - "serviceProviderProperties": { - "activeOperationId": "4067756a-fcc1-4732-a211-d785d888203c", - "clusterServiceID": "", - "usesNewNodePoolDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters/nodePools" - } - }, "location": "fake-location", "name": "node-pool-02", "properties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/nodepool-basic-node-pool.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/nodepool-basic-node-pool.json index 41db1ee73cd..3cd1631e8e6 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/nodepool-basic-node-pool.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/nodepool-basic-node-pool.json @@ -8,67 +8,6 @@ "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/basic-node-pool", - "intermediateResourceDoc": { - "activeOperationId": "cdfb496e-6e70-4022-9f8d-b0dacf6d2ff5", - "internalId": "/api/clusters_mgmt/v1/clusters/9p2sk955gj/node_pools/59mkgdzg9s", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/basic-node-pool", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/basic-node-pool", - "location": "fake-location", - "name": "basic-node-pool", - "properties": { - "autoRepair": true, - "autoScaling": { - "max": 5, - "min": 1 - }, - "labels": { - "label-ky": "label-value" - }, - "nodeDrainTimeoutMinutes": 2, - "platform": { - "enableEncryptionAtHost": false, - "osDisk": { - "diskStorageAccountType": "Premium_LRS", - "sizeGiB": 64 - }, - "vmSize": "large" - }, - "provisioningState": "Accepted", - "taints": [ - { - "effect": "NoExecute", - "key": "foo.com/key", - "value": "valid" - } - ], - "version": { - "channelGroup": "stable" - } - }, - "serviceProviderProperties": { - "activeOperationId": "cdfb496e-6e70-4022-9f8d-b0dacf6d2ff5", - "clusterServiceID": "", - "usesNewNodePoolDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters/nodePools" - } - }, "location": "fake-location", "name": "basic-node-pool", "properties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/nodepool-node-pool-02.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/nodepool-node-pool-02.json index 33c747b77ac..c235217a5ab 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/nodepool-node-pool-02.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/nodepool-node-pool-02.json @@ -8,67 +8,6 @@ "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/node-pool-02", - "intermediateResourceDoc": { - "activeOperationId": "4067756a-fcc1-4732-a211-d785d888203c", - "internalId": "/api/clusters_mgmt/v1/clusters/9p2sk955gj/node_pools/v4lx7rv2r4", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/node-pool-02", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/node-pool-02", - "location": "fake-location", - "name": "node-pool-02", - "properties": { - "autoRepair": true, - "autoScaling": { - "max": 5, - "min": 1 - }, - "labels": { - "label-ky": "label-value" - }, - "nodeDrainTimeoutMinutes": 2, - "platform": { - "enableEncryptionAtHost": false, - "osDisk": { - "diskStorageAccountType": "Premium_LRS", - "sizeGiB": 64 - }, - "vmSize": "large" - }, - "provisioningState": "Accepted", - "taints": [ - { - "effect": "NoExecute", - "key": "foo.com/key", - "value": "valid" - } - ], - "version": { - "channelGroup": "stable" - } - }, - "serviceProviderProperties": { - "activeOperationId": "4067756a-fcc1-4732-a211-d785d888203c", - "clusterServiceID": "", - "usesNewNodePoolDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters/nodePools" - } - }, "location": "fake-location", "name": "node-pool-02", "properties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/nodepool-basic-node-pool.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/nodepool-basic-node-pool.json index 41db1ee73cd..3cd1631e8e6 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/nodepool-basic-node-pool.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/nodepool-basic-node-pool.json @@ -8,67 +8,6 @@ "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/basic-node-pool", - "intermediateResourceDoc": { - "activeOperationId": "cdfb496e-6e70-4022-9f8d-b0dacf6d2ff5", - "internalId": "/api/clusters_mgmt/v1/clusters/9p2sk955gj/node_pools/59mkgdzg9s", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/basic-node-pool", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/basic-node-pool", - "location": "fake-location", - "name": "basic-node-pool", - "properties": { - "autoRepair": true, - "autoScaling": { - "max": 5, - "min": 1 - }, - "labels": { - "label-ky": "label-value" - }, - "nodeDrainTimeoutMinutes": 2, - "platform": { - "enableEncryptionAtHost": false, - "osDisk": { - "diskStorageAccountType": "Premium_LRS", - "sizeGiB": 64 - }, - "vmSize": "large" - }, - "provisioningState": "Accepted", - "taints": [ - { - "effect": "NoExecute", - "key": "foo.com/key", - "value": "valid" - } - ], - "version": { - "channelGroup": "stable" - } - }, - "serviceProviderProperties": { - "activeOperationId": "cdfb496e-6e70-4022-9f8d-b0dacf6d2ff5", - "clusterServiceID": "", - "usesNewNodePoolDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters/nodePools" - } - }, "location": "fake-location", "name": "basic-node-pool", "properties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/nodepool-node-pool-02.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/nodepool-node-pool-02.json index 5ac62d24f4b..358860c4e4a 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/nodepool-node-pool-02.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/nodepool-node-pool-02.json @@ -7,66 +7,6 @@ "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/node-pool-02" }, "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/node-pool-02", - "intermediateResourceDoc": { - "internalId": "/api/clusters_mgmt/v1/clusters/9p2sk955gj/node_pools/v4lx7rv2r4", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/node-pool-02", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/node-pool-02", - "location": "fake-location", - "name": "node-pool-02", - "properties": { - "autoRepair": true, - "autoScaling": { - "max": 5, - "min": 1 - }, - "labels": { - "label-ky": "label-value" - }, - "nodeDrainTimeoutMinutes": 2, - "platform": { - "enableEncryptionAtHost": false, - "osDisk": { - "diskStorageAccountType": "Premium_LRS", - "diskType": "Managed", - "sizeGiB": 64 - }, - "vmSize": "large" - }, - "provisioningState": "Succeeded", - "taints": [ - { - "effect": "NoExecute", - "key": "foo.com/key", - "value": "valid" - } - ], - "version": { - "channelGroup": "stable" - } - }, - "serviceProviderProperties": { - "clusterServiceID": "", - "usesNewNodePoolDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters/nodePools" - } - }, "location": "fake-location", "name": "node-pool-02", "properties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/create-current/06-cosmosCompare-confirm-content/nodepool-basic-node-pool.json b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/create-current/06-cosmosCompare-confirm-content/nodepool-basic-node-pool.json index 57d2b002237..472b9c24fcb 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/create-current/06-cosmosCompare-confirm-content/nodepool-basic-node-pool.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/create-current/06-cosmosCompare-confirm-content/nodepool-basic-node-pool.json @@ -11,70 +11,6 @@ "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/basic-node-pool" }, "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/basic-node-pool", - "intermediateResourceDoc": { - "activeOperationId": "bf643e76-55fe-48a0-a752-f5c5a2db72ad", - "internalId": "/api/clusters_mgmt/v1/clusters/dl7f9px2f2/node_pools/82npf9hxmk", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/basic-node-pool", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/basic-node-pool", - "location": "fake-location", - "name": "basic-node-pool", - "properties": { - "autoRepair": true, - "autoScaling": { - "max": 5, - "min": 1 - }, - "labels": { - "label-ky": "label-value" - }, - "nodeDrainTimeoutMinutes": 2, - "platform": { - "enableEncryptionAtHost": false, - "osDisk": { - "diskStorageAccountType": "Premium_LRS", - "diskType": "Managed", - "sizeGiB": 64 - }, - "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet", - "vmSize": "large" - }, - "provisioningState": "Accepted", - "taints": [ - { - "effect": "NoExecute", - "key": "foo.com/key", - "value": "valid" - } - ], - "version": { - "channelGroup": "stable", - "id": "4.20.8" - } - }, - "serviceProviderProperties": { - "activeOperationId": "bf643e76-55fe-48a0-a752-f5c5a2db72ad", - "clusterServiceID": "", - "usesNewNodePoolDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters/nodePools" - } - }, "location": "fake-location", "name": "basic-node-pool", "properties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/create-current/06-cosmosCompare-confirm-content/nodepool-node-pool-02.json b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/create-current/06-cosmosCompare-confirm-content/nodepool-node-pool-02.json index ba0ba9d894a..d9dbf26c2f8 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/create-current/06-cosmosCompare-confirm-content/nodepool-node-pool-02.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/create-current/06-cosmosCompare-confirm-content/nodepool-node-pool-02.json @@ -11,70 +11,6 @@ "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/node-pool-02" }, "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/node-pool-02", - "intermediateResourceDoc": { - "activeOperationId": "25e4713b-44b5-4799-9e60-894a132c6674", - "internalId": "/api/clusters_mgmt/v1/clusters/dl7f9px2f2/node_pools/5zdc9grtvf", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/node-pool-02", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/node-pool-02", - "location": "fake-location", - "name": "node-pool-02", - "properties": { - "autoRepair": true, - "autoScaling": { - "max": 5, - "min": 1 - }, - "labels": { - "label-ky": "label-value" - }, - "nodeDrainTimeoutMinutes": 2, - "platform": { - "enableEncryptionAtHost": false, - "osDisk": { - "diskStorageAccountType": "Premium_LRS", - "diskType": "Managed", - "sizeGiB": 64 - }, - "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet", - "vmSize": "large" - }, - "provisioningState": "Accepted", - "taints": [ - { - "effect": "NoExecute", - "key": "foo.com/key", - "value": "valid" - } - ], - "version": { - "channelGroup": "stable", - "id": "4.20.8" - } - }, - "serviceProviderProperties": { - "activeOperationId": "25e4713b-44b5-4799-9e60-894a132c6674", - "clusterServiceID": "", - "usesNewNodePoolDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters/nodePools" - } - }, "location": "fake-location", "name": "node-pool-02", "properties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/nodepool-basic-node-pool.json b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/nodepool-basic-node-pool.json index 41db1ee73cd..3cd1631e8e6 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/nodepool-basic-node-pool.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/nodepool-basic-node-pool.json @@ -8,67 +8,6 @@ "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/basic-node-pool", - "intermediateResourceDoc": { - "activeOperationId": "cdfb496e-6e70-4022-9f8d-b0dacf6d2ff5", - "internalId": "/api/clusters_mgmt/v1/clusters/9p2sk955gj/node_pools/59mkgdzg9s", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/basic-node-pool", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/basic-node-pool", - "location": "fake-location", - "name": "basic-node-pool", - "properties": { - "autoRepair": true, - "autoScaling": { - "max": 5, - "min": 1 - }, - "labels": { - "label-ky": "label-value" - }, - "nodeDrainTimeoutMinutes": 2, - "platform": { - "enableEncryptionAtHost": false, - "osDisk": { - "diskStorageAccountType": "Premium_LRS", - "sizeGiB": 64 - }, - "vmSize": "large" - }, - "provisioningState": "Accepted", - "taints": [ - { - "effect": "NoExecute", - "key": "foo.com/key", - "value": "valid" - } - ], - "version": { - "channelGroup": "stable" - } - }, - "serviceProviderProperties": { - "activeOperationId": "cdfb496e-6e70-4022-9f8d-b0dacf6d2ff5", - "clusterServiceID": "", - "usesNewNodePoolDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters/nodePools" - } - }, "location": "fake-location", "name": "basic-node-pool", "properties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/nodepool-node-pool-02.json b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/nodepool-node-pool-02.json index 33c747b77ac..c235217a5ab 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/nodepool-node-pool-02.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/nodepool-node-pool-02.json @@ -8,67 +8,6 @@ "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/node-pool-02", - "intermediateResourceDoc": { - "activeOperationId": "4067756a-fcc1-4732-a211-d785d888203c", - "internalId": "/api/clusters_mgmt/v1/clusters/9p2sk955gj/node_pools/v4lx7rv2r4", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/node-pool-02", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/node-pool-02", - "location": "fake-location", - "name": "node-pool-02", - "properties": { - "autoRepair": true, - "autoScaling": { - "max": 5, - "min": 1 - }, - "labels": { - "label-ky": "label-value" - }, - "nodeDrainTimeoutMinutes": 2, - "platform": { - "enableEncryptionAtHost": false, - "osDisk": { - "diskStorageAccountType": "Premium_LRS", - "sizeGiB": 64 - }, - "vmSize": "large" - }, - "provisioningState": "Accepted", - "taints": [ - { - "effect": "NoExecute", - "key": "foo.com/key", - "value": "valid" - } - ], - "version": { - "channelGroup": "stable" - } - }, - "serviceProviderProperties": { - "activeOperationId": "4067756a-fcc1-4732-a211-d785d888203c", - "clusterServiceID": "", - "usesNewNodePoolDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters/nodePools" - } - }, "location": "fake-location", "name": "node-pool-02", "properties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/nodepool-02.json b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/nodepool-02.json index 1bd4f70cecd..4f3fd0a96e2 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/nodepool-02.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/nodepool-02.json @@ -8,67 +8,6 @@ "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/node-pool-02", - "intermediateResourceDoc": { - "activeOperationId": "4067756a-fcc1-4732-a211-d785d888203c", - "internalId": "/api/clusters_mgmt/v1/clusters/9p2sk955gj/node_pools/v4lx7rv2r4", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/node-pool-02", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/node-pool-02", - "location": "fake-location", - "name": "node-pool-02", - "properties": { - "autoRepair": true, - "autoScaling": { - "max": 5, - "min": 1 - }, - "labels": { - "label-ky": "label-value" - }, - "nodeDrainTimeoutMinutes": 2, - "platform": { - "enableEncryptionAtHost": false, - "osDisk": { - "diskStorageAccountType": "Premium_LRS", - "sizeGiB": 64 - }, - "vmSize": "large" - }, - "provisioningState": "Accepted", - "taints": [ - { - "effect": "NoExecute", - "key": "foo.com/key", - "value": "valid" - } - ], - "version": { - "channelGroup": "stable" - } - }, - "serviceProviderProperties": { - "activeOperationId": "4067756a-fcc1-4732-a211-d785d888203c", - "clusterServiceID": "", - "usesNewNodePoolDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters/nodePools" - } - }, "location": "fake-location", "name": "node-pool-02", "properties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/nodepool-basic-node-pool.json b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/nodepool-basic-node-pool.json index 0fb73b2a88d..e0fbefaf877 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/nodepool-basic-node-pool.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/nodepool-basic-node-pool.json @@ -11,68 +11,6 @@ "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/basic-node-pool" }, "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/basic-node-pool", - "intermediateResourceDoc": { - "activeOperationId": "9e244879-591b-4693-823a-4412b4200f4d", - "internalId": "/api/clusters_mgmt/v1/clusters/9p2sk955gj/node_pools/59mkgdzg9s", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/basic-node-pool", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/basic-node-pool", - "location": "fake-location", - "name": "basic-node-pool", - "properties": { - "autoRepair": true, - "autoScaling": { - "max": 5, - "min": 1 - }, - "labels": { - "label-ky": "label-value" - }, - "nodeDrainTimeoutMinutes": 2, - "platform": { - "enableEncryptionAtHost": false, - "osDisk": { - "diskStorageAccountType": "Premium_LRS", - "diskType": "Managed", - "sizeGiB": 64 - }, - "vmSize": "large" - }, - "provisioningState": "Accepted", - "taints": [ - { - "effect": "NoExecute", - "key": "foo.com/key", - "value": "other" - } - ], - "version": { - "channelGroup": "stable" - } - }, - "serviceProviderProperties": { - "activeOperationId": "9e244879-591b-4693-823a-4412b4200f4d", - "clusterServiceID": "", - "usesNewNodePoolDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters/nodePools" - } - }, "location": "fake-location", "name": "basic-node-pool", "properties": { From 1840316b0fe42a805a6d43221452444a641bb945 Mon Sep 17 00:00:00 2001 From: David Eads Date: Mon, 11 May 2026 10:01:48 -0400 Subject: [PATCH 5/7] switch to using generic storage for nodepools Co-Authored-By: Claude Opus 4.7 (1M context) --- internal/database/convert_any.go | 6 -- .../convert_defaults_consistency_test.go | 36 +++---- internal/database/convert_nodepool.go | 72 ------------- internal/database/convert_nodepool_test.go | 100 ------------------ internal/database/crud_hcpcluster.go | 4 +- internal/database/crud_nested_resource.go | 2 +- internal/database/global_lister.go | 2 +- internal/database/transaction.go | 2 +- internal/database/types_nodepool.go | 36 ------- .../databasetesting/mock_resources_crud.go | 4 +- .../mock_resources_db_client.go | 4 +- .../mock_resources_global_lister.go | 2 +- 12 files changed, 27 insertions(+), 243 deletions(-) delete mode 100644 internal/database/convert_nodepool.go delete mode 100644 internal/database/types_nodepool.go diff --git a/internal/database/convert_any.go b/internal/database/convert_any.go index 18d935cf29f..db2a186dca1 100644 --- a/internal/database/convert_any.go +++ b/internal/database/convert_any.go @@ -33,9 +33,6 @@ func CosmosToInternal[InternalAPIType, CosmosAPIType any](obj *CosmosAPIType) (* case *ExternalAuth: internalObj, err = CosmosToInternalExternalAuth(cosmosObj) - case *NodePool: - internalObj, err = CosmosToInternalNodePool(cosmosObj) - case *TypedDocument: var expectedObj InternalAPIType switch castObj := any(expectedObj).(type) { @@ -86,9 +83,6 @@ func InternalToCosmos[InternalAPIType, CosmosAPIType any](obj *InternalAPIType) case *api.HCPOpenShiftClusterExternalAuth: cosmosObj, err = InternalToCosmosExternalAuth(internalObj) - case *api.HCPOpenShiftClusterNodePool: - cosmosObj, err = InternalToCosmosNodePool(internalObj) - case *fleet.Stamp: cosmosObj, err = InternalToCosmosFleet(internalObj) diff --git a/internal/database/convert_defaults_consistency_test.go b/internal/database/convert_defaults_consistency_test.go index bd17c4bea42..cead7507e99 100644 --- a/internal/database/convert_defaults_consistency_test.go +++ b/internal/database/convert_defaults_consistency_test.go @@ -315,7 +315,7 @@ func TestKMSVisibilityDefaultsToPublic(t *testing.T) { } } -// TestPreExistingDataNodePool verifies that CosmosToInternalNodePool applies +// TestPreExistingDataNodePool verifies that CosmosGenericToInternal applies // canonical defaults when reading a Cosmos document that predates the // introduction of DiskStorageAccountType. func TestPreExistingDataNodePool(t *testing.T) { @@ -324,35 +324,33 @@ func TestPreExistingDataNodePool(t *testing.T) { )) // Simulate a pre-existing Cosmos document missing DiskStorageAccountType. - preExistingDoc := &NodePool{ + preExistingDoc := &GenericDocument[api.HCPOpenShiftClusterNodePool]{ TypedDocument: TypedDocument{ BaseDocument: BaseDocument{ID: "test-doc-id"}, ResourceID: resourceID, }, - NodePoolProperties: NodePoolProperties{ - HCPOpenShiftClusterNodePool: api.HCPOpenShiftClusterNodePool{ - // DiskStorageAccountType is intentionally zero-valued - CosmosMetadata: arm.CosmosMetadata{ - ResourceID: resourceID, - }, - Properties: api.HCPOpenShiftClusterNodePoolProperties{ - ProvisioningState: arm.ProvisioningStateSucceeded, - Platform: api.NodePoolPlatformProfile{ - OSDisk: api.OSDiskProfile{ - // DiskStorageAccountType: "" — simulates pre-existing document - }, + Content: api.HCPOpenShiftClusterNodePool{ + // DiskStorageAccountType is intentionally zero-valued + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: resourceID, + }, + Properties: api.HCPOpenShiftClusterNodePoolProperties{ + ProvisioningState: arm.ProvisioningStateSucceeded, + Platform: api.NodePoolPlatformProfile{ + OSDisk: api.OSDiskProfile{ + // DiskStorageAccountType: "" — simulates pre-existing document }, }, - ServiceProviderProperties: api.HCPOpenShiftClusterNodePoolServiceProviderProperties{ - ClusterServiceID: ptr.To(api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/test-cluster/node_pools/test-np"))), - }, + }, + ServiceProviderProperties: api.HCPOpenShiftClusterNodePoolServiceProviderProperties{ + ClusterServiceID: ptr.To(api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/test-cluster/node_pools/test-np"))), }, }, } - internalNodePool, err := CosmosToInternalNodePool(preExistingDoc) + internalNodePool, err := CosmosGenericToInternal(preExistingDoc) if err != nil { - t.Fatalf("CosmosToInternalNodePool failed: %v", err) + t.Fatalf("CosmosGenericToInternal failed: %v", err) } if internalNodePool.Properties.Platform.OSDisk.DiskStorageAccountType != api.DiskStorageAccountTypePremium_LRS { diff --git a/internal/database/convert_nodepool.go b/internal/database/convert_nodepool.go deleted file mode 100644 index 05e32962d83..00000000000 --- a/internal/database/convert_nodepool.go +++ /dev/null @@ -1,72 +0,0 @@ -// Copyright 2025 Microsoft Corporation -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package database - -import ( - "fmt" - "strings" - - "github.com/Azure/ARO-HCP/internal/api" -) - -func InternalToCosmosNodePool(internalObj *api.HCPOpenShiftClusterNodePool) (*NodePool, error) { - if internalObj == nil { - return nil, nil - } - - // CosmosMetadata.ResourceID is the canonical identifier for cosmos-side - // concerns (partitioning, document UID, resource-type indexing). Use it - // instead of the TrackedResource.ID, which is an ARM-surface concern. - cosmosResourceID := internalObj.GetCosmosData().ResourceID - if cosmosResourceID == nil { - return nil, fmt.Errorf("internalObj is missing CosmosMetadata.ResourceID") - } - cosmosObj := &NodePool{ - TypedDocument: TypedDocument{ - BaseDocument: BaseDocument{ - ID: internalObj.GetCosmosData().GetCosmosUID(), - }, - PartitionKey: strings.ToLower(cosmosResourceID.SubscriptionID), - ResourceID: cosmosResourceID, - ResourceType: cosmosResourceID.ResourceType.String(), - }, - NodePoolProperties: NodePoolProperties{ - HCPOpenShiftClusterNodePool: *internalObj, - }, - } - - return cosmosObj, nil -} - -func CosmosToInternalNodePool(cosmosObj *NodePool) (*api.HCPOpenShiftClusterNodePool, error) { - if cosmosObj == nil { - return nil, nil - } - - internalObj := cosmosObj.DeepCopy() - internalObj.ExistingCosmosUID = cosmosObj.ID - internalObj.SetEtag(cosmosObj.CosmosETag) - if internalObj.GetResourceID() == nil { - if cosmosObj.ResourceID != nil { - internalObj.SetResourceID(cosmosObj.ResourceID) - } else { - return nil, fmt.Errorf("internalObj is missing a resourceID: %T: %q", cosmosObj, cosmosObj.ID) - } - } - - internalObj.EnsureDefaults() - - return internalObj, nil -} diff --git a/internal/database/convert_nodepool_test.go b/internal/database/convert_nodepool_test.go index 3131a589d3e..a1859492deb 100644 --- a/internal/database/convert_nodepool_test.go +++ b/internal/database/convert_nodepool_test.go @@ -15,111 +15,11 @@ package database import ( - "math/rand" - "strings" "testing" - "github.com/stretchr/testify/require" - - "sigs.k8s.io/randfill" - - "github.com/Azure/azure-sdk-for-go/sdk/azcore" - azcorearm "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/Azure/ARO-HCP/internal/api" - "github.com/Azure/ARO-HCP/internal/api/arm" ) -func TestRoundTripNodePoolInternalCosmosInternal(t *testing.T) { - seed := rand.Int63() - t.Logf("seed: %d", seed) - - fuzzer := fuzzerFor([]interface{}{ - func(j *azcorearm.ResourceID, c randfill.Continue) { - *j = *api.Must(azcorearm.ParseResourceID("/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myRg")) - }, - func(j *arm.Resource, c randfill.Continue) { - c.FillNoCustom(j) - j.ID = api.Must(azcorearm.ParseResourceID("/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/change-channel")) - j.Name = "change-channel" - j.Type = "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - }, - func(j *api.HCPOpenShiftClusterNodePoolServiceProviderProperties, c randfill.Continue) { - c.FillNoCustom(j) - if j == nil { - return - } - // Match CosmosToInternalNodePool: empty InternalID becomes nil on read. Round-trip - // must always carry a non-empty node pool ClusterServiceID (OCM node pool href). - clusterID := "r" + strings.ReplaceAll(c.String(10), "/", "-") - nodePoolID := strings.ReplaceAll(c.String(10), "/", "-") - foo := api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/" + clusterID + "/node_pools/" + nodePoolID)) - j.ClusterServiceID = &foo - }, - func(j *api.CosmosMetadata, c randfill.Continue) { - c.FillNoCustom(j) - j.ResourceID = api.Must(azcorearm.ParseResourceID("/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myRg")) - j.ExistingCosmosUID = "" - j.CosmosETag = "" - }, - func(j *api.HCPOpenShiftClusterNodePool, c randfill.Continue) { - c.FillNoCustom(j) - if j == nil { - return - } - // Canonical defaults are applied on Cosmos read, so ensure - // defaulted fields are never zero during round-trip testing. - if len(j.Properties.Platform.OSDisk.DiskStorageAccountType) == 0 { - j.Properties.Platform.OSDisk.DiskStorageAccountType = api.DiskStorageAccountTypePremium_LRS - } - if len(j.Properties.Platform.OSDisk.DiskType) == 0 { - j.Properties.Platform.OSDisk.DiskType = api.OsDiskTypeManaged - } - }, - func(j *arm.ManagedServiceIdentity, c randfill.Continue) { - c.FillNoCustom(j) - - // we only round trip keys, so only fill in keys - if j != nil && j.UserAssignedIdentities != nil { - for k := range j.UserAssignedIdentities { - j.UserAssignedIdentities[k] = nil - } - } - }, - }, rand.NewSource(seed)) - - // Try a few times, since runTest uses random values. - for i := 0; i < 20; i++ { - original := &api.HCPOpenShiftClusterNodePool{} - fuzzer.Fill(original) - roundTripInternalToCosmosToInternal[api.HCPOpenShiftClusterNodePool, NodePool](t, original) - } -} - -func TestCosmosToInternalNodePoolPreservesETag(t *testing.T) { - expectedETag := azcore.ETag("test-etag-value-12345") - resourceID := api.Must(azcorearm.ParseResourceID("/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/rg/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/my-cluster/nodePools/my-np")) - - cosmosObj := &NodePool{ - TypedDocument: TypedDocument{ - BaseDocument: BaseDocument{ - CosmosETag: expectedETag, - }, - }, - NodePoolProperties: NodePoolProperties{ - HCPOpenShiftClusterNodePool: api.HCPOpenShiftClusterNodePool{ - CosmosMetadata: arm.CosmosMetadata{ - ResourceID: resourceID, - }, - }, - }, - } - - internalObj, err := CosmosToInternalNodePool(cosmosObj) - require.NoError(t, err) - require.Equal(t, expectedETag, internalObj.GetCosmosData().CosmosETag) -} - func TestNodePoolEnsureDefaults(t *testing.T) { tests := []struct { name string diff --git a/internal/database/crud_hcpcluster.go b/internal/database/crud_hcpcluster.go index ab578789928..426d82376d7 100644 --- a/internal/database/crud_hcpcluster.go +++ b/internal/database/crud_hcpcluster.go @@ -177,7 +177,7 @@ func (h *hcpClusterCRUD) NodePools(hcpClusterName string) NodePoolsCRUD { hcpClusterName))) return &nodePoolsCRUD{ - nestedCosmosResourceCRUD: NewCosmosResourceCRUD[api.HCPOpenShiftClusterNodePool, NodePool]( + nestedCosmosResourceCRUD: NewCosmosResourceCRUD[api.HCPOpenShiftClusterNodePool, GenericDocument[api.HCPOpenShiftClusterNodePool]]( h.containerClient, parentResourceID, api.NodePoolResourceType), @@ -228,7 +228,7 @@ func (h *externalAuthCRUD) Controllers(externalAuthName string) ResourceCRUD[api } type nodePoolsCRUD struct { - *nestedCosmosResourceCRUD[api.HCPOpenShiftClusterNodePool, NodePool] + *nestedCosmosResourceCRUD[api.HCPOpenShiftClusterNodePool, GenericDocument[api.HCPOpenShiftClusterNodePool]] } func (h *nodePoolsCRUD) Controllers(nodePoolName string) ResourceCRUD[api.Controller] { diff --git a/internal/database/crud_nested_resource.go b/internal/database/crud_nested_resource.go index 8ad746c36d4..83bfca5c88c 100644 --- a/internal/database/crud_nested_resource.go +++ b/internal/database/crud_nested_resource.go @@ -57,7 +57,7 @@ type nestedCosmosResourceCRUD[InternalAPIType, CosmosAPIType any] struct { resourceType azcorearm.ResourceType } -var _ ResourceCRUD[api.HCPOpenShiftClusterNodePool] = &nestedCosmosResourceCRUD[api.HCPOpenShiftClusterNodePool, NodePool]{} +var _ ResourceCRUD[api.HCPOpenShiftClusterNodePool] = &nestedCosmosResourceCRUD[api.HCPOpenShiftClusterNodePool, GenericDocument[api.HCPOpenShiftClusterNodePool]]{} func NewCosmosResourceCRUD[InternalAPIType, CosmosAPIType any]( containerClient *azcosmos.ContainerClient, parentResourceID *azcorearm.ResourceID, resourceType azcorearm.ResourceType) *nestedCosmosResourceCRUD[InternalAPIType, CosmosAPIType] { diff --git a/internal/database/global_lister.go b/internal/database/global_lister.go index 499cf20d9c1..90bcf63ebe0 100644 --- a/internal/database/global_lister.go +++ b/internal/database/global_lister.go @@ -79,7 +79,7 @@ func (g *cosmosResourcesGlobalListers) Clusters() GlobalLister[api.HCPOpenShiftC } func (g *cosmosResourcesGlobalListers) NodePools() GlobalLister[api.HCPOpenShiftClusterNodePool] { - return &cosmosGlobalLister[api.HCPOpenShiftClusterNodePool, NodePool]{ + return &cosmosGlobalLister[api.HCPOpenShiftClusterNodePool, GenericDocument[api.HCPOpenShiftClusterNodePool]]{ containerClient: g.resources, resourceType: api.NodePoolResourceType, } diff --git a/internal/database/transaction.go b/internal/database/transaction.go index 8c84bc4c54e..f9bc9004c1f 100644 --- a/internal/database/transaction.go +++ b/internal/database/transaction.go @@ -208,7 +208,7 @@ func (r *cosmosDBTransactionResult) GetItem(cosmosUID string) (any, error) { case strings.ToLower(api.ClusterResourceType.String()): return getCastResult[api.HCPOpenShiftCluster, GenericDocument[api.HCPOpenShiftCluster]](r, cosmosUID) case strings.ToLower(api.NodePoolResourceType.String()): - return getCastResult[api.HCPOpenShiftClusterNodePool, NodePool](r, cosmosUID) + return getCastResult[api.HCPOpenShiftClusterNodePool, GenericDocument[api.HCPOpenShiftClusterNodePool]](r, cosmosUID) case strings.ToLower(api.ExternalAuthResourceType.String()): return getCastResult[api.HCPOpenShiftClusterExternalAuth, ExternalAuth](r, cosmosUID) default: diff --git a/internal/database/types_nodepool.go b/internal/database/types_nodepool.go deleted file mode 100644 index 33c533b4019..00000000000 --- a/internal/database/types_nodepool.go +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright 2025 Microsoft Corporation -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package database - -import ( - "github.com/Azure/ARO-HCP/internal/api" -) - -type NodePool struct { - TypedDocument `json:",inline"` - - NodePoolProperties `json:"properties"` -} - -type NodePoolProperties struct { - // HCPOpenShiftClusterNodePool is inlined directly. The on-disk shape now matches - // GenericDocument[api.HCPOpenShiftClusterNodePool] and NodePool only exists as a - // distinct type while the migration to that generic surface completes. - api.HCPOpenShiftClusterNodePool `json:",inline"` -} - -func (o *NodePool) GetTypedDocument() *TypedDocument { - return &o.TypedDocument -} diff --git a/internal/databasetesting/mock_resources_crud.go b/internal/databasetesting/mock_resources_crud.go index cb4341e4139..e8969a15070 100644 --- a/internal/databasetesting/mock_resources_crud.go +++ b/internal/databasetesting/mock_resources_crud.go @@ -485,7 +485,7 @@ func (m *mockHCPClusterCRUD) NodePools(hcpClusterName string) database.NodePools hcpClusterName))) return &mockNodePoolsCRUD{ - mockResourceCRUD: newMockResourceCRUD[api.HCPOpenShiftClusterNodePool, database.NodePool]( + mockResourceCRUD: newMockResourceCRUD[api.HCPOpenShiftClusterNodePool, database.GenericDocument[api.HCPOpenShiftClusterNodePool]]( m.client, parentResourceID, api.NodePoolResourceType), @@ -520,7 +520,7 @@ var _ database.HCPClusterCRUD = &mockHCPClusterCRUD{} // mockNodePoolsCRUD implements database.NodePoolsCRUD. type mockNodePoolsCRUD struct { - *mockResourceCRUD[api.HCPOpenShiftClusterNodePool, database.NodePool] + *mockResourceCRUD[api.HCPOpenShiftClusterNodePool, database.GenericDocument[api.HCPOpenShiftClusterNodePool]] } func (m *mockNodePoolsCRUD) Controllers(nodePoolName string) database.ResourceCRUD[api.Controller] { diff --git a/internal/databasetesting/mock_resources_db_client.go b/internal/databasetesting/mock_resources_db_client.go index 0ad54483d46..fb9eb79cb1b 100644 --- a/internal/databasetesting/mock_resources_db_client.go +++ b/internal/databasetesting/mock_resources_db_client.go @@ -371,11 +371,11 @@ func (r *mockTransactionResult) GetItem(cosmosUID string) (any, error) { } return database.CosmosGenericToInternal(&cosmosObj) case strings.ToLower(api.NodePoolResourceType.String()): - var cosmosObj database.NodePool + var cosmosObj database.GenericDocument[api.HCPOpenShiftClusterNodePool] if err := json.Unmarshal(data, &cosmosObj); err != nil { return nil, err } - return database.CosmosToInternalNodePool(&cosmosObj) + return database.CosmosGenericToInternal(&cosmosObj) case strings.ToLower(api.ExternalAuthResourceType.String()): var cosmosObj database.ExternalAuth if err := json.Unmarshal(data, &cosmosObj); err != nil { diff --git a/internal/databasetesting/mock_resources_global_lister.go b/internal/databasetesting/mock_resources_global_lister.go index b641194e32d..93b2d901cb6 100644 --- a/internal/databasetesting/mock_resources_global_lister.go +++ b/internal/databasetesting/mock_resources_global_lister.go @@ -45,7 +45,7 @@ func (g *mockResourcesGlobalListers) Clusters() database.GlobalLister[api.HCPOpe } func (g *mockResourcesGlobalListers) NodePools() database.GlobalLister[api.HCPOpenShiftClusterNodePool] { - return &mockTypedGlobalLister[api.HCPOpenShiftClusterNodePool, database.NodePool]{ + return &mockTypedGlobalLister[api.HCPOpenShiftClusterNodePool, database.GenericDocument[api.HCPOpenShiftClusterNodePool]]{ client: g.client, resourceType: api.NodePoolResourceType, } From bd7e115a23184e5bb9a371fe091d41f8c0268125 Mon Sep 17 00:00:00 2001 From: David Eads Date: Mon, 11 May 2026 11:39:38 -0400 Subject: [PATCH 6/7] stop serializing old externalauth fields Co-Authored-By: Claude Opus 4.7 (1M context) --- .../convert_defaults_consistency_test.go | 21 +++--- internal/database/convert_externalauth.go | 17 ----- .../database/convert_externalauth_test.go | 3 - internal/database/types_externalauth.go | 18 +---- .../externalauth-default.json | 74 ------------------- .../externalauth-default.json | 74 ------------------- .../externalauth-default.json | 74 ------------------- .../externalauth-default.json | 74 ------------------- .../externalauth-default.json | 74 ------------------- .../externalauth-default.json | 74 ------------------- .../basic-external-auth-auth.json | 52 ------------- .../basic-external-auth-auth.json | 52 ------------- .../basic-external-auth-auth.json | 52 ------------- .../basic-external-auth-auth.json | 52 ------------- .../externalauth-default.json | 74 ------------------- .../externalauth-default.json | 74 ------------------- .../externalauth-default.json | 74 ------------------- .../externalauth-default.json | 74 ------------------- .../externalauth-default.json | 74 ------------------- .../externalauth-default.json | 74 ------------------- .../externalauth-default.json | 74 ------------------- 21 files changed, 15 insertions(+), 1214 deletions(-) diff --git a/internal/database/convert_defaults_consistency_test.go b/internal/database/convert_defaults_consistency_test.go index cead7507e99..23e053f5e15 100644 --- a/internal/database/convert_defaults_consistency_test.go +++ b/internal/database/convert_defaults_consistency_test.go @@ -486,21 +486,24 @@ func TestPreExistingDataExternalAuth(t *testing.T) { "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster/externalAuths/default", )) + internalID := api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/test-cluster/external_auth_config/external_auths/default")) preExistingDoc := &ExternalAuth{ TypedDocument: TypedDocument{ BaseDocument: BaseDocument{ID: "test-doc-id"}, ResourceID: resourceID, }, ExternalAuthProperties: ExternalAuthProperties{ - IntermediateResourceDoc: &ResourceDocument{ - ResourceID: resourceID, - InternalID: api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/test-cluster/external_auth_config/external_auths/default")), - ProvisioningState: arm.ProvisioningStateSucceeded, - }, - InternalState: ExternalAuthInternalState{ - InternalAPI: api.HCPOpenShiftClusterExternalAuth{ - // PrefixPolicy is intentionally zero-valued to simulate - // a pre-existing document that predates the field. + HCPOpenShiftClusterExternalAuth: api.HCPOpenShiftClusterExternalAuth{ + // PrefixPolicy is intentionally zero-valued to simulate + // a pre-existing document that predates the field. + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: resourceID, + }, + Properties: api.HCPOpenShiftClusterExternalAuthProperties{ + ProvisioningState: arm.ProvisioningStateSucceeded, + }, + ServiceProviderProperties: api.HCPOpenShiftClusterExternalAuthServiceProviderProperties{ + ClusterServiceID: &internalID, }, }, }, diff --git a/internal/database/convert_externalauth.go b/internal/database/convert_externalauth.go index cc9f027578f..2681e9e885e 100644 --- a/internal/database/convert_externalauth.go +++ b/internal/database/convert_externalauth.go @@ -18,8 +18,6 @@ import ( "fmt" "strings" - "k8s.io/utils/ptr" - "github.com/Azure/ARO-HCP/internal/api" ) @@ -46,24 +44,9 @@ func InternalToCosmosExternalAuth(internalObj *api.HCPOpenShiftClusterExternalAu }, ExternalAuthProperties: ExternalAuthProperties{ HCPOpenShiftClusterExternalAuth: *internalObj, - IntermediateResourceDoc: &ResourceDocument{ - ResourceID: cosmosResourceID, - InternalID: ptr.Deref(internalObj.ServiceProviderProperties.ClusterServiceID, api.InternalID{}), - ActiveOperationID: internalObj.ServiceProviderProperties.ActiveOperationID, - ProvisioningState: internalObj.Properties.ProvisioningState, - Identity: nil, - SystemData: internalObj.SystemData, - Tags: nil, - }, - - InternalState: ExternalAuthInternalState{ - InternalAPI: *internalObj, - }, }, } - cosmosObj.InternalState.InternalAPI.CosmosMetadata = api.CosmosMetadata{} - return cosmosObj, nil } diff --git a/internal/database/convert_externalauth_test.go b/internal/database/convert_externalauth_test.go index 0810a719c52..9d7b21fa805 100644 --- a/internal/database/convert_externalauth_test.go +++ b/internal/database/convert_externalauth_test.go @@ -107,9 +107,6 @@ func TestCosmosToInternalExternalAuthPreservesETag(t *testing.T) { ResourceID: resourceID, }, }, - IntermediateResourceDoc: &ResourceDocument{ - ResourceID: resourceID, - }, }, } diff --git a/internal/database/types_externalauth.go b/internal/database/types_externalauth.go index e952c06f0b4..65ddfcfbfd9 100644 --- a/internal/database/types_externalauth.go +++ b/internal/database/types_externalauth.go @@ -25,22 +25,10 @@ type ExternalAuth struct { } type ExternalAuthProperties struct { - // HCPOpenShiftClusterExternalAuth is the inline serialization that mirrors GenericDocument[api.HCPOpenShiftClusterExternalAuth] - // (the destination shape for externalauth documents). The reading path now uses these inline fields as the - // source of truth; the IntermediateResourceDoc/InternalState siblings are still written for compatibility - // with old readers, but will be removed once all readers have migrated. + // HCPOpenShiftClusterExternalAuth is inlined directly. The on-disk shape now matches + // GenericDocument[api.HCPOpenShiftClusterExternalAuth] and ExternalAuth only exists as a + // distinct type while the migration to that generic surface completes. api.HCPOpenShiftClusterExternalAuth `json:",inline"` - - // IntermediateResourceDoc exists so that we can stop inlining the resource document so that we can directly - // embed the InternalAPIType which has colliding serialization fields. - IntermediateResourceDoc *ResourceDocument `json:"intermediateResourceDoc"` - - // TODO we may need look-aside data that we want to store in the same place. Build the nesting to allow it - InternalState ExternalAuthInternalState `json:"internalState"` -} - -type ExternalAuthInternalState struct { - InternalAPI api.HCPOpenShiftClusterExternalAuth `json:"internalAPI"` } func (o *ExternalAuth) GetTypedDocument() *TypedDocument { diff --git a/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/externalauth-default.json b/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/externalauth-default.json index 68d4039b496..cc074d1e815 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/externalauth-default.json +++ b/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/externalauth-default.json @@ -8,80 +8,6 @@ "partitionKey": "a433a095-1277-44f1-8453-8d61a4d848c2", "properties": { "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/externalAuths/default", - "intermediateResourceDoc": { - "activeOperationId": "ea807c13-7e15-43d4-b760-69ef7e31d273", - "internalId": "/api/clusters_mgmt/v1/clusters/swzpxg6nxn/external_auth_config/external_auths/5fghjjqxvd", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/externalAuths/default", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/externalAuths/default", - "name": "default", - "properties": { - "claim": { - "mappings": { - "groups": { - "claim": "groups", - "prefix": "" - }, - "username": { - "claim": "sub", - "prefix": "prefix-", - "prefixPolicy": "Prefix" - } - }, - "validationRules": [] - }, - "clients": [ - { - "clientId": "87654321-4321-4321-4321-abcdefghijkl", - "component": { - "authClientNamespace": "openshift-console", - "name": "console" - }, - "extraScopes": [], - "type": "Confidential" - }, - { - "clientId": "87654321-4321-4321-4321-abcdefghijkl", - "component": { - "authClientNamespace": "openshift-console", - "name": "cli" - }, - "extraScopes": [], - "type": "Public" - } - ], - "issuer": { - "audiences": [ - "87654321-4321-4321-4321-abcdefghijkl" - ], - "ca": "", - "url": "https://login.microsoftonline.com/12345678-1234-1234-1234-123456789abc/v2.0" - }, - "provisioningState": "Accepted" - }, - "serviceProviderProperties": { - "activeOperationId": "ea807c13-7e15-43d4-b760-69ef7e31d273", - "clusterServiceID": "", - "usesNewExternalAuthDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters/externalAuths" - } - }, "name": "default", "properties": { "claim": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/00-load-initial-state/externalauth-default.json b/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/00-load-initial-state/externalauth-default.json index bbc4ee4a739..5c2228bfffa 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/00-load-initial-state/externalauth-default.json +++ b/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/00-load-initial-state/externalauth-default.json @@ -8,80 +8,6 @@ "partitionKey": "a433a095-1277-44f1-8453-8d61a4d848c2", "properties": { "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/externalAuths/default", - "intermediateResourceDoc": { - "activeOperationId": "ea807c13-7e15-43d4-b760-69ef7e31d273", - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0/external_auth_config/external_auths/5fghjjqxvd", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/externalAuths/default", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/externalAuths/default", - "name": "default", - "properties": { - "claim": { - "mappings": { - "groups": { - "claim": "groups", - "prefix": "" - }, - "username": { - "claim": "sub", - "prefix": "prefix-", - "prefixPolicy": "Prefix" - } - }, - "validationRules": [] - }, - "clients": [ - { - "clientId": "87654321-4321-4321-4321-abcdefghijkl", - "component": { - "authClientNamespace": "openshift-console", - "name": "console" - }, - "extraScopes": [], - "type": "Confidential" - }, - { - "clientId": "87654321-4321-4321-4321-abcdefghijkl", - "component": { - "authClientNamespace": "openshift-console", - "name": "cli" - }, - "extraScopes": [], - "type": "Public" - } - ], - "issuer": { - "audiences": [ - "87654321-4321-4321-4321-abcdefghijkl" - ], - "ca": "", - "url": "https://login.microsoftonline.com/12345678-1234-1234-1234-123456789abc/v2.0" - }, - "provisioningState": "Accepted" - }, - "serviceProviderProperties": { - "activeOperationId": "ea807c13-7e15-43d4-b760-69ef7e31d273", - "clusterServiceID": "", - "usesNewExternalAuthDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters/externalAuths" - } - }, "name": "default", "properties": { "claim": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/99-cosmosCompare-end-state/externalauth-default.json b/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/99-cosmosCompare-end-state/externalauth-default.json index bbc4ee4a739..5c2228bfffa 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/99-cosmosCompare-end-state/externalauth-default.json +++ b/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/99-cosmosCompare-end-state/externalauth-default.json @@ -8,80 +8,6 @@ "partitionKey": "a433a095-1277-44f1-8453-8d61a4d848c2", "properties": { "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/externalAuths/default", - "intermediateResourceDoc": { - "activeOperationId": "ea807c13-7e15-43d4-b760-69ef7e31d273", - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0/external_auth_config/external_auths/5fghjjqxvd", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/externalAuths/default", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/externalAuths/default", - "name": "default", - "properties": { - "claim": { - "mappings": { - "groups": { - "claim": "groups", - "prefix": "" - }, - "username": { - "claim": "sub", - "prefix": "prefix-", - "prefixPolicy": "Prefix" - } - }, - "validationRules": [] - }, - "clients": [ - { - "clientId": "87654321-4321-4321-4321-abcdefghijkl", - "component": { - "authClientNamespace": "openshift-console", - "name": "console" - }, - "extraScopes": [], - "type": "Confidential" - }, - { - "clientId": "87654321-4321-4321-4321-abcdefghijkl", - "component": { - "authClientNamespace": "openshift-console", - "name": "cli" - }, - "extraScopes": [], - "type": "Public" - } - ], - "issuer": { - "audiences": [ - "87654321-4321-4321-4321-abcdefghijkl" - ], - "ca": "", - "url": "https://login.microsoftonline.com/12345678-1234-1234-1234-123456789abc/v2.0" - }, - "provisioningState": "Accepted" - }, - "serviceProviderProperties": { - "activeOperationId": "ea807c13-7e15-43d4-b760-69ef7e31d273", - "clusterServiceID": "", - "usesNewExternalAuthDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters/externalAuths" - } - }, "name": "default", "properties": { "claim": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/00-load-initial-state/externalauth-default.json b/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/00-load-initial-state/externalauth-default.json index bbc4ee4a739..5c2228bfffa 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/00-load-initial-state/externalauth-default.json +++ b/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/00-load-initial-state/externalauth-default.json @@ -8,80 +8,6 @@ "partitionKey": "a433a095-1277-44f1-8453-8d61a4d848c2", "properties": { "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/externalAuths/default", - "intermediateResourceDoc": { - "activeOperationId": "ea807c13-7e15-43d4-b760-69ef7e31d273", - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0/external_auth_config/external_auths/5fghjjqxvd", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/externalAuths/default", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/externalAuths/default", - "name": "default", - "properties": { - "claim": { - "mappings": { - "groups": { - "claim": "groups", - "prefix": "" - }, - "username": { - "claim": "sub", - "prefix": "prefix-", - "prefixPolicy": "Prefix" - } - }, - "validationRules": [] - }, - "clients": [ - { - "clientId": "87654321-4321-4321-4321-abcdefghijkl", - "component": { - "authClientNamespace": "openshift-console", - "name": "console" - }, - "extraScopes": [], - "type": "Confidential" - }, - { - "clientId": "87654321-4321-4321-4321-abcdefghijkl", - "component": { - "authClientNamespace": "openshift-console", - "name": "cli" - }, - "extraScopes": [], - "type": "Public" - } - ], - "issuer": { - "audiences": [ - "87654321-4321-4321-4321-abcdefghijkl" - ], - "ca": "", - "url": "https://login.microsoftonline.com/12345678-1234-1234-1234-123456789abc/v2.0" - }, - "provisioningState": "Accepted" - }, - "serviceProviderProperties": { - "activeOperationId": "ea807c13-7e15-43d4-b760-69ef7e31d273", - "clusterServiceID": "", - "usesNewExternalAuthDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters/externalAuths" - } - }, "name": "default", "properties": { "claim": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/00-load-initial-state/externalauth-default.json b/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/00-load-initial-state/externalauth-default.json index 68d4039b496..cc074d1e815 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/00-load-initial-state/externalauth-default.json +++ b/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/00-load-initial-state/externalauth-default.json @@ -8,80 +8,6 @@ "partitionKey": "a433a095-1277-44f1-8453-8d61a4d848c2", "properties": { "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/externalAuths/default", - "intermediateResourceDoc": { - "activeOperationId": "ea807c13-7e15-43d4-b760-69ef7e31d273", - "internalId": "/api/clusters_mgmt/v1/clusters/swzpxg6nxn/external_auth_config/external_auths/5fghjjqxvd", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/externalAuths/default", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/externalAuths/default", - "name": "default", - "properties": { - "claim": { - "mappings": { - "groups": { - "claim": "groups", - "prefix": "" - }, - "username": { - "claim": "sub", - "prefix": "prefix-", - "prefixPolicy": "Prefix" - } - }, - "validationRules": [] - }, - "clients": [ - { - "clientId": "87654321-4321-4321-4321-abcdefghijkl", - "component": { - "authClientNamespace": "openshift-console", - "name": "console" - }, - "extraScopes": [], - "type": "Confidential" - }, - { - "clientId": "87654321-4321-4321-4321-abcdefghijkl", - "component": { - "authClientNamespace": "openshift-console", - "name": "cli" - }, - "extraScopes": [], - "type": "Public" - } - ], - "issuer": { - "audiences": [ - "87654321-4321-4321-4321-abcdefghijkl" - ], - "ca": "", - "url": "https://login.microsoftonline.com/12345678-1234-1234-1234-123456789abc/v2.0" - }, - "provisioningState": "Accepted" - }, - "serviceProviderProperties": { - "activeOperationId": "ea807c13-7e15-43d4-b760-69ef7e31d273", - "clusterServiceID": "", - "usesNewExternalAuthDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters/externalAuths" - } - }, "name": "default", "properties": { "claim": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/99-cosmosCompare-end-state/externalauth-default.json b/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/99-cosmosCompare-end-state/externalauth-default.json index 68d4039b496..cc074d1e815 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/99-cosmosCompare-end-state/externalauth-default.json +++ b/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/99-cosmosCompare-end-state/externalauth-default.json @@ -8,80 +8,6 @@ "partitionKey": "a433a095-1277-44f1-8453-8d61a4d848c2", "properties": { "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/externalAuths/default", - "intermediateResourceDoc": { - "activeOperationId": "ea807c13-7e15-43d4-b760-69ef7e31d273", - "internalId": "/api/clusters_mgmt/v1/clusters/swzpxg6nxn/external_auth_config/external_auths/5fghjjqxvd", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/externalAuths/default", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantpostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousprecinct/externalAuths/default", - "name": "default", - "properties": { - "claim": { - "mappings": { - "groups": { - "claim": "groups", - "prefix": "" - }, - "username": { - "claim": "sub", - "prefix": "prefix-", - "prefixPolicy": "Prefix" - } - }, - "validationRules": [] - }, - "clients": [ - { - "clientId": "87654321-4321-4321-4321-abcdefghijkl", - "component": { - "authClientNamespace": "openshift-console", - "name": "console" - }, - "extraScopes": [], - "type": "Confidential" - }, - { - "clientId": "87654321-4321-4321-4321-abcdefghijkl", - "component": { - "authClientNamespace": "openshift-console", - "name": "cli" - }, - "extraScopes": [], - "type": "Public" - } - ], - "issuer": { - "audiences": [ - "87654321-4321-4321-4321-abcdefghijkl" - ], - "ca": "", - "url": "https://login.microsoftonline.com/12345678-1234-1234-1234-123456789abc/v2.0" - }, - "provisioningState": "Accepted" - }, - "serviceProviderProperties": { - "activeOperationId": "ea807c13-7e15-43d4-b760-69ef7e31d273", - "clusterServiceID": "", - "usesNewExternalAuthDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters/externalAuths" - } - }, "name": "default", "properties": { "claim": { diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/basic-external-auth-auth.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/basic-external-auth-auth.json index b9d94194120..b065f76b829 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/basic-external-auth-auth.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/basic-external-auth-auth.json @@ -8,58 +8,6 @@ "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-basic-external-auth/external_auth_config/external_auths/2wbhxn4qwk", - "internalState": { - "internalAPI": { - "properties": { - "claim": { - "mappings": { - "groups": { - "claim": "groups", - "prefix": "" - }, - "username": { - "claim": "sub", - "prefix": "prefix-", - "prefixPolicy": "Prefix" - } - }, - "validationRules": [] - }, - "clients": [ - { - "clientId": "87654321-4321-4321-4321-abcdefghijkl", - "component": { - "authClientNamespace": "openshift-console", - "name": "console" - }, - "extraScopes": [], - "type": "Confidential" - }, - { - "clientId": "87654321-4321-4321-4321-abcdefghijkl", - "component": { - "authClientNamespace": "openshift-console", - "name": "cli" - }, - "extraScopes": [], - "type": "Public" - } - ], - "issuer": { - "audiences": [ - "87654321-4321-4321-4321-abcdefghijkl" - ], - "ca": "", - "url": "https://login.microsoftonline.com/12345678-1234-1234-1234-123456789abc/v2.0" - }, - "provisioningState": "" - }, - "serviceProviderProperties": { - "clusterServiceID": "", - "usesNewExternalAuthDeletionApproach": false - } - } - }, "provisioningState": "Succeeded", "resourceId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/basic-external-auth/externalAuths/basic-external-auth", "systemData": { diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/04-untypedListRecursive-resourcegroup/basic-external-auth-auth.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/04-untypedListRecursive-resourcegroup/basic-external-auth-auth.json index 97b9b5f68c5..02f5d830e9f 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/04-untypedListRecursive-resourcegroup/basic-external-auth-auth.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/04-untypedListRecursive-resourcegroup/basic-external-auth-auth.json @@ -8,58 +8,6 @@ "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-basic-external-auth/external_auth_config/external_auths/2wbhxn4qwk", - "internalState": { - "internalAPI": { - "properties": { - "claim": { - "mappings": { - "groups": { - "claim": "groups", - "prefix": "" - }, - "username": { - "claim": "sub", - "prefix": "prefix-", - "prefixPolicy": "Prefix" - } - }, - "validationRules": [] - }, - "clients": [ - { - "clientId": "87654321-4321-4321-4321-abcdefghijkl", - "component": { - "authClientNamespace": "openshift-console", - "name": "console" - }, - "extraScopes": [], - "type": "Confidential" - }, - { - "clientId": "87654321-4321-4321-4321-abcdefghijkl", - "component": { - "authClientNamespace": "openshift-console", - "name": "cli" - }, - "extraScopes": [], - "type": "Public" - } - ], - "issuer": { - "audiences": [ - "87654321-4321-4321-4321-abcdefghijkl" - ], - "ca": "", - "url": "https://login.microsoftonline.com/12345678-1234-1234-1234-123456789abc/v2.0" - }, - "provisioningState": "" - }, - "serviceProviderProperties": { - "clusterServiceID": "", - "usesNewExternalAuthDeletionApproach": false - } - } - }, "provisioningState": "Succeeded", "resourceId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/basic-external-auth/externalAuths/basic-external-auth", "systemData": { diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/basic-external-auth-auth.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/basic-external-auth-auth.json index 97b9b5f68c5..02f5d830e9f 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/basic-external-auth-auth.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/basic-external-auth-auth.json @@ -8,58 +8,6 @@ "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-basic-external-auth/external_auth_config/external_auths/2wbhxn4qwk", - "internalState": { - "internalAPI": { - "properties": { - "claim": { - "mappings": { - "groups": { - "claim": "groups", - "prefix": "" - }, - "username": { - "claim": "sub", - "prefix": "prefix-", - "prefixPolicy": "Prefix" - } - }, - "validationRules": [] - }, - "clients": [ - { - "clientId": "87654321-4321-4321-4321-abcdefghijkl", - "component": { - "authClientNamespace": "openshift-console", - "name": "console" - }, - "extraScopes": [], - "type": "Confidential" - }, - { - "clientId": "87654321-4321-4321-4321-abcdefghijkl", - "component": { - "authClientNamespace": "openshift-console", - "name": "cli" - }, - "extraScopes": [], - "type": "Public" - } - ], - "issuer": { - "audiences": [ - "87654321-4321-4321-4321-abcdefghijkl" - ], - "ca": "", - "url": "https://login.microsoftonline.com/12345678-1234-1234-1234-123456789abc/v2.0" - }, - "provisioningState": "" - }, - "serviceProviderProperties": { - "clusterServiceID": "", - "usesNewExternalAuthDeletionApproach": false - } - } - }, "provisioningState": "Succeeded", "resourceId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/basic-external-auth/externalAuths/basic-external-auth", "systemData": { diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/07-untypedListRecursive-resourcegroup-via-child/basic-external-auth-auth.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/07-untypedListRecursive-resourcegroup-via-child/basic-external-auth-auth.json index 97b9b5f68c5..02f5d830e9f 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/07-untypedListRecursive-resourcegroup-via-child/basic-external-auth-auth.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/07-untypedListRecursive-resourcegroup-via-child/basic-external-auth-auth.json @@ -8,58 +8,6 @@ "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-basic-external-auth/external_auth_config/external_auths/2wbhxn4qwk", - "internalState": { - "internalAPI": { - "properties": { - "claim": { - "mappings": { - "groups": { - "claim": "groups", - "prefix": "" - }, - "username": { - "claim": "sub", - "prefix": "prefix-", - "prefixPolicy": "Prefix" - } - }, - "validationRules": [] - }, - "clients": [ - { - "clientId": "87654321-4321-4321-4321-abcdefghijkl", - "component": { - "authClientNamespace": "openshift-console", - "name": "console" - }, - "extraScopes": [], - "type": "Confidential" - }, - { - "clientId": "87654321-4321-4321-4321-abcdefghijkl", - "component": { - "authClientNamespace": "openshift-console", - "name": "cli" - }, - "extraScopes": [], - "type": "Public" - } - ], - "issuer": { - "audiences": [ - "87654321-4321-4321-4321-abcdefghijkl" - ], - "ca": "", - "url": "https://login.microsoftonline.com/12345678-1234-1234-1234-123456789abc/v2.0" - }, - "provisioningState": "" - }, - "serviceProviderProperties": { - "clusterServiceID": "", - "usesNewExternalAuthDeletionApproach": false - } - } - }, "provisioningState": "Succeeded", "resourceId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/basic-external-auth/externalAuths/basic-external-auth", "systemData": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/create-current/06-cosmosCompare-ending-content/externalauth-default.json b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/create-current/06-cosmosCompare-ending-content/externalauth-default.json index 281f4b75859..146829aa535 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/create-current/06-cosmosCompare-ending-content/externalauth-default.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/create-current/06-cosmosCompare-ending-content/externalauth-default.json @@ -11,80 +11,6 @@ "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/externalAuths/default" }, "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/externalAuths/default", - "intermediateResourceDoc": { - "activeOperationId": "60df392c-42ba-4384-95b4-5e4601df2f3e", - "internalId": "/api/clusters_mgmt/v1/clusters/tqqtpctbpj/external_auth_config/external_auths/88m6lb2bbv", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/externalAuths/default", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/externalAuths/default", - "name": "default", - "properties": { - "claim": { - "mappings": { - "groups": { - "claim": "groups", - "prefix": "" - }, - "username": { - "claim": "sub", - "prefix": "prefix-", - "prefixPolicy": "Prefix" - } - }, - "validationRules": [] - }, - "clients": [ - { - "clientId": "87654321-4321-4321-4321-abcdefghijkl", - "component": { - "authClientNamespace": "openshift-console", - "name": "console" - }, - "extraScopes": [], - "type": "Confidential" - }, - { - "clientId": "87654321-4321-4321-4321-abcdefghijkl", - "component": { - "authClientNamespace": "openshift-console", - "name": "cli" - }, - "extraScopes": [], - "type": "Public" - } - ], - "issuer": { - "audiences": [ - "87654321-4321-4321-4321-abcdefghijkl" - ], - "ca": "", - "url": "https://login.microsoftonline.com/12345678-1234-1234-1234-123456789abc/v2.0" - }, - "provisioningState": "Accepted" - }, - "serviceProviderProperties": { - "activeOperationId": "60df392c-42ba-4384-95b4-5e4601df2f3e", - "clusterServiceID": "", - "usesNewExternalAuthDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters/externalAuths" - } - }, "name": "default", "properties": { "claim": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/01-load-old-data/externalauth-default.json b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/01-load-old-data/externalauth-default.json index 52a37b8dec9..d7f83ce6847 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/01-load-old-data/externalauth-default.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/01-load-old-data/externalauth-default.json @@ -8,80 +8,6 @@ "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/externalAuths/default", - "intermediateResourceDoc": { - "activeOperationId": "5dce3cac-e09b-4ef5-803c-cb8f17b3a552", - "internalId": "/api/clusters_mgmt/v1/clusters/m6bpjxtlqf/external_auth_config/external_auths/zt59xrx22b", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/externalAuths/default", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/externalAuths/default", - "name": "default", - "properties": { - "claim": { - "mappings": { - "groups": { - "claim": "groups", - "prefix": "" - }, - "username": { - "claim": "sub", - "prefix": "prefix-", - "prefixPolicy": "Prefix" - } - }, - "validationRules": [] - }, - "clients": [ - { - "clientId": "87654321-4321-4321-4321-abcdefghijkl", - "component": { - "authClientNamespace": "openshift-console", - "name": "console" - }, - "extraScopes": [], - "type": "Confidential" - }, - { - "clientId": "87654321-4321-4321-4321-abcdefghijkl", - "component": { - "authClientNamespace": "openshift-console", - "name": "cli" - }, - "extraScopes": [], - "type": "Public" - } - ], - "issuer": { - "audiences": [ - "87654321-4321-4321-4321-abcdefghijkl" - ], - "ca": "", - "url": "https://login.microsoftonline.com/12345678-1234-1234-1234-123456789abc/v2.0" - }, - "provisioningState": "Accepted" - }, - "serviceProviderProperties": { - "activeOperationId": "5dce3cac-e09b-4ef5-803c-cb8f17b3a552", - "clusterServiceID": "", - "usesNewExternalAuthDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters/externalAuths" - } - }, "name": "default", "properties": { "claim": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/09-cosmosCompare-confirm-update/externalauth-default.json b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/09-cosmosCompare-confirm-update/externalauth-default.json index be715af43ce..93adbfed2ae 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/09-cosmosCompare-confirm-update/externalauth-default.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/09-cosmosCompare-confirm-update/externalauth-default.json @@ -11,80 +11,6 @@ "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/externalAuths/default" }, "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/externalAuths/default", - "intermediateResourceDoc": { - "activeOperationId": "d99a71e0-9237-4ae2-8617-e76035e2bcd4", - "internalId": "/api/clusters_mgmt/v1/clusters/m6bpjxtlqf/external_auth_config/external_auths/zt59xrx22b", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/externalAuths/default", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/externalAuths/default", - "name": "default", - "properties": { - "claim": { - "mappings": { - "groups": { - "claim": "groups2", - "prefix": "" - }, - "username": { - "claim": "sub", - "prefix": "prefix-", - "prefixPolicy": "Prefix" - } - }, - "validationRules": [] - }, - "clients": [ - { - "clientId": "87654321-4321-4321-4321-abcdefghijkl", - "component": { - "authClientNamespace": "openshift-console", - "name": "console" - }, - "extraScopes": [], - "type": "Confidential" - }, - { - "clientId": "87654321-4321-4321-4321-abcdefghijkl", - "component": { - "authClientNamespace": "openshift-console", - "name": "cli" - }, - "extraScopes": [], - "type": "Public" - } - ], - "issuer": { - "audiences": [ - "87654321-4321-4321-4321-abcdefghijkl" - ], - "ca": "", - "url": "https://login.microsoftonline.com/12345678-1234-1234-1234-123456789abc/v2.0" - }, - "provisioningState": "Accepted" - }, - "serviceProviderProperties": { - "activeOperationId": "d99a71e0-9237-4ae2-8617-e76035e2bcd4", - "clusterServiceID": "", - "usesNewExternalAuthDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters/externalAuths" - } - }, "name": "default", "properties": { "claim": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/externalauth-default.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/externalauth-default.json index 52a37b8dec9..d7f83ce6847 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/externalauth-default.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/externalauth-default.json @@ -8,80 +8,6 @@ "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/externalAuths/default", - "intermediateResourceDoc": { - "activeOperationId": "5dce3cac-e09b-4ef5-803c-cb8f17b3a552", - "internalId": "/api/clusters_mgmt/v1/clusters/m6bpjxtlqf/external_auth_config/external_auths/zt59xrx22b", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/externalAuths/default", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/externalAuths/default", - "name": "default", - "properties": { - "claim": { - "mappings": { - "groups": { - "claim": "groups", - "prefix": "" - }, - "username": { - "claim": "sub", - "prefix": "prefix-", - "prefixPolicy": "Prefix" - } - }, - "validationRules": [] - }, - "clients": [ - { - "clientId": "87654321-4321-4321-4321-abcdefghijkl", - "component": { - "authClientNamespace": "openshift-console", - "name": "console" - }, - "extraScopes": [], - "type": "Confidential" - }, - { - "clientId": "87654321-4321-4321-4321-abcdefghijkl", - "component": { - "authClientNamespace": "openshift-console", - "name": "cli" - }, - "extraScopes": [], - "type": "Public" - } - ], - "issuer": { - "audiences": [ - "87654321-4321-4321-4321-abcdefghijkl" - ], - "ca": "", - "url": "https://login.microsoftonline.com/12345678-1234-1234-1234-123456789abc/v2.0" - }, - "provisioningState": "Accepted" - }, - "serviceProviderProperties": { - "activeOperationId": "5dce3cac-e09b-4ef5-803c-cb8f17b3a552", - "clusterServiceID": "", - "usesNewExternalAuthDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters/externalAuths" - } - }, "name": "default", "properties": { "claim": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/externalauth-default.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/externalauth-default.json index 6fb75fc52cb..53329bd38d8 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/externalauth-default.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/externalauth-default.json @@ -11,80 +11,6 @@ "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/externalAuths/default" }, "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/externalAuths/default", - "intermediateResourceDoc": { - "activeOperationId": "5dce3cac-e09b-4ef5-803c-cb8f17b3a552", - "internalId": "/api/clusters_mgmt/v1/clusters/m6bpjxtlqf/external_auth_config/external_auths/zt59xrx22b", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/externalAuths/default", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/externalAuths/default", - "name": "default", - "properties": { - "claim": { - "mappings": { - "groups": { - "claim": "groups", - "prefix": "" - }, - "username": { - "claim": "sub", - "prefix": "prefix-", - "prefixPolicy": "Prefix" - } - }, - "validationRules": [] - }, - "clients": [ - { - "clientId": "87654321-4321-4321-4321-abcdefghijkl", - "component": { - "authClientNamespace": "openshift-console", - "name": "console" - }, - "extraScopes": [], - "type": "Confidential" - }, - { - "clientId": "87654321-4321-4321-4321-abcdefghijkl", - "component": { - "authClientNamespace": "openshift-console", - "name": "cli" - }, - "extraScopes": [], - "type": "Public" - } - ], - "issuer": { - "audiences": [ - "87654321-4321-4321-4321-abcdefghijkl" - ], - "ca": "", - "url": "https://login.microsoftonline.com/12345678-1234-1234-1234-123456789abc/v2.0" - }, - "provisioningState": "Accepted" - }, - "serviceProviderProperties": { - "activeOperationId": "5dce3cac-e09b-4ef5-803c-cb8f17b3a552", - "clusterServiceID": "", - "usesNewExternalAuthDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters/externalAuths" - } - }, "name": "default", "properties": { "claim": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/externalauth-default.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/externalauth-default.json index 3d9cf84cf36..029aae3b35d 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/externalauth-default.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/externalauth-default.json @@ -8,80 +8,6 @@ "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/externalAuths/default", - "intermediateResourceDoc": { - "activeOperationId": "5dce3cac-e09b-4ef5-803c-cb8f17b3a552", - "internalId": "/api/clusters_mgmt/v1/clusters/9p2sk955gj/external_auth_config/external_auths/zt59xrx22b", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/externalAuths/default", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/externalAuths/default", - "name": "default", - "properties": { - "claim": { - "mappings": { - "groups": { - "claim": "groups", - "prefix": "" - }, - "username": { - "claim": "sub", - "prefix": "prefix-", - "prefixPolicy": "Prefix" - } - }, - "validationRules": [] - }, - "clients": [ - { - "clientId": "87654321-4321-4321-4321-abcdefghijkl", - "component": { - "authClientNamespace": "openshift-console", - "name": "console" - }, - "extraScopes": [], - "type": "Confidential" - }, - { - "clientId": "87654321-4321-4321-4321-abcdefghijkl", - "component": { - "authClientNamespace": "openshift-console", - "name": "cli" - }, - "extraScopes": [], - "type": "Public" - } - ], - "issuer": { - "audiences": [ - "87654321-4321-4321-4321-abcdefghijkl" - ], - "ca": "", - "url": "https://login.microsoftonline.com/12345678-1234-1234-1234-123456789abc/v2.0" - }, - "provisioningState": "Accepted" - }, - "serviceProviderProperties": { - "activeOperationId": "5dce3cac-e09b-4ef5-803c-cb8f17b3a552", - "clusterServiceID": "", - "usesNewExternalAuthDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters/externalAuths" - } - }, "name": "default", "properties": { "claim": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/externalauth-default.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/externalauth-default.json index a1bb164a2ac..7c106435002 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/externalauth-default.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/externalauth-default.json @@ -7,80 +7,6 @@ "resourceID": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/externalAuths/default" }, "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/externalAuths/default", - "intermediateResourceDoc": { - "activeOperationId": "117a9956-c10f-493d-a435-fcc43ab90896", - "internalId": "/api/clusters_mgmt/v1/clusters/9p2sk955gj/external_auth_config/external_auths/zt59xrx22b", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/externalAuths/default", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/externalAuths/default", - "name": "default", - "properties": { - "claim": { - "mappings": { - "groups": { - "claim": "groups2", - "prefix": "" - }, - "username": { - "claim": "sub", - "prefix": "prefix-", - "prefixPolicy": "Prefix" - } - }, - "validationRules": [] - }, - "clients": [ - { - "clientId": "87654321-4321-4321-4321-abcdefghijkl", - "component": { - "authClientNamespace": "openshift-console", - "name": "console" - }, - "extraScopes": [], - "type": "Confidential" - }, - { - "clientId": "87654321-4321-4321-4321-abcdefghijkl", - "component": { - "authClientNamespace": "openshift-console", - "name": "cli" - }, - "extraScopes": [], - "type": "Public" - } - ], - "issuer": { - "audiences": [ - "87654321-4321-4321-4321-abcdefghijkl" - ], - "ca": "", - "url": "https://login.microsoftonline.com/12345678-1234-1234-1234-123456789abc/v2.0" - }, - "provisioningState": "Accepted" - }, - "serviceProviderProperties": { - "activeOperationId": "117a9956-c10f-493d-a435-fcc43ab90896", - "clusterServiceID": "", - "usesNewExternalAuthDeletionApproach": false - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters/externalAuths" - } - }, "name": "default", "properties": { "claim": { From 1f536b198b026291165ed8f803e000e716d6f0a8 Mon Sep 17 00:00:00 2001 From: David Eads Date: Mon, 11 May 2026 11:51:57 -0400 Subject: [PATCH 7/7] switch to using generic storage for externalauths Co-Authored-By: Claude Opus 4.7 (1M context) --- internal/database/convert_any.go | 6 - internal/database/convert_cluster_test.go | 66 ---------- .../convert_defaults_consistency_test.go | 32 +++-- internal/database/convert_externalauth.go | 72 ----------- .../database/convert_externalauth_test.go | 116 ------------------ internal/database/crud_hcpcluster.go | 4 +- internal/database/global_lister.go | 2 +- internal/database/transaction.go | 2 +- internal/database/types_externalauth.go | 36 ------ .../databasetesting/mock_resources_crud.go | 4 +- .../mock_resources_db_client.go | 4 +- .../mock_resources_global_lister.go | 2 +- 12 files changed, 24 insertions(+), 322 deletions(-) delete mode 100644 internal/database/convert_externalauth.go delete mode 100644 internal/database/convert_externalauth_test.go delete mode 100644 internal/database/types_externalauth.go diff --git a/internal/database/convert_any.go b/internal/database/convert_any.go index db2a186dca1..b05ee4fd028 100644 --- a/internal/database/convert_any.go +++ b/internal/database/convert_any.go @@ -20,7 +20,6 @@ import ( azcorearm "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - "github.com/Azure/ARO-HCP/internal/api" "github.com/Azure/ARO-HCP/internal/api/fleet" "github.com/Azure/ARO-HCP/internal/api/kubeapplier" "github.com/Azure/ARO-HCP/internal/utils" @@ -30,9 +29,6 @@ func CosmosToInternal[InternalAPIType, CosmosAPIType any](obj *CosmosAPIType) (* var internalObj any var err error switch cosmosObj := any(obj).(type) { - case *ExternalAuth: - internalObj, err = CosmosToInternalExternalAuth(cosmosObj) - case *TypedDocument: var expectedObj InternalAPIType switch castObj := any(expectedObj).(type) { @@ -80,8 +76,6 @@ func InternalToCosmos[InternalAPIType, CosmosAPIType any](obj *InternalAPIType) var cosmosObj any var err error switch internalObj := any(obj).(type) { - case *api.HCPOpenShiftClusterExternalAuth: - cosmosObj, err = InternalToCosmosExternalAuth(internalObj) case *fleet.Stamp: cosmosObj, err = InternalToCosmosFleet(internalObj) diff --git a/internal/database/convert_cluster_test.go b/internal/database/convert_cluster_test.go index a3d64727f5a..00b9df27013 100644 --- a/internal/database/convert_cluster_test.go +++ b/internal/database/convert_cluster_test.go @@ -15,77 +15,11 @@ package database import ( - "bytes" - "encoding/json" - "math/rand" "testing" - "github.com/google/go-cmp/cmp" - "github.com/stretchr/testify/require" - - "k8s.io/apimachinery/pkg/api/equality" - - "sigs.k8s.io/randfill" - "github.com/Azure/ARO-HCP/internal/api" ) -// fuzzerFor can randomly populate api objects that are destined for version. -func fuzzerFor(funcs []interface{}, src rand.Source) *randfill.Filler { - f := randfill.New().NilChance(.5).NumElements(0, 1) - if src != nil { - f.RandSource(src) - } - f.Funcs(funcs...) - return f -} - -func roundTripInternalToCosmosToInternal[InternalAPIType, CosmosAPIType any](t *testing.T, original *InternalAPIType) { - originalBeforeJSON, _ := json.MarshalIndent(original, "", " ") - - intermediate, err := InternalToCosmos[InternalAPIType, CosmosAPIType](original) - require.NoError(t, err) - intermediateBeforeJSON, _ := json.MarshalIndent(intermediate, "", " ") - - final, err := CosmosToInternal[InternalAPIType, CosmosAPIType](intermediate) - require.NoError(t, err) - - // this value is set during conversion, so we need clear for comparison - switch cast := any(final).(type) { - case *api.HCPOpenShiftCluster: - cast.ExistingCosmosUID = "" - case *api.HCPOpenShiftClusterNodePool: - cast.ExistingCosmosUID = "" - case *api.HCPOpenShiftClusterExternalAuth: - cast.ExistingCosmosUID = "" - } - //finalJSON, _ := json.MarshalIndent(final, "", " ") - - // we compare the JSON here because many of these types have private fields that cannot be introspected - if !equality.Semantic.DeepEqual(original, final) { - //t.Logf("original\n%s", string(originalBeforeJSON)) - //t.Logf("intermediate\n%s", string(intermediateBeforeJSON)) - //t.Logf("final\n%s", string(finalJSON)) - t.Errorf("Round trip failed: %v", cmp.Diff(original, final, api.CmpDiffOptions...)) - } - - // now check to be sure we didn't mutate the originals. The copies still aren't deep, but at least we didn't nuke the inputs - originalAfterJSON, _ := json.MarshalIndent(original, "", " ") - if !bytes.Equal(originalBeforeJSON, originalAfterJSON) { - t.Logf("original\n%s", string(originalBeforeJSON)) - t.Logf("originalAfter\n%s", string(originalAfterJSON)) - t.Errorf("original was modified: %v", cmp.Diff(originalBeforeJSON, originalAfterJSON)) - } - - // now check to be sure we didn't mutate the originals. The copies still aren't deep, but at least we didn't nuke the inputs - intermediateAfterJSON, _ := json.MarshalIndent(intermediate, "", " ") - if !bytes.Equal(intermediateBeforeJSON, intermediateAfterJSON) { - t.Logf("intermediate\n%s", string(intermediateBeforeJSON)) - t.Logf("intermediateAfter\n%s", string(intermediateAfterJSON)) - t.Errorf("intermediate was modified: %v", cmp.Diff(intermediateBeforeJSON, intermediateAfterJSON)) - } -} - func TestClusterEnsureDefaults(t *testing.T) { tests := []struct { name string diff --git a/internal/database/convert_defaults_consistency_test.go b/internal/database/convert_defaults_consistency_test.go index 23e053f5e15..80c69367f1d 100644 --- a/internal/database/convert_defaults_consistency_test.go +++ b/internal/database/convert_defaults_consistency_test.go @@ -478,7 +478,7 @@ func TestEnsureDefaultsConsistencyExternalAuth(t *testing.T) { }) } -// TestPreExistingDataExternalAuth verifies that CosmosToInternalExternalAuth +// TestPreExistingDataExternalAuth verifies that CosmosGenericToInternal // applies canonical defaults when reading a Cosmos document that predates the // introduction of the PrefixPolicy field. func TestPreExistingDataExternalAuth(t *testing.T) { @@ -487,31 +487,29 @@ func TestPreExistingDataExternalAuth(t *testing.T) { )) internalID := api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/test-cluster/external_auth_config/external_auths/default")) - preExistingDoc := &ExternalAuth{ + preExistingDoc := &GenericDocument[api.HCPOpenShiftClusterExternalAuth]{ TypedDocument: TypedDocument{ BaseDocument: BaseDocument{ID: "test-doc-id"}, ResourceID: resourceID, }, - ExternalAuthProperties: ExternalAuthProperties{ - HCPOpenShiftClusterExternalAuth: api.HCPOpenShiftClusterExternalAuth{ - // PrefixPolicy is intentionally zero-valued to simulate - // a pre-existing document that predates the field. - CosmosMetadata: arm.CosmosMetadata{ - ResourceID: resourceID, - }, - Properties: api.HCPOpenShiftClusterExternalAuthProperties{ - ProvisioningState: arm.ProvisioningStateSucceeded, - }, - ServiceProviderProperties: api.HCPOpenShiftClusterExternalAuthServiceProviderProperties{ - ClusterServiceID: &internalID, - }, + Content: api.HCPOpenShiftClusterExternalAuth{ + // PrefixPolicy is intentionally zero-valued to simulate + // a pre-existing document that predates the field. + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: resourceID, + }, + Properties: api.HCPOpenShiftClusterExternalAuthProperties{ + ProvisioningState: arm.ProvisioningStateSucceeded, + }, + ServiceProviderProperties: api.HCPOpenShiftClusterExternalAuthServiceProviderProperties{ + ClusterServiceID: &internalID, }, }, } - internalExternalAuth, err := CosmosToInternalExternalAuth(preExistingDoc) + internalExternalAuth, err := CosmosGenericToInternal(preExistingDoc) if err != nil { - t.Fatalf("CosmosToInternalExternalAuth failed: %v", err) + t.Fatalf("CosmosGenericToInternal failed: %v", err) } if internalExternalAuth.Properties.Claim.Mappings.Username.PrefixPolicy != api.UsernameClaimPrefixPolicyNone { diff --git a/internal/database/convert_externalauth.go b/internal/database/convert_externalauth.go deleted file mode 100644 index 2681e9e885e..00000000000 --- a/internal/database/convert_externalauth.go +++ /dev/null @@ -1,72 +0,0 @@ -// Copyright 2025 Microsoft Corporation -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package database - -import ( - "fmt" - "strings" - - "github.com/Azure/ARO-HCP/internal/api" -) - -func InternalToCosmosExternalAuth(internalObj *api.HCPOpenShiftClusterExternalAuth) (*ExternalAuth, error) { - if internalObj == nil { - return nil, nil - } - - // CosmosMetadata.ResourceID is the canonical identifier for cosmos-side - // concerns (partitioning, document UID, resource-type indexing). Use it - // instead of the ProxyResource.ID, which is an ARM-surface concern. - cosmosResourceID := internalObj.GetCosmosData().ResourceID - if cosmosResourceID == nil { - return nil, fmt.Errorf("internalObj is missing CosmosMetadata.ResourceID") - } - cosmosObj := &ExternalAuth{ - TypedDocument: TypedDocument{ - BaseDocument: BaseDocument{ - ID: internalObj.GetCosmosData().GetCosmosUID(), - }, - PartitionKey: strings.ToLower(cosmosResourceID.SubscriptionID), - ResourceID: cosmosResourceID, - ResourceType: cosmosResourceID.ResourceType.String(), - }, - ExternalAuthProperties: ExternalAuthProperties{ - HCPOpenShiftClusterExternalAuth: *internalObj, - }, - } - - return cosmosObj, nil -} - -func CosmosToInternalExternalAuth(cosmosObj *ExternalAuth) (*api.HCPOpenShiftClusterExternalAuth, error) { - if cosmosObj == nil { - return nil, nil - } - - internalObj := cosmosObj.DeepCopy() - internalObj.ExistingCosmosUID = cosmosObj.ID - internalObj.SetEtag(cosmosObj.CosmosETag) - if internalObj.GetResourceID() == nil { - if cosmosObj.ResourceID != nil { - internalObj.SetResourceID(cosmosObj.ResourceID) - } else { - return nil, fmt.Errorf("internalObj is missing a resourceID: %T: %q", cosmosObj, cosmosObj.ID) - } - } - - internalObj.EnsureDefaults() - - return internalObj, nil -} diff --git a/internal/database/convert_externalauth_test.go b/internal/database/convert_externalauth_test.go deleted file mode 100644 index 9d7b21fa805..00000000000 --- a/internal/database/convert_externalauth_test.go +++ /dev/null @@ -1,116 +0,0 @@ -// Copyright 2025 Microsoft Corporation -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package database - -import ( - "math/rand" - "strings" - "testing" - - "github.com/stretchr/testify/require" - - "sigs.k8s.io/randfill" - - "github.com/Azure/azure-sdk-for-go/sdk/azcore" - azcorearm "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" - - "github.com/Azure/ARO-HCP/internal/api" - "github.com/Azure/ARO-HCP/internal/api/arm" -) - -func TestRoundTripExternalAuthInternalCosmosInternal(t *testing.T) { - seed := rand.Int63() - t.Logf("seed: %d", seed) - - fuzzer := fuzzerFor([]interface{}{ - func(j *azcorearm.ResourceID, c randfill.Continue) { - *j = *api.Must(azcorearm.ParseResourceID("/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myRg")) - }, - func(j *arm.Resource, c randfill.Continue) { - c.FillNoCustom(j) - j.ID = api.Must(azcorearm.ParseResourceID("/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/change-channel")) - j.Name = "change-channel" - j.Type = "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - }, - func(j *api.HCPOpenShiftClusterExternalAuthServiceProviderProperties, c randfill.Continue) { - c.FillNoCustom(j) - if j == nil { - return - } - clusterID := "r" + strings.ReplaceAll(c.String(10), "/", "-") - externalAuthID := strings.ReplaceAll(c.String(10), "/", "-") - foo := api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/" + clusterID + "/external_auth_config/external_auths/" + externalAuthID)) - j.ClusterServiceID = &foo - }, - func(j *api.CosmosMetadata, c randfill.Continue) { - c.FillNoCustom(j) - j.ResourceID = api.Must(azcorearm.ParseResourceID("/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myRg")) - j.ExistingCosmosUID = "" - j.CosmosETag = "" - }, - func(j *api.HCPOpenShiftClusterExternalAuth, c randfill.Continue) { - c.FillNoCustom(j) - if j == nil { - return - } - // Canonical defaults are applied on Cosmos read, so ensure - // defaulted fields are never zero during round-trip testing. - if len(j.Properties.Claim.Mappings.Username.PrefixPolicy) == 0 { - j.Properties.Claim.Mappings.Username.PrefixPolicy = api.UsernameClaimPrefixPolicyNone - } - }, - func(j *arm.ManagedServiceIdentity, c randfill.Continue) { - c.FillNoCustom(j) - - // we only round trip keys, so only fill in keys - if j != nil && j.UserAssignedIdentities != nil { - for k := range j.UserAssignedIdentities { - j.UserAssignedIdentities[k] = nil - } - } - }, - }, rand.NewSource(seed)) - - // Try a few times, since runTest uses random values. - for i := 0; i < 20; i++ { - original := &api.HCPOpenShiftClusterExternalAuth{} - fuzzer.Fill(original) - roundTripInternalToCosmosToInternal[api.HCPOpenShiftClusterExternalAuth, ExternalAuth](t, original) - } -} - -func TestCosmosToInternalExternalAuthPreservesETag(t *testing.T) { - expectedETag := azcore.ETag("test-etag-value-12345") - resourceID := api.Must(azcorearm.ParseResourceID("/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/rg/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/my-cluster")) - - cosmosObj := &ExternalAuth{ - TypedDocument: TypedDocument{ - BaseDocument: BaseDocument{ - CosmosETag: expectedETag, - }, - }, - ExternalAuthProperties: ExternalAuthProperties{ - HCPOpenShiftClusterExternalAuth: api.HCPOpenShiftClusterExternalAuth{ - CosmosMetadata: arm.CosmosMetadata{ - ResourceID: resourceID, - }, - }, - }, - } - - internalObj, err := CosmosToInternalExternalAuth(cosmosObj) - require.NoError(t, err) - require.Equal(t, expectedETag, internalObj.GetCosmosData().CosmosETag) -} diff --git a/internal/database/crud_hcpcluster.go b/internal/database/crud_hcpcluster.go index 426d82376d7..16071a5257f 100644 --- a/internal/database/crud_hcpcluster.go +++ b/internal/database/crud_hcpcluster.go @@ -159,7 +159,7 @@ func (h *hcpClusterCRUD) ExternalAuth(hcpClusterName string) ExternalAuthsCRUD { hcpClusterName))) return &externalAuthCRUD{ - nestedCosmosResourceCRUD: NewCosmosResourceCRUD[api.HCPOpenShiftClusterExternalAuth, ExternalAuth]( + nestedCosmosResourceCRUD: NewCosmosResourceCRUD[api.HCPOpenShiftClusterExternalAuth, GenericDocument[api.HCPOpenShiftClusterExternalAuth]]( h.containerClient, parentResourceID, api.ExternalAuthResourceType, @@ -213,7 +213,7 @@ func (h *hcpClusterCRUD) ManagementClusterContents(hcpClusterName string) Manage } type externalAuthCRUD struct { - *nestedCosmosResourceCRUD[api.HCPOpenShiftClusterExternalAuth, ExternalAuth] + *nestedCosmosResourceCRUD[api.HCPOpenShiftClusterExternalAuth, GenericDocument[api.HCPOpenShiftClusterExternalAuth]] } func (h *externalAuthCRUD) Controllers(externalAuthName string) ResourceCRUD[api.Controller] { diff --git a/internal/database/global_lister.go b/internal/database/global_lister.go index 90bcf63ebe0..3d655f701c6 100644 --- a/internal/database/global_lister.go +++ b/internal/database/global_lister.go @@ -86,7 +86,7 @@ func (g *cosmosResourcesGlobalListers) NodePools() GlobalLister[api.HCPOpenShift } func (g *cosmosResourcesGlobalListers) ExternalAuths() GlobalLister[api.HCPOpenShiftClusterExternalAuth] { - return &cosmosGlobalLister[api.HCPOpenShiftClusterExternalAuth, ExternalAuth]{ + return &cosmosGlobalLister[api.HCPOpenShiftClusterExternalAuth, GenericDocument[api.HCPOpenShiftClusterExternalAuth]]{ containerClient: g.resources, resourceType: api.ExternalAuthResourceType, } diff --git a/internal/database/transaction.go b/internal/database/transaction.go index f9bc9004c1f..775615799be 100644 --- a/internal/database/transaction.go +++ b/internal/database/transaction.go @@ -210,7 +210,7 @@ func (r *cosmosDBTransactionResult) GetItem(cosmosUID string) (any, error) { case strings.ToLower(api.NodePoolResourceType.String()): return getCastResult[api.HCPOpenShiftClusterNodePool, GenericDocument[api.HCPOpenShiftClusterNodePool]](r, cosmosUID) case strings.ToLower(api.ExternalAuthResourceType.String()): - return getCastResult[api.HCPOpenShiftClusterExternalAuth, ExternalAuth](r, cosmosUID) + return getCastResult[api.HCPOpenShiftClusterExternalAuth, GenericDocument[api.HCPOpenShiftClusterExternalAuth]](r, cosmosUID) default: return nil, fmt.Errorf("unknown resource type '%s'", typedDoc.ResourceType) } diff --git a/internal/database/types_externalauth.go b/internal/database/types_externalauth.go deleted file mode 100644 index 65ddfcfbfd9..00000000000 --- a/internal/database/types_externalauth.go +++ /dev/null @@ -1,36 +0,0 @@ -// Copyright 2025 Microsoft Corporation -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package database - -import ( - "github.com/Azure/ARO-HCP/internal/api" -) - -type ExternalAuth struct { - TypedDocument `json:",inline"` - - ExternalAuthProperties `json:"properties"` -} - -type ExternalAuthProperties struct { - // HCPOpenShiftClusterExternalAuth is inlined directly. The on-disk shape now matches - // GenericDocument[api.HCPOpenShiftClusterExternalAuth] and ExternalAuth only exists as a - // distinct type while the migration to that generic surface completes. - api.HCPOpenShiftClusterExternalAuth `json:",inline"` -} - -func (o *ExternalAuth) GetTypedDocument() *TypedDocument { - return &o.TypedDocument -} diff --git a/internal/databasetesting/mock_resources_crud.go b/internal/databasetesting/mock_resources_crud.go index e8969a15070..7834873b2c8 100644 --- a/internal/databasetesting/mock_resources_crud.go +++ b/internal/databasetesting/mock_resources_crud.go @@ -467,7 +467,7 @@ func (m *mockHCPClusterCRUD) ExternalAuth(hcpClusterName string) database.Extern hcpClusterName))) return &mockExternalAuthCRUD{ - mockResourceCRUD: newMockResourceCRUD[api.HCPOpenShiftClusterExternalAuth, database.ExternalAuth]( + mockResourceCRUD: newMockResourceCRUD[api.HCPOpenShiftClusterExternalAuth, database.GenericDocument[api.HCPOpenShiftClusterExternalAuth]]( m.client, parentResourceID, api.ExternalAuthResourceType, @@ -549,7 +549,7 @@ var _ database.NodePoolsCRUD = &mockNodePoolsCRUD{} // mockExternalAuthCRUD implements database.ExternalAuthsCRUD. type mockExternalAuthCRUD struct { - *mockResourceCRUD[api.HCPOpenShiftClusterExternalAuth, database.ExternalAuth] + *mockResourceCRUD[api.HCPOpenShiftClusterExternalAuth, database.GenericDocument[api.HCPOpenShiftClusterExternalAuth]] } func (m *mockExternalAuthCRUD) Controllers(externalAuthName string) database.ResourceCRUD[api.Controller] { diff --git a/internal/databasetesting/mock_resources_db_client.go b/internal/databasetesting/mock_resources_db_client.go index fb9eb79cb1b..10c0dbbf5a6 100644 --- a/internal/databasetesting/mock_resources_db_client.go +++ b/internal/databasetesting/mock_resources_db_client.go @@ -377,11 +377,11 @@ func (r *mockTransactionResult) GetItem(cosmosUID string) (any, error) { } return database.CosmosGenericToInternal(&cosmosObj) case strings.ToLower(api.ExternalAuthResourceType.String()): - var cosmosObj database.ExternalAuth + var cosmosObj database.GenericDocument[api.HCPOpenShiftClusterExternalAuth] if err := json.Unmarshal(data, &cosmosObj); err != nil { return nil, err } - return database.CosmosToInternalExternalAuth(&cosmosObj) + return database.CosmosGenericToInternal(&cosmosObj) default: return nil, fmt.Errorf("unknown resource type '%s'", typedDoc.ResourceType) } diff --git a/internal/databasetesting/mock_resources_global_lister.go b/internal/databasetesting/mock_resources_global_lister.go index 93b2d901cb6..b7bedca5afc 100644 --- a/internal/databasetesting/mock_resources_global_lister.go +++ b/internal/databasetesting/mock_resources_global_lister.go @@ -52,7 +52,7 @@ func (g *mockResourcesGlobalListers) NodePools() database.GlobalLister[api.HCPOp } func (g *mockResourcesGlobalListers) ExternalAuths() database.GlobalLister[api.HCPOpenShiftClusterExternalAuth] { - return &mockTypedGlobalLister[api.HCPOpenShiftClusterExternalAuth, database.ExternalAuth]{ + return &mockTypedGlobalLister[api.HCPOpenShiftClusterExternalAuth, database.GenericDocument[api.HCPOpenShiftClusterExternalAuth]]{ client: g.client, resourceType: api.ExternalAuthResourceType, }