Merge pull request #4754 from Azure/revert-4

Revert "Merge pull request #4605 from Azure/fix-panic"

Author: deads2k

backend/pkg/informers/informers.go

@@ -489,14 +489,8 @@ func NewActiveOperationInformerWithRelistDuration(lister database.GlobalLister[a
 func resourceGroupIndexFunc(obj interface{}) ([]string, error) {
 	switch castObj := obj.(type) {
 	case arm.CosmosMetadataAccessor:
-		if castObj.GetResourceID() == nil {
-			return nil, utils.TrackError(fmt.Errorf("obj is missing resourceID: %T %v", obj, obj))
-		}
 		return []string{api.ToResourceGroupResourceIDString(castObj.GetResourceID().SubscriptionID, castObj.GetResourceID().ResourceGroupName)}, nil
 	case arm.CosmosPersistable:
-		if castObj.GetCosmosData() == nil || castObj.GetCosmosData().ResourceID == nil {
-			return nil, utils.TrackError(fmt.Errorf("obj is missing resourceID: %T %v", obj, obj))
-		}
 		return []string{api.ToResourceGroupResourceIDString(castObj.GetCosmosData().ResourceID.SubscriptionID, castObj.GetCosmosData().ResourceID.ResourceGroupName)}, nil
 	default:
 		return nil, utils.TrackError(fmt.Errorf("unexpected type %T, expected api.CosmosMetadataAccessor or api.CosmosPersistable", obj))

internal/database/convert_generic.go

@@ -65,13 +65,6 @@ func CosmosGenericToInternal[InternalAPIType any](cosmosObj *GenericDocument[Int
 	if !ok {
 		return nil, fmt.Errorf("internalObj must be an arm.CosmosMetadataAccessor: %T", cosmosObj)
 	}
-	if ret.GetResourceID() == nil {
-		if cosmosObj.ResourceID != nil {
-			ret.(arm.CosmosPersistable).GetCosmosData().ResourceID = cosmosObj.ResourceID
-		} else {
-			return nil, fmt.Errorf("internalObj is missing a resourceID: %T: %q", cosmosObj, cosmosObj.ID)
-		}
-	}
 	ret.(arm.CosmosPersistable).GetCosmosData().ExistingCosmosUID = cosmosObj.ID
 	ret.SetEtag(cosmosObj.CosmosETag)