From a30ed22576b24683871c430eff5a73aa9f1c7d1b Mon Sep 17 00:00:00 2001 From: David Eads Date: Tue, 20 Jan 2026 07:53:53 -0500 Subject: [PATCH 1/3] Stop using the old random cosmosUID and rely on new format Once https://github.com/Azure/ARO-HCP/commit/c23fb55071eb5cb0e4925fd3e3a405c87fa87d40 makes it to production, we can rely on the new cosmosUID being predictable based on resourceID. By doing this we're able to derive resourceID which is important elsewhere. Also eliminates cosmosUID since it is an unnessary field to store since it is always derivable. --- frontend/pkg/frontend/cluster.go | 3 +- frontend/pkg/frontend/external_auth.go | 3 +- frontend/pkg/frontend/node_pool.go | 3 +- internal/api/arm/subscription.go | 11 +-- internal/api/types_cluster.go | 12 +-- internal/api/types_controller.go | 2 - internal/api/types_externalauth.go | 12 +-- internal/api/types_nodepool.go | 12 +-- internal/api/types_operation.go | 14 +--- .../v20240610preview/conversion_fuzz_test.go | 6 -- .../v20251223preview/conversion_fuzz_test.go | 6 -- internal/database/convert_cluster.go | 2 - internal/database/convert_cluster_test.go | 2 - internal/database/convert_controller.go | 18 ---- internal/database/convert_externalauth.go | 2 - .../database/convert_externalauth_test.go | 2 - internal/database/convert_nodepool.go | 2 - internal/database/convert_nodepool_test.go | 2 - internal/database/convert_operation.go | 2 - internal/database/crud_helpers.go | 84 +------------------ internal/validation/validate_cluster.go | 9 -- internal/validation/validate_externalauth.go | 9 -- internal/validation/validate_nodepools.go | 9 -- .../per_resource_crud.go | 3 - 24 files changed, 9 insertions(+), 221 deletions(-) diff --git a/frontend/pkg/frontend/cluster.go b/frontend/pkg/frontend/cluster.go index e15e9772b2..b8be47a311 100644 --- a/frontend/pkg/frontend/cluster.go +++ b/frontend/pkg/frontend/cluster.go @@ -626,7 +626,7 @@ func (f *Frontend) updateHCPClusterInCosmos(ctx context.Context, writer http.Res } // Read back the resource document so the response body is accurate. - resultingUncastObj, err := transactionResult.GetItem(oldInternalCluster.ServiceProviderProperties.CosmosUID) + resultingUncastObj, err := transactionResult.GetItem(oldInternalCluster.GetCosmosData().CosmosUID) if err != nil { return utils.TrackError(err) } @@ -800,7 +800,6 @@ func mergeToInternalCluster(csCluster *arohcpv1alpha1.Cluster, internalCluster * clusterServiceBasedInternalCluster.ServiceProviderProperties.ProvisioningState = internalCluster.ServiceProviderProperties.ProvisioningState clusterServiceBasedInternalCluster.ServiceProviderProperties.ActiveOperationID = internalCluster.ServiceProviderProperties.ActiveOperationID clusterServiceBasedInternalCluster.ServiceProviderProperties.ClusterServiceID = internalCluster.ServiceProviderProperties.ClusterServiceID - clusterServiceBasedInternalCluster.ServiceProviderProperties.CosmosUID = internalCluster.ServiceProviderProperties.CosmosUID if clusterServiceBasedInternalCluster.Identity == nil { clusterServiceBasedInternalCluster.Identity = &arm.ManagedServiceIdentity{} } diff --git a/frontend/pkg/frontend/external_auth.go b/frontend/pkg/frontend/external_auth.go index 69a88069c9..a4125ff891 100644 --- a/frontend/pkg/frontend/external_auth.go +++ b/frontend/pkg/frontend/external_auth.go @@ -535,7 +535,7 @@ func (f *Frontend) updateExternalAuthInCosmos(ctx context.Context, writer http.R } // Read back the resource document so the response body is accurate. - resultingUncastInternalExternalAuth, err := transactionResult.GetItem(oldInternalExternalAuth.ServiceProviderProperties.CosmosUID) + resultingUncastInternalExternalAuth, err := transactionResult.GetItem(oldInternalExternalAuth.GetCosmosData().CosmosUID) if err != nil { return utils.TrackError(err) } @@ -681,7 +681,6 @@ func mergeToInternalExternalAuth(csEternalAuth *arohcpv1alpha1.ExternalAuth, int // this does not use conversion.CopyReadOnly* because some ServiceProvider properties come from cluster-service-only or live reads mergedExternalAuth.SystemData = internalObj.SystemData mergedExternalAuth.Properties.ProvisioningState = internalObj.Properties.ProvisioningState - mergedExternalAuth.ServiceProviderProperties.CosmosUID = internalObj.ServiceProviderProperties.CosmosUID mergedExternalAuth.ServiceProviderProperties.ClusterServiceID = internalObj.ServiceProviderProperties.ClusterServiceID mergedExternalAuth.ServiceProviderProperties.ActiveOperationID = internalObj.ServiceProviderProperties.ActiveOperationID diff --git a/frontend/pkg/frontend/node_pool.go b/frontend/pkg/frontend/node_pool.go index 43e9c2e675..42840d2a77 100644 --- a/frontend/pkg/frontend/node_pool.go +++ b/frontend/pkg/frontend/node_pool.go @@ -585,7 +585,7 @@ func (f *Frontend) updateNodePoolInCosmos(ctx context.Context, writer http.Respo } // Read back the resource document so the response body is accurate. - resultingUncastInternalNodePool, err := transactionResult.GetItem(oldInternalNodePool.ServiceProviderProperties.CosmosUID) + resultingUncastInternalNodePool, err := transactionResult.GetItem(oldInternalNodePool.GetCosmosData().CosmosUID) if err != nil { return utils.TrackError(err) } @@ -729,7 +729,6 @@ func mergeToInternalNodePool(clusterServiceNode *arohcpv1alpha1.NodePool, intern mergedOldClusterServiceNodePool.SystemData = internalNodePool.SystemData mergedOldClusterServiceNodePool.Tags = maps.Clone(internalNodePool.Tags) mergedOldClusterServiceNodePool.Properties.ProvisioningState = internalNodePool.Properties.ProvisioningState - mergedOldClusterServiceNodePool.ServiceProviderProperties.CosmosUID = internalNodePool.ServiceProviderProperties.CosmosUID mergedOldClusterServiceNodePool.ServiceProviderProperties.ClusterServiceID = internalNodePool.ServiceProviderProperties.ClusterServiceID mergedOldClusterServiceNodePool.ServiceProviderProperties.ActiveOperationID = internalNodePool.ServiceProviderProperties.ActiveOperationID diff --git a/internal/api/arm/subscription.go b/internal/api/arm/subscription.go index c1e364c287..5413e92c12 100644 --- a/internal/api/arm/subscription.go +++ b/internal/api/arm/subscription.go @@ -59,17 +59,8 @@ type Subscription struct { } func (o *Subscription) GetCosmosData() CosmosData { - cosmosUID := strings.ReplaceAll(strings.ToLower(o.ResourceID.String()), "/", "|") - if len(o.CosmosUID) != 0 { - // if this is an item that is being serialized for the first time, then we can force it to use the new scheme. - // if it already thinks it knows its CosmosID, then we must accept what it thinks because this could be a case - // where we have a new backend and an old frontend. In that case, the content still has random UIDs, but the backend - // must be able to read AND write the records. This means we cannot assume that all UIDs have already changed. - cosmosUID = o.CosmosUID - } - return CosmosData{ - CosmosUID: cosmosUID, + CosmosUID: strings.ReplaceAll(strings.ToLower(o.ResourceID.String()), "/", "|"), PartitionKey: strings.ToLower(o.ResourceID.Name), ItemID: o.ResourceID, } diff --git a/internal/api/types_cluster.go b/internal/api/types_cluster.go index a6f62571bc..6ec1dcc8c1 100644 --- a/internal/api/types_cluster.go +++ b/internal/api/types_cluster.go @@ -34,17 +34,8 @@ type HCPOpenShiftCluster struct { var _ CosmosPersistable = &HCPOpenShiftCluster{} func (o *HCPOpenShiftCluster) GetCosmosData() CosmosData { - cosmosUID := Must(ResourceIDToCosmosID(o.ID)) - if len(o.ServiceProviderProperties.CosmosUID) != 0 { - // if this is an item that is being serialized for the first time, then we can force it to use the new scheme. - // if it already thinks it knows its CosmosID, then we must accept what it thinks because this could be a case - // where we have a new backend and an old frontend. In that case, the content still has random UIDs, but the backend - // must be able to read AND write the records. This means we cannot assume that all UIDs have already changed. - cosmosUID = o.ServiceProviderProperties.CosmosUID - } - return CosmosData{ - CosmosUID: cosmosUID, + CosmosUID: Must(ResourceIDToCosmosID(o.ID)), PartitionKey: strings.ToLower(o.ID.SubscriptionID), ItemID: o.ID, } @@ -66,7 +57,6 @@ type HCPOpenShiftClusterCustomerProperties struct { // HCPOpenShiftClusterCustomerProperties represents the property bag of a HCPOpenShiftCluster resource. type HCPOpenShiftClusterServiceProviderProperties struct { ProvisioningState arm.ProvisioningState `json:"provisioningState,omitempty"` - CosmosUID string `json:"cosmosUID,omitempty"` ClusterServiceID InternalID `json:"clusterServiceID,omitempty"` ActiveOperationID string `json:"activeOperationId,omitempty"` DNS ServiceProviderDNSProfile `json:"dns,omitempty"` diff --git a/internal/api/types_controller.go b/internal/api/types_controller.go index 63fbb205cc..7d2d9e3e98 100644 --- a/internal/api/types_controller.go +++ b/internal/api/types_controller.go @@ -31,8 +31,6 @@ type Controller struct { // we need to be sure that all new records have it too. ResourceID *azcorearm.ResourceID `json:"resourceId,omitempty"` - CosmosUID string `json:"cosmosUID,omitempty"` - // ExternalID is the Azure resource ID of the type this is associated with. ExternalID *azcorearm.ResourceID `json:"externalId,omitempty"` diff --git a/internal/api/types_externalauth.go b/internal/api/types_externalauth.go index 5e53a1b000..90c84db210 100644 --- a/internal/api/types_externalauth.go +++ b/internal/api/types_externalauth.go @@ -34,17 +34,8 @@ type HCPOpenShiftClusterExternalAuth struct { var _ CosmosPersistable = &HCPOpenShiftClusterExternalAuth{} func (o *HCPOpenShiftClusterExternalAuth) GetCosmosData() CosmosData { - cosmosUID := Must(ResourceIDToCosmosID(o.ID)) - if len(o.ServiceProviderProperties.CosmosUID) != 0 { - // if this is an item that is being serialized for the first time, then we can force it to use the new scheme. - // if it already thinks it knows its CosmosID, then we must accept what it thinks because this could be a case - // where we have a new backend and an old frontend. In that case, the content still has random UIDs, but the backend - // must be able to read AND write the records. This means we cannot assume that all UIDs have already changed. - cosmosUID = o.ServiceProviderProperties.CosmosUID - } - return CosmosData{ - CosmosUID: cosmosUID, + CosmosUID: Must(ResourceIDToCosmosID(o.ID)), PartitionKey: strings.ToLower(o.ID.SubscriptionID), ItemID: o.ID, } @@ -61,7 +52,6 @@ type HCPOpenShiftClusterExternalAuthProperties struct { } type HCPOpenShiftClusterExternalAuthServiceProviderProperties struct { - CosmosUID string `json:"cosmosUID,omitempty"` ClusterServiceID InternalID `json:"clusterServiceID,omitempty"` ActiveOperationID string `json:"activeOperationId,omitempty"` } diff --git a/internal/api/types_nodepool.go b/internal/api/types_nodepool.go index 4ee9e2add4..2c4a1ad807 100644 --- a/internal/api/types_nodepool.go +++ b/internal/api/types_nodepool.go @@ -37,17 +37,8 @@ type HCPOpenShiftClusterNodePool struct { var _ CosmosPersistable = &HCPOpenShiftClusterNodePool{} func (o *HCPOpenShiftClusterNodePool) GetCosmosData() CosmosData { - cosmosUID := Must(ResourceIDToCosmosID(o.ID)) - if len(o.ServiceProviderProperties.CosmosUID) != 0 { - // if this is an item that is being serialized for the first time, then we can force it to use the new scheme. - // if it already thinks it knows its CosmosID, then we must accept what it thinks because this could be a case - // where we have a new backend and an old frontend. In that case, the content still has random UIDs, but the backend - // must be able to read AND write the records. This means we cannot assume that all UIDs have already changed. - cosmosUID = o.ServiceProviderProperties.CosmosUID - } - return CosmosData{ - CosmosUID: cosmosUID, + CosmosUID: Must(ResourceIDToCosmosID(o.ID)), PartitionKey: strings.ToLower(o.ID.SubscriptionID), ItemID: o.ID, } @@ -68,7 +59,6 @@ type HCPOpenShiftClusterNodePoolProperties struct { } type HCPOpenShiftClusterNodePoolServiceProviderProperties struct { - CosmosUID string `json:"cosmosUID,omitempty"` ClusterServiceID InternalID `json:"clusterServiceID,omitempty"` ActiveOperationID string `json:"activeOperationId,omitempty"` } diff --git a/internal/api/types_operation.go b/internal/api/types_operation.go index a0592f506d..2fcd57c0ab 100644 --- a/internal/api/types_operation.go +++ b/internal/api/types_operation.go @@ -71,9 +71,6 @@ type Operation struct { Status arm.ProvisioningState `json:"status,omitempty"` // Error is an OData error, present when Status is "Failed" or "Canceled" Error *arm.CloudErrorBody `json:"error,omitempty"` - - // CosmosUID is used to keep track of whether we have transitioned to a new cosmosUID scheme for this item - CosmosUID string `json:"cosmosUID"` } var _ CosmosPersistable = &Operation{} @@ -91,17 +88,8 @@ func (o *Operation) ComputeLogicalResourceID() *azcorearm.ResourceID { } func (o *Operation) GetCosmosData() CosmosData { - cosmosUID := Must(ResourceIDToCosmosID(o.ResourceID)) - if len(o.CosmosUID) != 0 { - // if this is an item that is being serialized for the first time, then we can force it to use the new scheme. - // if it already thinks it knows its CosmosID, then we must accept what it thinks because this could be a case - // where we have a new backend and an old frontend. In that case, the content still has random UIDs, but the backend - // must be able to read AND write the records. This means we cannot assume that all UIDs have already changed. - cosmosUID = o.CosmosUID - } - return CosmosData{ - CosmosUID: cosmosUID, + CosmosUID: Must(ResourceIDToCosmosID(o.ResourceID)), PartitionKey: strings.ToLower(o.ComputeLogicalResourceID().SubscriptionID), ItemID: o.ComputeLogicalResourceID(), } diff --git a/internal/api/v20240610preview/conversion_fuzz_test.go b/internal/api/v20240610preview/conversion_fuzz_test.go index 764c711a42..3ce27124f4 100644 --- a/internal/api/v20240610preview/conversion_fuzz_test.go +++ b/internal/api/v20240610preview/conversion_fuzz_test.go @@ -43,8 +43,6 @@ func TestRoundTripInternalExternalInternal(t *testing.T) { c.FillNoCustom(j) // ActiveOperationID does not roundtrip through the external type because it is purely an internal detail j.ActiveOperationID = "" - // CosmosUID does not roundtrip through the external type because it is purely an internal detail - j.CosmosUID = "" // ClusterServiceID does not roundtrip through the external type because it is purely an internal detail j.ClusterServiceID = ocm.InternalID{} }, @@ -52,8 +50,6 @@ func TestRoundTripInternalExternalInternal(t *testing.T) { c.FillNoCustom(j) // ActiveOperationID does not roundtrip through the external type because it is purely an internal detail j.ActiveOperationID = "" - // CosmosUID does not roundtrip through the external type because it is purely an internal detail - j.CosmosUID = "" // ClusterServiceID does not roundtrip through the external type because it is purely an internal detail j.ClusterServiceID = ocm.InternalID{} }, @@ -61,8 +57,6 @@ func TestRoundTripInternalExternalInternal(t *testing.T) { c.FillNoCustom(j) // ActiveOperationID does not roundtrip through the external type because it is purely an internal detail j.ActiveOperationID = "" - // CosmosUID does not roundtrip through the external type because it is purely an internal detail - j.CosmosUID = "" // ClusterServiceID does not roundtrip through the external type because it is purely an internal detail j.ClusterServiceID = ocm.InternalID{} }, diff --git a/internal/api/v20251223preview/conversion_fuzz_test.go b/internal/api/v20251223preview/conversion_fuzz_test.go index bedd2cbacf..5c89f30227 100644 --- a/internal/api/v20251223preview/conversion_fuzz_test.go +++ b/internal/api/v20251223preview/conversion_fuzz_test.go @@ -43,8 +43,6 @@ func TestRoundTripInternalExternalInternal(t *testing.T) { c.FillNoCustom(j) // ActiveOperationID does not roundtrip through the external type because it is purely an internal detail j.ActiveOperationID = "" - // CosmosUID does not roundtrip through the external type because it is purely an internal detail - j.CosmosUID = "" // ClusterServiceID does not roundtrip through the external type because it is purely an internal detail j.ClusterServiceID = ocm.InternalID{} }, @@ -52,8 +50,6 @@ func TestRoundTripInternalExternalInternal(t *testing.T) { c.FillNoCustom(j) // ActiveOperationID does not roundtrip through the external type because it is purely an internal detail j.ActiveOperationID = "" - // CosmosUID does not roundtrip through the external type because it is purely an internal detail - j.CosmosUID = "" // ClusterServiceID does not roundtrip through the external type because it is purely an internal detail j.ClusterServiceID = ocm.InternalID{} }, @@ -61,8 +57,6 @@ func TestRoundTripInternalExternalInternal(t *testing.T) { c.FillNoCustom(j) // ActiveOperationID does not roundtrip through the external type because it is purely an internal detail j.ActiveOperationID = "" - // CosmosUID does not roundtrip through the external type because it is purely an internal detail - j.CosmosUID = "" // ClusterServiceID does not roundtrip through the external type because it is purely an internal detail j.ClusterServiceID = ocm.InternalID{} }, diff --git a/internal/database/convert_cluster.go b/internal/database/convert_cluster.go index 141c9e91a4..d43998ebce 100644 --- a/internal/database/convert_cluster.go +++ b/internal/database/convert_cluster.go @@ -60,7 +60,6 @@ func InternalToCosmosCluster(internalObj *api.HCPOpenShiftCluster) (*HCPCluster, cosmosObj.InternalState.InternalAPI.SystemData = nil cosmosObj.InternalState.InternalAPI.Tags = nil cosmosObj.InternalState.InternalAPI.ServiceProviderProperties.ProvisioningState = "" - cosmosObj.InternalState.InternalAPI.ServiceProviderProperties.CosmosUID = "" cosmosObj.InternalState.InternalAPI.ServiceProviderProperties.ClusterServiceID = ocm.InternalID{} cosmosObj.InternalState.InternalAPI.ServiceProviderProperties.ActiveOperationID = "" @@ -135,7 +134,6 @@ func CosmosToInternalCluster(cosmosObj *HCPCluster) (*api.HCPOpenShiftCluster, e internalObj.SystemData = cosmosObj.SystemData internalObj.Tags = copyTags(cosmosObj.Tags) internalObj.ServiceProviderProperties.ProvisioningState = cosmosObj.ProvisioningState - internalObj.ServiceProviderProperties.CosmosUID = cosmosObj.ID internalObj.ServiceProviderProperties.ClusterServiceID = cosmosObj.InternalID internalObj.ServiceProviderProperties.ActiveOperationID = cosmosObj.ActiveOperationID diff --git a/internal/database/convert_cluster_test.go b/internal/database/convert_cluster_test.go index 40a1a36815..db86ae829a 100644 --- a/internal/database/convert_cluster_test.go +++ b/internal/database/convert_cluster_test.go @@ -72,8 +72,6 @@ func TestRoundTripClusterInternalCosmosInternal(t *testing.T) { if j == nil { return } - // this must match exactly - j.ServiceProviderProperties.CosmosUID = j.GetCosmosData().CosmosUID }, func(j *arm.ManagedServiceIdentity, c randfill.Continue) { c.FillNoCustom(j) diff --git a/internal/database/convert_controller.go b/internal/database/convert_controller.go index af6ae003a7..c0d785890c 100644 --- a/internal/database/convert_controller.go +++ b/internal/database/convert_controller.go @@ -17,8 +17,6 @@ package database import ( "strings" - "k8s.io/utils/ptr" - "github.com/Azure/ARO-HCP/internal/api" ) @@ -41,19 +39,7 @@ func InternalToCosmosController(internalObj *api.Controller) (*Controller, error }, } - // during a replace, this field will already have have data and we have to use it, but during a create, this field - // will not have a value and we'll need to fill it in the same way tha the generic wrapper will - if len(internalObj.CosmosUID) == 0 { - cosmosID, err := api.ResourceIDToCosmosID(ptr.To(internalObj.GetResourceID())) - if err != nil { - return nil, err - } - cosmosObj.ID = cosmosID - } - // some pieces of data conflict with standard fields. We may evolve over time, but for now avoid persisting those. - cosmosObj.ControllerProperties.CosmosUID = "" - cosmosObj.ControllerProperties.OldControllerSerialization.CosmosUID = "" return cosmosObj, nil } @@ -67,9 +53,6 @@ func CosmosToInternalController(cosmosObj *Controller) (*api.Controller, error) if cosmosObj.ControllerProperties.OldControllerSerialization == nil { tempInternalAPI := cosmosObj.ControllerProperties.Controller - // some pieces of data are stored on the BaseDocument, so we need to restore that data - tempInternalAPI.CosmosUID = cosmosObj.ID - return &tempInternalAPI, nil } @@ -86,7 +69,6 @@ func CosmosToInternalController(cosmosObj *Controller) (*api.Controller, error) } // some pieces of data are stored on the BaseDocument, so we need to restore that data - tempInternalAPI.CosmosUID = cosmosObj.ID return &tempInternalAPI, nil } diff --git a/internal/database/convert_externalauth.go b/internal/database/convert_externalauth.go index bf39c9a2b3..6636ae047d 100644 --- a/internal/database/convert_externalauth.go +++ b/internal/database/convert_externalauth.go @@ -56,7 +56,6 @@ func InternalToCosmosExternalAuth(internalObj *api.HCPOpenShiftClusterExternalAu cosmosObj.InternalState.InternalAPI.ProxyResource = arm.ProxyResource{} cosmosObj.InternalState.InternalAPI.Properties.ProvisioningState = "" cosmosObj.InternalState.InternalAPI.SystemData = nil - cosmosObj.InternalState.InternalAPI.ServiceProviderProperties.CosmosUID = "" cosmosObj.InternalState.InternalAPI.ServiceProviderProperties.ClusterServiceID = ocm.InternalID{} cosmosObj.InternalState.InternalAPI.ServiceProviderProperties.ActiveOperationID = "" @@ -82,7 +81,6 @@ func CosmosToInternalExternalAuth(cosmosObj *ExternalAuth) (*api.HCPOpenShiftClu } internalObj.Properties.ProvisioningState = cosmosObj.ProvisioningState internalObj.SystemData = cosmosObj.SystemData - internalObj.ServiceProviderProperties.CosmosUID = cosmosObj.ID internalObj.ServiceProviderProperties.ClusterServiceID = cosmosObj.InternalID internalObj.ServiceProviderProperties.ActiveOperationID = cosmosObj.ActiveOperationID diff --git a/internal/database/convert_externalauth_test.go b/internal/database/convert_externalauth_test.go index 3015cb345a..f0b30ef4b0 100644 --- a/internal/database/convert_externalauth_test.go +++ b/internal/database/convert_externalauth_test.go @@ -45,8 +45,6 @@ func TestRoundTripExternalAuthInternalCosmosInternal(t *testing.T) { if j == nil { return } - // this must match exactly - j.ServiceProviderProperties.CosmosUID = j.GetCosmosData().CosmosUID }, func(j *arm.ManagedServiceIdentity, c randfill.Continue) { c.FillNoCustom(j) diff --git a/internal/database/convert_nodepool.go b/internal/database/convert_nodepool.go index 2dd1f7cf8b..a19e20be1b 100644 --- a/internal/database/convert_nodepool.go +++ b/internal/database/convert_nodepool.go @@ -60,7 +60,6 @@ func InternalToCosmosNodePool(internalObj *api.HCPOpenShiftClusterNodePool) (*No cosmosObj.InternalState.InternalAPI.Properties.ProvisioningState = "" cosmosObj.InternalState.InternalAPI.SystemData = nil cosmosObj.InternalState.InternalAPI.Tags = nil - cosmosObj.InternalState.InternalAPI.ServiceProviderProperties.CosmosUID = "" cosmosObj.InternalState.InternalAPI.ServiceProviderProperties.ClusterServiceID = ocm.InternalID{} cosmosObj.InternalState.InternalAPI.ServiceProviderProperties.ActiveOperationID = "" @@ -90,7 +89,6 @@ func CosmosToInternalNodePool(cosmosObj *NodePool) (*api.HCPOpenShiftClusterNode internalObj.Properties.ProvisioningState = cosmosObj.ProvisioningState internalObj.SystemData = cosmosObj.SystemData internalObj.Tags = copyTags(cosmosObj.Tags) - internalObj.ServiceProviderProperties.CosmosUID = cosmosObj.ID internalObj.ServiceProviderProperties.ClusterServiceID = cosmosObj.InternalID internalObj.ServiceProviderProperties.ActiveOperationID = cosmosObj.ActiveOperationID diff --git a/internal/database/convert_nodepool_test.go b/internal/database/convert_nodepool_test.go index 76cef30161..70b3541ebb 100644 --- a/internal/database/convert_nodepool_test.go +++ b/internal/database/convert_nodepool_test.go @@ -45,8 +45,6 @@ func TestRoundTripNodePoolInternalCosmosInternal(t *testing.T) { if j == nil { return } - // this must match exactly - j.ServiceProviderProperties.CosmosUID = j.GetCosmosData().CosmosUID }, func(j *arm.ManagedServiceIdentity, c randfill.Continue) { c.FillNoCustom(j) diff --git a/internal/database/convert_operation.go b/internal/database/convert_operation.go index 6091f7e384..6461acdcf9 100644 --- a/internal/database/convert_operation.go +++ b/internal/database/convert_operation.go @@ -50,7 +50,6 @@ func InternalToCosmosOperation(internalObj *api.Operation) (*Operation, error) { } // some pieces of data conflict with standard fields. We may evolve over time, but for now avoid persisting those. - cosmosObj.OperationProperties.CosmosUID = "" return cosmosObj, nil } @@ -63,7 +62,6 @@ func CosmosToInternalOperation(cosmosObj *Operation) (*api.Operation, error) { tempInternalAPI := cosmosObj.OperationProperties internalObj := &tempInternalAPI - internalObj.CosmosUID = cosmosObj.ID // old records don't serialize this, but we want all readers to be able to depend on it. We can derive it from the operationID // this ID does not include the location because doing so changes the resulting azcorearm.ParseResourceID().ResourceType to be // Microsoft.RedHatOpenShift/locations/hcpOperationStatuses. This type is not compatible with the current cosmos storage and diff --git a/internal/database/crud_helpers.go b/internal/database/crud_helpers.go index 93b9e9992e..e3fa864b61 100644 --- a/internal/database/crud_helpers.go +++ b/internal/database/crud_helpers.go @@ -23,7 +23,6 @@ import ( "k8s.io/utils/ptr" - "github.com/Azure/azure-sdk-for-go/sdk/azcore" azcorearm "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" "github.com/Azure/azure-sdk-for-go/sdk/data/azcosmos" @@ -60,94 +59,13 @@ func getByItemID[InternalAPIType, CosmosAPIType any](ctx context.Context, contai } func get[InternalAPIType, CosmosAPIType any](ctx context.Context, containerClient *azcosmos.ContainerClient, partitionKeyString string, completeResourceID *azcorearm.ResourceID) (*InternalAPIType, error) { - logger := utils.LoggerFromContext(ctx) // try to see if the cosmosID we've passed is also the exact resource ID. If so, then return the value we got. exactCosmosID, err := api.ResourceIDToCosmosID(completeResourceID) - if err == nil { - ret, err := getByItemID[InternalAPIType, CosmosAPIType](ctx, containerClient, partitionKeyString, exactCosmosID) - if err == nil { - return ret, nil - } - if !IsResponseError(err, http.StatusNotFound) { - return nil, err - } - } - logger.Info("failed to get exact cosmosID, trying to rekey", "newCosmosID", exactCosmosID) - - if strings.ToLower(partitionKeyString) != partitionKeyString { - return nil, fmt.Errorf("partitionKeyString must be lowercase, not: %q", partitionKeyString) - } - - var responseItem []byte - - const query = "SELECT * FROM c WHERE STRINGEQUALS(c.resourceType, @resourceType, true) AND STRINGEQUALS(c.properties.resourceId, @resourceId, true)" - opt := azcosmos.QueryOptions{ - QueryParameters: []azcosmos.QueryParameter{ - { - Name: "@resourceType", - Value: completeResourceID.ResourceType.String(), - }, - { - Name: "@resourceId", - Value: completeResourceID.String(), - }, - }, - } - - queryPager := containerClient.NewQueryItemsPager(query, azcosmos.NewPartitionKeyString(partitionKeyString), &opt) - for queryPager.More() { - queryResponse, err := queryPager.NextPage(ctx) - if err != nil { - return nil, fmt.Errorf("failed to advance page while querying Resources container for '%s': %w", completeResourceID, err) - } - - for _, item := range queryResponse.Items { - // Let the pager finish to ensure we get a single result. - if responseItem == nil { - responseItem = item - } else { - return nil, ErrAmbiguousResult - } - } - } - - if responseItem == nil { - // Fabricate a "404 Not Found" ResponseError to wrap. - err := &azcore.ResponseError{ - ErrorCode: http.StatusText(http.StatusNotFound), - StatusCode: http.StatusNotFound, - } - return nil, fmt.Errorf("failed to read Resources container item for '%s': %w", completeResourceID, err) - } - - // To get here, we didn't find the item by direct cosmos ID, but after re-keying we will. - // We also know for sure it exists. Let's go ahead and create the replacement item and delete the original - // Old frontends will continue to work because the query used will still match since all the non-cosmos ID data remains the same. - // After a successful create, we will delete the original. - // If we crash after the create and before the delete or the delete fails, we will get a detectable failure of `ErrAmbiguousResult` - // which will force a manual cleanup. Given how few of these we have, it should be uncommon. - objAsMap := map[string]any{} - if err := json.Unmarshal(responseItem, &objAsMap); err != nil { - return nil, fmt.Errorf("failed to unmarshal Resources container item for '%s': %w", completeResourceID, err) - } - originalCosmosID := objAsMap["id"].(string) - newCosmosID := api.Must(api.ResourceIDToCosmosID(completeResourceID)) - objAsMap["id"] = newCosmosID - newBytes, err := json.Marshal(objAsMap) if err != nil { - return nil, fmt.Errorf("failed to marshal Cosmos DB item for '%s': %w", completeResourceID, err) - } - - logger.Info("creating new item", "newCosmosID", newCosmosID, "oldCosmosID", originalCosmosID) - if _, err := containerClient.CreateItem(ctx, azcosmos.NewPartitionKeyString(partitionKeyString), newBytes, nil); err != nil { return nil, utils.TrackError(err) } - if _, err = containerClient.DeleteItem(ctx, azcosmos.NewPartitionKeyString(partitionKeyString), originalCosmosID, nil); err != nil { - return nil, utils.TrackError(err) - } - - return getByItemID[InternalAPIType, CosmosAPIType](ctx, containerClient, partitionKeyString, newCosmosID) + return getByItemID[InternalAPIType, CosmosAPIType](ctx, containerClient, partitionKeyString, exactCosmosID) } func list[InternalAPIType, CosmosAPIType any](ctx context.Context, containerClient *azcosmos.ContainerClient, partitionKeyString string, resourceType *azcorearm.ResourceType, prefix *azcorearm.ResourceID, options *DBClientListResourceDocsOptions, untypedNonRecursive bool) (DBClientIterator[InternalAPIType], error) { diff --git a/internal/validation/validate_cluster.go b/internal/validation/validate_cluster.go index 45300a9d66..7693590cec 100644 --- a/internal/validation/validate_cluster.go +++ b/internal/validation/validate_cluster.go @@ -235,9 +235,6 @@ var ( toServiceProviderDNS = func(oldObj *api.HCPOpenShiftClusterServiceProviderProperties) *api.ServiceProviderDNSProfile { return &oldObj.DNS } - toServiceProviderCosmosUID = func(oldObj *api.HCPOpenShiftClusterServiceProviderProperties) *string { - return &oldObj.CosmosUID - } toServiceProviderClusterServiceID = func(oldObj *api.HCPOpenShiftClusterServiceProviderProperties) *api.InternalID { return &oldObj.ClusterServiceID } @@ -258,12 +255,6 @@ func validateClusterServiceProviderProperties(ctx context.Context, op operation. // ProvisioningState arm.ProvisioningState `json:"provisioningState,omitempty"` errs = append(errs, validate.ImmutableByCompare(ctx, op, fldPath.Child("provisioningState"), &newObj.ProvisioningState, safe.Field(oldObj, toHCPOpenShiftClusterServiceProviderPropertiesProvisioningState))...) - //CosmosUID string `json:"cosmosUID,omitempty"` - errs = append(errs, validate.ImmutableByCompare(ctx, op, fldPath.Child("cosmosUID"), &newObj.CosmosUID, safe.Field(oldObj, toServiceProviderCosmosUID))...) - if oldObj == nil { // must be unset on creation because we don't know it yet. - errs = append(errs, validate.ForbiddenValue(ctx, op, fldPath.Child("cosmosUID"), &newObj.CosmosUID, nil)...) - } - //ClusterServiceID InternalID `json:"clusterServiceID,omitempty"` errs = append(errs, validate.ImmutableByReflect(ctx, op, fldPath.Child("clusterServiceID"), &newObj.ClusterServiceID, safe.Field(oldObj, toServiceProviderClusterServiceID))...) diff --git a/internal/validation/validate_externalauth.go b/internal/validation/validate_externalauth.go index 58f963be57..34ec18ea43 100644 --- a/internal/validation/validate_externalauth.go +++ b/internal/validation/validate_externalauth.go @@ -146,9 +146,6 @@ func validateExternalAuthProperties(ctx context.Context, op operation.Operation, } var ( - toExternalAuthServiceProviderCosmosUID = func(oldObj *api.HCPOpenShiftClusterExternalAuthServiceProviderProperties) *string { - return &oldObj.CosmosUID - } toExternalAuthServiceProviderClusterServiceID = func(oldObj *api.HCPOpenShiftClusterExternalAuthServiceProviderProperties) *api.InternalID { return &oldObj.ClusterServiceID } @@ -157,12 +154,6 @@ var ( func validateExternalAuthServiceProviderProperties(ctx context.Context, op operation.Operation, fldPath *field.Path, newObj, oldObj *api.HCPOpenShiftClusterExternalAuthServiceProviderProperties) field.ErrorList { errs := field.ErrorList{} - //CosmosUID string `json:"cosmosUID,omitempty"` - errs = append(errs, validate.ImmutableByCompare(ctx, op, fldPath.Child("cosmosUID"), &newObj.CosmosUID, safe.Field(oldObj, toExternalAuthServiceProviderCosmosUID))...) - if oldObj == nil { // must be unset on creation because we don't know it yet. - errs = append(errs, validate.ForbiddenValue(ctx, op, fldPath.Child("cosmosUID"), &newObj.CosmosUID, nil)...) - } - //ClusterServiceID InternalID `json:"clusterServiceID,omitempty"` errs = append(errs, validate.ImmutableByReflect(ctx, op, fldPath.Child("clusterServiceID"), &newObj.ClusterServiceID, safe.Field(oldObj, toExternalAuthServiceProviderClusterServiceID))...) diff --git a/internal/validation/validate_nodepools.go b/internal/validation/validate_nodepools.go index 331a4d0649..e916dbd2f3 100644 --- a/internal/validation/validate_nodepools.go +++ b/internal/validation/validate_nodepools.go @@ -143,9 +143,6 @@ func validateNodePoolProperties(ctx context.Context, op operation.Operation, fld } var ( - toNodePoolServiceProviderCosmosUID = func(oldObj *api.HCPOpenShiftClusterNodePoolServiceProviderProperties) *string { - return &oldObj.CosmosUID - } toNodePoolServiceProviderClusterServiceID = func(oldObj *api.HCPOpenShiftClusterNodePoolServiceProviderProperties) *api.InternalID { return &oldObj.ClusterServiceID } @@ -154,12 +151,6 @@ var ( func validateNodePoolServiceProviderProperties(ctx context.Context, op operation.Operation, fldPath *field.Path, newObj, oldObj *api.HCPOpenShiftClusterNodePoolServiceProviderProperties) field.ErrorList { errs := field.ErrorList{} - //CosmosUID string `json:"cosmosUID,omitempty"` - errs = append(errs, validate.ImmutableByCompare(ctx, op, fldPath.Child("cosmosUID"), &newObj.CosmosUID, safe.Field(oldObj, toNodePoolServiceProviderCosmosUID))...) - if oldObj == nil { // must be unset on creation because we don't know it yet. - errs = append(errs, validate.ForbiddenValue(ctx, op, fldPath.Child("cosmosUID"), &newObj.CosmosUID, nil)...) - } - //ClusterServiceID InternalID `json:"clusterServiceID,omitempty"` errs = append(errs, validate.ImmutableByReflect(ctx, op, fldPath.Child("clusterServiceID"), &newObj.ClusterServiceID, safe.Field(oldObj, toNodePoolServiceProviderClusterServiceID))...) diff --git a/test-integration/utils/databasemutationhelpers/per_resource_crud.go b/test-integration/utils/databasemutationhelpers/per_resource_crud.go index 6f21941d6e..7a878e2687 100644 --- a/test-integration/utils/databasemutationhelpers/per_resource_crud.go +++ b/test-integration/utils/databasemutationhelpers/per_resource_crud.go @@ -59,8 +59,6 @@ func (ControllerCRUDSpecializer) InstanceEquals(expected, actual *api.Controller // clear the fields that don't compare shallowExpected := *expected shallowActual := *actual - shallowExpected.CosmosUID = "" - shallowActual.CosmosUID = "" return equality.Semantic.DeepEqual(shallowExpected, shallowActual) } @@ -69,7 +67,6 @@ func (ControllerCRUDSpecializer) NameFromInstance(obj *api.Controller) string { } func (ControllerCRUDSpecializer) WriteCosmosID(newObj, oldObj *api.Controller) { - newObj.CosmosUID = oldObj.CosmosUID } type OperationCRUDSpecializer struct { From 17488a6c05b33be1ae7701be005aa56b91f0343c Mon Sep 17 00:00:00 2001 From: David Eads Date: Tue, 20 Jan 2026 09:01:19 -0500 Subject: [PATCH 2/3] Update integration test fixtures to use the new keying format Since we migrated all the data in int, stg, and prod, the existing fixtures no longer match. Update them all to match so we can continue testing the database layer. --- .../01-subscription.json | 3 +- .../00-load-new/new-subscription.json | 2 +- .../01-subscription.json | 3 +- .../00-load-initial-state/cluster.json | 2 +- .../initial-cosmos-state/01-subscription.json | 17 ++++---- .../initial-cosmos-state/01-subscription.json | 17 ++++---- .../initial-cosmos-state/02-some-cluster.json | 34 ++++++++-------- .../01-load-initial/test-controller.json | 2 +- .../expected-error.txt | 2 +- .../do-nothing-success.json | 2 +- .../01-load-initial/operation-1.json | 21 ---------- .../01-load-initial/operation-2.json | 21 ---------- .../01-load-initial/operation-3-new.json | 22 ---------- .../00-key.json | 3 -- .../operation-1.json | 11 ----- .../operation-2.json | 11 ----- .../operation-3-new.json | 12 ------ .../03-getByID-old/00-key.json | 4 -- .../03-getByID-old/operation-2.json | 12 ------ .../basic-external-auth-auth.json | 2 +- .../basic-external-auth-cluster.json | 2 +- ...external-auth-operation-external-auth.json | 2 +- .../create-with-tags-cluster.json | 2 +- .../create-with-tags-operation.json | 2 +- .../01-load-initial/immutability-cluster.json | 2 +- .../01-load-initial/immutability-np.json | 2 +- .../immutability-operation-for-node-pool.json | 2 +- .../01-load-initial/operation-3-new.json | 2 +- ..._0465bc32-c654-41b8-8d87-9815d7abe8f6.json | 3 +- .../test-controller-in-different-sub.json | 2 +- .../immutability-cluster.json | 2 +- .../basic-external-auth-auth.json | 2 +- .../basic-external-auth-cluster.json | 2 +- .../create-with-tags-cluster.json | 2 +- .../immutability-cluster.json | 2 +- .../basic-external-auth-auth.json | 2 +- .../basic-external-auth-cluster.json | 2 +- .../create-with-tags-cluster.json | 2 +- .../immutability-cluster.json | 2 +- .../operation-3-new.json | 2 +- .../test-controller-in-different-sub.json | 2 +- .../basic-external-auth-auth.json | 2 +- .../basic-external-auth-cluster.json | 2 +- .../create-with-tags-cluster.json | 2 +- .../immutability-cluster.json | 2 +- .../basic-external-auth-cluster.json | 2 +- .../create-with-tags-cluster.json | 2 +- .../immutability-cluster.json | 2 +- .../basic-external-auth-cluster.json | 2 +- .../create-with-tags-cluster.json | 2 +- .../cosmos-state/cosmos-01-cluster.json | 2 +- .../cosmos-state/cosmos-01-cluster.json | 2 +- .../cosmos-state/cosmos-01-cluster.json | 2 +- .../cosmos-state/cosmos-01-cluster.json | 2 +- .../cosmos-state/cosmos-01-cluster.json | 2 +- .../initial-cosmos-state/01-subscription.json | 17 ++++---- .../cosmos-state/cosmos-01-cluster.json | 2 +- .../cosmos-state/cosmos-01-cluster.json | 2 +- .../cosmos-state/cosmos-01-cluster.json | 2 +- .../cosmos-state/cosmos-01-cluster.json | 2 +- .../cosmos-state/cosmos-01-cluster.json | 2 +- .../cosmos-state/cosmos-01-cluster.json | 2 +- .../cosmos-state/cosmos-01-cluster.json | 2 +- .../cluster-create-with-tags.json | 2 +- ...ation-cluster-create-with-tags-create.json | 2 +- .../subscription.json | 2 +- .../cluster-create-with-tags.json | 2 +- .../6b690bec-0c16-4ecb-8f67-781caf40bba7.json | 2 +- .../01-load-old-data/create-with-tags.json | 2 +- ..._90b2322c-2c26-47ca-b6f9-d9b1a8385cbc.json | 40 +++++++++---------- .../cluster-create-with-tags.json | 2 +- .../externalauth-default.json | 2 +- .../cluster-create-with-tags.json | 2 +- .../externalauth-default.json | 2 +- ...ation-cluster-create-with-tags-create.json | 2 +- ...operation-externalauth-create-default.json | 2 +- .../01-load-old-data/subscription.json | 2 +- .../cluster-create-with-tags.json | 2 +- .../externalauth-default.json | 2 +- .../nodepool-basic-node-pool.json | 2 +- .../nodepool-node-pool-02.json | 2 +- ...ation-cluster-create-with-tags-create.json | 4 +- .../operation-create-basicnodepool.json | 4 +- .../operation-create-nodepool-02.json | 4 +- ...operation-externalauth-create-default.json | 2 +- .../01-load-old-data/subscription.json | 2 +- ...ation-cluster-create-with-tags-create.json | 4 +- .../operation-create-basicnodepool.json | 4 +- .../operation-create-nodepool-02.json | 4 +- ...operation-externalauth-create-default.json | 2 +- .../cluster-create-with-tags.json | 2 +- .../nodepool-basic-node-pool.json | 2 +- .../nodepool-node-pool-02.json | 2 +- ...ation-cluster-create-with-tags-create.json | 4 +- .../subscription.json | 2 +- .../cluster-create-with-tags.json | 2 +- .../nodepool-basic-node-pool.json | 2 +- .../nodepool-node-pool-02.json | 2 +- ...ation-cluster-create-with-tags-create.json | 4 +- .../operation-create-basicnodepool.json | 4 +- .../operation-create-nodepool-02.json | 4 +- .../01-load-old-data/subscription.json | 28 ++++++------- .../cluster-create-with-tags.json | 2 +- .../nodepool-02.json | 2 +- .../nodepool-basic-node-pool.json | 2 +- .../01-load-new-data/subscription.json | 28 ++++++------- .../basic/cosmos-state/cosmos-01-cluster.json | 36 ++++++++--------- .../cosmos-state/cosmos-01-cluster.json | 36 ++++++++--------- .../cosmos-state/cosmos-01-cluster.json | 36 ++++++++--------- .../cosmos-state/cosmos-01-cluster.json | 36 ++++++++--------- .../initial-cosmos-state/01-subscription.json | 3 +- .../cosmos-state/cosmos-01-cluster.json | 34 ++++++++-------- .../cosmos-state/cosmos-01-cluster.json | 36 ++++++++--------- .../cosmos-state/cosmos-01-cluster.json | 34 ++++++++-------- .../cosmos-state/cosmos-01-cluster.json | 36 ++++++++--------- .../cosmos-state/cosmos-01-cluster.json | 36 ++++++++--------- .../cosmos-state/cosmos-01-cluster.json | 2 +- .../cosmos-state/cosmos-01-cluster.json | 2 +- 118 files changed, 359 insertions(+), 469 deletions(-) delete mode 100644 test-integration/frontend/artifacts/DatabaseCRUD/OperationCRUD/new-operation-storage-compatible-with-old/01-load-initial/operation-1.json delete mode 100644 test-integration/frontend/artifacts/DatabaseCRUD/OperationCRUD/new-operation-storage-compatible-with-old/01-load-initial/operation-2.json delete mode 100644 test-integration/frontend/artifacts/DatabaseCRUD/OperationCRUD/new-operation-storage-compatible-with-old/01-load-initial/operation-3-new.json delete mode 100644 test-integration/frontend/artifacts/DatabaseCRUD/OperationCRUD/new-operation-storage-compatible-with-old/02-listActiveOperations-initial/00-key.json delete mode 100644 test-integration/frontend/artifacts/DatabaseCRUD/OperationCRUD/new-operation-storage-compatible-with-old/02-listActiveOperations-initial/operation-1.json delete mode 100644 test-integration/frontend/artifacts/DatabaseCRUD/OperationCRUD/new-operation-storage-compatible-with-old/02-listActiveOperations-initial/operation-2.json delete mode 100644 test-integration/frontend/artifacts/DatabaseCRUD/OperationCRUD/new-operation-storage-compatible-with-old/02-listActiveOperations-initial/operation-3-new.json delete mode 100644 test-integration/frontend/artifacts/DatabaseCRUD/OperationCRUD/new-operation-storage-compatible-with-old/03-getByID-old/00-key.json delete mode 100644 test-integration/frontend/artifacts/DatabaseCRUD/OperationCRUD/new-operation-storage-compatible-with-old/03-getByID-old/operation-2.json diff --git a/frontend/test/simulate/artifacts/DatabaseCRUD/SubscriptionCRUD/mutate-old-via-new/00-load-old-subscription/01-subscription.json b/frontend/test/simulate/artifacts/DatabaseCRUD/SubscriptionCRUD/mutate-old-via-new/00-load-old-subscription/01-subscription.json index 0cfd4e7010..975894fc01 100644 --- a/frontend/test/simulate/artifacts/DatabaseCRUD/SubscriptionCRUD/mutate-old-via-new/00-load-old-subscription/01-subscription.json +++ b/frontend/test/simulate/artifacts/DatabaseCRUD/SubscriptionCRUD/mutate-old-via-new/00-load-old-subscription/01-subscription.json @@ -4,9 +4,10 @@ "_rid": "LKgdAIiT-BgDAAAAAAAAAA==", "_self": "dbs/LKgdAA==/colls/LKgdAIiT-Bg=/docs/LKgdAIiT-BgDAAAAAAAAAA==/", "_ts": 1765995430, - "id": "b3fa2ee1-d1b3-4eaa-beae-7dd4003b4987", + "id": "|subscriptions|b3fa2ee1-d1b3-4eaa-beae-7dd4003b4987", "partitionKey": "b3fa2ee1-d1b3-4eaa-beae-7dd4003b4987", "properties": { + "resourceId": "/subscriptions/b3fa2ee1-d1b3-4eaa-beae-7dd4003b4987", "properties": null, "registrationDate": "2025-12-17T18:16:37+00:00", "state": "Registered" diff --git a/frontend/test/simulate/artifacts/DatabaseCRUD/SubscriptionCRUD/read-new/00-load-new/new-subscription.json b/frontend/test/simulate/artifacts/DatabaseCRUD/SubscriptionCRUD/read-new/00-load-new/new-subscription.json index 1c2dbba001..20680063e2 100644 --- a/frontend/test/simulate/artifacts/DatabaseCRUD/SubscriptionCRUD/read-new/00-load-new/new-subscription.json +++ b/frontend/test/simulate/artifacts/DatabaseCRUD/SubscriptionCRUD/read-new/00-load-new/new-subscription.json @@ -4,7 +4,7 @@ "_rid": "zDEpAKTEnZ4DAAAAAAAAAA==", "_self": "dbs/zDEpAA==/colls/zDEpAKTEnZ4=/docs/zDEpAKTEnZ4DAAAAAAAAAA==/", "_ts": 1765995984, - "id": "ddfbdeeb-89a1-4a9a-9469-2895f63e2d82", + "id": "|subscriptions|ddfbdeeb-89a1-4a9a-9469-2895f63e2d82", "partitionKey": "ddfbdeeb-89a1-4a9a-9469-2895f63e2d82", "properties": { "properties": null, diff --git a/frontend/test/simulate/artifacts/DatabaseCRUD/SubscriptionCRUD/read-old/00-load-old-subscription/01-subscription.json b/frontend/test/simulate/artifacts/DatabaseCRUD/SubscriptionCRUD/read-old/00-load-old-subscription/01-subscription.json index 0cfd4e7010..975894fc01 100644 --- a/frontend/test/simulate/artifacts/DatabaseCRUD/SubscriptionCRUD/read-old/00-load-old-subscription/01-subscription.json +++ b/frontend/test/simulate/artifacts/DatabaseCRUD/SubscriptionCRUD/read-old/00-load-old-subscription/01-subscription.json @@ -4,9 +4,10 @@ "_rid": "LKgdAIiT-BgDAAAAAAAAAA==", "_self": "dbs/LKgdAA==/colls/LKgdAIiT-Bg=/docs/LKgdAIiT-BgDAAAAAAAAAA==/", "_ts": 1765995430, - "id": "b3fa2ee1-d1b3-4eaa-beae-7dd4003b4987", + "id": "|subscriptions|b3fa2ee1-d1b3-4eaa-beae-7dd4003b4987", "partitionKey": "b3fa2ee1-d1b3-4eaa-beae-7dd4003b4987", "properties": { + "resourceId": "/subscriptions/b3fa2ee1-d1b3-4eaa-beae-7dd4003b4987", "properties": null, "registrationDate": "2025-12-17T18:16:37+00:00", "state": "Registered" 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 1c8ac0bbaf..a86a3d7ce3 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 @@ -1,5 +1,5 @@ { - "id": "48381685-4d43-43a7-b9ab-9a5a2f208a20", + "id": "|subscriptions|4fa75980-6637-4157-9726-84d878a62e83|resourcegroups|shrilleffectiveness|providers|microsoft.redhatopenShift|hcpopenshiftclusters|lavishunhappiness", "partitionKey": "4fa75980-6637-4157-9726-84d878a62e83", "properties": { "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", diff --git a/test-integration/frontend/artifacts/ClusterMutation/initial-cosmos-state/01-subscription.json b/test-integration/frontend/artifacts/ClusterMutation/initial-cosmos-state/01-subscription.json index 4d6eccfa4b..556e478960 100644 --- a/test-integration/frontend/artifacts/ClusterMutation/initial-cosmos-state/01-subscription.json +++ b/test-integration/frontend/artifacts/ClusterMutation/initial-cosmos-state/01-subscription.json @@ -1,10 +1,11 @@ { - "id": "0465bc32-c654-41b8-8d87-9815d7abe8f6", - "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", - "resourceType": "microsoft.resources/subscriptions", - "properties": { - "state": "Registered", - "registrationDate": null, - "properties": null - } + "id": "|subscriptions|0465bc32-c654-41b8-8d87-9815d7abe8f6", + "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", + "resourceType": "microsoft.resources/subscriptions", + "properties": { + "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6", + "state": "Registered", + "registrationDate": null, + "properties": null + } } diff --git a/test-integration/frontend/artifacts/ClusterReadOldData/initial-cosmos-state/01-subscription.json b/test-integration/frontend/artifacts/ClusterReadOldData/initial-cosmos-state/01-subscription.json index 4d6eccfa4b..556e478960 100644 --- a/test-integration/frontend/artifacts/ClusterReadOldData/initial-cosmos-state/01-subscription.json +++ b/test-integration/frontend/artifacts/ClusterReadOldData/initial-cosmos-state/01-subscription.json @@ -1,10 +1,11 @@ { - "id": "0465bc32-c654-41b8-8d87-9815d7abe8f6", - "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", - "resourceType": "microsoft.resources/subscriptions", - "properties": { - "state": "Registered", - "registrationDate": null, - "properties": null - } + "id": "|subscriptions|0465bc32-c654-41b8-8d87-9815d7abe8f6", + "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", + "resourceType": "microsoft.resources/subscriptions", + "properties": { + "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6", + "state": "Registered", + "registrationDate": null, + "properties": null + } } diff --git a/test-integration/frontend/artifacts/ClusterReadOldData/initial-cosmos-state/02-some-cluster.json b/test-integration/frontend/artifacts/ClusterReadOldData/initial-cosmos-state/02-some-cluster.json index 090c1c2f29..eace4617d7 100644 --- a/test-integration/frontend/artifacts/ClusterReadOldData/initial-cosmos-state/02-some-cluster.json +++ b/test-integration/frontend/artifacts/ClusterReadOldData/initial-cosmos-state/02-some-cluster.json @@ -1,19 +1,19 @@ { - "id" : "8feb19cd-3d3c-4575-863b-b26ad817ce18", - "partitionKey" : "0465bc32-c654-41b8-8d87-9815d7abe8f6", - "resourceType" : "microsoft.redhatopenshift/hcpopenshiftclusters", - "properties" : { - "resourceId" : "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "internalId" : "/api/aro_hcp/v1alpha1/clusters/fixed-value", - "identity" : { - "principalId" : "the-principal", - "tenantId" : "the-tenant", - "type" : "" - }, - "tags" : { - "foo" : "bar" - }, - "customerDesiredState" : null, - "serviceProviderState" : null - } + "id": "|subscriptions|0465bc32-c654-41b8-8d87-9815d7abe8f6|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|some-hcp-cluster", + "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", + "resourceType": "microsoft.redhatopenshift/hcpopenshiftclusters", + "properties": { + "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", + "internalId": "/api/aro_hcp/v1alpha1/clusters/fixed-value", + "identity": { + "principalId": "the-principal", + "tenantId": "the-tenant", + "type": "" + }, + "tags": { + "foo": "bar" + }, + "customerDesiredState": null, + "serviceProviderState": null + } } \ No newline at end of file diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/ControllerCRUD/basic/01-load-initial/test-controller.json b/test-integration/frontend/artifacts/DatabaseCRUD/ControllerCRUD/basic/01-load-initial/test-controller.json index 75f910597b..db3b3511c3 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/ControllerCRUD/basic/01-load-initial/test-controller.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/ControllerCRUD/basic/01-load-initial/test-controller.json @@ -4,7 +4,7 @@ "_rid": "vWhbAJ1AYhMBAAAAAAAAAA==", "_self": "dbs/vWhbAA==/colls/vWhbAJ1AYhM=/docs/vWhbAJ1AYhMBAAAAAAAAAA==/", "_ts": 1764939717, - "id": "89260758-2990-46dd-8e97-99b31c7cee89", + "id": "|subscriptions|subscriptionid|resourcegroups|resourcegroupname|providers|microsoft.redhatopenshift|hcpopenshiftclusters|parentcluster|hcpopenshiftcontrollers|test-controller", "partitionKey": "subscriptionid", "properties": { "internalState": { diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/ControllerCRUD/basic/07-get-other-resource-group/expected-error.txt b/test-integration/frontend/artifacts/DatabaseCRUD/ControllerCRUD/basic/07-get-other-resource-group/expected-error.txt index 422644c400..cae5abbdc7 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/ControllerCRUD/basic/07-get-other-resource-group/expected-error.txt +++ b/test-integration/frontend/artifacts/DatabaseCRUD/ControllerCRUD/basic/07-get-other-resource-group/expected-error.txt @@ -1 +1 @@ -ERROR CODE: Not Found \ No newline at end of file +ERROR CODE: 404 Not Found \ No newline at end of file diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/ControllerCRUD/basic/99-cosmosCompare-end-state/do-nothing-success.json b/test-integration/frontend/artifacts/DatabaseCRUD/ControllerCRUD/basic/99-cosmosCompare-end-state/do-nothing-success.json index 429ffde611..3118bf2dcb 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/ControllerCRUD/basic/99-cosmosCompare-end-state/do-nothing-success.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/ControllerCRUD/basic/99-cosmosCompare-end-state/do-nothing-success.json @@ -1,5 +1,5 @@ { - "id": "de52b796-cff1-4c4b-9140-684087b5eb60", + "id": "|subscriptions|subscriptionid|resourcegroups|resourcegroupname|providers|microsoft.redhatopenshift|hcpopenshiftclusters|parentcluster|hcpopenshiftcontrollers|second-controller", "_rid": "sIMIAKLq4TwCAAAAAAAAAA==", "_self": "dbs/sIMIAA==/colls/sIMIAKLq4Tw=/docs/sIMIAKLq4TwCAAAAAAAAAA==/", "_etag": "\"00000000-0000-0000-80ed-5174940501dc\"", diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/OperationCRUD/new-operation-storage-compatible-with-old/01-load-initial/operation-1.json b/test-integration/frontend/artifacts/DatabaseCRUD/OperationCRUD/new-operation-storage-compatible-with-old/01-load-initial/operation-1.json deleted file mode 100644 index 4a180a0fbe..0000000000 --- a/test-integration/frontend/artifacts/DatabaseCRUD/OperationCRUD/new-operation-storage-compatible-with-old/01-load-initial/operation-1.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "_attachments": "attachments/", - "_etag": "\"00000000-0000-0000-6625-ed6b640501dc\"", - "_rid": "KDJCAI5tVlcEAAAAAAAAAA==", - "_self": "dbs/KDJCAA==/colls/KDJCAI5tVlc=/docs/KDJCAI5tVlcEAAAAAAAAAA==/", - "_ts": 1764966599, - "id": "7c6b7caa-572f-41b6-9f18-1bb11adfba31", - "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", - "properties": { - "externalId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "internalId": "/api/clusters_mgmt/v1/clusters/dv8blqb5g9", - "lastTransitionTime": "2025-12-05T20:29:59.734335781Z", - "operationId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/providers/Microsoft.RedHatOpenShift/locations/fake-location/hcpOperationStatuses/7c6b7caa-572f-41b6-9f18-1bb11adfba31", - "request": "Create", - "startTime": "2025-12-05T20:29:59.734335781Z", - "status": "Accepted", - "tenantId": "00000000-0000-0000-0000-000000000000" - }, - "resourceType": "microsoft.redhatopenshift/hcpoperationstatuses", - "ttl": 604800 -} \ No newline at end of file diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/OperationCRUD/new-operation-storage-compatible-with-old/01-load-initial/operation-2.json b/test-integration/frontend/artifacts/DatabaseCRUD/OperationCRUD/new-operation-storage-compatible-with-old/01-load-initial/operation-2.json deleted file mode 100644 index 176d3f3f66..0000000000 --- a/test-integration/frontend/artifacts/DatabaseCRUD/OperationCRUD/new-operation-storage-compatible-with-old/01-load-initial/operation-2.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "_attachments": "attachments/", - "_etag": "\"00000000-0000-0000-6625-fc96940501dc\"", - "_rid": "zT0eAODBiq0GAAAAAAAAAA==", - "_self": "dbs/zT0eAA==/colls/zT0eAODBiq0=/docs/zT0eAODBiq0GAAAAAAAAAA==/", - "_ts": 1764966625, - "id": "37332594-70b3-4796-9af6-301a5d47d1e6", - "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", - "properties": { - "externalId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/immutability/nodePools/immutability-np", - "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-immutability/node_pools/4nd28q7n8q", - "lastTransitionTime": "2025-12-05T15:30:25.179901514-05:00", - "operationId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/providers/Microsoft.RedHatOpenShift/locations/fake-location/hcpOperationStatuses/37332594-70b3-4796-9af6-301a5d47d1e6", - "request": "Create", - "startTime": "2025-12-05T20:30:25.067364685Z", - "status": "Accepted", - "tenantId": "00000000-0000-0000-0000-000000000000" - }, - "resourceType": "microsoft.redhatopenshift/hcpoperationstatuses", - "ttl": 604800 -} \ No newline at end of file diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/OperationCRUD/new-operation-storage-compatible-with-old/01-load-initial/operation-3-new.json b/test-integration/frontend/artifacts/DatabaseCRUD/OperationCRUD/new-operation-storage-compatible-with-old/01-load-initial/operation-3-new.json deleted file mode 100644 index 5031298d58..0000000000 --- a/test-integration/frontend/artifacts/DatabaseCRUD/OperationCRUD/new-operation-storage-compatible-with-old/01-load-initial/operation-3-new.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "_attachments": "attachments/", - "_etag": "\"00000000-0000-0000-6625-fc96940501dc\"", - "_rid": "zT0eAODBiq0GAAAAAAAAAA==", - "_self": "dbs/zT0eAA==/colls/zT0eAODBiq0=/docs/zT0eAODBiq0GAAAAAAAAAA==/", - "_ts": 1764966625, - "id": "37332594-70b3-4796-9af6-301a5d47d127", - "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", - "properties": { - "externalId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/immutability/nodePools/immutability-np", - "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-immutability/node_pools/4nd28q7n8q", - "lastTransitionTime": "2025-12-05T15:30:25.179901514-05:00", - "operationId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/providers/Microsoft.RedHatOpenShift/locations/fake-location/hcpOperationStatuses/37332594-70b3-4796-9af6-301a5d47d127", - "request": "Create", - "startTime": "2025-12-05T20:30:25.067364685Z", - "status": "Accepted", - "tenantId": "00000000-0000-0000-0000-000000000000", - "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/providers/Microsoft.RedHatOpenShift/hcpOperationStatuses/37332594-70b3-4796-9af6-301a5d47d127" - }, - "resourceType": "microsoft.redhatopenshift/hcpoperationstatuses", - "ttl": 604800 -} \ No newline at end of file diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/OperationCRUD/new-operation-storage-compatible-with-old/02-listActiveOperations-initial/00-key.json b/test-integration/frontend/artifacts/DatabaseCRUD/OperationCRUD/new-operation-storage-compatible-with-old/02-listActiveOperations-initial/00-key.json deleted file mode 100644 index 00fa7dbeb1..0000000000 --- a/test-integration/frontend/artifacts/DatabaseCRUD/OperationCRUD/new-operation-storage-compatible-with-old/02-listActiveOperations-initial/00-key.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "parentResourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6" -} \ No newline at end of file diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/OperationCRUD/new-operation-storage-compatible-with-old/02-listActiveOperations-initial/operation-1.json b/test-integration/frontend/artifacts/DatabaseCRUD/OperationCRUD/new-operation-storage-compatible-with-old/02-listActiveOperations-initial/operation-1.json deleted file mode 100644 index dd448a54c5..0000000000 --- a/test-integration/frontend/artifacts/DatabaseCRUD/OperationCRUD/new-operation-storage-compatible-with-old/02-listActiveOperations-initial/operation-1.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "cosmosUID": "7c6b7caa-572f-41b6-9f18-1bb11adfba31", - "externalId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "internalId": "/api/clusters_mgmt/v1/clusters/dv8blqb5g9", - "lastTransitionTime": "2025-12-05T20:29:59.734335781Z", - "operationId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/providers/Microsoft.RedHatOpenShift/locations/fake-location/hcpOperationStatuses/7c6b7caa-572f-41b6-9f18-1bb11adfba31", - "request": "Create", - "startTime": "2025-12-05T20:29:59.734335781Z", - "status": "Accepted", - "tenantId": "00000000-0000-0000-0000-000000000000" -} \ No newline at end of file diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/OperationCRUD/new-operation-storage-compatible-with-old/02-listActiveOperations-initial/operation-2.json b/test-integration/frontend/artifacts/DatabaseCRUD/OperationCRUD/new-operation-storage-compatible-with-old/02-listActiveOperations-initial/operation-2.json deleted file mode 100644 index 7af5c206d2..0000000000 --- a/test-integration/frontend/artifacts/DatabaseCRUD/OperationCRUD/new-operation-storage-compatible-with-old/02-listActiveOperations-initial/operation-2.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "cosmosUID": "37332594-70b3-4796-9af6-301a5d47d1e6", - "externalId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/immutability/nodePools/immutability-np", - "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-immutability/node_pools/4nd28q7n8q", - "lastTransitionTime": "2025-12-05T15:30:25.179901514-05:00", - "operationId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/providers/Microsoft.RedHatOpenShift/locations/fake-location/hcpOperationStatuses/37332594-70b3-4796-9af6-301a5d47d1e6", - "request": "Create", - "startTime": "2025-12-05T20:30:25.067364685Z", - "status": "Accepted", - "tenantId": "00000000-0000-0000-0000-000000000000" -} \ No newline at end of file diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/OperationCRUD/new-operation-storage-compatible-with-old/02-listActiveOperations-initial/operation-3-new.json b/test-integration/frontend/artifacts/DatabaseCRUD/OperationCRUD/new-operation-storage-compatible-with-old/02-listActiveOperations-initial/operation-3-new.json deleted file mode 100644 index a006d972a7..0000000000 --- a/test-integration/frontend/artifacts/DatabaseCRUD/OperationCRUD/new-operation-storage-compatible-with-old/02-listActiveOperations-initial/operation-3-new.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "cosmosUID": "37332594-70b3-4796-9af6-301a5d47d127", - "externalId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/immutability/nodePools/immutability-np", - "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-immutability/node_pools/4nd28q7n8q", - "lastTransitionTime": "2025-12-05T15:30:25.179901514-05:00", - "operationId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/providers/Microsoft.RedHatOpenShift/locations/fake-location/hcpOperationStatuses/37332594-70b3-4796-9af6-301a5d47d127", - "request": "Create", - "startTime": "2025-12-05T20:30:25.067364685Z", - "status": "Accepted", - "tenantId": "00000000-0000-0000-0000-000000000000", - "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/providers/Microsoft.RedHatOpenShift/hcpOperationStatuses/37332594-70b3-4796-9af6-301a5d47d127" -} \ No newline at end of file diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/OperationCRUD/new-operation-storage-compatible-with-old/03-getByID-old/00-key.json b/test-integration/frontend/artifacts/DatabaseCRUD/OperationCRUD/new-operation-storage-compatible-with-old/03-getByID-old/00-key.json deleted file mode 100644 index 03aeff63b7..0000000000 --- a/test-integration/frontend/artifacts/DatabaseCRUD/OperationCRUD/new-operation-storage-compatible-with-old/03-getByID-old/00-key.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "parentResourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6", - "cosmosID": "37332594-70b3-4796-9af6-301a5d47d1e6" -} \ No newline at end of file diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/OperationCRUD/new-operation-storage-compatible-with-old/03-getByID-old/operation-2.json b/test-integration/frontend/artifacts/DatabaseCRUD/OperationCRUD/new-operation-storage-compatible-with-old/03-getByID-old/operation-2.json deleted file mode 100644 index a6ef169bbb..0000000000 --- a/test-integration/frontend/artifacts/DatabaseCRUD/OperationCRUD/new-operation-storage-compatible-with-old/03-getByID-old/operation-2.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "cosmosUID": "37332594-70b3-4796-9af6-301a5d47d1e6", - "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/providers/Microsoft.RedHatOpenShift/hcpOperationStatuses/37332594-70b3-4796-9af6-301a5d47d1e6", - "tenantId": "00000000-0000-0000-0000-000000000000", - "request": "Create", - "externalId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/immutability/nodePools/immutability-np", - "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-immutability/node_pools/4nd28q7n8q", - "operationId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/providers/Microsoft.RedHatOpenShift/locations/fake-location/hcpOperationStatuses/37332594-70b3-4796-9af6-301a5d47d1e6", - "startTime": "2025-12-05T20:30:25.067364685Z", - "lastTransitionTime": "2025-12-05T15:30:25.179901514-05:00", - "status": "Accepted" -} \ No newline at end of file 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 4cbc92d3f9..9b02892d12 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 @@ -4,7 +4,7 @@ "_rid": "QS9oAIjBpYUEAAAAAAAAAA==", "_self": "dbs/QS9oAA==/colls/QS9oAIjBpYU=/docs/QS9oAIjBpYUEAAAAAAAAAA==/", "_ts": 1764966613, - "id": "e2d82cd9-b5c7-4383-b15f-61b80905c39d", + "id": "|subscriptions|f52dfea2-47ee-4396-8006-4a27d47d59c5|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|basic-external-auth|externalauths|basic-external-auth", "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-basic-external-auth/external_auth_config/external_auths/2wbhxn4qwk", diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/basic-external-auth-cluster.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/basic-external-auth-cluster.json index a607f111e9..4944b525c4 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/basic-external-auth-cluster.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/basic-external-auth-cluster.json @@ -4,7 +4,7 @@ "_rid": "QS9oAIjBpYUCAAAAAAAAAA==", "_self": "dbs/QS9oAA==/colls/QS9oAIjBpYU=/docs/QS9oAIjBpYUCAAAAAAAAAA==/", "_ts": 1764966610, - "id": "8feb19cd-3d3c-4575-863b-b26ad817ce18", + "id": "|subscriptions|f52dfea2-47ee-4396-8006-4a27d47d59c5|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|basic-external-auth", "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "customerDesiredState": null, 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 f0568c2a2b..be0e74d903 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 @@ -4,7 +4,7 @@ "_rid": "QS9oAIjBpYUDAAAAAAAAAA==", "_self": "dbs/QS9oAA==/colls/QS9oAIjBpYU=/docs/QS9oAIjBpYUDAAAAAAAAAA==/", "_ts": 1764966613, - "id": "01738f95-410e-414a-98ce-fe6097133ce6", + "id": "|subscriptions|f52dfea2-47ee-4396-8006-4a27d47d59c5|providers|microsoft.redhatopenshift|locations|fake-location|hcpoperationstatuses|01738f95-410e-414a-98ce-fe6097133ce6", "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "externalId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/basic-external-auth/externalAuths/basic-external-auth", 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 e3766de45a..3b81d99276 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 @@ -4,7 +4,7 @@ "_rid": "KDJCAI5tVlcFAAAAAAAAAA==", "_self": "dbs/KDJCAA==/colls/KDJCAI5tVlc=/docs/KDJCAI5tVlcFAAAAAAAAAA==/", "_ts": 1764966599, - "id": "c6fc0c94-cfcc-4af0-a9b2-78132b1d9289", + "id": "|subscriptions|f52dfea2-47ee-4396-8006-4a27d47d59c5|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|create-with-tags", "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "activeOperationId": "7c6b7caa-572f-41b6-9f18-1bb11adfba31", 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 f6f9163bd6..02829ed8c5 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 @@ -4,7 +4,7 @@ "_rid": "KDJCAI5tVlcEAAAAAAAAAA==", "_self": "dbs/KDJCAA==/colls/KDJCAI5tVlc=/docs/KDJCAI5tVlcEAAAAAAAAAA==/", "_ts": 1764966599, - "id": "7c6b7caa-572f-41b6-9f18-1bb11adfbd31", + "id": "|subscriptions|f52dfea2-47ee-4396-8006-4a27d47d59c5|providers|microsoft.redhatopenshift|locations|fake-location|hcpoperationstatuses|7c6b7caa-572f-41b6-9f18-1bb11adfbd31", "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "externalId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/immutability-cluster.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/immutability-cluster.json index 991014cef8..10b413f4f4 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/immutability-cluster.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/immutability-cluster.json @@ -4,7 +4,7 @@ "_rid": "zT0eAODBiq0FAAAAAAAAAA==", "_self": "dbs/zT0eAA==/colls/zT0eAODBiq0=/docs/zT0eAODBiq0FAAAAAAAAAA==/", "_ts": 1764966624, - "id": "8feb19cd-3d3c-4575-863b-b26ad817ce33", + "id": "|subscriptions|f52dfea2-47ee-4396-8006-4a27d47d59c5|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|immutability", "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "customerDesiredState": null, 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 4535bf04fc..84de2fdebc 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 @@ -4,7 +4,7 @@ "_rid": "zT0eAODBiq0HAAAAAAAAAA==", "_self": "dbs/zT0eAA==/colls/zT0eAODBiq0=/docs/zT0eAODBiq0HAAAAAAAAAA==/", "_ts": 1764966625, - "id": "85f1f006-dd68-49f7-a28f-86df17019b75", + "id": "|subscriptions|f52dfea2-47ee-4396-8006-4a27d47d59c5|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|immutability|nodepools|immutability-np", "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-immutability/node_pools/4nd28q7n8q", 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 11e80aa2d3..0ad177eb14 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 @@ -4,7 +4,7 @@ "_rid": "zT0eAODBiq0GAAAAAAAAAA==", "_self": "dbs/zT0eAA==/colls/zT0eAODBiq0=/docs/zT0eAODBiq0GAAAAAAAAAA==/", "_ts": 1764966625, - "id": "37332594-70b3-4796-9af6-301a5d57d1e6", + "id": "|subscriptions|f52dfea2-47ee-4396-8006-4a27d47d59c5|providers|microsoft.redhatopenshift|locations|fake-location|hcpoperationstatuses|37332594-70b3-4796-9af6-301a5d57d1e6", "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "externalId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/immutability/nodePools/immutability-np", 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 01e4496563..d9a3b98550 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 @@ -4,7 +4,7 @@ "_rid": "zT0eAODBiq0GAAAAAAAAAA==", "_self": "dbs/zT0eAA==/colls/zT0eAODBiq0=/docs/zT0eAODBiq0GAAAAAAAAAA==/", "_ts": 1764966625, - "id": "37332504-70b3-4796-9af6-301a5d47d127", + "id": "|subscriptions|f52dfea2-47ee-4396-8006-4a27d47d59c5|providers|microsoft.redhatopenshift|hcpoperationstatuses|37332504-70b3-4796-9af6-301a5d47d127", "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "externalId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/immutability/nodePools/immutability-np", diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/subscription_0465bc32-c654-41b8-8d87-9815d7abe8f6.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/subscription_0465bc32-c654-41b8-8d87-9815d7abe8f6.json index 1f152e35a5..bcd42cfff4 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/subscription_0465bc32-c654-41b8-8d87-9815d7abe8f6.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/subscription_0465bc32-c654-41b8-8d87-9815d7abe8f6.json @@ -4,9 +4,10 @@ "_rid": "zT0eAODBiq0BAAAAAAAAAA==", "_self": "dbs/zT0eAA==/colls/zT0eAODBiq0=/docs/zT0eAODBiq0BAAAAAAAAAA==/", "_ts": 1764966624, - "id": "f52dfea2-47ee-4396-8006-4a27d47d59c5", + "id": "|subscriptions|f52dfea2-47ee-4396-8006-4a27d47d59c5", "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { + "resourceId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": null, "registrationDate": null, "state": "Registered" diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/test-controller-in-different-sub.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/test-controller-in-different-sub.json index 77608414ce..562a6d2ef1 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/test-controller-in-different-sub.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/test-controller-in-different-sub.json @@ -4,7 +4,7 @@ "_rid": "vWhbAJ1AYhMBAAAAAAAAAA==", "_self": "dbs/vWhbAA==/colls/vWhbAJ1AYhM=/docs/vWhbAJ1AYhMBAAAAAAAAAA==/", "_ts": 1764939717, - "id": "89261758-2990-46dd-8e97-99b31c7cee89", + "id": "|subscriptions|de3c5eaa-5fd0-4b8e-bd61-7c1a797b3780|resourcegroups|resourcegroupname|providers|microsoft.redhatopenshift|hcpopenshiftclusters|parentcluster|hcpopenshiftcontrollers|test-controller", "partitionKey": "de3c5eaa-5fd0-4b8e-bd61-7c1a797b3780", "properties": { "internalState": { diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/03-untypedGet-immutability-cluster-via-child/immutability-cluster.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/03-untypedGet-immutability-cluster-via-child/immutability-cluster.json index 0b0c12b970..cb8e2a6ccf 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/03-untypedGet-immutability-cluster-via-child/immutability-cluster.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/03-untypedGet-immutability-cluster-via-child/immutability-cluster.json @@ -4,7 +4,7 @@ "_rid": "zT0eAODBiq0FAAAAAAAAAA==", "_self": "dbs/zT0eAA==/colls/zT0eAODBiq0=/docs/zT0eAODBiq0FAAAAAAAAAA==/", "_ts": 1764966624, - "id": "8feb19cd-3d3c-4575-863b-b26ad817ce33", + "id": "|subscriptions|f52dfea2-47ee-4396-8006-4a27d47d59c5|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|immutability", "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "customerDesiredState": null, 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 4cbc92d3f9..9b02892d12 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 @@ -4,7 +4,7 @@ "_rid": "QS9oAIjBpYUEAAAAAAAAAA==", "_self": "dbs/QS9oAA==/colls/QS9oAIjBpYU=/docs/QS9oAIjBpYUEAAAAAAAAAA==/", "_ts": 1764966613, - "id": "e2d82cd9-b5c7-4383-b15f-61b80905c39d", + "id": "|subscriptions|f52dfea2-47ee-4396-8006-4a27d47d59c5|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|basic-external-auth|externalauths|basic-external-auth", "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-basic-external-auth/external_auth_config/external_auths/2wbhxn4qwk", diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/04-untypedListRecursive-resourcegroup/basic-external-auth-cluster.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/04-untypedListRecursive-resourcegroup/basic-external-auth-cluster.json index a607f111e9..4944b525c4 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/04-untypedListRecursive-resourcegroup/basic-external-auth-cluster.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/04-untypedListRecursive-resourcegroup/basic-external-auth-cluster.json @@ -4,7 +4,7 @@ "_rid": "QS9oAIjBpYUCAAAAAAAAAA==", "_self": "dbs/QS9oAA==/colls/QS9oAIjBpYU=/docs/QS9oAIjBpYUCAAAAAAAAAA==/", "_ts": 1764966610, - "id": "8feb19cd-3d3c-4575-863b-b26ad817ce18", + "id": "|subscriptions|f52dfea2-47ee-4396-8006-4a27d47d59c5|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|basic-external-auth", "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "customerDesiredState": null, 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 e3766de45a..3b81d99276 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 @@ -4,7 +4,7 @@ "_rid": "KDJCAI5tVlcFAAAAAAAAAA==", "_self": "dbs/KDJCAA==/colls/KDJCAI5tVlc=/docs/KDJCAI5tVlcFAAAAAAAAAA==/", "_ts": 1764966599, - "id": "c6fc0c94-cfcc-4af0-a9b2-78132b1d9289", + "id": "|subscriptions|f52dfea2-47ee-4396-8006-4a27d47d59c5|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|create-with-tags", "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "activeOperationId": "7c6b7caa-572f-41b6-9f18-1bb11adfba31", diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/04-untypedListRecursive-resourcegroup/immutability-cluster.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/04-untypedListRecursive-resourcegroup/immutability-cluster.json index 991014cef8..10b413f4f4 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/04-untypedListRecursive-resourcegroup/immutability-cluster.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/04-untypedListRecursive-resourcegroup/immutability-cluster.json @@ -4,7 +4,7 @@ "_rid": "zT0eAODBiq0FAAAAAAAAAA==", "_self": "dbs/zT0eAA==/colls/zT0eAODBiq0=/docs/zT0eAODBiq0FAAAAAAAAAA==/", "_ts": 1764966624, - "id": "8feb19cd-3d3c-4575-863b-b26ad817ce33", + "id": "|subscriptions|f52dfea2-47ee-4396-8006-4a27d47d59c5|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|immutability", "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "customerDesiredState": null, 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 4cbc92d3f9..9b02892d12 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 @@ -4,7 +4,7 @@ "_rid": "QS9oAIjBpYUEAAAAAAAAAA==", "_self": "dbs/QS9oAA==/colls/QS9oAIjBpYU=/docs/QS9oAIjBpYUEAAAAAAAAAA==/", "_ts": 1764966613, - "id": "e2d82cd9-b5c7-4383-b15f-61b80905c39d", + "id": "|subscriptions|f52dfea2-47ee-4396-8006-4a27d47d59c5|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|basic-external-auth|externalauths|basic-external-auth", "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-basic-external-auth/external_auth_config/external_auths/2wbhxn4qwk", diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/basic-external-auth-cluster.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/basic-external-auth-cluster.json index a607f111e9..4944b525c4 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/basic-external-auth-cluster.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/basic-external-auth-cluster.json @@ -4,7 +4,7 @@ "_rid": "QS9oAIjBpYUCAAAAAAAAAA==", "_self": "dbs/QS9oAA==/colls/QS9oAIjBpYU=/docs/QS9oAIjBpYUCAAAAAAAAAA==/", "_ts": 1764966610, - "id": "8feb19cd-3d3c-4575-863b-b26ad817ce18", + "id": "|subscriptions|f52dfea2-47ee-4396-8006-4a27d47d59c5|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|basic-external-auth", "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "customerDesiredState": null, 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 e3766de45a..3b81d99276 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 @@ -4,7 +4,7 @@ "_rid": "KDJCAI5tVlcFAAAAAAAAAA==", "_self": "dbs/KDJCAA==/colls/KDJCAI5tVlc=/docs/KDJCAI5tVlcFAAAAAAAAAA==/", "_ts": 1764966599, - "id": "c6fc0c94-cfcc-4af0-a9b2-78132b1d9289", + "id": "|subscriptions|f52dfea2-47ee-4396-8006-4a27d47d59c5|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|create-with-tags", "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "activeOperationId": "7c6b7caa-572f-41b6-9f18-1bb11adfba31", diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/immutability-cluster.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/immutability-cluster.json index 991014cef8..10b413f4f4 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/immutability-cluster.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/immutability-cluster.json @@ -4,7 +4,7 @@ "_rid": "zT0eAODBiq0FAAAAAAAAAA==", "_self": "dbs/zT0eAA==/colls/zT0eAODBiq0=/docs/zT0eAODBiq0FAAAAAAAAAA==/", "_ts": 1764966624, - "id": "8feb19cd-3d3c-4575-863b-b26ad817ce33", + "id": "|subscriptions|f52dfea2-47ee-4396-8006-4a27d47d59c5|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|immutability", "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "customerDesiredState": null, 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 01e4496563..d9a3b98550 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 @@ -4,7 +4,7 @@ "_rid": "zT0eAODBiq0GAAAAAAAAAA==", "_self": "dbs/zT0eAA==/colls/zT0eAODBiq0=/docs/zT0eAODBiq0GAAAAAAAAAA==/", "_ts": 1764966625, - "id": "37332504-70b3-4796-9af6-301a5d47d127", + "id": "|subscriptions|f52dfea2-47ee-4396-8006-4a27d47d59c5|providers|microsoft.redhatopenshift|hcpoperationstatuses|37332504-70b3-4796-9af6-301a5d47d127", "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "externalId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/immutability/nodePools/immutability-np", diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/06-untypedListRecursive-new-subscription-with-controller/test-controller-in-different-sub.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/06-untypedListRecursive-new-subscription-with-controller/test-controller-in-different-sub.json index 77608414ce..562a6d2ef1 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/06-untypedListRecursive-new-subscription-with-controller/test-controller-in-different-sub.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/06-untypedListRecursive-new-subscription-with-controller/test-controller-in-different-sub.json @@ -4,7 +4,7 @@ "_rid": "vWhbAJ1AYhMBAAAAAAAAAA==", "_self": "dbs/vWhbAA==/colls/vWhbAJ1AYhM=/docs/vWhbAJ1AYhMBAAAAAAAAAA==/", "_ts": 1764939717, - "id": "89261758-2990-46dd-8e97-99b31c7cee89", + "id": "|subscriptions|de3c5eaa-5fd0-4b8e-bd61-7c1a797b3780|resourcegroups|resourcegroupname|providers|microsoft.redhatopenshift|hcpopenshiftclusters|parentcluster|hcpopenshiftcontrollers|test-controller", "partitionKey": "de3c5eaa-5fd0-4b8e-bd61-7c1a797b3780", "properties": { "internalState": { 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 4cbc92d3f9..9b02892d12 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 @@ -4,7 +4,7 @@ "_rid": "QS9oAIjBpYUEAAAAAAAAAA==", "_self": "dbs/QS9oAA==/colls/QS9oAIjBpYU=/docs/QS9oAIjBpYUEAAAAAAAAAA==/", "_ts": 1764966613, - "id": "e2d82cd9-b5c7-4383-b15f-61b80905c39d", + "id": "|subscriptions|f52dfea2-47ee-4396-8006-4a27d47d59c5|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|basic-external-auth|externalauths|basic-external-auth", "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-basic-external-auth/external_auth_config/external_auths/2wbhxn4qwk", diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/07-untypedListRecursive-resourcegroup-via-child/basic-external-auth-cluster.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/07-untypedListRecursive-resourcegroup-via-child/basic-external-auth-cluster.json index a607f111e9..4944b525c4 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/07-untypedListRecursive-resourcegroup-via-child/basic-external-auth-cluster.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/07-untypedListRecursive-resourcegroup-via-child/basic-external-auth-cluster.json @@ -4,7 +4,7 @@ "_rid": "QS9oAIjBpYUCAAAAAAAAAA==", "_self": "dbs/QS9oAA==/colls/QS9oAIjBpYU=/docs/QS9oAIjBpYUCAAAAAAAAAA==/", "_ts": 1764966610, - "id": "8feb19cd-3d3c-4575-863b-b26ad817ce18", + "id": "|subscriptions|f52dfea2-47ee-4396-8006-4a27d47d59c5|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|basic-external-auth", "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "customerDesiredState": null, 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 e3766de45a..3b81d99276 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 @@ -4,7 +4,7 @@ "_rid": "KDJCAI5tVlcFAAAAAAAAAA==", "_self": "dbs/KDJCAA==/colls/KDJCAI5tVlc=/docs/KDJCAI5tVlcFAAAAAAAAAA==/", "_ts": 1764966599, - "id": "c6fc0c94-cfcc-4af0-a9b2-78132b1d9289", + "id": "|subscriptions|f52dfea2-47ee-4396-8006-4a27d47d59c5|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|create-with-tags", "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "activeOperationId": "7c6b7caa-572f-41b6-9f18-1bb11adfba31", diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/07-untypedListRecursive-resourcegroup-via-child/immutability-cluster.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/07-untypedListRecursive-resourcegroup-via-child/immutability-cluster.json index 991014cef8..10b413f4f4 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/07-untypedListRecursive-resourcegroup-via-child/immutability-cluster.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/07-untypedListRecursive-resourcegroup-via-child/immutability-cluster.json @@ -4,7 +4,7 @@ "_rid": "zT0eAODBiq0FAAAAAAAAAA==", "_self": "dbs/zT0eAA==/colls/zT0eAODBiq0=/docs/zT0eAODBiq0FAAAAAAAAAA==/", "_ts": 1764966624, - "id": "8feb19cd-3d3c-4575-863b-b26ad817ce33", + "id": "|subscriptions|f52dfea2-47ee-4396-8006-4a27d47d59c5|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|immutability", "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "customerDesiredState": null, diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/10-untypedList-resourcegroup/basic-external-auth-cluster.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/10-untypedList-resourcegroup/basic-external-auth-cluster.json index a607f111e9..4944b525c4 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/10-untypedList-resourcegroup/basic-external-auth-cluster.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/10-untypedList-resourcegroup/basic-external-auth-cluster.json @@ -4,7 +4,7 @@ "_rid": "QS9oAIjBpYUCAAAAAAAAAA==", "_self": "dbs/QS9oAA==/colls/QS9oAIjBpYU=/docs/QS9oAIjBpYUCAAAAAAAAAA==/", "_ts": 1764966610, - "id": "8feb19cd-3d3c-4575-863b-b26ad817ce18", + "id": "|subscriptions|f52dfea2-47ee-4396-8006-4a27d47d59c5|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|basic-external-auth", "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "customerDesiredState": null, 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 e3766de45a..3b81d99276 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 @@ -4,7 +4,7 @@ "_rid": "KDJCAI5tVlcFAAAAAAAAAA==", "_self": "dbs/KDJCAA==/colls/KDJCAI5tVlc=/docs/KDJCAI5tVlcFAAAAAAAAAA==/", "_ts": 1764966599, - "id": "c6fc0c94-cfcc-4af0-a9b2-78132b1d9289", + "id": "|subscriptions|f52dfea2-47ee-4396-8006-4a27d47d59c5|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|create-with-tags", "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "activeOperationId": "7c6b7caa-572f-41b6-9f18-1bb11adfba31", diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/10-untypedList-resourcegroup/immutability-cluster.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/10-untypedList-resourcegroup/immutability-cluster.json index 991014cef8..10b413f4f4 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/10-untypedList-resourcegroup/immutability-cluster.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/10-untypedList-resourcegroup/immutability-cluster.json @@ -4,7 +4,7 @@ "_rid": "zT0eAODBiq0FAAAAAAAAAA==", "_self": "dbs/zT0eAA==/colls/zT0eAODBiq0=/docs/zT0eAODBiq0FAAAAAAAAAA==/", "_ts": 1764966624, - "id": "8feb19cd-3d3c-4575-863b-b26ad817ce33", + "id": "|subscriptions|f52dfea2-47ee-4396-8006-4a27d47d59c5|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|immutability", "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "customerDesiredState": null, diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/12-untypedList-resourcegroup/basic-external-auth-cluster.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/12-untypedList-resourcegroup/basic-external-auth-cluster.json index a607f111e9..4944b525c4 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/12-untypedList-resourcegroup/basic-external-auth-cluster.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/12-untypedList-resourcegroup/basic-external-auth-cluster.json @@ -4,7 +4,7 @@ "_rid": "QS9oAIjBpYUCAAAAAAAAAA==", "_self": "dbs/QS9oAA==/colls/QS9oAIjBpYU=/docs/QS9oAIjBpYUCAAAAAAAAAA==/", "_ts": 1764966610, - "id": "8feb19cd-3d3c-4575-863b-b26ad817ce18", + "id": "|subscriptions|f52dfea2-47ee-4396-8006-4a27d47d59c5|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|basic-external-auth", "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "customerDesiredState": null, 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 e3766de45a..3b81d99276 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 @@ -4,7 +4,7 @@ "_rid": "KDJCAI5tVlcFAAAAAAAAAA==", "_self": "dbs/KDJCAA==/colls/KDJCAI5tVlc=/docs/KDJCAI5tVlcFAAAAAAAAAA==/", "_ts": 1764966599, - "id": "c6fc0c94-cfcc-4af0-a9b2-78132b1d9289", + "id": "|subscriptions|f52dfea2-47ee-4396-8006-4a27d47d59c5|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|create-with-tags", "partitionKey": "f52dfea2-47ee-4396-8006-4a27d47d59c5", "properties": { "activeOperationId": "7c6b7caa-572f-41b6-9f18-1bb11adfba31", diff --git a/test-integration/frontend/artifacts/ExternalAuthMutation/basic-external-auth/cosmos-state/cosmos-01-cluster.json b/test-integration/frontend/artifacts/ExternalAuthMutation/basic-external-auth/cosmos-state/cosmos-01-cluster.json index 78c1905e57..1c629d7de3 100644 --- a/test-integration/frontend/artifacts/ExternalAuthMutation/basic-external-auth/cosmos-state/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/ExternalAuthMutation/basic-external-auth/cosmos-state/cosmos-01-cluster.json @@ -1,5 +1,5 @@ { - "id" : "8feb19cd-3d3c-4575-863b-b26ad817ce18", + "id" : "|subscriptions|0465bc32-c654-41b8-8d87-9815d7abe8f6|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|basic-external-auth", "partitionKey" : "0465bc32-c654-41b8-8d87-9815d7abe8f6", "resourceType" : "microsoft.redhatopenshift/hcpopenshiftclusters", "properties" : { diff --git a/test-integration/frontend/artifacts/ExternalAuthMutation/clientid-not-in-audiences/cosmos-state/cosmos-01-cluster.json b/test-integration/frontend/artifacts/ExternalAuthMutation/clientid-not-in-audiences/cosmos-state/cosmos-01-cluster.json index 10e5c83156..2da21edb81 100644 --- a/test-integration/frontend/artifacts/ExternalAuthMutation/clientid-not-in-audiences/cosmos-state/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/ExternalAuthMutation/clientid-not-in-audiences/cosmos-state/cosmos-01-cluster.json @@ -1,5 +1,5 @@ { - "id" : "8feb19cd-3d3c-4575-863b-b26ad817ce50", + "id" : "|subscriptions|0465bc32-c654-41b8-8d87-9815d7abe8f6|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|clientid-not-in-audiences", "partitionKey" : "0465bc32-c654-41b8-8d87-9815d7abe8f6", "resourceType" : "microsoft.redhatopenshift/hcpopenshiftclusters", "properties" : { diff --git a/test-integration/frontend/artifacts/ExternalAuthMutation/cluster-creating/cosmos-state/cosmos-01-cluster.json b/test-integration/frontend/artifacts/ExternalAuthMutation/cluster-creating/cosmos-state/cosmos-01-cluster.json index 6d9627589f..34605e61fa 100644 --- a/test-integration/frontend/artifacts/ExternalAuthMutation/cluster-creating/cosmos-state/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/ExternalAuthMutation/cluster-creating/cosmos-state/cosmos-01-cluster.json @@ -1,5 +1,5 @@ { - "id" : "29c5d490-ec04-11f0-b051-9c6b00c26e8e", + "id" : "|subscriptions|0465bc32-c654-41b8-8d87-9815d7abe8f6|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|cluster-creating", "partitionKey" : "0465bc32-c654-41b8-8d87-9815d7abe8f6", "resourceType" : "microsoft.redhatopenshift/hcpopenshiftclusters", "properties" : { diff --git a/test-integration/frontend/artifacts/ExternalAuthMutation/cluster-deleting/cosmos-state/cosmos-01-cluster.json b/test-integration/frontend/artifacts/ExternalAuthMutation/cluster-deleting/cosmos-state/cosmos-01-cluster.json index eb62b3fd70..12721aab2d 100644 --- a/test-integration/frontend/artifacts/ExternalAuthMutation/cluster-deleting/cosmos-state/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/ExternalAuthMutation/cluster-deleting/cosmos-state/cosmos-01-cluster.json @@ -1,5 +1,5 @@ { - "id" : "39885b40-ec04-11f0-b70f-9c6b00c26e8e", + "id" : "|subscriptions|0465bc32-c654-41b8-8d87-9815d7abe8f6|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|cluster-deleting", "partitionKey" : "0465bc32-c654-41b8-8d87-9815d7abe8f6", "resourceType" : "microsoft.redhatopenshift/hcpopenshiftclusters", "properties" : { diff --git a/test-integration/frontend/artifacts/ExternalAuthMutation/duplicate-client-components/cosmos-state/cosmos-01-cluster.json b/test-integration/frontend/artifacts/ExternalAuthMutation/duplicate-client-components/cosmos-state/cosmos-01-cluster.json index 42c8ca706a..1bf136c217 100644 --- a/test-integration/frontend/artifacts/ExternalAuthMutation/duplicate-client-components/cosmos-state/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/ExternalAuthMutation/duplicate-client-components/cosmos-state/cosmos-01-cluster.json @@ -1,5 +1,5 @@ { - "id" : "8feb19cd-3d3c-4575-863b-b26ad817ce51", + "id" : "|subscriptions|0465bc32-c654-41b8-8d87-9815d7abe8f6|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|duplicate-client-components", "partitionKey" : "0465bc32-c654-41b8-8d87-9815d7abe8f6", "resourceType" : "microsoft.redhatopenshift/hcpopenshiftclusters", "properties" : { diff --git a/test-integration/frontend/artifacts/ExternalAuthMutation/initial-cosmos-state/01-subscription.json b/test-integration/frontend/artifacts/ExternalAuthMutation/initial-cosmos-state/01-subscription.json index 4d6eccfa4b..9318b10271 100644 --- a/test-integration/frontend/artifacts/ExternalAuthMutation/initial-cosmos-state/01-subscription.json +++ b/test-integration/frontend/artifacts/ExternalAuthMutation/initial-cosmos-state/01-subscription.json @@ -1,10 +1,11 @@ { - "id": "0465bc32-c654-41b8-8d87-9815d7abe8f6", - "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", - "resourceType": "microsoft.resources/subscriptions", - "properties": { - "state": "Registered", - "registrationDate": null, - "properties": null - } + "id": "|subscriptions|0465bc32-c654-41b8-8d87-9815d7abe8f6", + "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", + "resourceType": "microsoft.resources/subscriptions", + "properties": { + "state": "Registered", + "registrationDate": null, + "properties": null, + "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6" + } } diff --git a/test-integration/frontend/artifacts/ExternalAuthMutation/invalid-format/cosmos-state/cosmos-01-cluster.json b/test-integration/frontend/artifacts/ExternalAuthMutation/invalid-format/cosmos-state/cosmos-01-cluster.json index 5a84e5f823..89df1d5314 100644 --- a/test-integration/frontend/artifacts/ExternalAuthMutation/invalid-format/cosmos-state/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/ExternalAuthMutation/invalid-format/cosmos-state/cosmos-01-cluster.json @@ -1,5 +1,5 @@ { - "id" : "8feb19cd-3d3c-4575-863b-b26ad817ce17", + "id" : "|subscriptions|0465bc32-c654-41b8-8d87-9815d7abe8f6|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|invalid-format", "partitionKey" : "0465bc32-c654-41b8-8d87-9815d7abe8f6", "resourceType" : "microsoft.redhatopenshift/hcpopenshiftclusters", "properties" : { diff --git a/test-integration/frontend/artifacts/ExternalAuthMutation/minimal-external-auth/cosmos-state/cosmos-01-cluster.json b/test-integration/frontend/artifacts/ExternalAuthMutation/minimal-external-auth/cosmos-state/cosmos-01-cluster.json index 9337ec1e8c..04e7c540d1 100644 --- a/test-integration/frontend/artifacts/ExternalAuthMutation/minimal-external-auth/cosmos-state/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/ExternalAuthMutation/minimal-external-auth/cosmos-state/cosmos-01-cluster.json @@ -1,5 +1,5 @@ { - "id" : "8feb19cd-3d3c-4575-863b-b26ad817ce15", + "id" : "|subscriptions|0465bc32-c654-41b8-8d87-9815d7abe8f6|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|minimal-external-auth", "partitionKey" : "0465bc32-c654-41b8-8d87-9815d7abe8f6", "resourceType" : "microsoft.redhatopenshift/hcpopenshiftclusters", "properties" : { diff --git a/test-integration/frontend/artifacts/ExternalAuthMutation/missing-non-leaf-required-fields/cosmos-state/cosmos-01-cluster.json b/test-integration/frontend/artifacts/ExternalAuthMutation/missing-non-leaf-required-fields/cosmos-state/cosmos-01-cluster.json index f046715945..6f6885b02e 100644 --- a/test-integration/frontend/artifacts/ExternalAuthMutation/missing-non-leaf-required-fields/cosmos-state/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/ExternalAuthMutation/missing-non-leaf-required-fields/cosmos-state/cosmos-01-cluster.json @@ -1,5 +1,5 @@ { - "id" : "8feb19cd-3d3c-4575-863b-b26ad817ce20", + "id" : "|subscriptions|0465bc32-c654-41b8-8d87-9815d7abe8f6|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|missing-non-leaf-required-fields", "partitionKey" : "0465bc32-c654-41b8-8d87-9815d7abe8f6", "resourceType" : "microsoft.redhatopenshift/hcpopenshiftclusters", "properties" : { diff --git a/test-integration/frontend/artifacts/ExternalAuthMutation/missing-required-fields/cosmos-state/cosmos-01-cluster.json b/test-integration/frontend/artifacts/ExternalAuthMutation/missing-required-fields/cosmos-state/cosmos-01-cluster.json index 8c276d1772..a883f98bc0 100644 --- a/test-integration/frontend/artifacts/ExternalAuthMutation/missing-required-fields/cosmos-state/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/ExternalAuthMutation/missing-required-fields/cosmos-state/cosmos-01-cluster.json @@ -1,5 +1,5 @@ { - "id" : "9feb19cd-3d3c-4575-863b-b26ad817ce17", + "id" : "|subscriptions|0465bc32-c654-41b8-8d87-9815d7abe8f6|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|missing-required-fields", "partitionKey" : "0465bc32-c654-41b8-8d87-9815d7abe8f6", "resourceType" : "microsoft.redhatopenshift/hcpopenshiftclusters", "properties" : { diff --git a/test-integration/frontend/artifacts/ExternalAuthMutation/multiple-validation-errors/cosmos-state/cosmos-01-cluster.json b/test-integration/frontend/artifacts/ExternalAuthMutation/multiple-validation-errors/cosmos-state/cosmos-01-cluster.json index 7bceada8ef..dccc872541 100644 --- a/test-integration/frontend/artifacts/ExternalAuthMutation/multiple-validation-errors/cosmos-state/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/ExternalAuthMutation/multiple-validation-errors/cosmos-state/cosmos-01-cluster.json @@ -1,5 +1,5 @@ { - "id" : "8feb19cd-3d3c-4575-863b-b26ad817ce55", + "id" : "|subscriptions|0465bc32-c654-41b8-8d87-9815d7abe8f6|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|multiple-validation-errors", "partitionKey" : "0465bc32-c654-41b8-8d87-9815d7abe8f6", "resourceType" : "microsoft.redhatopenshift/hcpopenshiftclusters", "properties" : { diff --git a/test-integration/frontend/artifacts/ExternalAuthMutation/noop-external-auth-update/cosmos-state/cosmos-01-cluster.json b/test-integration/frontend/artifacts/ExternalAuthMutation/noop-external-auth-update/cosmos-state/cosmos-01-cluster.json index 8d67fb1dfb..c707f0154e 100644 --- a/test-integration/frontend/artifacts/ExternalAuthMutation/noop-external-auth-update/cosmos-state/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/ExternalAuthMutation/noop-external-auth-update/cosmos-state/cosmos-01-cluster.json @@ -1,5 +1,5 @@ { - "id" : "8feb19cd-3d3c-4575-863b-b26ad817ce30", + "id" : "|subscriptions|0465bc32-c654-41b8-8d87-9815d7abe8f6|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|noop-external-auth-update", "partitionKey" : "0465bc32-c654-41b8-8d87-9815d7abe8f6", "resourceType" : "microsoft.redhatopenshift/hcpopenshiftclusters", "properties" : { diff --git a/test-integration/frontend/artifacts/ExternalAuthMutation/patch-null-01/cosmos-state/cosmos-01-cluster.json b/test-integration/frontend/artifacts/ExternalAuthMutation/patch-null-01/cosmos-state/cosmos-01-cluster.json index 81a4cd50dc..45141da498 100644 --- a/test-integration/frontend/artifacts/ExternalAuthMutation/patch-null-01/cosmos-state/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/ExternalAuthMutation/patch-null-01/cosmos-state/cosmos-01-cluster.json @@ -1,5 +1,5 @@ { - "id" : "8feb19cd-3d3c-4575-863b-b26ad817ce70", + "id" : "|subscriptions|0465bc32-c654-41b8-8d87-9815d7abe8f6|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|patch-null-01", "partitionKey" : "0465bc32-c654-41b8-8d87-9815d7abe8f6", "resourceType" : "microsoft.redhatopenshift/hcpopenshiftclusters", "properties" : { 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 3c58e7ba57..dae9f2415c 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 @@ -4,7 +4,7 @@ "_rid": "WZlNALYurecDAAAAAAAAAA==", "_self": "dbs/WZlNAA==/colls/WZlNALYurec=/docs/WZlNALYurecDAAAAAAAAAA==/", "_ts": 1766174370, - "id": "c893be2c-80b0-497f-8490-e3e5fd2b2cc4", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7|resourcegroups|resourcegroupname|providers|microsoft.redhatopenshift|hcpopenshiftclusters|create-with-tags", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", 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 00cdb59e2e..fa4d545329 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 @@ -4,7 +4,7 @@ "_rid": "WZlNALYurecCAAAAAAAAAA==", "_self": "dbs/WZlNAA==/colls/WZlNALYurec=/docs/WZlNALYurecCAAAAAAAAAA==/", "_ts": 1766174370, - "id": "7a4ed07a-47a1-4efb-966a-93a6316522a0", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7|providers|microsoft.redhatopenshift|locations|fake-location|hcpoperationstatuses|7a4ed07a-47a1-4efb-966a-93a6316522a0", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "externalId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/02-cosmosCompare-confirm-content/subscription.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/02-cosmosCompare-confirm-content/subscription.json index eb217c3212..28e3bdae44 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/02-cosmosCompare-confirm-content/subscription.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/02-cosmosCompare-confirm-content/subscription.json @@ -4,7 +4,7 @@ "_rid": "WZlNALYurecBAAAAAAAAAA==", "_self": "dbs/WZlNAA==/colls/WZlNALYurec=/docs/WZlNALYurecBAAAAAAAAAA==/", "_ts": 1766174370, - "id": "6b690bec-0c16-4ecb-8f67-781caf40bba7", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "properties": null, 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 3dfc297e62..b31b6b93b4 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 @@ -4,7 +4,7 @@ "_rid": "WZlNALYurecDAAAAAAAAAA==", "_self": "dbs/WZlNAA==/colls/WZlNALYurec=/docs/WZlNALYurecDAAAAAAAAAA==/", "_ts": 1766174370, - "id": "c893be2c-80b0-497f-8490-e3e5fd2b2cc4", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7|resourcegroups|resourcegroupname|providers|microsoft.redhatopenshift|hcpopenshiftclusters|create-with-tags", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/01-load-old-data/6b690bec-0c16-4ecb-8f67-781caf40bba7.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/01-load-old-data/6b690bec-0c16-4ecb-8f67-781caf40bba7.json index f722b276c8..013f82eb41 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/01-load-old-data/6b690bec-0c16-4ecb-8f67-781caf40bba7.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/01-load-old-data/6b690bec-0c16-4ecb-8f67-781caf40bba7.json @@ -4,7 +4,7 @@ "_rid": "qr1CAKur9GQBAAAAAAAAAA==", "_self": "dbs/qr1CAA==/colls/qr1CAKur9GQ=/docs/qr1CAKur9GQBAAAAAAAAAA==/", "_ts": 1767637797, - "id": "6b690bec-0c16-4ecb-8f67-781caf40bba7", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "properties": null, 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 2584e8beff..7b8a36e53e 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 @@ -4,7 +4,7 @@ "_rid": "qr1CAKur9GQDAAAAAAAAAA==", "_self": "dbs/qr1CAA==/colls/qr1CAKur9GQ=/docs/qr1CAKur9GQDAAAAAAAAAA==/", "_ts": 1767637798, - "id": "9462c9da-42ac-4606-ad99-84e4f3ec0977", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7|resourcegroups|resourcegroupname|providers|microsoft.redhatopenshift|hcpopenshiftclusters|create-with-tags", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "activeOperationId": "90b2322c-2c26-47ca-b6f9-d9b1a8385cbc", 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 74c42895df..34f1abe6c4 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 @@ -1,22 +1,22 @@ { - "_attachments": "attachments/", - "_etag": "\"00000000-0000-0000-7e71-4bc4d00501dc\"", - "_rid": "qr1CAKur9GQCAAAAAAAAAA==", - "_self": "dbs/qr1CAA==/colls/qr1CAKur9GQ=/docs/qr1CAKur9GQCAAAAAAAAAA==/", - "_ts": 1767637798, - "id": "90b2322c-2c26-47ca-b6f9-d9b1a8385cbc", - "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", - "properties": { - "externalId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "internalId": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", - "lastTransitionTime": "2026-01-05T18:29:58.181047849Z", - "operationId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/providers/Microsoft.RedHatOpenShift/locations/fake-location/hcpOperationStatuses/90b2322c-2c26-47ca-b6f9-d9b1a8385cbc", - "request": "Create", - "resourceId": null, - "startTime": "2026-01-05T18:29:58.181047849Z", - "status": "Accepted", - "tenantId": "00000000-0000-0000-0000-000000000000" - }, - "resourceType": "Microsoft.RedHatOpenShift/hcpOperationStatuses", - "ttl": 604800 + "_attachments": "attachments/", + "_etag": "\"00000000-0000-0000-7e71-4bc4d00501dc\"", + "_rid": "qr1CAKur9GQCAAAAAAAAAA==", + "_self": "dbs/qr1CAA==/colls/qr1CAKur9GQ=/docs/qr1CAKur9GQCAAAAAAAAAA==/", + "_ts": 1767637798, + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7|providers|microsoft.redhatopenshift|hcpoperationstatuses|90b2322c-2c26-47ca-b6f9-d9b1a8385cbc", + "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", + "properties": { + "externalId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", + "internalId": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", + "lastTransitionTime": "2026-01-05T18:29:58.181047849Z", + "operationId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/providers/Microsoft.RedHatOpenShift/locations/fake-location/hcpOperationStatuses/90b2322c-2c26-47ca-b6f9-d9b1a8385cbc", + "request": "Create", + "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/providers/Microsoft.RedHatOpenShift/hcpOperationStatuses/90b2322c-2c26-47ca-b6f9-d9b1a8385cbc", + "startTime": "2026-01-05T18:29:58.181047849Z", + "status": "Accepted", + "tenantId": "00000000-0000-0000-0000-000000000000" + }, + "resourceType": "Microsoft.RedHatOpenShift/hcpOperationStatuses", + "ttl": 604800 } \ No newline at end of file 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 3dfc297e62..b31b6b93b4 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 @@ -4,7 +4,7 @@ "_rid": "WZlNALYurecDAAAAAAAAAA==", "_self": "dbs/WZlNAA==/colls/WZlNALYurec=/docs/WZlNALYurecDAAAAAAAAAA==/", "_ts": 1766174370, - "id": "c893be2c-80b0-497f-8490-e3e5fd2b2cc4", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7|resourcegroups|resourcegroupname|providers|microsoft.redhatopenshift|hcpopenshiftclusters|create-with-tags", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", 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 562dfc9646..2fe46fb6c4 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 @@ -4,7 +4,7 @@ "_rid": "M4dGAP57SmwFAAAAAAAAAA==", "_self": "dbs/M4dGAA==/colls/M4dGAP57Smw=/docs/M4dGAP57SmwFAAAAAAAAAA==/", "_ts": 1767983403, - "id": "980ba655-ecf5-4d88-a766-af2a96a2b25b", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7|resourcegroups|resourcegroupname|providers|microsoft.redhatopenshift|hcpopenshiftclusters|create-with-tags|externalauths|default", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "activeOperationId": "ea807c13-7e15-43d4-b760-69ef7e31d273", 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 d2f00db842..dd8dbc4507 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 @@ -4,7 +4,7 @@ "_rid": "MFstAI+1dLsDAAAAAAAAAA==", "_self": "dbs/MFstAA==/colls/MFstAI+1dLs=/docs/MFstAI+1dLsDAAAAAAAAAA==/", "_ts": 1767983530, - "id": "c88935c2-816e-4ba6-8a0e-40490b6c01c8", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7|resourcegroups|resourcegroupname|providers|microsoft.redhatopenshift|hcpopenshiftclusters|create-with-tags", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "identity": { 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 284ab36211..a8f91f5d34 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 @@ -4,7 +4,7 @@ "_rid": "MFstAI+1dLsFAAAAAAAAAA==", "_self": "dbs/MFstAA==/colls/MFstAI+1dLs=/docs/MFstAI+1dLsFAAAAAAAAAA==/", "_ts": 1767983530, - "id": "227c4c23-2bb6-4fae-9f16-5090b02298b0", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7|resourcegroups|resourcegroupname|providers|microsoft.redhatopenshift|hcpopenshiftclusters|create-with-tags|externalauths|default", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "activeOperationId": "5dce3cac-e09b-4ef5-803c-cb8f17b3a552", 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 af455fd6d3..2c221c3783 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 @@ -4,7 +4,7 @@ "_rid": "MFstAI+1dLsCAAAAAAAAAA==", "_self": "dbs/MFstAA==/colls/MFstAI+1dLs=/docs/MFstAI+1dLsCAAAAAAAAAA==/", "_ts": 1767983530, - "id": "9696fbeb-0e78-4a32-a3fd-a6e987c2a015", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7|providers|microsoft.redhatopenshift|hcpoperationstatuses|9696fbeb-0e78-4a32-a3fd-a6e987c2a015", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "externalId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", 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 23761eabcc..d70dd38e34 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 @@ -4,7 +4,7 @@ "_rid": "MFstAI+1dLsEAAAAAAAAAA==", "_self": "dbs/MFstAA==/colls/MFstAI+1dLs=/docs/MFstAI+1dLsEAAAAAAAAAA==/", "_ts": 1767983530, - "id": "5dce3cac-e09b-4ef5-803c-cb8f17b3a552", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7|providers|microsoft.redhatopenshift|hcpoperationstatuses|5dce3cac-e09b-4ef5-803c-cb8f17b3a552", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "externalId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/externalAuths/default", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/01-load-old-data/subscription.json b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/01-load-old-data/subscription.json index e1d9cc9344..524f14a3f2 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/01-load-old-data/subscription.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/01-load-old-data/subscription.json @@ -4,7 +4,7 @@ "_rid": "MFstAI+1dLsBAAAAAAAAAA==", "_self": "dbs/MFstAA==/colls/MFstAI+1dLs=/docs/MFstAI+1dLsBAAAAAAAAAA==/", "_ts": 1767983529, - "id": "6b690bec-0c16-4ecb-8f67-781caf40bba7", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "properties": null, 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 bd6f38c511..cbfe3efdcb 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 @@ -4,7 +4,7 @@ "_rid": "WZlNALYurecDAAAAAAAAAA==", "_self": "dbs/WZlNAA==/colls/WZlNALYurec=/docs/WZlNALYurecDAAAAAAAAAA==/", "_ts": 1766174370, - "id": "c893be2c-80b0-497f-8490-e3e5fd2b2cc4", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7|resourcegroups|resourcegroupname|providers|microsoft.redhatopenshift|hcpopenshiftclusters|create-with-tags", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", 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 284ab36211..a8f91f5d34 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 @@ -4,7 +4,7 @@ "_rid": "MFstAI+1dLsFAAAAAAAAAA==", "_self": "dbs/MFstAA==/colls/MFstAI+1dLs=/docs/MFstAI+1dLsFAAAAAAAAAA==/", "_ts": 1767983530, - "id": "227c4c23-2bb6-4fae-9f16-5090b02298b0", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7|resourcegroups|resourcegroupname|providers|microsoft.redhatopenshift|hcpopenshiftclusters|create-with-tags|externalauths|default", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "activeOperationId": "5dce3cac-e09b-4ef5-803c-cb8f17b3a552", 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 4497c50b0f..836c46f075 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 @@ -4,7 +4,7 @@ "_rid": "SdEpAPzZNVkFAAAAAAAAAA==", "_self": "dbs/SdEpAA==/colls/SdEpAPzZNVk=/docs/SdEpAPzZNVkFAAAAAAAAAA==/", "_ts": 1766178371, - "id": "23bd08bc-2ed3-40be-8c9e-7e005f8a421f", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7|resourcegroups|resourcegroupname|providers|microsoft.redhatopenshift|hcpopenshiftclusters|create-with-tags|nodepools|basic-node-pool", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "activeOperationId": "cdfb496e-6e70-4022-9f8d-b0dacf6d2ff5", 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 86336a490e..e9af399168 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 @@ -4,7 +4,7 @@ "_rid": "SdEpAPzZNVkHAAAAAAAAAA==", "_self": "dbs/SdEpAA==/colls/SdEpAPzZNVk=/docs/SdEpAPzZNVkHAAAAAAAAAA==/", "_ts": 1766178372, - "id": "405f85e0-9528-458d-abbf-b16e2319c833", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7|resourcegroups|resourcegroupname|providers|microsoft.redhatopenshift|hcpopenshiftclusters|create-with-tags|nodepools|node-pool-02", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "activeOperationId": "4067756a-fcc1-4732-a211-d785d888203c", 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 b52017ac78..49b93a6eae 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 @@ -4,7 +4,7 @@ "_rid": "WZlNALYurecCAAAAAAAAAA==", "_self": "dbs/WZlNAA==/colls/WZlNALYurec=/docs/WZlNALYurecCAAAAAAAAAA==/", "_ts": 1766174370, - "id": "7a4ed07a-47a1-4efb-966a-93a6316522a0", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7|providers|microsoft.redhatopenshift|hcpoperationstatuses|7a4ed07a-47a1-4efb-966a-93a6316522a0", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "externalId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", @@ -12,7 +12,7 @@ "lastTransitionTime": "2025-12-19T19:59:30.714826736Z", "operationId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/providers/Microsoft.RedHatOpenShift/locations/fake-location/hcpOperationStatuses/7a4ed07a-47a1-4efb-966a-93a6316522a0", "request": "Create", - "resourceId": null, + "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/providers/Microsoft.RedHatOpenShift/hcpOperationStatuses/7a4ed07a-47a1-4efb-966a-93a6316522a0", "startTime": "2025-12-19T19:59:30.714826736Z", "status": "Succeeded", "tenantId": "00000000-0000-0000-0000-000000000000" 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 0a5006738c..e1b7605da6 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 @@ -4,7 +4,7 @@ "_rid": "3+dlAMzyjkYEAAAAAAAAAA==", "_self": "dbs/3+dlAA==/colls/3+dlAMzyjkY=/docs/3+dlAMzyjkYEAAAAAAAAAA==/", "_ts": 1767902645, - "id": "cdfb496e-6e70-4022-9f8d-b0dacf6d2ff5", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7|providers|microsoft.redhatopenshift|hcpoperationstatuses|cdfb496e-6e70-4022-9f8d-b0dacf6d2ff5", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "externalId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/basic-node-pool", @@ -12,7 +12,7 @@ "lastTransitionTime": "2026-01-08T20:04:05.054190978Z", "operationId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/providers/Microsoft.RedHatOpenShift/locations/fake-location/hcpOperationStatuses/cdfb496e-6e70-4022-9f8d-b0dacf6d2ff5", "request": "Create", - "resourceId": null, + "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/providers/Microsoft.RedHatOpenShift/hcpOperationStatuses/cdfb496e-6e70-4022-9f8d-b0dacf6d2ff5", "startTime": "2026-01-08T20:04:05.054190978Z", "status": "Accepted", "tenantId": "00000000-0000-0000-0000-000000000000" 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 4a921f1e7b..4ed40bd23b 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 @@ -4,7 +4,7 @@ "_rid": "3+dlAMzyjkYGAAAAAAAAAA==", "_self": "dbs/3+dlAA==/colls/3+dlAMzyjkY=/docs/3+dlAMzyjkYGAAAAAAAAAA==/", "_ts": 1767902645, - "id": "4067756a-fcc1-4732-a211-d785d888203c", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7|providers|microsoft.redhatopenshift|hcpoperationstatuses|4067756a-fcc1-4732-a211-d785d888203c", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "externalId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/node-pool-02", @@ -12,7 +12,7 @@ "lastTransitionTime": "2026-01-08T20:04:05.330050272Z", "operationId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/providers/Microsoft.RedHatOpenShift/locations/fake-location/hcpOperationStatuses/4067756a-fcc1-4732-a211-d785d888203c", "request": "Create", - "resourceId": null, + "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/providers/Microsoft.RedHatOpenShift/hcpOperationStatuses/4067756a-fcc1-4732-a211-d785d888203c", "startTime": "2026-01-08T20:04:05.330050272Z", "status": "Accepted", "tenantId": "00000000-0000-0000-0000-000000000000" 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 23761eabcc..d70dd38e34 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 @@ -4,7 +4,7 @@ "_rid": "MFstAI+1dLsEAAAAAAAAAA==", "_self": "dbs/MFstAA==/colls/MFstAI+1dLs=/docs/MFstAI+1dLsEAAAAAAAAAA==/", "_ts": 1767983530, - "id": "5dce3cac-e09b-4ef5-803c-cb8f17b3a552", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7|providers|microsoft.redhatopenshift|hcpoperationstatuses|5dce3cac-e09b-4ef5-803c-cb8f17b3a552", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "externalId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/externalAuths/default", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/subscription.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/subscription.json index eb217c3212..28e3bdae44 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/subscription.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/subscription.json @@ -4,7 +4,7 @@ "_rid": "WZlNALYurecBAAAAAAAAAA==", "_self": "dbs/WZlNAA==/colls/WZlNALYurec=/docs/WZlNALYurecBAAAAAAAAAA==/", "_ts": 1766174370, - "id": "6b690bec-0c16-4ecb-8f67-781caf40bba7", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "properties": null, 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 b52017ac78..49b93a6eae 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 @@ -4,7 +4,7 @@ "_rid": "WZlNALYurecCAAAAAAAAAA==", "_self": "dbs/WZlNAA==/colls/WZlNALYurec=/docs/WZlNALYurecCAAAAAAAAAA==/", "_ts": 1766174370, - "id": "7a4ed07a-47a1-4efb-966a-93a6316522a0", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7|providers|microsoft.redhatopenshift|hcpoperationstatuses|7a4ed07a-47a1-4efb-966a-93a6316522a0", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "externalId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", @@ -12,7 +12,7 @@ "lastTransitionTime": "2025-12-19T19:59:30.714826736Z", "operationId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/providers/Microsoft.RedHatOpenShift/locations/fake-location/hcpOperationStatuses/7a4ed07a-47a1-4efb-966a-93a6316522a0", "request": "Create", - "resourceId": null, + "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/providers/Microsoft.RedHatOpenShift/hcpOperationStatuses/7a4ed07a-47a1-4efb-966a-93a6316522a0", "startTime": "2025-12-19T19:59:30.714826736Z", "status": "Succeeded", "tenantId": "00000000-0000-0000-0000-000000000000" 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 0a5006738c..e1b7605da6 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 @@ -4,7 +4,7 @@ "_rid": "3+dlAMzyjkYEAAAAAAAAAA==", "_self": "dbs/3+dlAA==/colls/3+dlAMzyjkY=/docs/3+dlAMzyjkYEAAAAAAAAAA==/", "_ts": 1767902645, - "id": "cdfb496e-6e70-4022-9f8d-b0dacf6d2ff5", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7|providers|microsoft.redhatopenshift|hcpoperationstatuses|cdfb496e-6e70-4022-9f8d-b0dacf6d2ff5", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "externalId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/basic-node-pool", @@ -12,7 +12,7 @@ "lastTransitionTime": "2026-01-08T20:04:05.054190978Z", "operationId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/providers/Microsoft.RedHatOpenShift/locations/fake-location/hcpOperationStatuses/cdfb496e-6e70-4022-9f8d-b0dacf6d2ff5", "request": "Create", - "resourceId": null, + "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/providers/Microsoft.RedHatOpenShift/hcpOperationStatuses/cdfb496e-6e70-4022-9f8d-b0dacf6d2ff5", "startTime": "2026-01-08T20:04:05.054190978Z", "status": "Accepted", "tenantId": "00000000-0000-0000-0000-000000000000" 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 4a921f1e7b..4ed40bd23b 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 @@ -4,7 +4,7 @@ "_rid": "3+dlAMzyjkYGAAAAAAAAAA==", "_self": "dbs/3+dlAA==/colls/3+dlAMzyjkY=/docs/3+dlAMzyjkYGAAAAAAAAAA==/", "_ts": 1767902645, - "id": "4067756a-fcc1-4732-a211-d785d888203c", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7|providers|microsoft.redhatopenshift|hcpoperationstatuses|4067756a-fcc1-4732-a211-d785d888203c", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "externalId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/node-pool-02", @@ -12,7 +12,7 @@ "lastTransitionTime": "2026-01-08T20:04:05.330050272Z", "operationId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/providers/Microsoft.RedHatOpenShift/locations/fake-location/hcpOperationStatuses/4067756a-fcc1-4732-a211-d785d888203c", "request": "Create", - "resourceId": null, + "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/providers/Microsoft.RedHatOpenShift/hcpOperationStatuses/4067756a-fcc1-4732-a211-d785d888203c", "startTime": "2026-01-08T20:04:05.330050272Z", "status": "Accepted", "tenantId": "00000000-0000-0000-0000-000000000000" 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 23761eabcc..d70dd38e34 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 @@ -4,7 +4,7 @@ "_rid": "MFstAI+1dLsEAAAAAAAAAA==", "_self": "dbs/MFstAA==/colls/MFstAI+1dLs=/docs/MFstAI+1dLsEAAAAAAAAAA==/", "_ts": 1767983530, - "id": "5dce3cac-e09b-4ef5-803c-cb8f17b3a552", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7|providers|microsoft.redhatopenshift|hcpoperationstatuses|5dce3cac-e09b-4ef5-803c-cb8f17b3a552", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "externalId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/externalAuths/default", 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 9d575a4e07..52bb62ee39 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 @@ -4,7 +4,7 @@ "_rid": "WZlNALYurecDAAAAAAAAAA==", "_self": "dbs/WZlNAA==/colls/WZlNALYurec=/docs/WZlNALYurecDAAAAAAAAAA==/", "_ts": 1766174370, - "id": "c893be2c-80b0-497f-8490-e3e5fd2b2cc4", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7|resourcegroups|resourcegroupname|providers|microsoft.redhatopenshift|hcpopenshiftclusters|create-with-tags", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", 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 baa5e3d0ae..1736f3d8e3 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 @@ -4,7 +4,7 @@ "_rid": "SdEpAPzZNVkFAAAAAAAAAA==", "_self": "dbs/SdEpAA==/colls/SdEpAPzZNVk=/docs/SdEpAPzZNVkFAAAAAAAAAA==/", "_ts": 1766178371, - "id": "23bd08bc-2ed3-40be-8c9e-7e005f8a421f", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7|resourcegroups|resourcegroupname|providers|microsoft.redhatopenshift|hcpopenshiftclusters|create-with-tags|nodepools|basic-node-pool", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "activeOperationId": "a7b69c90-242b-4a85-8187-0b3bd4979155", 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 d007a2cb20..d43fa65060 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 @@ -4,7 +4,7 @@ "_rid": "SdEpAPzZNVkHAAAAAAAAAA==", "_self": "dbs/SdEpAA==/colls/SdEpAPzZNVk=/docs/SdEpAPzZNVkHAAAAAAAAAA==/", "_ts": 1766178372, - "id": "405f85e0-9528-458d-abbf-b16e2319c833", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7|resourcegroups|resourcegroupname|providers|microsoft.redhatopenshift|hcpopenshiftclusters|create-with-tags|nodepools|node-pool-02", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "activeOperationId": "0129e72d-1f34-4630-9c58-725bd97283c6", 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 6661a8b079..29e9b1a2f6 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 @@ -4,7 +4,7 @@ "_rid": "WZlNALYurecCAAAAAAAAAA==", "_self": "dbs/WZlNAA==/colls/WZlNALYurec=/docs/WZlNALYurecCAAAAAAAAAA==/", "_ts": 1766174370, - "id": "7a4ed07a-47a1-4efb-966a-93a6316522a0", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7|providers|microsoft.redhatopenshift|locations|fake-location|hcpoperationstatuses|7a4ed07a-47a1-4efb-966a-93a6316522a0", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "externalId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", @@ -12,7 +12,7 @@ "lastTransitionTime": "2025-12-19T19:59:30.714826736Z", "operationId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/providers/Microsoft.RedHatOpenShift/locations/fake-location/hcpOperationStatuses/7a4ed07a-47a1-4efb-966a-93a6316522a0", "request": "Create", - "resourceId": null, + "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/providers/Microsoft.RedHatOpenShift/locations/fake-location/hcpOperationStatuses/7a4ed07a-47a1-4efb-966a-93a6316522a0", "startTime": "2025-12-19T19:59:30.714826736Z", "status": "Succeeded", "tenantId": "00000000-0000-0000-0000-000000000000" diff --git a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/create-current/06-cosmosCompare-confirm-content/subscription.json b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/create-current/06-cosmosCompare-confirm-content/subscription.json index eb217c3212..28e3bdae44 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/create-current/06-cosmosCompare-confirm-content/subscription.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/create-current/06-cosmosCompare-confirm-content/subscription.json @@ -4,7 +4,7 @@ "_rid": "WZlNALYurecBAAAAAAAAAA==", "_self": "dbs/WZlNAA==/colls/WZlNALYurec=/docs/WZlNALYurecBAAAAAAAAAA==/", "_ts": 1766174370, - "id": "6b690bec-0c16-4ecb-8f67-781caf40bba7", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "properties": null, 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 bd6f38c511..cbfe3efdcb 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 @@ -4,7 +4,7 @@ "_rid": "WZlNALYurecDAAAAAAAAAA==", "_self": "dbs/WZlNAA==/colls/WZlNALYurec=/docs/WZlNALYurecDAAAAAAAAAA==/", "_ts": 1766174370, - "id": "c893be2c-80b0-497f-8490-e3e5fd2b2cc4", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7|resourcegroups|resourcegroupname|providers|microsoft.redhatopenshift|hcpopenshiftclusters|create-with-tags", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", 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 4497c50b0f..836c46f075 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 @@ -4,7 +4,7 @@ "_rid": "SdEpAPzZNVkFAAAAAAAAAA==", "_self": "dbs/SdEpAA==/colls/SdEpAPzZNVk=/docs/SdEpAPzZNVkFAAAAAAAAAA==/", "_ts": 1766178371, - "id": "23bd08bc-2ed3-40be-8c9e-7e005f8a421f", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7|resourcegroups|resourcegroupname|providers|microsoft.redhatopenshift|hcpopenshiftclusters|create-with-tags|nodepools|basic-node-pool", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "activeOperationId": "cdfb496e-6e70-4022-9f8d-b0dacf6d2ff5", 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 86336a490e..e9af399168 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 @@ -4,7 +4,7 @@ "_rid": "SdEpAPzZNVkHAAAAAAAAAA==", "_self": "dbs/SdEpAA==/colls/SdEpAPzZNVk=/docs/SdEpAPzZNVkHAAAAAAAAAA==/", "_ts": 1766178372, - "id": "405f85e0-9528-458d-abbf-b16e2319c833", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7|resourcegroups|resourcegroupname|providers|microsoft.redhatopenshift|hcpopenshiftclusters|create-with-tags|nodepools|node-pool-02", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "activeOperationId": "4067756a-fcc1-4732-a211-d785d888203c", 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 b52017ac78..49b93a6eae 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 @@ -4,7 +4,7 @@ "_rid": "WZlNALYurecCAAAAAAAAAA==", "_self": "dbs/WZlNAA==/colls/WZlNALYurec=/docs/WZlNALYurecCAAAAAAAAAA==/", "_ts": 1766174370, - "id": "7a4ed07a-47a1-4efb-966a-93a6316522a0", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7|providers|microsoft.redhatopenshift|hcpoperationstatuses|7a4ed07a-47a1-4efb-966a-93a6316522a0", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "externalId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", @@ -12,7 +12,7 @@ "lastTransitionTime": "2025-12-19T19:59:30.714826736Z", "operationId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/providers/Microsoft.RedHatOpenShift/locations/fake-location/hcpOperationStatuses/7a4ed07a-47a1-4efb-966a-93a6316522a0", "request": "Create", - "resourceId": null, + "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/providers/Microsoft.RedHatOpenShift/hcpOperationStatuses/7a4ed07a-47a1-4efb-966a-93a6316522a0", "startTime": "2025-12-19T19:59:30.714826736Z", "status": "Succeeded", "tenantId": "00000000-0000-0000-0000-000000000000" 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 0a5006738c..e1b7605da6 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 @@ -4,7 +4,7 @@ "_rid": "3+dlAMzyjkYEAAAAAAAAAA==", "_self": "dbs/3+dlAA==/colls/3+dlAMzyjkY=/docs/3+dlAMzyjkYEAAAAAAAAAA==/", "_ts": 1767902645, - "id": "cdfb496e-6e70-4022-9f8d-b0dacf6d2ff5", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7|providers|microsoft.redhatopenshift|hcpoperationstatuses|cdfb496e-6e70-4022-9f8d-b0dacf6d2ff5", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "externalId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/basic-node-pool", @@ -12,7 +12,7 @@ "lastTransitionTime": "2026-01-08T20:04:05.054190978Z", "operationId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/providers/Microsoft.RedHatOpenShift/locations/fake-location/hcpOperationStatuses/cdfb496e-6e70-4022-9f8d-b0dacf6d2ff5", "request": "Create", - "resourceId": null, + "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/providers/Microsoft.RedHatOpenShift/hcpOperationStatuses/cdfb496e-6e70-4022-9f8d-b0dacf6d2ff5", "startTime": "2026-01-08T20:04:05.054190978Z", "status": "Accepted", "tenantId": "00000000-0000-0000-0000-000000000000" 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 4a921f1e7b..4ed40bd23b 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 @@ -4,7 +4,7 @@ "_rid": "3+dlAMzyjkYGAAAAAAAAAA==", "_self": "dbs/3+dlAA==/colls/3+dlAMzyjkY=/docs/3+dlAMzyjkYGAAAAAAAAAA==/", "_ts": 1767902645, - "id": "4067756a-fcc1-4732-a211-d785d888203c", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7|providers|microsoft.redhatopenshift|hcpoperationstatuses|4067756a-fcc1-4732-a211-d785d888203c", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "externalId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags/nodePools/node-pool-02", @@ -12,7 +12,7 @@ "lastTransitionTime": "2026-01-08T20:04:05.330050272Z", "operationId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/providers/Microsoft.RedHatOpenShift/locations/fake-location/hcpOperationStatuses/4067756a-fcc1-4732-a211-d785d888203c", "request": "Create", - "resourceId": null, + "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/providers/Microsoft.RedHatOpenShift/hcpOperationStatuses/4067756a-fcc1-4732-a211-d785d888203c", "startTime": "2026-01-08T20:04:05.330050272Z", "status": "Accepted", "tenantId": "00000000-0000-0000-0000-000000000000" diff --git a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/subscription.json b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/subscription.json index eb217c3212..506865ae94 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/subscription.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/subscription.json @@ -1,16 +1,16 @@ { - "_attachments": "attachments/", - "_etag": "\"00000000-0000-0000-7121-fcdc980501dc\"", - "_rid": "WZlNALYurecBAAAAAAAAAA==", - "_self": "dbs/WZlNAA==/colls/WZlNALYurec=/docs/WZlNALYurecBAAAAAAAAAA==/", - "_ts": 1766174370, - "id": "6b690bec-0c16-4ecb-8f67-781caf40bba7", - "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", - "properties": { - "properties": null, - "registrationDate": "2025-12-19T19:53:15+00:00", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7", - "state": "Registered" - }, - "resourceType": "Microsoft.Resources/subscriptions" + "_attachments": "attachments/", + "_etag": "\"00000000-0000-0000-7121-fcdc980501dc\"", + "_rid": "WZlNALYurecBAAAAAAAAAA==", + "_self": "dbs/WZlNAA==/colls/WZlNALYurec=/docs/WZlNALYurecBAAAAAAAAAA==/", + "_ts": 1766174370, + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7", + "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", + "properties": { + "properties": null, + "registrationDate": "2025-12-19T19:53:15+00:00", + "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7", + "state": "Registered" + }, + "resourceType": "Microsoft.Resources/subscriptions" } \ No newline at end of file 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 c69ce7215b..db3668f283 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 @@ -4,7 +4,7 @@ "_rid": "NNYoALQEciYBAAAAAAAAAA==", "_self": "dbs/NNYoAA==/colls/NNYoALQEciY=/docs/NNYoALQEciYBAAAAAAAAAA==/", "_ts": 1767902971, - "id": "c893be2c-80b0-497f-8490-e3e5fd2b2cc4", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7|resourcegroups|resourcegroupname|providers|microsoft.redhatopenshift|hcpopenshiftclusters|create-with-tags", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", 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 22d0213b3f..cc6dc9b8d4 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 @@ -4,7 +4,7 @@ "_rid": "NNYoALQEciYDAAAAAAAAAA==", "_self": "dbs/NNYoAA==/colls/NNYoALQEciY=/docs/NNYoALQEciYDAAAAAAAAAA==/", "_ts": 1767902971, - "id": "405f85e0-9528-458d-abbf-b16e2319c833", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7|resourcegroups|resourcegroupname|providers|microsoft.redhatopenshift|hcpopenshiftclusters|create-with-tags|nodepools|node-pool-02", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "activeOperationId": "4067756a-fcc1-4732-a211-d785d888203c", 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 0489c939cf..a5addc0eb1 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 @@ -4,7 +4,7 @@ "_rid": "NNYoALQEciYCAAAAAAAAAA==", "_self": "dbs/NNYoAA==/colls/NNYoALQEciY=/docs/NNYoALQEciYCAAAAAAAAAA==/", "_ts": 1767902972, - "id": "23bd08bc-2ed3-40be-8c9e-7e005f8a421f", + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7|resourcegroups|resourcegroupname|providers|microsoft.redhatopenshift|hcpopenshiftclusters|create-with-tags|nodepools|basic-node-pool", "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", "properties": { "activeOperationId": "50c1a0ba-3bc4-48fb-857e-eb0974df1e1c", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Operations/read-new-data/01-load-new-data/subscription.json b/test-integration/frontend/artifacts/FrontendCRUD/Operations/read-new-data/01-load-new-data/subscription.json index f722b276c8..61de14b9cf 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Operations/read-new-data/01-load-new-data/subscription.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Operations/read-new-data/01-load-new-data/subscription.json @@ -1,16 +1,16 @@ { - "_attachments": "attachments/", - "_etag": "\"00000000-0000-0000-7e71-4b9c340501dc\"", - "_rid": "qr1CAKur9GQBAAAAAAAAAA==", - "_self": "dbs/qr1CAA==/colls/qr1CAKur9GQ=/docs/qr1CAKur9GQBAAAAAAAAAA==/", - "_ts": 1767637797, - "id": "6b690bec-0c16-4ecb-8f67-781caf40bba7", - "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", - "properties": { - "properties": null, - "registrationDate": "2025-12-19T19:53:15+00:00", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7", - "state": "Registered" - }, - "resourceType": "Microsoft.Resources/subscriptions" + "_attachments": "attachments/", + "_etag": "\"00000000-0000-0000-7e71-4b9c340501dc\"", + "_rid": "qr1CAKur9GQBAAAAAAAAAA==", + "_self": "dbs/qr1CAA==/colls/qr1CAKur9GQ=/docs/qr1CAKur9GQBAAAAAAAAAA==/", + "_ts": 1767637797, + "id": "|subscriptions|6b690bec-0c16-4ecb-8f67-781caf40bba7", + "partitionKey": "6b690bec-0c16-4ecb-8f67-781caf40bba7", + "properties": { + "properties": null, + "registrationDate": "2025-12-19T19:53:15+00:00", + "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7", + "state": "Registered" + }, + "resourceType": "Microsoft.Resources/subscriptions" } \ No newline at end of file diff --git a/test-integration/frontend/artifacts/NodePoolMutation/basic/cosmos-state/cosmos-01-cluster.json b/test-integration/frontend/artifacts/NodePoolMutation/basic/cosmos-state/cosmos-01-cluster.json index a01f227188..c954054d2e 100644 --- a/test-integration/frontend/artifacts/NodePoolMutation/basic/cosmos-state/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/NodePoolMutation/basic/cosmos-state/cosmos-01-cluster.json @@ -1,20 +1,20 @@ { - "id" : "8feb19cd-3d3c-4575-863b-b26ad817ce18", - "partitionKey" : "0465bc32-c654-41b8-8d87-9815d7abe8f6", - "resourceType" : "microsoft.redhatopenshift/hcpopenshiftclusters", - "properties" : { - "resourceId" : "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/basic", - "internalId" : "/api/aro_hcp/v1alpha1/clusters/cs-basic", - "identity" : { - "principalId" : "the-principal", - "tenantId" : "the-tenant", - "type" : "" - }, - "tags" : { - "foo" : "bar" - }, - "provisioningState": "Succeeded", - "customerDesiredState" : null, - "serviceProviderState" : null - } + "id": "|subscriptions|0465bc32-c654-41b8-8d87-9815d7abe8f6|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|basic", + "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", + "resourceType": "microsoft.redhatopenshift/hcpopenshiftclusters", + "properties": { + "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/basic", + "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-basic", + "identity": { + "principalId": "the-principal", + "tenantId": "the-tenant", + "type": "" + }, + "tags": { + "foo": "bar" + }, + "provisioningState": "Succeeded", + "customerDesiredState": null, + "serviceProviderState": null + } } \ No newline at end of file diff --git a/test-integration/frontend/artifacts/NodePoolMutation/cluster-creating/cosmos-state/cosmos-01-cluster.json b/test-integration/frontend/artifacts/NodePoolMutation/cluster-creating/cosmos-state/cosmos-01-cluster.json index 6d9627589f..5ad10bfa74 100644 --- a/test-integration/frontend/artifacts/NodePoolMutation/cluster-creating/cosmos-state/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/NodePoolMutation/cluster-creating/cosmos-state/cosmos-01-cluster.json @@ -1,20 +1,20 @@ { - "id" : "29c5d490-ec04-11f0-b051-9c6b00c26e8e", - "partitionKey" : "0465bc32-c654-41b8-8d87-9815d7abe8f6", - "resourceType" : "microsoft.redhatopenshift/hcpopenshiftclusters", - "properties" : { - "resourceId" : "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-creating", - "internalId" : "/api/aro_hcp/v1alpha1/clusters/cs-cluster-creating", - "identity" : { - "principalId" : "the-principal", - "tenantId" : "the-tenant", - "type" : "" - }, - "tags" : { - "foo" : "bar" - }, - "provisioningState": "Provisioning", - "customerDesiredState" : null, - "serviceProviderState" : null - } + "id": "|subscriptions|0465bc32-c654-41b8-8d87-9815d7abe8f6|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|cluster-creating", + "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", + "resourceType": "microsoft.redhatopenshift/hcpopenshiftclusters", + "properties": { + "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-creating", + "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-cluster-creating", + "identity": { + "principalId": "the-principal", + "tenantId": "the-tenant", + "type": "" + }, + "tags": { + "foo": "bar" + }, + "provisioningState": "Provisioning", + "customerDesiredState": null, + "serviceProviderState": null + } } diff --git a/test-integration/frontend/artifacts/NodePoolMutation/cluster-deleting/cosmos-state/cosmos-01-cluster.json b/test-integration/frontend/artifacts/NodePoolMutation/cluster-deleting/cosmos-state/cosmos-01-cluster.json index eb62b3fd70..3096c24b19 100644 --- a/test-integration/frontend/artifacts/NodePoolMutation/cluster-deleting/cosmos-state/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/NodePoolMutation/cluster-deleting/cosmos-state/cosmos-01-cluster.json @@ -1,20 +1,20 @@ { - "id" : "39885b40-ec04-11f0-b70f-9c6b00c26e8e", - "partitionKey" : "0465bc32-c654-41b8-8d87-9815d7abe8f6", - "resourceType" : "microsoft.redhatopenshift/hcpopenshiftclusters", - "properties" : { - "resourceId" : "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-deleting", - "internalId" : "/api/aro_hcp/v1alpha1/clusters/cs-cluster-deleting", - "identity" : { - "principalId" : "the-principal", - "tenantId" : "the-tenant", - "type" : "" - }, - "tags" : { - "foo" : "bar" - }, - "provisioningState": "Deleting", - "customerDesiredState" : null, - "serviceProviderState" : null - } + "id": "|subscriptions|0465bc32-c654-41b8-8d87-9815d7abe8f6|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|cluster-deleting", + "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", + "resourceType": "microsoft.redhatopenshift/hcpopenshiftclusters", + "properties": { + "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-deleting", + "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-cluster-deleting", + "identity": { + "principalId": "the-principal", + "tenantId": "the-tenant", + "type": "" + }, + "tags": { + "foo": "bar" + }, + "provisioningState": "Deleting", + "customerDesiredState": null, + "serviceProviderState": null + } } diff --git a/test-integration/frontend/artifacts/NodePoolMutation/immutability/cosmos-state/cosmos-01-cluster.json b/test-integration/frontend/artifacts/NodePoolMutation/immutability/cosmos-state/cosmos-01-cluster.json index e59510417f..cde6e04ade 100644 --- a/test-integration/frontend/artifacts/NodePoolMutation/immutability/cosmos-state/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/NodePoolMutation/immutability/cosmos-state/cosmos-01-cluster.json @@ -1,20 +1,20 @@ { - "id" : "8feb19cd-3d3c-4575-863b-b26ad817ce33", - "partitionKey" : "0465bc32-c654-41b8-8d87-9815d7abe8f6", - "resourceType" : "microsoft.redhatopenshift/hcpopenshiftclusters", - "properties" : { - "resourceId" : "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/immutability", - "internalId" : "/api/aro_hcp/v1alpha1/clusters/cs-immutability", - "identity" : { - "principalId" : "the-principal", - "tenantId" : "the-tenant", - "type" : "" - }, - "tags" : { - "foo" : "bar" - }, - "provisioningState": "Succeeded", - "customerDesiredState" : null, - "serviceProviderState" : null - } + "id": "|subscriptions|0465bc32-c654-41b8-8d87-9815d7abe8f6|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|immutability", + "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", + "resourceType": "microsoft.redhatopenshift/hcpopenshiftclusters", + "properties": { + "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/immutability", + "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-immutability", + "identity": { + "principalId": "the-principal", + "tenantId": "the-tenant", + "type": "" + }, + "tags": { + "foo": "bar" + }, + "provisioningState": "Succeeded", + "customerDesiredState": null, + "serviceProviderState": null + } } \ No newline at end of file diff --git a/test-integration/frontend/artifacts/NodePoolMutation/initial-cosmos-state/01-subscription.json b/test-integration/frontend/artifacts/NodePoolMutation/initial-cosmos-state/01-subscription.json index 4d6eccfa4b..920c4d61cc 100644 --- a/test-integration/frontend/artifacts/NodePoolMutation/initial-cosmos-state/01-subscription.json +++ b/test-integration/frontend/artifacts/NodePoolMutation/initial-cosmos-state/01-subscription.json @@ -1,8 +1,9 @@ { - "id": "0465bc32-c654-41b8-8d87-9815d7abe8f6", + "id": "|subscriptions|0465bc32-c654-41b8-8d87-9815d7abe8f6", "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", "resourceType": "microsoft.resources/subscriptions", "properties": { + "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6", "state": "Registered", "registrationDate": null, "properties": null diff --git a/test-integration/frontend/artifacts/NodePoolMutation/invalid-format/cosmos-state/cosmos-01-cluster.json b/test-integration/frontend/artifacts/NodePoolMutation/invalid-format/cosmos-state/cosmos-01-cluster.json index 5a84e5f823..6c853f3150 100644 --- a/test-integration/frontend/artifacts/NodePoolMutation/invalid-format/cosmos-state/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/NodePoolMutation/invalid-format/cosmos-state/cosmos-01-cluster.json @@ -1,19 +1,19 @@ { - "id" : "8feb19cd-3d3c-4575-863b-b26ad817ce17", - "partitionKey" : "0465bc32-c654-41b8-8d87-9815d7abe8f6", - "resourceType" : "microsoft.redhatopenshift/hcpopenshiftclusters", - "properties" : { - "resourceId" : "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/invalid-format", - "internalId" : "/api/aro_hcp/v1alpha1/clusters/cs-invalid-format", - "identity" : { - "principalId" : "the-principal", - "tenantId" : "the-tenant", - "type" : "" - }, - "tags" : { - "foo" : "bar" - }, - "customerDesiredState" : null, - "serviceProviderState" : null - } + "id": "|subscriptions|0465bc32-c654-41b8-8d87-9815d7abe8f6|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|invalid-format", + "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", + "resourceType": "microsoft.redhatopenshift/hcpopenshiftclusters", + "properties": { + "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/invalid-format", + "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-invalid-format", + "identity": { + "principalId": "the-principal", + "tenantId": "the-tenant", + "type": "" + }, + "tags": { + "foo": "bar" + }, + "customerDesiredState": null, + "serviceProviderState": null + } } \ No newline at end of file diff --git a/test-integration/frontend/artifacts/NodePoolMutation/minimal/cosmos-state/cosmos-01-cluster.json b/test-integration/frontend/artifacts/NodePoolMutation/minimal/cosmos-state/cosmos-01-cluster.json index 491141e404..76e24552fb 100644 --- a/test-integration/frontend/artifacts/NodePoolMutation/minimal/cosmos-state/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/NodePoolMutation/minimal/cosmos-state/cosmos-01-cluster.json @@ -1,20 +1,20 @@ { - "id" : "8feb19cd-3d3c-4575-863b-b26ad817ce15", - "partitionKey" : "0465bc32-c654-41b8-8d87-9815d7abe8f6", - "resourceType" : "microsoft.redhatopenshift/hcpopenshiftclusters", - "properties" : { - "resourceId" : "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/minimal", - "internalId" : "/api/aro_hcp/v1alpha1/clusters/cs-minimal", - "identity" : { - "principalId" : "the-principal", - "tenantId" : "the-tenant", - "type" : "" - }, - "tags" : { - "foo" : "bar" - }, - "provisioningState": "Succeeded", - "customerDesiredState" : null, - "serviceProviderState" : null - } + "id": "|subscriptions|0465bc32-c654-41b8-8d87-9815d7abe8f6|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|minimal", + "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", + "resourceType": "microsoft.redhatopenshift/hcpopenshiftclusters", + "properties": { + "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/minimal", + "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-minimal", + "identity": { + "principalId": "the-principal", + "tenantId": "the-tenant", + "type": "" + }, + "tags": { + "foo": "bar" + }, + "provisioningState": "Succeeded", + "customerDesiredState": null, + "serviceProviderState": null + } } \ No newline at end of file diff --git a/test-integration/frontend/artifacts/NodePoolMutation/missing-required-fields/cosmos-state/cosmos-01-cluster.json b/test-integration/frontend/artifacts/NodePoolMutation/missing-required-fields/cosmos-state/cosmos-01-cluster.json index ecb8d74cb8..1d9af401ab 100644 --- a/test-integration/frontend/artifacts/NodePoolMutation/missing-required-fields/cosmos-state/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/NodePoolMutation/missing-required-fields/cosmos-state/cosmos-01-cluster.json @@ -1,19 +1,19 @@ { - "id" : "8feb19cd-3d3c-4575-863b-b26ad817ce19", - "partitionKey" : "0465bc32-c654-41b8-8d87-9815d7abe8f6", - "resourceType" : "microsoft.redhatopenshift/hcpopenshiftclusters", - "properties" : { - "resourceId" : "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/missing-required-fields", - "internalId" : "/api/aro_hcp/v1alpha1/clusters/cs-missing-required-fields", - "identity" : { - "principalId" : "the-principal", - "tenantId" : "the-tenant", - "type" : "" - }, - "tags" : { - "foo" : "bar" - }, - "customerDesiredState" : null, - "serviceProviderState" : null - } + "id": "|subscriptions|0465bc32-c654-41b8-8d87-9815d7abe8f6|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|missing-required-fields", + "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", + "resourceType": "microsoft.redhatopenshift/hcpopenshiftclusters", + "properties": { + "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/missing-required-fields", + "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-missing-required-fields", + "identity": { + "principalId": "the-principal", + "tenantId": "the-tenant", + "type": "" + }, + "tags": { + "foo": "bar" + }, + "customerDesiredState": null, + "serviceProviderState": null + } } \ No newline at end of file diff --git a/test-integration/frontend/artifacts/NodePoolMutation/noop-update/cosmos-state/cosmos-01-cluster.json b/test-integration/frontend/artifacts/NodePoolMutation/noop-update/cosmos-state/cosmos-01-cluster.json index e401261822..d20aa7d4d2 100644 --- a/test-integration/frontend/artifacts/NodePoolMutation/noop-update/cosmos-state/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/NodePoolMutation/noop-update/cosmos-state/cosmos-01-cluster.json @@ -1,20 +1,20 @@ { - "id" : "8feb19cd-3d3c-4575-863b-b26ad817ce30", - "partitionKey" : "0465bc32-c654-41b8-8d87-9815d7abe8f6", - "resourceType" : "microsoft.redhatopenshift/hcpopenshiftclusters", - "properties" : { - "resourceId" : "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/noop-update", - "internalId" : "/api/aro_hcp/v1alpha1/clusters/cs-noop-update", - "identity" : { - "principalId" : "the-principal", - "tenantId" : "the-tenant", - "type" : "" - }, - "tags" : { - "foo" : "bar" - }, - "provisioningState": "Succeeded", - "customerDesiredState" : null, - "serviceProviderState" : null - } + "id": "|subscriptions|0465bc32-c654-41b8-8d87-9815d7abe8f6|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|noop-update", + "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", + "resourceType": "microsoft.redhatopenshift/hcpopenshiftclusters", + "properties": { + "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/noop-update", + "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-noop-update", + "identity": { + "principalId": "the-principal", + "tenantId": "the-tenant", + "type": "" + }, + "tags": { + "foo": "bar" + }, + "provisioningState": "Succeeded", + "customerDesiredState": null, + "serviceProviderState": null + } } \ No newline at end of file diff --git a/test-integration/frontend/artifacts/NodePoolMutation/update-np-to-illegal-value/cosmos-state/cosmos-01-cluster.json b/test-integration/frontend/artifacts/NodePoolMutation/update-np-to-illegal-value/cosmos-state/cosmos-01-cluster.json index c58ed60744..66b30bd398 100644 --- a/test-integration/frontend/artifacts/NodePoolMutation/update-np-to-illegal-value/cosmos-state/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/NodePoolMutation/update-np-to-illegal-value/cosmos-state/cosmos-01-cluster.json @@ -1,20 +1,20 @@ { - "id" : "8feb19cd-3d3c-4575-863b-b26ad817ce99", - "partitionKey" : "0465bc32-c654-41b8-8d87-9815d7abe8f6", - "resourceType" : "microsoft.redhatopenshift/hcpopenshiftclusters", - "properties" : { - "resourceId" : "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/update-np-to-illegal-value", - "internalId" : "/api/aro_hcp/v1alpha1/clusters/cs-update-np-to-illegal-value", - "identity" : { - "principalId" : "the-principal", - "tenantId" : "the-tenant", - "type" : "" - }, - "tags" : { - "foo" : "bar" - }, - "provisioningState": "Succeeded", - "customerDesiredState" : null, - "serviceProviderState" : null - } + "id": "|subscriptions|0465bc32-c654-41b8-8d87-9815d7abe8f6|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|update-np-to-illegal-value", + "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", + "resourceType": "microsoft.redhatopenshift/hcpopenshiftclusters", + "properties": { + "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/update-np-to-illegal-value", + "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-update-np-to-illegal-value", + "identity": { + "principalId": "the-principal", + "tenantId": "the-tenant", + "type": "" + }, + "tags": { + "foo": "bar" + }, + "provisioningState": "Succeeded", + "customerDesiredState": null, + "serviceProviderState": null + } } diff --git a/test-integration/frontend/artifacts/NodePoolMutation/update-tags-with-empty/cosmos-state/cosmos-01-cluster.json b/test-integration/frontend/artifacts/NodePoolMutation/update-tags-with-empty/cosmos-state/cosmos-01-cluster.json index 75d9e070e6..70a7319857 100644 --- a/test-integration/frontend/artifacts/NodePoolMutation/update-tags-with-empty/cosmos-state/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/NodePoolMutation/update-tags-with-empty/cosmos-state/cosmos-01-cluster.json @@ -1,5 +1,5 @@ { - "id": "8feb19cd-3d3c-4585-863b-a66ad817ce18", + "id": "|subscriptions|0465bc32-c654-41b8-8d87-9815d7abe8f6|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|update-tags-with-empty", "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", "resourceType": "microsoft.redhatopenshift/hcpopenshiftclusters", "properties": { diff --git a/test-integration/frontend/artifacts/NodePoolMutation/update-tags-with-nil/cosmos-state/cosmos-01-cluster.json b/test-integration/frontend/artifacts/NodePoolMutation/update-tags-with-nil/cosmos-state/cosmos-01-cluster.json index ff6b359a16..08a8d623d7 100644 --- a/test-integration/frontend/artifacts/NodePoolMutation/update-tags-with-nil/cosmos-state/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/NodePoolMutation/update-tags-with-nil/cosmos-state/cosmos-01-cluster.json @@ -1,5 +1,5 @@ { - "id": "8feb19cd-3d3c-4575-863b-a66ad817ce18", + "id": "|subscriptions|0465bc32-c654-41b8-8d87-9815d7abe8f6|resourcegroups|some-resource-group|providers|microsoft.redhatopenshift|hcpopenshiftclusters|update-tags-with-nil", "partitionKey": "0465bc32-c654-41b8-8d87-9815d7abe8f6", "resourceType": "microsoft.redhatopenshift/hcpopenshiftclusters", "properties": { From df53dea4d32efca6631d963d80f8923e246da3eb Mon Sep 17 00:00:00 2001 From: David Eads Date: Tue, 20 Jan 2026 19:18:54 -0500 Subject: [PATCH 3/3] Add controller to delete orphaned cosmos resources We found that may controllers weren't getting cleaned up. We need to find and fix that problem, but we also need to clean up the data we have. This adds a controller that cleans up ones that already escaped and will continue to do so. It works in a way that should scale for order of low tens of thousands of resources to scan in a reasonable timeframe. --- backend/main.go | 2 + .../cluster_watching_controller.go | 1 + .../delete_orphaned_cosmos.go | 240 ++++++++++++++++++ internal/database/crud_helpers.go | 8 + internal/database/crud_untyped_resource.go | 5 + internal/mocks/crud_untyped_resource.go | 38 +++ 6 files changed, 294 insertions(+) create mode 100644 backend/pkg/controllers/mismatchcontrollers/delete_orphaned_cosmos.go diff --git a/backend/main.go b/backend/main.go index 4643332a97..87180b7cc4 100644 --- a/backend/main.go +++ b/backend/main.go @@ -349,6 +349,7 @@ func Run(cmd *cobra.Command, args []string) error { clusterServiceMatchingExternalAuthController = controllerutils.NewClusterWatchingController( "ClusterServiceMatchingExternalAuths", dbClient, subscriptionLister, 60*time.Minute, mismatchcontrollers.NewClusterServiceExternalAuthMatchingController(dbClient, clusterServiceClient)) + deleteOrphanedCosmosResourcesController = mismatchcontrollers.NewDeleteOrphanedCosmosResourcesController(dbClient, subscriptionLister) ) le, err := leaderelection.NewLeaderElector(leaderelection.LeaderElectionConfig{ @@ -368,6 +369,7 @@ func Run(cmd *cobra.Command, args []string) error { go clusterServiceMatchingClusterController.Run(ctx, 20) go clusterServiceMatchingNodePoolController.Run(ctx, 20) go clusterServiceMatchingExternalAuthController.Run(ctx, 20) + go deleteOrphanedCosmosResourcesController.Run(ctx, 20) }, OnStoppedLeading: func() { operationsScanner.LeaderGauge.Set(0) diff --git a/backend/pkg/controllers/controllerutils/cluster_watching_controller.go b/backend/pkg/controllers/controllerutils/cluster_watching_controller.go index 4ed716064d..bb1cdc1d57 100644 --- a/backend/pkg/controllers/controllerutils/cluster_watching_controller.go +++ b/backend/pkg/controllers/controllerutils/cluster_watching_controller.go @@ -157,6 +157,7 @@ func (c *clusterWatchingController) processNextWorkItem(ctx context.Context) boo defer c.queue.Done(ref) logger := utils.LoggerFromContext(ctx) + logger = ref.AddLoggerValues(logger) ctx = utils.ContextWithLogger(ctx, logger) err := c.SyncOnce(ctx, ref) diff --git a/backend/pkg/controllers/mismatchcontrollers/delete_orphaned_cosmos.go b/backend/pkg/controllers/mismatchcontrollers/delete_orphaned_cosmos.go new file mode 100644 index 0000000000..26ec971edc --- /dev/null +++ b/backend/pkg/controllers/mismatchcontrollers/delete_orphaned_cosmos.go @@ -0,0 +1,240 @@ +// 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 mismatchcontrollers + +import ( + "context" + "errors" + "fmt" + "slices" + "strings" + "time" + + utilruntime "k8s.io/apimachinery/pkg/util/runtime" + "k8s.io/apimachinery/pkg/util/sets" + "k8s.io/apimachinery/pkg/util/wait" + "k8s.io/client-go/util/workqueue" + "k8s.io/utils/ptr" + + azcorearm "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" + + "github.com/Azure/ARO-HCP/backend/pkg/controllers/controllerutils" + "github.com/Azure/ARO-HCP/backend/pkg/listers" + "github.com/Azure/ARO-HCP/internal/api" + "github.com/Azure/ARO-HCP/internal/api/arm" + "github.com/Azure/ARO-HCP/internal/database" + "github.com/Azure/ARO-HCP/internal/utils" +) + +type deleteOrphanedCosmosResources struct { + name string + + subscriptionLister listers.SubscriptionLister + cosmosClient database.DBClient + + // queue is where incoming work is placed to de-dup and to allow "easy" + // rate limited requeues on errors + queue workqueue.TypedRateLimitingInterface[string] +} + +// NewDeleteOrphanedCosmosResourcesController periodically looks for cosmos objs that don't have an owning cluster and deletes them. +func NewDeleteOrphanedCosmosResourcesController(cosmosClient database.DBClient, subscriptionLister listers.SubscriptionLister) controllerutils.Controller { + c := &deleteOrphanedCosmosResources{ + name: "DeleteOrphanedCosmosResources", + subscriptionLister: subscriptionLister, + cosmosClient: cosmosClient, + queue: workqueue.NewTypedRateLimitingQueueWithConfig( + workqueue.DefaultTypedControllerRateLimiter[string](), + workqueue.TypedRateLimitingQueueConfig[string]{ + Name: "DeleteOrphanedCosmosResources", + }, + ), + } + + return c +} + +func (c *deleteOrphanedCosmosResources) synchronizeSubscription(ctx context.Context, subscription string) error { + logger := utils.LoggerFromContext(ctx) + + subscriptionResourceID, err := arm.ToSubscriptionResourceID(subscription) + if err != nil { + return utils.TrackError(err) + } + untypedSubscriptionCRUD, err := c.cosmosClient.UntypedCRUD(*subscriptionResourceID) + if err != nil { + return utils.TrackError(err) + } + paginatedListOptions := &database.DBClientListResourceDocsOptions{ + PageSizeHint: ptr.To(int32(500)), + } + subscriptionResourceIterator, err := untypedSubscriptionCRUD.ListRecursive(ctx, paginatedListOptions) + if err != nil { + return utils.TrackError(err) + } + + errs := []error{} + // while the number of items is large, but we can paginate through + allSubscriptionResourceIDs := map[string]*azcorearm.ResourceID{} + for _, subscriptionResource := range subscriptionResourceIterator.Items(ctx) { + resourceID, err := api.CosmosIDToResourceID(subscriptionResource.ID) + if err != nil { + // we cannot convert the stored cosmos ID into a resourceID, then it was never migrated. This means it was inaccessible and needs to be removed + logger.Error("cosmos resource not accessible, removing", "cosmosResourceID", subscriptionResource.ID) + if err := untypedSubscriptionCRUD.DeleteByCosmosID(ctx, subscriptionResource.PartitionKey, subscriptionResource.ID); err != nil { + errs = append(errs, utils.TrackError(fmt.Errorf("unable to delete %q in %q: %w", subscriptionResource.ID, subscriptionResource.PartitionKey, err))) + } + continue + } + allSubscriptionResourceIDs[resourceID.String()] = resourceID + } + if err := subscriptionResourceIterator.GetError(); err != nil { + return utils.TrackError(err) + } + + // longer strings are first, so we're guaranteed to see children before parents when we iterate + resourceIDStrings := sets.KeySet(allSubscriptionResourceIDs).UnsortedList() + slices.Sort(resourceIDStrings) + slices.Reverse(resourceIDStrings) + + // at this point we have every resourceID under the subscription that is under a resourcegroup + resourceGroupPrefix := subscriptionResourceID.String() + "/resourcegroups/" + for _, currResourceIDString := range resourceIDStrings { + currResourceID := allSubscriptionResourceIDs[currResourceIDString] + switch { + case strings.EqualFold(currResourceID.ResourceType.String(), api.ClusterResourceType.String()): + // clusters clearly have an owning cluster + continue + case !strings.HasPrefix(currResourceIDString, resourceGroupPrefix): + // skip anything outside a resourcegroup (operations for instance) + continue + case !strings.EqualFold(currResourceID.ResourceType.Namespace, api.ProviderNamespace): + // any resources outside our namespace we shouldn't delete + continue + } + + _, parentExists := allSubscriptionResourceIDs[currResourceID.Parent.String()] + if !parentExists { + localLogger := logger.With( + "cosmosResourceID", currResourceIDString, + "resource_group", currResourceID.ResourceGroupName, + "resource_id", currResourceID, + "resource_name", currResourceID.Name, + "hcp_cluster_name", clusterNameOfResourceID(currResourceID), + ) + ctxWithLocalLogger := utils.ContextWithLogger(ctx, localLogger) // setting so that other calls down the chain will show correctly in kusto for the delete + localLogger.Info("deleting orphaned cosmos resource") + if err := untypedSubscriptionCRUD.Delete(ctxWithLocalLogger, currResourceID); err != nil { + errs = append(errs, utils.TrackError(fmt.Errorf("unable to delete %q in %q: %w", currResourceIDString, currResourceID.Parent.String(), err))) + } + } + } + + return errors.Join(errs...) +} + +func clusterNameOfResourceID(resourceID *azcorearm.ResourceID) string { + if resourceID == nil { + return "" + } + if !strings.EqualFold(resourceID.ResourceType.Namespace, api.ProviderNamespace) { + return "" + } + if strings.EqualFold(resourceID.ResourceType.String(), api.ClusterResourceType.String()) { + return resourceID.String() + } + return clusterNameOfResourceID(resourceID.Parent) +} + +func (c *deleteOrphanedCosmosResources) SyncOnce(ctx context.Context, subscription any) error { + logger := utils.LoggerFromContext(ctx) + + syncErr := c.synchronizeSubscription(ctx, subscription.(string)) // we'll handle this is a moment. + if syncErr != nil { + logger.Error("unable to synchronize all clusters", "error", syncErr) + } + + return utils.TrackError(syncErr) +} + +func (c *deleteOrphanedCosmosResources) queueAllSubscriptions(ctx context.Context) { + logger := utils.LoggerFromContext(ctx) + + allSubscriptions, err := c.subscriptionLister.List(ctx) + if err != nil { + logger.Error("unable to list subscriptions", "error", err) + } + for _, subscription := range allSubscriptions { + c.queue.Add(subscription.ResourceID.SubscriptionID) + } +} + +func (c *deleteOrphanedCosmosResources) Run(ctx context.Context, threadiness int) { + // don't let panics crash the process + defer utilruntime.HandleCrash() + // make sure the work queue is shutdown which will trigger workers to end + defer c.queue.ShutDown() + + logger := utils.LoggerFromContext(ctx) + logger.With("controller_name", c.name) + ctx = utils.ContextWithLogger(ctx, logger) + logger.Info("Starting") + + // start up your worker threads based on threadiness. Some controllers + // have multiple kinds of workers + for i := 0; i < threadiness; i++ { + // runWorker will loop until "something bad" happens. The .Until will + // then rekick the worker after one second + go wait.UntilWithContext(ctx, c.runWorker, time.Second) + } + + go wait.JitterUntilWithContext(ctx, c.queueAllSubscriptions, 60*time.Minute, 0.1, true) + + logger.Info("Started workers") + + // wait until we're told to stop + <-ctx.Done() + logger.Info("Shutting down") +} + +func (c *deleteOrphanedCosmosResources) runWorker(ctx context.Context) { + for c.processNextWorkItem(ctx) { + } +} + +// processNextWorkItem deals with one item off the queue. It returns false +// when it's time to quit. +func (c *deleteOrphanedCosmosResources) processNextWorkItem(ctx context.Context) bool { + ref, shutdown := c.queue.Get() + if shutdown { + return false + } + defer c.queue.Done(ref) + + logger := utils.LoggerFromContext(ctx) + logger = logger.With("subscription_id", ref) + ctx = utils.ContextWithLogger(ctx, logger) + + err := c.SyncOnce(ctx, ref) + if err == nil { + c.queue.Forget(ref) + return true + } + + utilruntime.HandleErrorWithContext(ctx, err, "Error syncing; requeuing for later retry", "objectReference", ref) + c.queue.AddRateLimited(ref) + + return true +} diff --git a/internal/database/crud_helpers.go b/internal/database/crud_helpers.go index e3fa864b61..f30b790ebc 100644 --- a/internal/database/crud_helpers.go +++ b/internal/database/crud_helpers.go @@ -323,3 +323,11 @@ func deleteResource(ctx context.Context, containerClient *azcosmos.ContainerClie } return nil } + +func deleteByCosmosID(ctx context.Context, containerClient *azcosmos.ContainerClient, partitionKeyString, cosmosID string) error { + _, err := containerClient.DeleteItem(ctx, azcosmos.NewPartitionKeyString(partitionKeyString), cosmosID, nil) + if err != nil { + return utils.TrackError(err) + } + return nil +} diff --git a/internal/database/crud_untyped_resource.go b/internal/database/crud_untyped_resource.go index 5f80904773..f62eba5bd1 100644 --- a/internal/database/crud_untyped_resource.go +++ b/internal/database/crud_untyped_resource.go @@ -36,6 +36,7 @@ type UntypedResourceCRUD interface { // the controllers for the external auths, etc. ListRecursive(ctx context.Context, opts *DBClientListResourceDocsOptions) (DBClientIterator[TypedDocument], error) Delete(ctx context.Context, resourceID *azcorearm.ResourceID) error + DeleteByCosmosID(ctx context.Context, partitionKey, cosmosID string) error Child(resourceType azcorearm.ResourceType, resourceName string) (UntypedResourceCRUD, error) } @@ -91,6 +92,10 @@ func (d *untypedCRUD) Delete(ctx context.Context, resourceID *azcorearm.Resource return deleteResource(ctx, d.containerClient, partitionKey, resourceID) } +func (d *untypedCRUD) DeleteByCosmosID(ctx context.Context, partitionKey, cosmosID string) error { + return deleteByCosmosID(ctx, d.containerClient, partitionKey, cosmosID) +} + func (d *untypedCRUD) Child(resourceType azcorearm.ResourceType, resourceName string) (UntypedResourceCRUD, error) { if len(resourceName) == 0 { return nil, fmt.Errorf("resourceName is required") diff --git a/internal/mocks/crud_untyped_resource.go b/internal/mocks/crud_untyped_resource.go index 01c2b63ff1..00be4f9235 100644 --- a/internal/mocks/crud_untyped_resource.go +++ b/internal/mocks/crud_untyped_resource.go @@ -120,6 +120,44 @@ func (c *MockUntypedResourceCRUDDeleteCall) DoAndReturn(f func(context.Context, return c } +// DeleteByCosmosID mocks base method. +func (m *MockUntypedResourceCRUD) DeleteByCosmosID(ctx context.Context, partitionKey, cosmosID string) error { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "DeleteByCosmosID", ctx, partitionKey, cosmosID) + ret0, _ := ret[0].(error) + return ret0 +} + +// DeleteByCosmosID indicates an expected call of DeleteByCosmosID. +func (mr *MockUntypedResourceCRUDMockRecorder) DeleteByCosmosID(ctx, partitionKey, cosmosID any) *MockUntypedResourceCRUDDeleteByCosmosIDCall { + mr.mock.ctrl.T.Helper() + call := mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteByCosmosID", reflect.TypeOf((*MockUntypedResourceCRUD)(nil).DeleteByCosmosID), ctx, partitionKey, cosmosID) + return &MockUntypedResourceCRUDDeleteByCosmosIDCall{Call: call} +} + +// MockUntypedResourceCRUDDeleteByCosmosIDCall wrap *gomock.Call +type MockUntypedResourceCRUDDeleteByCosmosIDCall struct { + *gomock.Call +} + +// Return rewrite *gomock.Call.Return +func (c *MockUntypedResourceCRUDDeleteByCosmosIDCall) Return(arg0 error) *MockUntypedResourceCRUDDeleteByCosmosIDCall { + c.Call = c.Call.Return(arg0) + return c +} + +// Do rewrite *gomock.Call.Do +func (c *MockUntypedResourceCRUDDeleteByCosmosIDCall) Do(f func(context.Context, string, string) error) *MockUntypedResourceCRUDDeleteByCosmosIDCall { + c.Call = c.Call.Do(f) + return c +} + +// DoAndReturn rewrite *gomock.Call.DoAndReturn +func (c *MockUntypedResourceCRUDDeleteByCosmosIDCall) DoAndReturn(f func(context.Context, string, string) error) *MockUntypedResourceCRUDDeleteByCosmosIDCall { + c.Call = c.Call.DoAndReturn(f) + return c +} + // Get mocks base method. func (m *MockUntypedResourceCRUD) Get(ctx context.Context, resourceID *arm.ResourceID) (*database.TypedDocument, error) { m.ctrl.T.Helper()