diff --git a/admin/server/handlers/hcp/serialconsole_test.go b/admin/server/handlers/hcp/serialconsole_test.go index 08909d85c01..fc3ecd91042 100644 --- a/admin/server/handlers/hcp/serialconsole_test.go +++ b/admin/server/handlers/hcp/serialconsole_test.go @@ -94,6 +94,9 @@ func TestSerialConsoleHandler(t *testing.T) { internalID, err := api.NewInternalID("/api/clusters_mgmt/v1/clusters/test-cluster-id") require.NoError(t, err) hcp := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: resourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ID: resourceID}, }, @@ -117,6 +120,9 @@ func TestSerialConsoleHandler(t *testing.T) { internalID, err := api.NewInternalID("/api/clusters_mgmt/v1/clusters/test-cluster-id") require.NoError(t, err) hcp := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: resourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ID: resourceID}, }, diff --git a/backend/pkg/controllers/billingcontrollers/create_billing_doc_test.go b/backend/pkg/controllers/billingcontrollers/create_billing_doc_test.go index c0f77a560d9..beebb489e1d 100644 --- a/backend/pkg/controllers/billingcontrollers/create_billing_doc_test.go +++ b/backend/pkg/controllers/billingcontrollers/create_billing_doc_test.go @@ -83,6 +83,9 @@ func newTestSubscription() *arm.Subscription { func newTestCluster(t *testing.T, clusterUID string, provisioningState arm.ProvisioningState, createdAt *time.Time) *api.HCPOpenShiftCluster { t.Helper() return &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: newTestClusterResourceID(t), + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ ID: newTestClusterResourceID(t), diff --git a/backend/pkg/controllers/billingcontrollers/orphaned_billing_cleanup_test.go b/backend/pkg/controllers/billingcontrollers/orphaned_billing_cleanup_test.go index 6806ee67b25..3531e971f84 100644 --- a/backend/pkg/controllers/billingcontrollers/orphaned_billing_cleanup_test.go +++ b/backend/pkg/controllers/billingcontrollers/orphaned_billing_cleanup_test.go @@ -126,6 +126,9 @@ func TestOrphanedBillingCleanup_SyncOnce(t *testing.T) { clusters: []*api.HCPOpenShiftCluster{ // Only cluster-2 exists { + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: api.Must(azcorearm.ParseResourceID("/subscriptions/" + testSubscriptionID + "/resourceGroups/" + testResourceGroupName + "/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-2")), + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ ID: api.Must(azcorearm.ParseResourceID("/subscriptions/" + testSubscriptionID + "/resourceGroups/" + testResourceGroupName + "/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-2")), diff --git a/backend/pkg/controllers/clusterpropertiescontroller/cluster_properties_sync_test.go b/backend/pkg/controllers/clusterpropertiescontroller/cluster_properties_sync_test.go index d43bf23c66f..142c7a8ad4a 100644 --- a/backend/pkg/controllers/clusterpropertiescontroller/cluster_properties_sync_test.go +++ b/backend/pkg/controllers/clusterpropertiescontroller/cluster_properties_sync_test.go @@ -330,6 +330,9 @@ func newTestCluster(opts ...func(*api.HCPOpenShiftCluster)) *api.HCPOpenShiftClu )) cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: resourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ ID: resourceID, diff --git a/backend/pkg/controllers/create_cluster_scoped_maestro_readonly_bundles_controller_test.go b/backend/pkg/controllers/create_cluster_scoped_maestro_readonly_bundles_controller_test.go index 1d235d78b7f..b6ea53b7e33 100644 --- a/backend/pkg/controllers/create_cluster_scoped_maestro_readonly_bundles_controller_test.go +++ b/backend/pkg/controllers/create_cluster_scoped_maestro_readonly_bundles_controller_test.go @@ -129,6 +129,9 @@ func TestBuildInitialReadonlyMaestroBundleForHostedCluster(t *testing.T) { clusterResourceID := api.Must(azcorearm.ParseResourceID("/subscriptions/test-sub/resourceGroups/test-rg/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/test-cluster")) cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterResourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ ID: clusterResourceID, @@ -399,6 +402,9 @@ func TestCreateClusterScopedMaestroReadonlyBundlesSyncer_syncMaestroBundle(t *te } ctx := context.Background() cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterResourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ID: clusterResourceID}, }, @@ -537,6 +543,9 @@ func TestCreateClusterScopedMaestroReadonlyBundlesSyncer_SyncOnce_GetServiceProv clusterResourceID := api.Must(azcorearm.ParseResourceID("/subscriptions/test-sub/resourceGroups/test-rg/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/test-cluster")) cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterResourceID, + }, TrackedResource: arm.TrackedResource{Resource: arm.Resource{ID: clusterResourceID}}, ServiceProviderProperties: api.HCPOpenShiftClusterServiceProviderProperties{ ClusterServiceID: api.Ptr(api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/11111111111111111111111111111111"))), @@ -587,6 +596,9 @@ func TestCreateClusterScopedMaestroReadonlyBundlesSyncer_SyncOnce_AllBundlesAlre clusterResourceID := api.Must(azcorearm.ParseResourceID("/subscriptions/test-sub/resourceGroups/test-rg/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/test-cluster")) cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterResourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ID: clusterResourceID}, }, @@ -656,6 +668,9 @@ func TestCreateClusterScopedMaestroReadonlyBundlesSyncer_SyncOnce_SyncLoopExecut // Setup cluster clusterResourceID := api.Must(azcorearm.ParseResourceID("/subscriptions/test-sub/resourceGroups/test-rg/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/test-cluster")) cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterResourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ ID: clusterResourceID, @@ -769,6 +784,9 @@ func TestCreateClusterScopedMaestroReadonlyBundlesSyncer_SyncOnce_ProcessesParti clusterResourceID := api.Must(azcorearm.ParseResourceID("/subscriptions/test-sub/resourceGroups/test-rg/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/test-cluster")) cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterResourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ID: clusterResourceID}, }, diff --git a/backend/pkg/controllers/datadumpcontrollers/cs_state_dump_test.go b/backend/pkg/controllers/datadumpcontrollers/cs_state_dump_test.go index d93368c1599..3b9062c4eba 100644 --- a/backend/pkg/controllers/datadumpcontrollers/cs_state_dump_test.go +++ b/backend/pkg/controllers/datadumpcontrollers/cs_state_dump_test.go @@ -173,6 +173,9 @@ func TestCSStateDump_SyncOnce(t *testing.T) { if tt.createCluster { clusterResourceID := api.Must(azcorearm.ParseResourceID("/subscriptions/test-sub/resourceGroups/test-rg/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/test-cluster")) cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterResourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ID: clusterResourceID}, }, diff --git a/backend/pkg/controllers/delete_orphaned_maestro_readonly_bundles_controller_test.go b/backend/pkg/controllers/delete_orphaned_maestro_readonly_bundles_controller_test.go index 4b926a04108..7acedcb7911 100644 --- a/backend/pkg/controllers/delete_orphaned_maestro_readonly_bundles_controller_test.go +++ b/backend/pkg/controllers/delete_orphaned_maestro_readonly_bundles_controller_test.go @@ -802,6 +802,9 @@ func TestDeleteOrphanedMaestroReadonlyBundles_mapServiceProviderClustersByProvis mockResourcesDBClient := databasetesting.NewMockResourcesDBClient() mockCS := ocm.NewMockClusterServiceClientSpec(ctrl) cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterResourceID, + }, TrackedResource: arm.TrackedResource{Resource: arm.Resource{ID: clusterResourceID}}, ServiceProviderProperties: api.HCPOpenShiftClusterServiceProviderProperties{ ClusterServiceID: api.Ptr(api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/csid"))), @@ -826,6 +829,9 @@ func TestDeleteOrphanedMaestroReadonlyBundles_mapServiceProviderClustersByProvis mockResourcesDBClient := databasetesting.NewMockResourcesDBClient() mockCS := ocm.NewMockClusterServiceClientSpec(ctrl) cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterResourceID, + }, TrackedResource: arm.TrackedResource{Resource: arm.Resource{ID: clusterResourceID}}, ServiceProviderProperties: api.HCPOpenShiftClusterServiceProviderProperties{ ClusterServiceID: api.Ptr(api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/csid"))), @@ -863,6 +869,9 @@ func TestDeleteOrphanedMaestroReadonlyBundles_mapServiceProviderClustersByProvis mockResourcesDBClient := databasetesting.NewMockResourcesDBClient() mockCS := ocm.NewMockClusterServiceClientSpec(ctrl) cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterResourceID, + }, TrackedResource: arm.TrackedResource{Resource: arm.Resource{ID: clusterResourceID}}, ServiceProviderProperties: api.HCPOpenShiftClusterServiceProviderProperties{ ClusterServiceID: api.Ptr(api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/csid"))), @@ -895,12 +904,18 @@ func TestDeleteOrphanedMaestroReadonlyBundles_mapServiceProviderClustersByProvis cluster1ResourceID := api.Must(azcorearm.ParseResourceID("/subscriptions/sub1/resourceGroups/rg1/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster1")) cluster2ResourceID := api.Must(azcorearm.ParseResourceID("/subscriptions/sub2/resourceGroups/rg2/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster2")) cluster1 := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: cluster1ResourceID, + }, TrackedResource: arm.TrackedResource{Resource: arm.Resource{ID: cluster1ResourceID}}, ServiceProviderProperties: api.HCPOpenShiftClusterServiceProviderProperties{ ClusterServiceID: api.Ptr(api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/csid1"))), }, } cluster2 := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: cluster2ResourceID, + }, TrackedResource: arm.TrackedResource{Resource: arm.Resource{ID: cluster2ResourceID}}, ServiceProviderProperties: api.HCPOpenShiftClusterServiceProviderProperties{ ClusterServiceID: api.Ptr(api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/csid2"))), @@ -1106,6 +1121,9 @@ func TestDeleteOrphanedMaestroReadonlyBundles_mapServiceProviderNodePoolsByProvi mockResourcesDBClient := databasetesting.NewMockResourcesDBClient() mockCS := ocm.NewMockClusterServiceClientSpec(ctrl) cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterResourceID, + }, TrackedResource: arm.TrackedResource{Resource: arm.Resource{ID: clusterResourceID}}, ServiceProviderProperties: api.HCPOpenShiftClusterServiceProviderProperties{ ClusterServiceID: ptr.To(api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/csid"))), @@ -1130,6 +1148,9 @@ func TestDeleteOrphanedMaestroReadonlyBundles_mapServiceProviderNodePoolsByProvi mockResourcesDBClient := databasetesting.NewMockResourcesDBClient() mockCS := ocm.NewMockClusterServiceClientSpec(ctrl) cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterResourceID, + }, TrackedResource: arm.TrackedResource{Resource: arm.Resource{ID: clusterResourceID}}, ServiceProviderProperties: api.HCPOpenShiftClusterServiceProviderProperties{ ClusterServiceID: ptr.To(api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/csid"))), @@ -1167,6 +1188,9 @@ func TestDeleteOrphanedMaestroReadonlyBundles_mapServiceProviderNodePoolsByProvi mockResourcesDBClient := databasetesting.NewMockResourcesDBClient() mockCS := ocm.NewMockClusterServiceClientSpec(ctrl) cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterResourceID, + }, TrackedResource: arm.TrackedResource{Resource: arm.Resource{ID: clusterResourceID}}, ServiceProviderProperties: api.HCPOpenShiftClusterServiceProviderProperties{ ClusterServiceID: ptr.To(api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/csid"))), @@ -1199,12 +1223,18 @@ func TestDeleteOrphanedMaestroReadonlyBundles_mapServiceProviderNodePoolsByProvi cluster1ResourceID := api.Must(azcorearm.ParseResourceID("/subscriptions/sub1/resourceGroups/rg1/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster1")) cluster2ResourceID := api.Must(azcorearm.ParseResourceID("/subscriptions/sub2/resourceGroups/rg2/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster2")) cluster1 := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: cluster1ResourceID, + }, TrackedResource: arm.TrackedResource{Resource: arm.Resource{ID: cluster1ResourceID}}, ServiceProviderProperties: api.HCPOpenShiftClusterServiceProviderProperties{ ClusterServiceID: ptr.To(api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/csid1"))), }, } cluster2 := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: cluster2ResourceID, + }, TrackedResource: arm.TrackedResource{Resource: arm.Resource{ID: cluster2ResourceID}}, ServiceProviderProperties: api.HCPOpenShiftClusterServiceProviderProperties{ ClusterServiceID: ptr.To(api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/csid2"))), @@ -1346,6 +1376,9 @@ func TestDeleteOrphanedMaestroReadonlyBundles_ensureClusterScopedOrphanedMaestro setupMock: func(t *testing.T, m *maestro.MockClient, mockResourcesDBClient *databasetesting.MockResourcesDBClient, mockCS *ocm.MockClusterServiceClientSpec, shard *arohcpv1alpha1.ProvisionShard) map[string]*shardMaestroClient { clusterRID := spcResourceID.Parent cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterRID, + }, TrackedResource: arm.TrackedResource{Resource: arm.Resource{ID: clusterRID}}, ServiceProviderProperties: api.HCPOpenShiftClusterServiceProviderProperties{ ClusterServiceID: ptr.To(api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/csid"))), @@ -1386,6 +1419,9 @@ func TestDeleteOrphanedMaestroReadonlyBundles_ensureClusterScopedOrphanedMaestro setupMock: func(t *testing.T, m *maestro.MockClient, mockResourcesDBClient *databasetesting.MockResourcesDBClient, mockCS *ocm.MockClusterServiceClientSpec, shard *arohcpv1alpha1.ProvisionShard) map[string]*shardMaestroClient { clusterRID := spcResourceID.Parent cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterRID, + }, TrackedResource: arm.TrackedResource{Resource: arm.Resource{ID: clusterRID}}, ServiceProviderProperties: api.HCPOpenShiftClusterServiceProviderProperties{ ClusterServiceID: ptr.To(api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/csid"))), @@ -1567,6 +1603,9 @@ func TestDeleteOrphanedMaestroReadonlyBundles_ensureOrphanedNodePoolScopedMaestr setupMock: func(t *testing.T, m *maestro.MockClient, mockResourcesDBClient *databasetesting.MockResourcesDBClient, mockCS *ocm.MockClusterServiceClientSpec, shard *arohcpv1alpha1.ProvisionShard) map[string]*shardMaestroClient { clusterRID := spnpResourceID.Parent.Parent cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterRID, + }, TrackedResource: arm.TrackedResource{Resource: arm.Resource{ID: clusterRID}}, ServiceProviderProperties: api.HCPOpenShiftClusterServiceProviderProperties{ ClusterServiceID: ptr.To(api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/csid"))), @@ -1607,6 +1646,9 @@ func TestDeleteOrphanedMaestroReadonlyBundles_ensureOrphanedNodePoolScopedMaestr setupMock: func(t *testing.T, m *maestro.MockClient, mockResourcesDBClient *databasetesting.MockResourcesDBClient, mockCS *ocm.MockClusterServiceClientSpec, shard *arohcpv1alpha1.ProvisionShard) map[string]*shardMaestroClient { clusterRID := spnpResourceID.Parent.Parent cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterRID, + }, TrackedResource: arm.TrackedResource{Resource: arm.Resource{ID: clusterRID}}, ServiceProviderProperties: api.HCPOpenShiftClusterServiceProviderProperties{ ClusterServiceID: ptr.To(api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/csid"))), @@ -1695,6 +1737,9 @@ func TestDeleteOrphanedMaestroReadonlyBundles_ensureClusterScopedOrphanedMaestro spcOnShard1ResourceID := api.Must(azcorearm.ParseResourceID("/subscriptions/sub/resourceGroups/rg/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster1/serviceProviderClusters/default")) clusterRID := spcOnShard1ResourceID.Parent cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterRID, + }, TrackedResource: arm.TrackedResource{Resource: arm.Resource{ID: clusterRID}}, ServiceProviderProperties: api.HCPOpenShiftClusterServiceProviderProperties{ ClusterServiceID: ptr.To(api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/csid"))), @@ -1777,6 +1822,9 @@ func TestDeleteOrphanedMaestroReadonlyBundles_ensureClusterScopedOrphanedMaestro spcResourceID := api.Must(azcorearm.ParseResourceID("/subscriptions/sub/resourceGroups/rg/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-a/serviceProviderClusters/default")) clusterRID := spcResourceID.Parent cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterRID, + }, TrackedResource: arm.TrackedResource{Resource: arm.Resource{ID: clusterRID}}, ServiceProviderProperties: api.HCPOpenShiftClusterServiceProviderProperties{ ClusterServiceID: ptr.To(api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/csid"))), @@ -1834,6 +1882,9 @@ func TestDeleteOrphanedMaestroReadonlyBundles_ensureClusterScopedOrphanedMaestro spcResourceID := api.Must(azcorearm.ParseResourceID("/subscriptions/sub/resourceGroups/rg/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster/serviceProviderClusters/default")) clusterRID := spcResourceID.Parent cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterRID, + }, TrackedResource: arm.TrackedResource{Resource: arm.Resource{ID: clusterRID}}, ServiceProviderProperties: api.HCPOpenShiftClusterServiceProviderProperties{ ClusterServiceID: ptr.To(api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/csid"))), @@ -1891,6 +1942,9 @@ func TestDeleteOrphanedMaestroReadonlyBundles_SyncOnce_FullFlow_DeletesOrphanedB clusterResourceID := api.Must(azcorearm.ParseResourceID("/subscriptions/sub/resourceGroups/rg/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster")) cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterResourceID, + }, TrackedResource: arm.TrackedResource{Resource: arm.Resource{ID: clusterResourceID}}, ServiceProviderProperties: api.HCPOpenShiftClusterServiceProviderProperties{ ClusterServiceID: api.Ptr(api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/csid"))), diff --git a/backend/pkg/controllers/maestro_readonly_bundle_helpers_test.go b/backend/pkg/controllers/maestro_readonly_bundle_helpers_test.go index ba09da267a3..c8a8cfd09c9 100644 --- a/backend/pkg/controllers/maestro_readonly_bundle_helpers_test.go +++ b/backend/pkg/controllers/maestro_readonly_bundle_helpers_test.go @@ -350,6 +350,9 @@ var _ database.ServiceProviderClusterCRUD = &errorInjectingSPCCRUD{} func TestMaestroReadonlyBundleHelpers_calculateManagementClusterContentFromMaestroBundle(t *testing.T) { clusterResourceID := api.Must(azcorearm.ParseResourceID("/subscriptions/sub/resourceGroups/rg/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster")) cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterResourceID, + }, TrackedResource: arm.TrackedResource{Resource: arm.Resource{ID: clusterResourceID}}, } ref := &api.MaestroBundleReference{ @@ -439,6 +442,9 @@ func TestMaestroReadonlyBundleHelpers_readAndPersistMaestroReadonlyBundleContent ctx := context.Background() clusterResourceID := api.Must(azcorearm.ParseResourceID("/subscriptions/sub/resourceGroups/rg/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster")) cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterResourceID, + }, TrackedResource: arm.TrackedResource{Resource: arm.Resource{ID: clusterResourceID}}, } ref := &api.MaestroBundleReference{ diff --git a/backend/pkg/controllers/metricscontrollers/resource_metrics_controller_test.go b/backend/pkg/controllers/metricscontrollers/resource_metrics_controller_test.go index 73c44690aff..46e3d13665a 100644 --- a/backend/pkg/controllers/metricscontrollers/resource_metrics_controller_test.go +++ b/backend/pkg/controllers/metricscontrollers/resource_metrics_controller_test.go @@ -42,6 +42,9 @@ func newTestCluster(t *testing.T, name string, state arm.ProvisioningState, crea } return &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: api.Must(azcorearm.ParseResourceID("/subscriptions/sub-1/resourceGroups/rg/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/" + name)), + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ ID: api.Must(azcorearm.ParseResourceID("/subscriptions/sub-1/resourceGroups/rg/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/" + name)), diff --git a/backend/pkg/controllers/nodepoolpropertiescontroller/node_pool_properties_sync_test.go b/backend/pkg/controllers/nodepoolpropertiescontroller/node_pool_properties_sync_test.go index bc1a8d151c9..a325b091637 100644 --- a/backend/pkg/controllers/nodepoolpropertiescontroller/node_pool_properties_sync_test.go +++ b/backend/pkg/controllers/nodepoolpropertiescontroller/node_pool_properties_sync_test.go @@ -282,6 +282,9 @@ func newTestCluster(t *testing.T) *api.HCPOpenShiftCluster { "/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/" + testClusterName)) clusterInternalID := api.Must(api.NewInternalID(testClusterServiceIDStr)) return &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: resourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ ID: resourceID, diff --git a/backend/pkg/controllers/operationcontrollers/test_helpers_test.go b/backend/pkg/controllers/operationcontrollers/test_helpers_test.go index f6c43ee56a6..4bf85fddeb7 100644 --- a/backend/pkg/controllers/operationcontrollers/test_helpers_test.go +++ b/backend/pkg/controllers/operationcontrollers/test_helpers_test.go @@ -82,6 +82,9 @@ func newClusterTestFixture() *clusterTestFixture { func (f *clusterTestFixture) newCluster(createdAt *time.Time) *api.HCPOpenShiftCluster { return &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: f.clusterResourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ ID: f.clusterResourceID, @@ -162,6 +165,9 @@ func newNodePoolTestFixture() *nodePoolTestFixture { func (f *nodePoolTestFixture) newCluster() *api.HCPOpenShiftCluster { return &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: f.clusterResourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ ID: f.clusterResourceID, @@ -256,6 +262,9 @@ func newExternalAuthTestFixture() *externalAuthTestFixture { func (f *externalAuthTestFixture) newCluster() *api.HCPOpenShiftCluster { return &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: f.clusterResourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ ID: f.clusterResourceID, diff --git a/backend/pkg/controllers/read_and_persist_cluster_scoped_maestro_readonly_bundles_content_controller_test.go b/backend/pkg/controllers/read_and_persist_cluster_scoped_maestro_readonly_bundles_content_controller_test.go index b727c3215f5..22adb796f96 100644 --- a/backend/pkg/controllers/read_and_persist_cluster_scoped_maestro_readonly_bundles_content_controller_test.go +++ b/backend/pkg/controllers/read_and_persist_cluster_scoped_maestro_readonly_bundles_content_controller_test.go @@ -66,6 +66,9 @@ func TestReadAndPersistClusterScopedMaestroReadonlyBundlesContentSyncer_SyncOnce clusterResourceID := api.Must(azcorearm.ParseResourceID("/subscriptions/test-sub/resourceGroups/test-rg/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/test-cluster")) cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterResourceID, + }, TrackedResource: arm.TrackedResource{Resource: arm.Resource{ID: clusterResourceID}}, ServiceProviderProperties: api.HCPOpenShiftClusterServiceProviderProperties{ ClusterServiceID: api.Ptr(api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/11111111111111111111111111111111"))), @@ -112,6 +115,9 @@ func TestReadAndPersistClusterScopedMaestroReadonlyBundlesContentSyncer_SyncOnce clusterResourceID := api.Must(azcorearm.ParseResourceID("/subscriptions/test-sub/resourceGroups/test-rg/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/test-cluster")) cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterResourceID, + }, TrackedResource: arm.TrackedResource{Resource: arm.Resource{ID: clusterResourceID}}, ServiceProviderProperties: api.HCPOpenShiftClusterServiceProviderProperties{ ClusterServiceID: api.Ptr(api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/11111111111111111111111111111111"))), @@ -154,6 +160,9 @@ func TestReadAndPersistClusterScopedMaestroReadonlyBundlesContentSyncer_SyncOnce clusterResourceID := api.Must(azcorearm.ParseResourceID("/subscriptions/test-sub/resourceGroups/test-rg/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/test-cluster")) cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterResourceID, + }, TrackedResource: arm.TrackedResource{Resource: arm.Resource{ID: clusterResourceID}}, ServiceProviderProperties: api.HCPOpenShiftClusterServiceProviderProperties{ ClusterServiceID: api.Ptr(api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/11111111111111111111111111111111"))), @@ -210,6 +219,9 @@ func TestReadAndPersistClusterScopedMaestroReadonlyBundlesContentSyncer_SyncOnce clusterResourceID := api.Must(azcorearm.ParseResourceID("/subscriptions/test-sub/resourceGroups/test-rg/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/test-cluster")) cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterResourceID, + }, TrackedResource: arm.TrackedResource{Resource: arm.Resource{ID: clusterResourceID}}, ServiceProviderProperties: api.HCPOpenShiftClusterServiceProviderProperties{ ClusterServiceID: api.Ptr(api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/11111111111111111111111111111111"))), diff --git a/backend/pkg/controllers/upgradecontrollers/control_plane_active_version_controller_test.go b/backend/pkg/controllers/upgradecontrollers/control_plane_active_version_controller_test.go index e0df48532eb..431b9e2b11f 100644 --- a/backend/pkg/controllers/upgradecontrollers/control_plane_active_version_controller_test.go +++ b/backend/pkg/controllers/upgradecontrollers/control_plane_active_version_controller_test.go @@ -286,6 +286,9 @@ func createTestHCPCluster(t *testing.T, ctx context.Context, mockResourcesDBClie require.NoError(t, err) cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterResourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ ID: clusterResourceID, diff --git a/backend/pkg/controllers/upgradecontrollers/control_plane_desired_version_controller_test.go b/backend/pkg/controllers/upgradecontrollers/control_plane_desired_version_controller_test.go index db194d81d5f..450de9ff04e 100644 --- a/backend/pkg/controllers/upgradecontrollers/control_plane_desired_version_controller_test.go +++ b/backend/pkg/controllers/upgradecontrollers/control_plane_desired_version_controller_test.go @@ -516,6 +516,9 @@ func TestDesiredControlPlaneZVersion_NextYStreamUpgrade(t *testing.T) { func testCosmosClusterWithWorkersNodePoolAtVersion(nodePoolVersionId string) []any { clusterResourceId := api.Must(api.ToClusterResourceID("6b690bec-0c16-4ecb-8f67-781caf40bba7", "test-rg", "test-cluster")) cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterResourceId, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ ID: clusterResourceId, @@ -909,6 +912,9 @@ func createTestHCPClusterWithCustomerVersion(t *testing.T, ctx context.Context, clusterInternalID, err := api.NewInternalID(testCSClusterIDStr) require.NoError(t, err) cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterResourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ ID: clusterResourceID, diff --git a/backend/pkg/controllers/upgradecontrollers/nodepool_version_controller_test.go b/backend/pkg/controllers/upgradecontrollers/nodepool_version_controller_test.go index c1256ed4920..a3aef33a1cf 100644 --- a/backend/pkg/controllers/upgradecontrollers/nodepool_version_controller_test.go +++ b/backend/pkg/controllers/upgradecontrollers/nodepool_version_controller_test.go @@ -100,6 +100,9 @@ func createTestNodePoolWithVersion(t *testing.T, ctx context.Context, mockResour require.NoError(t, err) cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterResourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ ID: clusterResourceID, diff --git a/backend/pkg/informers/informers_test.go b/backend/pkg/informers/informers_test.go index 7d6f706336f..40ab3b15624 100644 --- a/backend/pkg/informers/informers_test.go +++ b/backend/pkg/informers/informers_test.go @@ -344,6 +344,9 @@ func clusterInformerTestCase() informerTestCase { internalID, err := api.NewInternalID("/api/clusters_mgmt/v1/clusters/" + name) require.NoError(t, err) return &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterResourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ ID: clusterResourceID, @@ -478,6 +481,9 @@ func nodePoolInformerTestCase() informerTestCase { internalID, err := api.NewInternalID("/api/clusters_mgmt/v1/clusters/" + clusterName) require.NoError(t, err) cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterResourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ ID: clusterResourceID, @@ -709,6 +715,9 @@ func controllerInformerTestCase() informerTestCase { internalID, err := api.NewInternalID("/api/clusters_mgmt/v1/clusters/" + clusterName) require.NoError(t, err) cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterResourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ ID: clusterResourceID, diff --git a/backend/pkg/listertesting/slice_listers_test.go b/backend/pkg/listertesting/slice_listers_test.go index eb4dd051bac..3d30290eab0 100644 --- a/backend/pkg/listertesting/slice_listers_test.go +++ b/backend/pkg/listertesting/slice_listers_test.go @@ -323,6 +323,9 @@ func newTestCluster(subscriptionID, resourceGroupName, clusterName string) *api. "/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/" + clusterName, )) return &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: resourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ ID: resourceID, diff --git a/frontend/pkg/frontend/cluster.go b/frontend/pkg/frontend/cluster.go index 37b9690e617..efb80a46498 100644 --- a/frontend/pkg/frontend/cluster.go +++ b/frontend/pkg/frontend/cluster.go @@ -232,6 +232,7 @@ func decodeDesiredClusterCreate(ctx context.Context, azureLocation string, reque } // TrackedResource info doesn't appear to come from the external resource information conversion.CopyReadOnlyTrackedResourceValues(&newInternalCluster.TrackedResource, ptr.To(arm.NewTrackedResource(resourceID, azureLocation))) + newInternalCluster.SetResourceID(resourceID) // set fields that were not included during the conversion, because the user does not provide them or because the // data is determined live on read. @@ -839,8 +840,11 @@ func (f *Frontend) getInternalClusterFromStorage(ctx context.Context, resourceID // normalize or return a toupper or tolower form of the resource // group or resource name. The resource group name and resource // name must come from the URL and not the request body. - if !strings.EqualFold(internalCluster.ID.String(), resourceID.String()) { - return nil, fmt.Errorf("unexpected resourceID: %s", internalCluster.ID.String()) + if internalCluster.ResourceID == nil { + return nil, fmt.Errorf("stored cluster document is missing cosmosMetadata.resourceID") + } + if !strings.EqualFold(internalCluster.ResourceID.String(), resourceID.String()) { + return nil, fmt.Errorf("unexpected resourceID: %s", internalCluster.ResourceID.String()) } internalCluster.ID = resourceID diff --git a/frontend/pkg/frontend/frontend_test.go b/frontend/pkg/frontend/frontend_test.go index 813c768878d..e8fa7179a6d 100644 --- a/frontend/pkg/frontend/frontend_test.go +++ b/frontend/pkg/frontend/frontend_test.go @@ -603,6 +603,9 @@ func TestRequestAdminCredential(t *testing.T) { ctx := utils.ContextWithLogger(t.Context(), testr.New(t)) cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterResourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ ID: clusterResourceID, @@ -713,6 +716,9 @@ func TestRevokeCredentials(t *testing.T) { ctx := utils.ContextWithLogger(t.Context(), testr.New(t)) cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterResourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ ID: clusterResourceID, diff --git a/frontend/pkg/frontend/helpers_test.go b/frontend/pkg/frontend/helpers_test.go index 0bf08d55a97..f6abfa46c6a 100644 --- a/frontend/pkg/frontend/helpers_test.go +++ b/frontend/pkg/frontend/helpers_test.go @@ -123,6 +123,9 @@ func TestCheckForProvisioningStateConflict(t *testing.T) { parentResourceID := resourceID.Parent clusterInternalID := api.Must(api.NewInternalID(ocm.GenerateOCMCommercialClusterHREF("testCluster"))) parentCluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: parentResourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ ID: parentResourceID, @@ -170,6 +173,9 @@ func TestCheckForProvisioningStateConflict(t *testing.T) { // Pre-populate the parent cluster with the test provisioning state clusterInternalID := api.Must(api.NewInternalID(ocm.GenerateOCMCommercialClusterHREF("testCluster"))) parentCluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: parentResourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ ID: parentResourceID, diff --git a/internal/api/types_cluster.go b/internal/api/types_cluster.go index ba7c919e4cb..c764fd2c8fd 100644 --- a/internal/api/types_cluster.go +++ b/internal/api/types_cluster.go @@ -15,7 +15,6 @@ package api import ( - "github.com/Azure/azure-sdk-for-go/sdk/azcore" azcorearm "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm" "github.com/Azure/ARO-HCP/internal/api/arm" @@ -24,30 +23,17 @@ import ( // HCPOpenShiftCluster represents an ARO HCP OpenShift cluster resource. // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type HCPOpenShiftCluster struct { + CosmosMetadata `json:"cosmosMetadata"` + arm.TrackedResource CustomerProperties HCPOpenShiftClusterCustomerProperties `json:"customerProperties,omitempty"` ServiceProviderProperties HCPOpenShiftClusterServiceProviderProperties `json:"serviceProviderProperties,omitempty"` Identity *arm.ManagedServiceIdentity `json:"identity,omitempty"` - // CosmosETag is an in-memory copy of the _etag field read from the Cosmos DB document (BaseDocument) and - // populated on DB read via the CosmosToInternalCluster() conversion function. - // We carry it across the API boundary between HCPCluster (the direct cosmos db type) and HCPOpenShiftCluster (this) - // so we can populate the CosmosETag in GetCosmosData() so that we can do conditional replaces in cosmos. - // This can be removed once we have inlined and serialized CosmosMetadata in - // HCPOpenShiftCluster. - CosmosETag azcore.ETag `json:"-"` } var _ arm.CosmosPersistable = &HCPOpenShiftCluster{} -func (o *HCPOpenShiftCluster) GetCosmosData() *arm.CosmosMetadata { - return &arm.CosmosMetadata{ - CosmosETag: o.CosmosETag, - ResourceID: o.ID, - ExistingCosmosUID: o.ServiceProviderProperties.ExistingCosmosUID, - } -} - // HCPOpenShiftClusterCustomerProperties represents the property bag of a HCPOpenShiftCluster resource. type HCPOpenShiftClusterCustomerProperties struct { Version VersionProfile `json:"version,omitempty"` @@ -64,7 +50,6 @@ type HCPOpenShiftClusterCustomerProperties struct { // HCPOpenShiftClusterCustomerProperties represents the property bag of a HCPOpenShiftCluster resource. type HCPOpenShiftClusterServiceProviderProperties struct { - ExistingCosmosUID string `json:"-"` ProvisioningState arm.ProvisioningState `json:"provisioningState,omitempty"` ClusterServiceID *InternalID `json:"clusterServiceID,omitempty"` ActiveOperationID string `json:"activeOperationId,omitempty"` diff --git a/internal/api/v20240610preview/conversion_fuzz_test.go b/internal/api/v20240610preview/conversion_fuzz_test.go index 7c17643c5f2..99b0057e632 100644 --- a/internal/api/v20240610preview/conversion_fuzz_test.go +++ b/internal/api/v20240610preview/conversion_fuzz_test.go @@ -54,7 +54,6 @@ func TestRoundTripInternalExternalInternal(t *testing.T) { j.RevokeCredentialsOperationID = "" // ClusterServiceID does not roundtrip through the external type because it is purely an internal detail j.ClusterServiceID = nil - j.ExistingCosmosUID = "" // ExperimentalFeatures does not roundtrip through the external type because it is purely an internal detail j.ExperimentalFeatures = api.ExperimentalFeatures{} // ManagedIdentitiesDataPlaneIdentityURL does not roundtrip through the external type because @@ -99,6 +98,12 @@ func TestRoundTripInternalExternalInternal(t *testing.T) { // Visibility was added in v2025_12_23_preview and does not exist in v2024_06_10_preview j.Visibility = "" }, + func(j *api.CosmosMetadata, c randfill.Continue) { + c.FillNoCustom(j) + j.ResourceID = api.Must(azcorearm.ParseResourceID("/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myRg")) + j.ExistingCosmosUID = "" + j.CosmosETag = "" + }, func(j *api.CustomerManagedEncryptionProfile, c randfill.Continue) { c.FillNoCustom(j) // A zero-value KmsEncryptionProfile cannot roundtrip because @@ -116,8 +121,6 @@ func TestRoundTripInternalExternalInternal(t *testing.T) { for i := 0; i < 200; i++ { original := &api.HCPOpenShiftCluster{} fuzzer.Fill(original) - // CosmosETag does not roundtrip through the external type because it is purely a database concern - original.CosmosETag = "" roundTripHCPCluster(t, original) } diff --git a/internal/api/v20240610preview/hcpopenshiftclusters_methods.go b/internal/api/v20240610preview/hcpopenshiftclusters_methods.go index b1546e3878b..62f658d422e 100644 --- a/internal/api/v20240610preview/hcpopenshiftclusters_methods.go +++ b/internal/api/v20240610preview/hcpopenshiftclusters_methods.go @@ -307,8 +307,8 @@ func (v version) NewHCPOpenShiftCluster(from *api.HCPOpenShiftCluster) api.Versi } idString := "" - if from.ID != nil { - idString = from.ID.String() + if from.ResourceID != nil { + idString = from.ResourceID.String() } out := &HcpOpenShiftCluster{ @@ -349,6 +349,7 @@ func (c *HcpOpenShiftCluster) ConvertToInternal(existing *api.HCPOpenShiftCluste if c.ID != nil { out.ID = api.Must(azcorearm.ParseResourceID(strings.ToLower(*c.ID))) + out.ResourceID = api.Must(azcorearm.ParseResourceID(strings.ToLower(*c.ID))) } if c.Name != nil { out.Name = *c.Name diff --git a/internal/api/v20251223preview/conversion_fuzz_test.go b/internal/api/v20251223preview/conversion_fuzz_test.go index a144b0f4fd5..f7551a9266a 100644 --- a/internal/api/v20251223preview/conversion_fuzz_test.go +++ b/internal/api/v20251223preview/conversion_fuzz_test.go @@ -39,6 +39,12 @@ func TestRoundTripInternalExternalInternal(t *testing.T) { func(j *azcorearm.ResourceID, c randfill.Continue) { *j = *api.Must(azcorearm.ParseResourceID("/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myRg")) }, + func(j *api.CosmosMetadata, c randfill.Continue) { + c.FillNoCustom(j) + j.ResourceID = api.Must(azcorearm.ParseResourceID("/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myRg")) + j.ExistingCosmosUID = "" + j.CosmosETag = "" + }, func(j *api.ImageDigestMirror, c randfill.Continue) { c.FillNoCustom(j) // MirrorSourcePolicy does not roundtrip through the external type because it is purely an internal detail @@ -52,7 +58,6 @@ func TestRoundTripInternalExternalInternal(t *testing.T) { j.RevokeCredentialsOperationID = "" // ClusterServiceID does not roundtrip through the external type because it is purely an internal detail j.ClusterServiceID = nil - j.ExistingCosmosUID = "" // ExperimentalFeatures does not roundtrip through the external type because it is purely an internal detail j.ExperimentalFeatures = api.ExperimentalFeatures{} // ManagedIdentitiesDataPlaneIdentityURL does not roundtrip through the external type because @@ -100,8 +105,6 @@ func TestRoundTripInternalExternalInternal(t *testing.T) { for i := 0; i < 200; i++ { original := &api.HCPOpenShiftCluster{} fuzzer.Fill(original) - // CosmosETag does not roundtrip through the external type because it is purely a database concern - original.CosmosETag = "" roundTripHCPCluster(t, original) } diff --git a/internal/api/v20251223preview/hcpopenshiftclusters_methods.go b/internal/api/v20251223preview/hcpopenshiftclusters_methods.go index 9598b3631ae..b26144dee86 100644 --- a/internal/api/v20251223preview/hcpopenshiftclusters_methods.go +++ b/internal/api/v20251223preview/hcpopenshiftclusters_methods.go @@ -326,8 +326,8 @@ func (v version) NewHCPOpenShiftCluster(from *api.HCPOpenShiftCluster) api.Versi } idString := "" - if from.ID != nil { - idString = from.ID.String() + if from.ResourceID != nil { + idString = from.ResourceID.String() } out := &HcpOpenShiftCluster{ @@ -406,6 +406,7 @@ func (c *HcpOpenShiftCluster) ConvertToInternal(existing *api.HCPOpenShiftCluste if c.ID != nil { out.ID = api.Must(azcorearm.ParseResourceID(strings.ToLower(*c.ID))) + out.ResourceID = api.Must(azcorearm.ParseResourceID(strings.ToLower(*c.ID))) } if c.Name != nil { out.Name = *c.Name diff --git a/internal/api/v20251223preview/zero_value_roundtrip_test.go b/internal/api/v20251223preview/zero_value_roundtrip_test.go index 305f44de779..b29a6dcc381 100644 --- a/internal/api/v20251223preview/zero_value_roundtrip_test.go +++ b/internal/api/v20251223preview/zero_value_roundtrip_test.go @@ -295,6 +295,9 @@ func newBaselineInternalNodePool() *api.HCPOpenShiftClusterNodePool { // to zero before round-tripping. func newBaselineInternalCluster() *api.HCPOpenShiftCluster { return &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: api.Must(azcorearm.ParseResourceID(strings.ToLower("/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myRg/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/myCluster"))), + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ ID: api.Must(azcorearm.ParseResourceID(strings.ToLower("/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myRg/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/myCluster"))), diff --git a/internal/api/zz_generated.deepcopy.go b/internal/api/zz_generated.deepcopy.go index 40bbc43858f..c30748dc159 100644 --- a/internal/api/zz_generated.deepcopy.go +++ b/internal/api/zz_generated.deepcopy.go @@ -426,6 +426,7 @@ func (in *HCPNodePoolActiveVersion) DeepCopy() *HCPNodePoolActiveVersion { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *HCPOpenShiftCluster) DeepCopyInto(out *HCPOpenShiftCluster) { *out = *in + in.CosmosMetadata.DeepCopyInto(&out.CosmosMetadata) in.TrackedResource.DeepCopyInto(&out.TrackedResource) in.CustomerProperties.DeepCopyInto(&out.CustomerProperties) in.ServiceProviderProperties.DeepCopyInto(&out.ServiceProviderProperties) diff --git a/internal/conversion/readonly_cluster.go b/internal/conversion/readonly_cluster.go index 60e1b2f4d5f..ac61c0d8a02 100644 --- a/internal/conversion/readonly_cluster.go +++ b/internal/conversion/readonly_cluster.go @@ -30,6 +30,10 @@ func CopyReadOnlyTrackedResourceValues(dest, src *arm.TrackedResource) { func CopyReadOnlyClusterValues(dest, src *api.HCPOpenShiftCluster) { CopyReadOnlyTrackedResourceValues(&dest.TrackedResource, &src.TrackedResource) + // CosmosMetadata is read-only on the API surface; carry over so the + // case-preserving ResourceID and CosmosETag survive the replace round-trip. + dest.CosmosMetadata = *src.CosmosMetadata.DeepCopy() + switch { case hasClusterIdentityToSet(src.Identity) && dest.Identity == nil: dest.Identity = &arm.ManagedServiceIdentity{} @@ -41,7 +45,6 @@ func CopyReadOnlyClusterValues(dest, src *api.HCPOpenShiftCluster) { } dest.ServiceProviderProperties = *src.ServiceProviderProperties.DeepCopy() - dest.CosmosETag = src.CosmosETag } func copyReadOnlyManagedServiceIdentityValues(dest, src *arm.ManagedServiceIdentity) { diff --git a/internal/database/convert_cluster.go b/internal/database/convert_cluster.go index 28c6c2a9397..8fbf64d6f9c 100644 --- a/internal/database/convert_cluster.go +++ b/internal/database/convert_cluster.go @@ -18,10 +18,7 @@ import ( "fmt" "strings" - "k8s.io/utils/ptr" - "github.com/Azure/ARO-HCP/internal/api" - "github.com/Azure/ARO-HCP/internal/api/arm" ) func InternalToCosmosCluster(internalObj *api.HCPOpenShiftCluster) (*HCPCluster, error) { @@ -29,32 +26,24 @@ func InternalToCosmosCluster(internalObj *api.HCPOpenShiftCluster) (*HCPCluster, return nil, nil } + // CosmosMetadata.ResourceID is the canonical identifier for cosmos-side + // concerns (partitioning, document UID, resource-type indexing). Use it + // instead of the TrackedResource.ID, which is an ARM-surface concern. + cosmosResourceID := internalObj.GetCosmosData().ResourceID + if cosmosResourceID == nil { + return nil, fmt.Errorf("internalObj is missing CosmosMetadata.ResourceID") + } cosmosObj := &HCPCluster{ TypedDocument: TypedDocument{ BaseDocument: BaseDocument{ ID: internalObj.GetCosmosData().GetCosmosUID(), }, - PartitionKey: strings.ToLower(internalObj.ID.SubscriptionID), - ResourceID: internalObj.ID, - ResourceType: internalObj.ID.ResourceType.String(), + PartitionKey: strings.ToLower(cosmosResourceID.SubscriptionID), + ResourceID: cosmosResourceID, + ResourceType: cosmosResourceID.ResourceType.String(), }, HCPClusterProperties: HCPClusterProperties{ HCPOpenShiftCluster: *internalObj, - CosmosMetadata: api.CosmosMetadata{ - ResourceID: internalObj.ID, - }, - IntermediateResourceDoc: &ResourceDocument{ - ResourceID: internalObj.ID, - InternalID: ptr.Deref(internalObj.ServiceProviderProperties.ClusterServiceID, api.InternalID{}), - ActiveOperationID: internalObj.ServiceProviderProperties.ActiveOperationID, - ProvisioningState: internalObj.ServiceProviderProperties.ProvisioningState, - Identity: internalObj.Identity.DeepCopy(), - SystemData: internalObj.SystemData, - Tags: copyTags(internalObj.Tags), - }, - InternalState: ClusterInternalState{ - InternalAPI: *internalObj, - }, }, } @@ -77,42 +66,17 @@ func CosmosToInternalCluster(cosmosObj *HCPCluster) (*api.HCPOpenShiftCluster, e if cosmosObj == nil { return nil, nil } - resourceDoc := cosmosObj.IntermediateResourceDoc - if resourceDoc == nil { - return nil, fmt.Errorf("resource document cannot be nil") - } - - tempInternalAPI := cosmosObj.InternalState.InternalAPI - internalObj := &tempInternalAPI - - // some pieces of data are stored on the ResourceDocument, so we need to restore that data - internalObj.TrackedResource = arm.TrackedResource{ - Resource: arm.Resource{ - ID: resourceDoc.ResourceID, - Name: resourceDoc.ResourceID.Name, - Type: resourceDoc.ResourceID.ResourceType.String(), - SystemData: resourceDoc.SystemData, - }, - Location: cosmosObj.InternalState.InternalAPI.Location, - Tags: resourceDoc.Tags, - } - // we carry over the CosmosETag from the cosmos object to the internal object into a - // temporary field until we have inlined and serialized CosmosMetadata in - // HCPOpenShiftCluster. - internalObj.CosmosETag = cosmosObj.BaseDocument.CosmosETag - internalObj.Identity = resourceDoc.Identity.DeepCopy() - internalObj.SystemData = resourceDoc.SystemData - internalObj.Tags = copyTags(resourceDoc.Tags) - internalObj.ServiceProviderProperties.ExistingCosmosUID = cosmosObj.ID - internalObj.ServiceProviderProperties.ProvisioningState = resourceDoc.ProvisioningState - if len(resourceDoc.InternalID.String()) == 0 { - // preserve the nil on read - internalObj.ServiceProviderProperties.ClusterServiceID = nil - } else { - internalObj.ServiceProviderProperties.ClusterServiceID = &resourceDoc.InternalID + internalObj := cosmosObj.DeepCopy() + internalObj.ExistingCosmosUID = cosmosObj.ID + internalObj.SetEtag(cosmosObj.CosmosETag) + if internalObj.GetResourceID() == nil { + if cosmosObj.ResourceID != nil { + internalObj.SetResourceID(cosmosObj.ResourceID) + } else { + return nil, fmt.Errorf("internalObj is missing a resourceID: %T: %q", cosmosObj, cosmosObj.ID) + } } - internalObj.ServiceProviderProperties.ActiveOperationID = resourceDoc.ActiveOperationID internalObj.EnsureDefaults() diff --git a/internal/database/convert_cluster_test.go b/internal/database/convert_cluster_test.go index 2c886285514..f28f9a92ebb 100644 --- a/internal/database/convert_cluster_test.go +++ b/internal/database/convert_cluster_test.go @@ -68,13 +68,17 @@ func TestRoundTripClusterInternalCosmosInternal(t *testing.T) { foo := api.Must(api.NewInternalID("/api/clusters_mgmt/v1/clusters/r" + strings.ReplaceAll(c.String(10), "/", "-"))) j.ClusterServiceID = &foo }, + func(j *api.CosmosMetadata, c randfill.Continue) { + c.FillNoCustom(j) + j.ResourceID = api.Must(azcorearm.ParseResourceID("/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myRg")) + j.ExistingCosmosUID = "" + j.CosmosETag = "" + }, func(j *api.HCPOpenShiftCluster, c randfill.Continue) { c.FillNoCustom(j) if j == nil { return } - j.ServiceProviderProperties.ExistingCosmosUID = "" - j.CosmosETag = "" // Canonical defaults are applied on Cosmos read, so ensure // defaulted fields are never zero during round-trip testing. if len(j.CustomerProperties.Network.NetworkType) == 0 { @@ -136,7 +140,7 @@ func roundTripInternalToCosmosToInternal[InternalAPIType, CosmosAPIType any](t * // this value is set during conversion, so we need clear for comparison switch cast := any(final).(type) { case *api.HCPOpenShiftCluster: - cast.ServiceProviderProperties.ExistingCosmosUID = "" + cast.ExistingCosmosUID = "" case *api.HCPOpenShiftClusterNodePool: cast.ServiceProviderProperties.ExistingCosmosUID = "" case *api.HCPOpenShiftClusterExternalAuth: @@ -180,8 +184,10 @@ func TestCosmosToInternalClusterPreservesETag(t *testing.T) { }, }, HCPClusterProperties: HCPClusterProperties{ - IntermediateResourceDoc: &ResourceDocument{ - ResourceID: resourceID, + HCPOpenShiftCluster: api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: resourceID, + }, }, }, } diff --git a/internal/database/convert_defaults_consistency_test.go b/internal/database/convert_defaults_consistency_test.go index 0090a7ebb6b..e177ac705e8 100644 --- a/internal/database/convert_defaults_consistency_test.go +++ b/internal/database/convert_defaults_consistency_test.go @@ -304,16 +304,16 @@ func TestPreExistingDataCluster(t *testing.T) { ResourceID: resourceID, }, HCPClusterProperties: HCPClusterProperties{ - IntermediateResourceDoc: &ResourceDocument{ - ResourceID: resourceID, - InternalID: api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/test-cluster")), - ProvisioningState: arm.ProvisioningStateSucceeded, - }, - InternalState: ClusterInternalState{ - InternalAPI: api.HCPOpenShiftCluster{ - // All canonically-defaulted fields are intentionally zero-valued: - // NetworkType, Visibility, OutboundType, - // ClusterImageRegistry.State, Etcd.DataEncryption.KeyManagementMode + HCPOpenShiftCluster: api.HCPOpenShiftCluster{ + // All canonically-defaulted fields are intentionally zero-valued: + // NetworkType, Visibility, OutboundType, + // ClusterImageRegistry.State, Etcd.DataEncryption.KeyManagementMode + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: resourceID, + }, + ServiceProviderProperties: api.HCPOpenShiftClusterServiceProviderProperties{ + ClusterServiceID: ptr.To(api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/test-cluster"))), + ProvisioningState: arm.ProvisioningStateSucceeded, }, }, }, @@ -362,33 +362,33 @@ func TestKMSVisibilityDefaultsToPublic(t *testing.T) { ResourceID: resourceID, }, HCPClusterProperties: HCPClusterProperties{ - IntermediateResourceDoc: &ResourceDocument{ - ResourceID: resourceID, - InternalID: api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/test-cluster")), - ProvisioningState: arm.ProvisioningStateSucceeded, - }, - InternalState: ClusterInternalState{ - InternalAPI: api.HCPOpenShiftCluster{ - CustomerProperties: api.HCPOpenShiftClusterCustomerProperties{ - Etcd: api.EtcdProfile{ - DataEncryption: api.EtcdDataEncryptionProfile{ - KeyManagementMode: api.EtcdDataEncryptionKeyManagementModeTypeCustomerManaged, - CustomerManaged: &api.CustomerManagedEncryptionProfile{ - EncryptionType: api.CustomerManagedEncryptionTypeKMS, - Kms: &api.KmsEncryptionProfile{ - ActiveKey: api.KmsKey{ - Name: "test-key", - VaultName: "test-vault", - Version: "v1", - }, - // Visibility intentionally not set (empty string) - Visibility: "", + HCPOpenShiftCluster: api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: resourceID, + }, + CustomerProperties: api.HCPOpenShiftClusterCustomerProperties{ + Etcd: api.EtcdProfile{ + DataEncryption: api.EtcdDataEncryptionProfile{ + KeyManagementMode: api.EtcdDataEncryptionKeyManagementModeTypeCustomerManaged, + CustomerManaged: &api.CustomerManagedEncryptionProfile{ + EncryptionType: api.CustomerManagedEncryptionTypeKMS, + Kms: &api.KmsEncryptionProfile{ + ActiveKey: api.KmsKey{ + Name: "test-key", + VaultName: "test-vault", + Version: "v1", }, + // Visibility intentionally not set (empty string) + Visibility: "", }, }, }, }, }, + ServiceProviderProperties: api.HCPOpenShiftClusterServiceProviderProperties{ + ClusterServiceID: ptr.To(api.Must(api.NewInternalID("/api/aro_hcp/v1alpha1/clusters/test-cluster"))), + ProvisioningState: arm.ProvisioningStateSucceeded, + }, }, }, } diff --git a/internal/database/types_hcpcluster.go b/internal/database/types_hcpcluster.go index 7570a5d4f21..d8e984236f4 100644 --- a/internal/database/types_hcpcluster.go +++ b/internal/database/types_hcpcluster.go @@ -25,26 +25,10 @@ type HCPCluster struct { } type HCPClusterProperties struct { - // HCPOpenShiftCluster is where we're migrating to. It is compatible with a GenericDocument[api.HCPOpenShiftCluster] - // which is where we want to end up. - // * to be compatible with prior versions, we must continue writing all previous fields and this new field - // * to be compatible with prior versions, we must continue reading only from previous fields + // HCPOpenShiftCluster is inlined directly. The on-disk shape now matches + // GenericDocument[api.HCPOpenShiftCluster] and HCPCluster only exists as a + // distinct type while the migration to that generic surface completes. api.HCPOpenShiftCluster `json:",inline"` - - // when we switch to inlining the internalObj, this will be in the right spot. We add it now so that we can switch our - // queries to select on cosmosMetadata.ResourceID instead of resourceId - CosmosMetadata api.CosmosMetadata `json:"cosmosMetadata"` - - // IntermediateResourceDoc exists so that we can stop inlining the resource document so that we can directly - // embed the InternalAPIType which has colliding serialization fields. - IntermediateResourceDoc *ResourceDocument `json:"intermediateResourceDoc"` - - // TODO we may need look-aside data that we want to store in the same place. Build the nesting to allow it - InternalState ClusterInternalState `json:"internalState"` -} - -type ClusterInternalState struct { - InternalAPI api.HCPOpenShiftCluster `json:"internalAPI"` } func (o *HCPCluster) GetTypedDocument() *TypedDocument { diff --git a/internal/databasetesting/mock_dbclient_test.go b/internal/databasetesting/mock_dbclient_test.go index 8ab938a974b..07507eb60d2 100644 --- a/internal/databasetesting/mock_dbclient_test.go +++ b/internal/databasetesting/mock_dbclient_test.go @@ -149,6 +149,9 @@ func TestMockResourcesDBClient_CRUD_Cluster(t *testing.T) { } cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterResourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ ID: clusterResourceID, @@ -386,6 +389,9 @@ func TestMockResourcesDBClient_Transaction(t *testing.T) { } cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterResourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ ID: clusterResourceID, @@ -444,6 +450,9 @@ func TestMockResourcesDBClient_UntypedCRUD(t *testing.T) { } cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterResourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ ID: clusterResourceID, @@ -797,6 +806,9 @@ func TestMockResourcesDBClient_addResource(t *testing.T) { } cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterResourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ ID: clusterResourceID, @@ -878,6 +890,9 @@ func TestNewMockResourcesDBClientWithResources(t *testing.T) { } cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterResourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ ID: clusterResourceID, diff --git a/internal/serverutils/dump_billing_test.go b/internal/serverutils/dump_billing_test.go index 2914425951b..8d4688fcea6 100644 --- a/internal/serverutils/dump_billing_test.go +++ b/internal/serverutils/dump_billing_test.go @@ -43,6 +43,9 @@ func TestDumpBillingToLogger(t *testing.T) { // Create HCP clusters cluster1 := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: cluster1ResourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ ID: cluster1ResourceID, @@ -57,6 +60,9 @@ func TestDumpBillingToLogger(t *testing.T) { } cluster2 := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: cluster2ResourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ ID: cluster2ResourceID, @@ -120,6 +126,9 @@ func TestDumpBillingToLogger_PartitionScoping(t *testing.T) { // Create HCP clusters with ClusterUIDs cluster1 := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: cluster1ResourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ ID: cluster1ResourceID, @@ -134,6 +143,9 @@ func TestDumpBillingToLogger_PartitionScoping(t *testing.T) { } cluster2 := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: cluster2ResourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ ID: cluster2ResourceID, @@ -148,6 +160,9 @@ func TestDumpBillingToLogger_PartitionScoping(t *testing.T) { } cluster3 := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: cluster3ResourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ ID: cluster3ResourceID, diff --git a/test-integration/admin/artifacts/AdminCRUD/HCP/breakglass/00-load-initial-cosmos-state/01-cluster.json b/test-integration/admin/artifacts/AdminCRUD/HCP/breakglass/00-load-initial-cosmos-state/01-cluster.json index df797d0cd94..315cbb9e2dc 100644 --- a/test-integration/admin/artifacts/AdminCRUD/HCP/breakglass/00-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/admin/artifacts/AdminCRUD/HCP/breakglass/00-load-initial-cosmos-state/01-cluster.json @@ -9,36 +9,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/aro_hcp/v1alpha1/clusters/fixed-value", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "systemData": {}, - "tags": { - "foo": "bar" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "identity": { - "type": "UserAssigned" - }, - "location": "eastus", - "name": "some-hcp-cluster", - "serviceProviderProperties": { - "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/fixed-value", - "provisioningState": "Succeeded" - }, - "tags": { - "foo": "bar" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "eastus", "name": "some-hcp-cluster", "serviceProviderProperties": { diff --git a/test-integration/admin/artifacts/AdminCRUD/HCP/cosmosdump/00-load-initial-cosmos-state/01-cluster.json b/test-integration/admin/artifacts/AdminCRUD/HCP/cosmosdump/00-load-initial-cosmos-state/01-cluster.json index 50790056402..d37a42c8310 100644 --- a/test-integration/admin/artifacts/AdminCRUD/HCP/cosmosdump/00-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/admin/artifacts/AdminCRUD/HCP/cosmosdump/00-load-initial-cosmos-state/01-cluster.json @@ -9,47 +9,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/aro_hcp/v1alpha1/clusters/fixed-value", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "foo": "bar" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "identity": { - "type": "UserAssigned" - }, - "location": "eastus", - "name": "some-hcp-cluster", - "serviceProviderProperties": { - "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/fixed-value", - "provisioningState": "Succeeded" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "foo": "bar" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "eastus", "name": "some-hcp-cluster", "serviceProviderProperties": { diff --git a/test-integration/admin/artifacts/AdminCRUD/HCP/hello-world/00-load-initial-cosmos-state/01-cluster.json b/test-integration/admin/artifacts/AdminCRUD/HCP/hello-world/00-load-initial-cosmos-state/01-cluster.json index 50790056402..d37a42c8310 100644 --- a/test-integration/admin/artifacts/AdminCRUD/HCP/hello-world/00-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/admin/artifacts/AdminCRUD/HCP/hello-world/00-load-initial-cosmos-state/01-cluster.json @@ -9,47 +9,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/aro_hcp/v1alpha1/clusters/fixed-value", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "foo": "bar" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "identity": { - "type": "UserAssigned" - }, - "location": "eastus", - "name": "some-hcp-cluster", - "serviceProviderProperties": { - "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/fixed-value", - "provisioningState": "Succeeded" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "foo": "bar" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "eastus", "name": "some-hcp-cluster", "serviceProviderProperties": { diff --git a/test-integration/admin/artifacts/AdminCRUD/HCP/lowercase-middleware/00-load-initial-cosmos-state/01-cluster.json b/test-integration/admin/artifacts/AdminCRUD/HCP/lowercase-middleware/00-load-initial-cosmos-state/01-cluster.json index 50790056402..d37a42c8310 100644 --- a/test-integration/admin/artifacts/AdminCRUD/HCP/lowercase-middleware/00-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/admin/artifacts/AdminCRUD/HCP/lowercase-middleware/00-load-initial-cosmos-state/01-cluster.json @@ -9,47 +9,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/aro_hcp/v1alpha1/clusters/fixed-value", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "foo": "bar" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "identity": { - "type": "UserAssigned" - }, - "location": "eastus", - "name": "some-hcp-cluster", - "serviceProviderProperties": { - "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/fixed-value", - "provisioningState": "Succeeded" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "foo": "bar" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "eastus", "name": "some-hcp-cluster", "serviceProviderProperties": { diff --git a/test-integration/backend/controllers/do_nothing/artifacts/sync_cluster/00-load-initial-state/cluster.json b/test-integration/backend/controllers/do_nothing/artifacts/sync_cluster/00-load-initial-state/cluster.json index d2abf8d5758..2cf729987ad 100644 --- a/test-integration/backend/controllers/do_nothing/artifacts/sync_cluster/00-load-initial-state/cluster.json +++ b/test-integration/backend/controllers/do_nothing/artifacts/sync_cluster/00-load-initial-state/cluster.json @@ -59,97 +59,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/shrillEffectiveness/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/lavishUnhappiness", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "uprightPairing", - "networkSecurityGroupId": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/shrillEffectiveness/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": { - "serviceManagedIdentity": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" - } - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/shrillEffectiveness/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/lavishUnhappiness", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "lavishUnhappiness", - "serviceProviderProperties": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Accepted" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "lavishUnhappiness", "serviceProviderProperties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/cluster/present_cluster/00-load-initial-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/cluster/present_cluster/00-load-initial-state/cluster.json index b93039a54e6..4a8b7ee6dbb 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/cluster/present_cluster/00-load-initial-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/cluster/present_cluster/00-load-initial-state/cluster.json @@ -59,97 +59,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "uprightPairing", - "networkSecurityGroupId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": { - "serviceManagedIdentity": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" - } - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "monstrousPrecinct", - "serviceProviderProperties": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Accepted" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "monstrousPrecinct", "serviceProviderProperties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/cluster/present_cluster/99-cosmosCompare-end-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/cluster/present_cluster/99-cosmosCompare-end-state/cluster.json index b93039a54e6..4a8b7ee6dbb 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/cluster/present_cluster/99-cosmosCompare-end-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/cluster/present_cluster/99-cosmosCompare-end-state/cluster.json @@ -59,97 +59,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "uprightPairing", - "networkSecurityGroupId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": { - "serviceManagedIdentity": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" - } - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "monstrousPrecinct", - "serviceProviderProperties": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Accepted" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "monstrousPrecinct", "serviceProviderProperties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/cluster-safe.json b/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/cluster-safe.json index d2abf8d5758..2cf729987ad 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/cluster-safe.json +++ b/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/cluster-safe.json @@ -59,97 +59,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/shrillEffectiveness/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/lavishUnhappiness", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "uprightPairing", - "networkSecurityGroupId": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/shrillEffectiveness/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": { - "serviceManagedIdentity": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" - } - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/shrillEffectiveness/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/lavishUnhappiness", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "lavishUnhappiness", - "serviceProviderProperties": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Accepted" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "lavishUnhappiness", "serviceProviderProperties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/cluster.json index b93039a54e6..4a8b7ee6dbb 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/00-load-initial-state/cluster.json @@ -59,97 +59,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "uprightPairing", - "networkSecurityGroupId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": { - "serviceManagedIdentity": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" - } - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "monstrousPrecinct", - "serviceProviderProperties": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Accepted" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "monstrousPrecinct", "serviceProviderProperties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/99-cosmosCompare-end-state/cluster-safe.json b/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/99-cosmosCompare-end-state/cluster-safe.json index d2abf8d5758..2cf729987ad 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/99-cosmosCompare-end-state/cluster-safe.json +++ b/test-integration/backend/controllers/mismatches/artifacts/cluster/remove_orphaned_cluster_descendents/99-cosmosCompare-end-state/cluster-safe.json @@ -59,97 +59,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/shrillEffectiveness/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/lavishUnhappiness", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "uprightPairing", - "networkSecurityGroupId": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/shrillEffectiveness/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": { - "serviceManagedIdentity": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" - } - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/4fa75980-6637-4157-9726-84d878a62e83/resourceGroups/shrillEffectiveness/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/lavishUnhappiness", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "lavishUnhappiness", - "serviceProviderProperties": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Accepted" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "lavishUnhappiness", "serviceProviderProperties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/00-load-initial-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/00-load-initial-state/cluster.json index cf23e04131c..e5f55700237 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/00-load-initial-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/00-load-initial-state/cluster.json @@ -29,67 +29,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "uprightPairing", - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "monstrousPrecinct", - "serviceProviderProperties": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Accepted" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "monstrousPrecinct", "serviceProviderProperties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/99-cosmosCompare-end-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/99-cosmosCompare-end-state/cluster.json index cf23e04131c..e5f55700237 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/99-cosmosCompare-end-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/all_parents_exist/99-cosmosCompare-end-state/cluster.json @@ -29,67 +29,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "uprightPairing", - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "monstrousPrecinct", - "serviceProviderProperties": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Accepted" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "monstrousPrecinct", "serviceProviderProperties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/controller_under_missing_nodepool_deleted/00-load-initial-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/controller_under_missing_nodepool_deleted/00-load-initial-state/cluster.json index cf23e04131c..e5f55700237 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/controller_under_missing_nodepool_deleted/00-load-initial-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/controller_under_missing_nodepool_deleted/00-load-initial-state/cluster.json @@ -29,67 +29,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "uprightPairing", - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "monstrousPrecinct", - "serviceProviderProperties": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Accepted" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "monstrousPrecinct", "serviceProviderProperties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/controller_under_missing_nodepool_deleted/99-cosmosCompare-end-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/controller_under_missing_nodepool_deleted/99-cosmosCompare-end-state/cluster.json index cf23e04131c..e5f55700237 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/controller_under_missing_nodepool_deleted/99-cosmosCompare-end-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/delete_orphaned_cosmos/controller_under_missing_nodepool_deleted/99-cosmosCompare-end-state/cluster.json @@ -29,67 +29,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "uprightPairing", - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "monstrousPrecinct", - "serviceProviderProperties": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Accepted" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "monstrousPrecinct", "serviceProviderProperties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/00-load-initial-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/00-load-initial-state/cluster.json index b93039a54e6..4a8b7ee6dbb 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/00-load-initial-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/00-load-initial-state/cluster.json @@ -59,97 +59,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "uprightPairing", - "networkSecurityGroupId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": { - "serviceManagedIdentity": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" - } - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "monstrousPrecinct", - "serviceProviderProperties": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Accepted" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "monstrousPrecinct", "serviceProviderProperties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/99-cosmosCompare-end-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/99-cosmosCompare-end-state/cluster.json index b93039a54e6..4a8b7ee6dbb 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/99-cosmosCompare-end-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/externalauth/present_externalauth/99-cosmosCompare-end-state/cluster.json @@ -59,97 +59,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "uprightPairing", - "networkSecurityGroupId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": { - "serviceManagedIdentity": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" - } - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "monstrousPrecinct", - "serviceProviderProperties": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Accepted" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "monstrousPrecinct", "serviceProviderProperties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/00-load-initial-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/00-load-initial-state/cluster.json index b93039a54e6..4a8b7ee6dbb 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/00-load-initial-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/00-load-initial-state/cluster.json @@ -59,97 +59,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "uprightPairing", - "networkSecurityGroupId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": { - "serviceManagedIdentity": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" - } - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "monstrousPrecinct", - "serviceProviderProperties": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Accepted" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "monstrousPrecinct", "serviceProviderProperties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/99-cosmosCompare-end-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/99-cosmosCompare-end-state/cluster.json index b93039a54e6..4a8b7ee6dbb 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/99-cosmosCompare-end-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/externalauth/remove_orphaned_externalauth_descendents/99-cosmosCompare-end-state/cluster.json @@ -59,97 +59,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "uprightPairing", - "networkSecurityGroupId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": { - "serviceManagedIdentity": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" - } - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "monstrousPrecinct", - "serviceProviderProperties": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Accepted" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "monstrousPrecinct", "serviceProviderProperties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/00-load-initial-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/00-load-initial-state/cluster.json index b93039a54e6..4a8b7ee6dbb 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/00-load-initial-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/00-load-initial-state/cluster.json @@ -59,97 +59,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "uprightPairing", - "networkSecurityGroupId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": { - "serviceManagedIdentity": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" - } - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "monstrousPrecinct", - "serviceProviderProperties": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Accepted" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "monstrousPrecinct", "serviceProviderProperties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/99-cosmosCompare-end-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/99-cosmosCompare-end-state/cluster.json index b93039a54e6..4a8b7ee6dbb 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/99-cosmosCompare-end-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/nodepool/present_nodepool/99-cosmosCompare-end-state/cluster.json @@ -59,97 +59,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "uprightPairing", - "networkSecurityGroupId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": { - "serviceManagedIdentity": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" - } - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "monstrousPrecinct", - "serviceProviderProperties": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Accepted" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "monstrousPrecinct", "serviceProviderProperties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/00-load-initial-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/00-load-initial-state/cluster.json index b93039a54e6..4a8b7ee6dbb 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/00-load-initial-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/00-load-initial-state/cluster.json @@ -59,97 +59,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "uprightPairing", - "networkSecurityGroupId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": { - "serviceManagedIdentity": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" - } - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "monstrousPrecinct", - "serviceProviderProperties": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Accepted" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "monstrousPrecinct", "serviceProviderProperties": { diff --git a/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/99-cosmosCompare-end-state/cluster.json b/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/99-cosmosCompare-end-state/cluster.json index b93039a54e6..4a8b7ee6dbb 100644 --- a/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/99-cosmosCompare-end-state/cluster.json +++ b/test-integration/backend/controllers/mismatches/artifacts/nodepool/remove_orphaned_nodepool_descendents/99-cosmosCompare-end-state/cluster.json @@ -59,97 +59,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "uprightPairing", - "networkSecurityGroupId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": { - "serviceManagedIdentity": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.ManagedIdentity/userAssignedIdentities/service-managed-identity" - } - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/different-resource-group/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/a433a095-1277-44f1-8453-8d61a4d848c2/resourceGroups/unimportantPostponement/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/monstrousPrecinct", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "monstrousPrecinct", - "serviceProviderProperties": { - "activeOperationId": "6aeeebf8-f771-4d4e-9097-45b972cb96e4", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/1243e9e9-d150-4ef1-9735-2bbc3cabc7d0", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Accepted" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "monstrousPrecinct", "serviceProviderProperties": { diff --git a/test-integration/backend/launch/metrics_test.go b/test-integration/backend/launch/metrics_test.go index 3b63b9ff6ce..4e963a1103f 100644 --- a/test-integration/backend/launch/metrics_test.go +++ b/test-integration/backend/launch/metrics_test.go @@ -151,6 +151,9 @@ func TestBackendExposesMetrics(t *testing.T) { func newMetricsTestCluster(resourceID *azcorearm.ResourceID, provisioningState arm.ProvisioningState, createdAt *time.Time) *api.HCPOpenShiftCluster { return &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: resourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ ID: resourceID, diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/create-with-tags-cluster.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/create-with-tags-cluster.json index e004965a3e6..afb58e653b5 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/create-with-tags-cluster.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/01-load-initial/create-with-tags-cluster.json @@ -64,80 +64,6 @@ "type": "UserAssigned" }, "internalId": "/api/clusters_mgmt/v1/clusters/dv8blqb5g9", - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "api": {}, - "console": {}, - "dns": {}, - "platform": {} - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "provisioningState": "Accepted", diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/04-untypedListRecursive-resourcegroup/create-with-tags-cluster.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/04-untypedListRecursive-resourcegroup/create-with-tags-cluster.json index d68e63268d8..427e064b889 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/04-untypedListRecursive-resourcegroup/create-with-tags-cluster.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/04-untypedListRecursive-resourcegroup/create-with-tags-cluster.json @@ -64,80 +64,6 @@ "type": "UserAssigned" }, "internalId": "/api/clusters_mgmt/v1/clusters/dv8blqb5g9", - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "api": {}, - "console": {}, - "dns": {}, - "platform": {} - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "provisioningState": "Accepted", diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/create-with-tags-cluster.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/create-with-tags-cluster.json index d68e63268d8..427e064b889 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/create-with-tags-cluster.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/05-untypedListRecursive-subscription/create-with-tags-cluster.json @@ -64,80 +64,6 @@ "type": "UserAssigned" }, "internalId": "/api/clusters_mgmt/v1/clusters/dv8blqb5g9", - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "api": {}, - "console": {}, - "dns": {}, - "platform": {} - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "provisioningState": "Accepted", diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/07-untypedListRecursive-resourcegroup-via-child/create-with-tags-cluster.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/07-untypedListRecursive-resourcegroup-via-child/create-with-tags-cluster.json index d68e63268d8..427e064b889 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/07-untypedListRecursive-resourcegroup-via-child/create-with-tags-cluster.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/07-untypedListRecursive-resourcegroup-via-child/create-with-tags-cluster.json @@ -64,80 +64,6 @@ "type": "UserAssigned" }, "internalId": "/api/clusters_mgmt/v1/clusters/dv8blqb5g9", - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "api": {}, - "console": {}, - "dns": {}, - "platform": {} - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "provisioningState": "Accepted", diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/10-untypedList-resourcegroup/create-with-tags-cluster.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/10-untypedList-resourcegroup/create-with-tags-cluster.json index d68e63268d8..427e064b889 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/10-untypedList-resourcegroup/create-with-tags-cluster.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/10-untypedList-resourcegroup/create-with-tags-cluster.json @@ -64,80 +64,6 @@ "type": "UserAssigned" }, "internalId": "/api/clusters_mgmt/v1/clusters/dv8blqb5g9", - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "api": {}, - "console": {}, - "dns": {}, - "platform": {} - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "provisioningState": "Accepted", diff --git a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/12-untypedList-resourcegroup/create-with-tags-cluster.json b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/12-untypedList-resourcegroup/create-with-tags-cluster.json index d68e63268d8..427e064b889 100644 --- a/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/12-untypedList-resourcegroup/create-with-tags-cluster.json +++ b/test-integration/frontend/artifacts/DatabaseCRUD/UntypedCRUD/basic/12-untypedList-resourcegroup/create-with-tags-cluster.json @@ -64,80 +64,6 @@ "type": "UserAssigned" }, "internalId": "/api/clusters_mgmt/v1/clusters/dv8blqb5g9", - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/f52dfea2-47ee-4396-8006-4a27d47d59c5/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "api": {}, - "console": {}, - "dns": {}, - "platform": {} - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "provisioningState": "Accepted", diff --git a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/request-provisioning-conflict/01-load-initial-cosmos-state/01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/request-provisioning-conflict/01-load-initial-cosmos-state/01-cluster.json index 0a5457d64a0..31827bb0d29 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/request-provisioning-conflict/01-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/request-provisioning-conflict/01-load-initial-cosmos-state/01-cluster.json @@ -6,11 +6,6 @@ "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster" }, "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "intermediateResourceDoc": { - "internalId": "/api/clusters_mgmt/v1/clusters/fixed-value", - "provisioningState": "Provisioning", - "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster" - }, "serviceProviderProperties": { "clusterServiceID": "/api/clusters_mgmt/v1/clusters/fixed-value", "provisioningState": "Provisioning" diff --git a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/request/01-load-initial-cosmos-state/01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/request/01-load-initial-cosmos-state/01-cluster.json index 619c0119993..de4b286789d 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/request/01-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/request/01-load-initial-cosmos-state/01-cluster.json @@ -6,11 +6,6 @@ "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster" }, "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "intermediateResourceDoc": { - "internalId": "/api/clusters_mgmt/v1/clusters/fixed-value", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster" - }, "serviceProviderProperties": { "clusterServiceID": "/api/clusters_mgmt/v1/clusters/fixed-value", "provisioningState": "Succeeded" diff --git a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-forbidden-afec-missing/01-load-initial-cosmos-state/01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-forbidden-afec-missing/01-load-initial-cosmos-state/01-cluster.json index d840efb96b7..de4b286789d 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-forbidden-afec-missing/01-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-forbidden-afec-missing/01-load-initial-cosmos-state/01-cluster.json @@ -6,14 +6,6 @@ "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster" }, "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "intermediateResourceDoc": { - "internalId": "/api/clusters_mgmt/v1/clusters/fixed-value", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "tags": { - "foo": "bar" - } - }, "serviceProviderProperties": { "clusterServiceID": "/api/clusters_mgmt/v1/clusters/fixed-value", "provisioningState": "Succeeded" diff --git a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-forbidden-afec-pending/01-load-initial-cosmos-state/01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-forbidden-afec-pending/01-load-initial-cosmos-state/01-cluster.json index d840efb96b7..de4b286789d 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-forbidden-afec-pending/01-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-forbidden-afec-pending/01-load-initial-cosmos-state/01-cluster.json @@ -6,14 +6,6 @@ "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster" }, "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "intermediateResourceDoc": { - "internalId": "/api/clusters_mgmt/v1/clusters/fixed-value", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "tags": { - "foo": "bar" - } - }, "serviceProviderProperties": { "clusterServiceID": "/api/clusters_mgmt/v1/clusters/fixed-value", "provisioningState": "Succeeded" diff --git a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-provisioning-conflict/01-load-initial-cosmos-state/01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-provisioning-conflict/01-load-initial-cosmos-state/01-cluster.json index 04f84414c93..b1a89c172b1 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-provisioning-conflict/01-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke-provisioning-conflict/01-load-initial-cosmos-state/01-cluster.json @@ -9,47 +9,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/fixed-value", - "provisioningState": "Provisioning", - "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "foo": "bar" - } - }, - "internalState": { - "internalAPI": { - "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "identity": { - "type": "UserAssigned" - }, - "location": "eastus", - "name": "some-hcp-cluster", - "serviceProviderProperties": { - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/fixed-value", - "provisioningState": "Provisioning" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "foo": "bar" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "eastus", "name": "some-hcp-cluster", "serviceProviderProperties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke/01-load-initial-cosmos-state/01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke/01-load-initial-cosmos-state/01-cluster.json index d840efb96b7..de4b286789d 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke/01-load-initial-cosmos-state/01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/AdminCredentials/revoke/01-load-initial-cosmos-state/01-cluster.json @@ -6,14 +6,6 @@ "resourceID": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster" }, "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "intermediateResourceDoc": { - "internalId": "/api/clusters_mgmt/v1/clusters/fixed-value", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/some-hcp-cluster", - "tags": { - "foo": "bar" - } - }, "serviceProviderProperties": { "clusterServiceID": "/api/clusters_mgmt/v1/clusters/fixed-value", "provisioningState": "Succeeded" diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/02-cosmosCompare-confirm-content/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/02-cosmosCompare-confirm-content/cluster-create-with-tags.json index 0f016eec4d3..c879d761d47 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/02-cosmosCompare-confirm-content/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/02-cosmosCompare-confirm-content/cluster-create-with-tags.json @@ -64,104 +64,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "bb83a448-9eb0-431c-9fd3-9cec8699ea5f", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/fhlllh5lkl", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - }, - "visibility": "Public" - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable", - "id": "4.20" - } - }, - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "activeOperationId": "bb83a448-9eb0-431c-9fd3-9cec8699ea5f", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/fhlllh5lkl", - "console": {}, - "dns": {}, - "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {}, - "provisioningState": "Accepted" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "serviceProviderProperties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/09-cosmosCompare-confirm-update/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/09-cosmosCompare-confirm-update/cluster-create-with-tags.json index 3f9d1bc46ba..47b7716f731 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/09-cosmosCompare-confirm-update/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/create-current/09-cosmosCompare-confirm-update/cluster-create-with-tags.json @@ -64,106 +64,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "bb83a448-9eb0-431c-9fd3-9cec8699ea5f", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/fhlllh5lkl", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple", - "two": "banana" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 47, - "maxPodGracePeriodSeconds": 73, - "podPriorityThreshold": -6 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - }, - "visibility": "Public" - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable", - "id": "4.20" - } - }, - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "activeOperationId": "bb83a448-9eb0-431c-9fd3-9cec8699ea5f", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/fhlllh5lkl", - "console": {}, - "dns": {}, - "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {}, - "provisioningState": "Accepted" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple", - "two": "banana" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "serviceProviderProperties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-cluster-operation/03-cosmosCompare-final-state/cluster-test-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-cluster-operation/03-cosmosCompare-final-state/cluster-test-cluster.json index 42bf2bc191a..f239e2e9404 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-cluster-operation/03-cosmosCompare-final-state/cluster-test-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-cluster-operation/03-cosmosCompare-final-state/cluster-test-cluster.json @@ -59,94 +59,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "identity": { - "type": "UserAssigned" - }, - "provisioningState": "Deleting", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/test-cluster", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - }, - "visibility": "Public" - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable", - "id": "4.20" - } - }, - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/test-cluster", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "test-cluster", - "serviceProviderProperties": { - "api": {}, - "console": {}, - "dns": {}, - "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {}, - "provisioningState": "Deleting" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "test-cluster", "serviceProviderProperties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-nodepool-operation/05-cosmosCompare-final-state/cluster-test-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-nodepool-operation/05-cosmosCompare-final-state/cluster-test-cluster.json index 42bf2bc191a..f239e2e9404 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-nodepool-operation/05-cosmosCompare-final-state/cluster-test-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/delete-with-pending-nodepool-operation/05-cosmosCompare-final-state/cluster-test-cluster.json @@ -59,94 +59,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "identity": { - "type": "UserAssigned" - }, - "provisioningState": "Deleting", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/test-cluster", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - }, - "visibility": "Public" - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable", - "id": "4.20" - } - }, - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/test-cluster", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "test-cluster", - "serviceProviderProperties": { - "api": {}, - "console": {}, - "dns": {}, - "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {}, - "provisioningState": "Deleting" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "test-cluster", "serviceProviderProperties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/01-load-old-data/create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/01-load-old-data/create-with-tags.json index 7b793736b78..9c1a3770162 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/01-load-old-data/create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/01-load-old-data/create-with-tags.json @@ -62,102 +62,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "90b2322c-2c26-47ca-b6f9-d9b1a8385cbc", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "activeOperationId": "90b2322c-2c26-47ca-b6f9-d9b1a8385cbc", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", - "console": {}, - "dns": {}, - "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {}, - "provisioningState": "Accepted" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "serviceProviderProperties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json index b06265dc897..bb8df2ca47b 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Cluster/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json @@ -63,105 +63,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "c01d4815-566a-4f10-ad8c-de1667682c5b", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", - "provisioningState": "Accepted", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple", - "two": "banana" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 47, - "maxPodGracePeriodSeconds": 73, - "podPriorityThreshold": -6 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - }, - "visibility": "Public" - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "activeOperationId": "c01d4815-566a-4f10-ad8c-de1667682c5b", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", - "console": {}, - "dns": {}, - "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {}, - "provisioningState": "Accepted" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple", - "two": "banana" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "serviceProviderProperties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/cluster-creating/02-loadCosmos-cluster/cosmos-01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/cluster-creating/02-loadCosmos-cluster/cosmos-01-cluster.json index 76a0029fbad..840491d3118 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/cluster-creating/02-loadCosmos-cluster/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/cluster-creating/02-loadCosmos-cluster/cosmos-01-cluster.json @@ -7,19 +7,6 @@ }, "customerDesiredState": null, "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-creating", - "intermediateResourceDoc": { - "identity": { - "principalId": "the-principal", - "tenantId": "the-tenant", - "type": "" - }, - "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-cluster-creating", - "provisioningState": "Provisioning", - "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-creating", - "tags": { - "foo": "bar" - } - }, "serviceProviderProperties": { "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/cs-cluster-creating", "provisioningState": "Provisioning" diff --git a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/cluster-deleting/02-loadCosmos-cluster/cosmos-01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/cluster-deleting/02-loadCosmos-cluster/cosmos-01-cluster.json index 02ac22e874d..259b98de607 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/cluster-deleting/02-loadCosmos-cluster/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/cluster-deleting/02-loadCosmos-cluster/cosmos-01-cluster.json @@ -7,19 +7,6 @@ }, "customerDesiredState": null, "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-deleting", - "intermediateResourceDoc": { - "identity": { - "principalId": "the-principal", - "tenantId": "the-tenant", - "type": "" - }, - "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-cluster-deleting", - "provisioningState": "Deleting", - "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-deleting", - "tags": { - "foo": "bar" - } - }, "serviceProviderProperties": { "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/cs-cluster-deleting", "provisioningState": "Deleting" diff --git a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/create-current/06-cosmosCompare-ending-content/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/create-current/06-cosmosCompare-ending-content/cluster-create-with-tags.json index 202c883baa2..1c9b919f543 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/create-current/06-cosmosCompare-ending-content/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/create-current/06-cosmosCompare-ending-content/cluster-create-with-tags.json @@ -64,102 +64,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/tqqtpctbpj", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - }, - "visibility": "Public" - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable", - "id": "4.20" - } - }, - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/tqqtpctbpj", - "console": {}, - "dns": {}, - "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {}, - "provisioningState": "Succeeded" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "serviceProviderProperties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/01-load-old-data/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/01-load-old-data/cluster-create-with-tags.json index c141ded29f5..64a29defc11 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/01-load-old-data/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/01-load-old-data/cluster-create-with-tags.json @@ -62,100 +62,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/m6bpjxtlqf", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/m6bpjxtlqf", - "console": {}, - "dns": {}, - "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {}, - "provisioningState": "Succeeded" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "serviceProviderProperties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json index 37030891ccf..c5e1b7dfb40 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/ExternalAuth/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json @@ -62,100 +62,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/m6bpjxtlqf", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/m6bpjxtlqf", - "console": {}, - "dns": {}, - "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {}, - "provisioningState": "Succeeded" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "serviceProviderProperties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/cluster-create-with-tags.json index ece0e5aa806..f9267cee198 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/01-load-old-data/cluster-create-with-tags.json @@ -62,102 +62,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", - "console": {}, - "dns": {}, - "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {}, - "provisioningState": "Succeeded" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "serviceProviderProperties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/cluster-create-with-tags.json index 92a305be4dd..dbfd83ba326 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/migrate-old-data/99-cosmosCompare-confirm-migration/cluster-create-with-tags.json @@ -63,103 +63,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - }, - "visibility": "Public" - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", - "console": {}, - "dns": {}, - "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {}, - "provisioningState": "Succeeded" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "serviceProviderProperties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/cluster-create-with-tags.json index 67cb2f1778a..a726bf3605a 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/01-load-old-data/cluster-create-with-tags.json @@ -62,101 +62,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Succeeded" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "serviceProviderProperties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/cluster-create-with-tags.json index 67cb2f1778a..a726bf3605a 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/Migration/read-new-data/18-cosmosCompare-confirm/cluster-create-with-tags.json @@ -62,101 +62,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", - "console": {}, - "dns": {}, - "platform": {}, - "provisioningState": "Succeeded" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "serviceProviderProperties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/cluster-creating/02-loadCosmos-cluster/cosmos-01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/cluster-creating/02-loadCosmos-cluster/cosmos-01-cluster.json index dc6321536e1..9854f518f7a 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/cluster-creating/02-loadCosmos-cluster/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/cluster-creating/02-loadCosmos-cluster/cosmos-01-cluster.json @@ -11,29 +11,6 @@ } }, "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-creating", - "intermediateResourceDoc": { - "identity": { - "principalId": "the-principal", - "tenantId": "the-tenant", - "type": "" - }, - "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-cluster-creating", - "provisioningState": "Provisioning", - "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-creating", - "tags": { - "foo": "bar" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-creating" - } - }, "serviceProviderProperties": { "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/cs-cluster-creating", "provisioningState": "Provisioning" diff --git a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/cluster-deleting/02-loadCosmos-cluster/cosmos-01-cluster.json b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/cluster-deleting/02-loadCosmos-cluster/cosmos-01-cluster.json index 7d0db4d2e0a..13eb3db5451 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/cluster-deleting/02-loadCosmos-cluster/cosmos-01-cluster.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/cluster-deleting/02-loadCosmos-cluster/cosmos-01-cluster.json @@ -11,29 +11,6 @@ } }, "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-deleting", - "intermediateResourceDoc": { - "identity": { - "principalId": "the-principal", - "tenantId": "the-tenant", - "type": "" - }, - "internalId": "/api/aro_hcp/v1alpha1/clusters/cs-cluster-deleting", - "provisioningState": "Deleting", - "resourceId": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-deleting", - "tags": { - "foo": "bar" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/0465bc32-c654-41b8-8d87-9815d7abe8f6/resourceGroups/some-resource-group/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/cluster-deleting" - } - }, "serviceProviderProperties": { "clusterServiceID": "/api/aro_hcp/v1alpha1/clusters/cs-cluster-deleting", "provisioningState": "Deleting" diff --git a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/create-current/06-cosmosCompare-confirm-content/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/create-current/06-cosmosCompare-confirm-content/cluster-create-with-tags.json index 6105660da1e..45259993ee0 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/create-current/06-cosmosCompare-confirm-content/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/create-current/06-cosmosCompare-confirm-content/cluster-create-with-tags.json @@ -64,102 +64,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/dl7f9px2f2", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - }, - "visibility": "Public" - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable", - "id": "4.20" - } - }, - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/dl7f9px2f2", - "console": {}, - "dns": {}, - "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {}, - "provisioningState": "Succeeded" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "serviceProviderProperties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/cluster-create-with-tags.json index ece0e5aa806..f9267cee198 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/01-load-old-data/cluster-create-with-tags.json @@ -62,102 +62,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", - "console": {}, - "dns": {}, - "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {}, - "provisioningState": "Succeeded" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "serviceProviderProperties": { diff --git a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json index 03db3af16a6..c7d60dd4dc8 100644 --- a/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json +++ b/test-integration/frontend/artifacts/FrontendCRUD/NodePool/read-old-data/09-cosmosCompare-confirm-update/cluster-create-with-tags.json @@ -62,102 +62,6 @@ "identity": { "type": "UserAssigned" }, - "intermediateResourceDoc": { - "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", - "identity": { - "type": "UserAssigned" - }, - "internalId": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", - "provisioningState": "Succeeded", - "resourceId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - } - }, - "internalState": { - "internalAPI": { - "customerProperties": { - "api": { - "visibility": "Public" - }, - "autoscaling": { - "maxNodeProvisionTimeSeconds": 900, - "maxPodGracePeriodSeconds": 600, - "podPriorityThreshold": -10 - }, - "clusterImageRegistry": { - "state": "Disabled" - }, - "dns": {}, - "etcd": { - "dataEncryption": { - "customerManaged": { - "encryptionType": "KMS", - "kms": { - "activeKey": { - "name": "encryptionKeyName", - "vaultName": "keyVaultName", - "version": "2024-12-01-preview" - } - } - }, - "keyManagementMode": "CustomerManaged" - } - }, - "network": { - "hostPrefix": 23, - "machineCidr": "10.0.0.0/16", - "networkType": "OVNKubernetes", - "podCidr": "10.128.0.0/14", - "serviceCidr": "172.30.0.0/16" - }, - "platform": { - "managedResourceGroup": "managed-resource-group-name", - "networkSecurityGroupId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/networkSecurityGroups/nsg", - "operatorsAuthentication": { - "userAssignedIdentities": {} - }, - "outboundType": "LoadBalancer", - "subnetId": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/bar/providers/Microsoft.Network/virtualNetworks/vnet/subnets/subnet" - }, - "version": { - "channelGroup": "stable" - } - }, - "id": "/subscriptions/6b690bec-0c16-4ecb-8f67-781caf40bba7/resourceGroups/resourceGroupName/providers/Microsoft.RedHatOpenShift/hcpOpenShiftClusters/create-with-tags", - "identity": { - "type": "UserAssigned" - }, - "location": "fake-location", - "name": "create-with-tags", - "serviceProviderProperties": { - "activeOperationId": "7a4ed07a-47a1-4efb-966a-93a6316522a0", - "api": {}, - "clusterServiceID": "/api/clusters_mgmt/v1/clusters/9p2sk955gj", - "console": {}, - "dns": {}, - "managedIdentitiesDataPlaneIdentityURL": "https://dummyhost.identity.azure.net/otherinformation?aqueryarg=somevalue", - "platform": {}, - "provisioningState": "Succeeded" - }, - "systemData": { - "createdBy": "Unknown-ARO-HCP-frontend", - "createdByType": "Application", - "lastModifiedBy": "Unknown-ARO-HCP-frontend", - "lastModifiedByType": "Application" - }, - "tags": { - "one": "apple" - }, - "type": "Microsoft.RedHatOpenShift/hcpOpenShiftClusters" - } - }, "location": "fake-location", "name": "create-with-tags", "serviceProviderProperties": { diff --git a/test-integration/frontend/informer_test.go b/test-integration/frontend/informer_test.go index 04847beafcc..6b81c6c0e07 100644 --- a/test-integration/frontend/informer_test.go +++ b/test-integration/frontend/informer_test.go @@ -359,6 +359,9 @@ func clusterInformerIntegrationTestCase() informerIntegrationTestCase { internalID, err := api.NewInternalID("/api/clusters_mgmt/v1/clusters/" + name) require.NoError(t, err) return &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterResourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ ID: clusterResourceID, @@ -486,6 +489,9 @@ func nodePoolInformerIntegrationTestCase() informerIntegrationTestCase { internalID, err := api.NewInternalID("/api/clusters_mgmt/v1/clusters/" + clusterName) require.NoError(t, err) cluster := &api.HCPOpenShiftCluster{ + CosmosMetadata: arm.CosmosMetadata{ + ResourceID: clusterResourceID, + }, TrackedResource: arm.TrackedResource{ Resource: arm.Resource{ ID: clusterResourceID, diff --git a/test-integration/utils/databasemutationhelpers/per_resource_comparer.go b/test-integration/utils/databasemutationhelpers/per_resource_comparer.go index 579174dd6c2..ae01dfacbfe 100644 --- a/test-integration/utils/databasemutationhelpers/per_resource_comparer.go +++ b/test-integration/utils/databasemutationhelpers/per_resource_comparer.go @@ -120,6 +120,7 @@ func ResourceInstanceEquals(t *testing.T, expected, actual any) (string, bool) { unstructured.RemoveNestedField(currMap, prepend(possiblePrepend, "internalState", "internalAPI", "serviceProviderProperties", "clusterServiceID")...) // cluster, nodepool, externalauth - randomly generated by cluster-service mock unstructured.RemoveNestedField(currMap, prepend(possiblePrepend, "internalState", "internalAPI", "systemData", "createdAt")...) // cluster, nodepool, externalauth - varies on every run unstructured.RemoveNestedField(currMap, prepend(possiblePrepend, "internalState", "internalAPI", "systemData", "lastModifiedAt")...) // cluster, nodepool, externalauth - varies on every run + unstructured.RemoveNestedField(currMap, prepend(possiblePrepend, "internalState", "internalAPI", "cosmosMetadata")...) // cluster - redundant copy of inline cosmosMetadata unstructured.RemoveNestedField(currMap, prepend(possiblePrepend, "cosmosMetadata", "etag")...) // inline serialization (cluster, nodepool, externalauth) also exposes these UUID-generated / variable fields directly under properties