Merge pull request #4025 from Azure/cs-123-collapse-sub

Remove database conversion and logic that isn't needed anymore

Author: openshift-merge-bot[bot]

internal/api/arm/subscription.go

@@ -40,6 +40,7 @@ func ToSubscriptionResourceIDString(subscriptionName string) string {
 type Subscription struct {
 	CosmosMetadata `json:"cosmosMetadata"`
 
+	// kept so untyped client can function
 	ResourceID *azcorearm.ResourceID `json:"resourceId,omitempty"`
 
 	// The resource provider contract gives an example RegistrationDate

internal/database/convert_any.go

@@ -21,7 +21,6 @@ import (
 	azcorearm "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm"
 
 	"github.com/Azure/ARO-HCP/internal/api"
-	"github.com/Azure/ARO-HCP/internal/api/arm"
 	"github.com/Azure/ARO-HCP/internal/utils"
 )
 
@@ -38,15 +37,6 @@ func CosmosToInternal[InternalAPIType, CosmosAPIType any](obj *CosmosAPIType) (*
 	case *NodePool:
 		internalObj, err = CosmosToInternalNodePool(cosmosObj)
 
-	case *Controller:
-		internalObj, err = CosmosToInternalController(cosmosObj)
-
-	case *Operation:
-		internalObj, err = CosmosToInternalOperation(cosmosObj)
-
-	case *Subscription:
-		internalObj, err = CosmosToInternalSubscription(cosmosObj)
-
 	case *TypedDocument:
 		var expectedObj InternalAPIType
 		switch castObj := any(expectedObj).(type) {
@@ -103,15 +93,6 @@ func InternalToCosmos[InternalAPIType, CosmosAPIType any](obj *InternalAPIType)
 	case *api.HCPOpenShiftClusterNodePool:
 		cosmosObj, err = InternalToCosmosNodePool(internalObj)
 
-	case *api.Controller:
-		cosmosObj, err = InternalToCosmosController(internalObj)
-
-	case *api.Operation:
-		cosmosObj, err = InternalToCosmosOperation(internalObj)
-
-	case *arm.Subscription:
-		cosmosObj, err = InternalToCosmosSubscription(internalObj)
-
 	case *TypedDocument:
 		var expectedObj CosmosAPIType
 		switch castObj := any(expectedObj).(type) {

internal/database/convert_controller.go

@@ -18,9 +18,12 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/Azure/ARO-HCP/internal/api"
 	"github.com/Azure/ARO-HCP/internal/api/arm"
 )
 
+const operationTimeToLive = 604800 // 7 days
+
 func InternalToCosmosGeneric[InternalAPIType any](internalObj *InternalAPIType) (*GenericDocument[InternalAPIType], error) {
 	if internalObj == nil {
 		return nil, nil
@@ -43,6 +46,13 @@ func InternalToCosmosGeneric[InternalAPIType any](internalObj *InternalAPIType)
 		Content: *internalObj,
 	}
 
+	// this isn't pretty, but on balance it's a better choice so that we can share all the rest.
+	switch any(internalObj).(type) {
+	case *api.Operation:
+		// TODO Add TTL to cosmosMetadata
+		cosmosObj.TimeToLive = operationTimeToLive
+	}
+
 	return cosmosObj, nil
 }
 
@@ -58,5 +68,13 @@ func CosmosGenericToInternal[InternalAPIType any](cosmosObj *GenericDocument[Int
 	ret.(arm.CosmosPersistable).GetCosmosData().ExistingCosmosUID = cosmosObj.ID
 	ret.SetEtag(cosmosObj.CosmosETag)
 
+	// this isn't pretty, but on balance it's a better choice so that we can share all the rest.
+	switch castObj := any(ret).(type) {
+	case *arm.Subscription:
+		castObj.LastUpdated = cosmosObj.CosmosTimestamp
+	case arm.Subscription:
+		castObj.LastUpdated = cosmosObj.CosmosTimestamp
+	}
+
 	return &cosmosObj.Content, nil
 }

internal/database/convert_generic.go

@@ -48,7 +48,7 @@ type OperationCRUD interface {
 }
 
 type operationCRUD struct {
-	*nestedCosmosResourceCRUD[api.Operation, Operation]
+	*nestedCosmosResourceCRUD[api.Operation, GenericDocument[api.Operation]]
 }
 
 func NewOperationCRUD(containerClient *azcosmos.ContainerClient, subscriptionID string) OperationCRUD {
@@ -59,7 +59,7 @@ func NewOperationCRUD(containerClient *azcosmos.ContainerClient, subscriptionID
 	parentResourceID := api.Must(azcorearm.ParseResourceID(path.Join(parts...)))
 
 	return &operationCRUD{
-		nestedCosmosResourceCRUD: NewCosmosResourceCRUD[api.Operation, Operation](containerClient, parentResourceID, api.OperationStatusResourceType),
+		nestedCosmosResourceCRUD: NewCosmosResourceCRUD[api.Operation, GenericDocument[api.Operation]](containerClient, parentResourceID, api.OperationStatusResourceType),
 	}
 }
 
@@ -104,7 +104,7 @@ func (d *operationCRUD) ListActiveOperations(options *DBClientListActiveOperatio
 	}
 
 	pager := d.containerClient.NewQueryItemsPager(query, NewPartitionKey(d.parentResourceID.SubscriptionID), &queryOptions)
-	return newQueryResourcesIterator[api.Operation, Operation](pager)
+	return newQueryResourcesIterator[api.Operation, GenericDocument[api.Operation]](pager)
 }
 
 type HCPClusterCRUD interface {
@@ -228,5 +228,5 @@ func (h *nodePoolsCRUD) Controllers(nodePoolName string) ResourceCRUD[api.Contro
 func NewControllerCRUD(
 	containerClient *azcosmos.ContainerClient, parentResourceID *azcorearm.ResourceID, resourceType azcorearm.ResourceType) ResourceCRUD[api.Controller] {
 
-	return NewCosmosResourceCRUD[api.Controller, Controller](containerClient, parentResourceID, resourceType)
+	return NewCosmosResourceCRUD[api.Controller, GenericDocument[api.Controller]](containerClient, parentResourceID, resourceType)
 }

internal/database/convert_operation.go

@@ -113,7 +113,7 @@ func list[InternalAPIType, CosmosAPIType any](ctx context.Context, containerClie
 	if prefix == nil {
 		query = "SELECT * FROM c"
 	} else {
-		query = "SELECT * FROM c WHERE STARTSWITH(c.properties.resourceId, @prefix, true)"
+		query = "SELECT * FROM c WHERE STARTSWITH(c.resourceID, @prefix, true)"
 		queryOptions = azcosmos.QueryOptions{
 			PageSizeHint: -1,
 			QueryParameters: []azcosmos.QueryParameter{
@@ -148,7 +148,7 @@ func list[InternalAPIType, CosmosAPIType any](ctx context.Context, containerClie
 		}
 
 		// no sql injection risk because it's an int we control
-		query += fmt.Sprintf(" AND (LENGTH(c.properties.resourceId) - LENGTH(REPLACE(c.properties.resourceId, '/', ''))) = %d", requiredNumSlashes)
+		query += fmt.Sprintf(" AND (LENGTH(c.resourceID) - LENGTH(REPLACE(c.resourceID, '/', ''))) = %d", requiredNumSlashes)
 	}
 
 	if options != nil {