diff --git a/pkg/database/billing.go b/pkg/database/billing.go index b74c5dfbf1d..77225f02ac4 100644 --- a/pkg/database/billing.go +++ b/pkg/database/billing.go @@ -33,46 +33,6 @@ type Billing interface { func NewBilling(ctx context.Context, dbc cosmosdb.DatabaseClient, dbName string, sqlResourceClient *sdkcosmos.SQLResourcesClient, location, resourceGroup, dbAccountName string) (Billing, error) { collc := cosmosdb.NewCollectionClient(dbc, dbName) - // triggerResources := []*sdkcosmos.SQLTriggerResource{ - // { - // ID: to.Ptr("setCreationBillingTimeStamp"), - // Body: to.Ptr(`function trigger() { - // var request = getContext().getRequest(); - // var body = request.getBody(); - // var date = new Date(); - // var now = Math.floor(date.getTime() / 1000); - // var billingBody = body["billing"]; - // if (!billingBody["creationTime"]) { - // billingBody["creationTime"] = now; - // } - // request.setBody(body); - // }`), - // TriggerOperation: to.Ptr(sdkcosmos.TriggerOperation("Create")), - // TriggerType: to.Ptr(sdkcosmos.TriggerType("Pre")), - // }, - // { - // ID: to.Ptr("setDeletionBillingTimeStamp"), - // Body: to.Ptr(`function trigger() { - // var request = getContext().getRequest(); - // var body = request.getBody(); - // var date = new Date(); - // var now = Math.floor(date.getTime() / 1000); - // var billingBody = body["billing"]; - // if (!billingBody["creationTime"]) { - // billingBody["creationTime"] = now; - // } - // request.setBody(body); - // }`), - // TriggerOperation: to.Ptr(sdkcosmos.TriggerOperation("Replace")), - // TriggerType: to.Ptr(sdkcosmos.TriggerType("Pre")), - // }, - // } - - // err := createTriggers(ctx, sqlResourceClient, triggerResources, resourceGroup, dbName, dbAccountName, location, collBilling) - // if err != nil { - // return nil, err - // } - documentClient := cosmosdb.NewBillingDocumentClient(collc, collBilling) return NewBillingWithProvidedClient(documentClient), nil } diff --git a/pkg/database/database.go b/pkg/database/database.go index bfe5803731a..c2d00e945c3 100644 --- a/pkg/database/database.go +++ b/pkg/database/database.go @@ -12,7 +12,6 @@ import ( "github.com/Azure/azure-sdk-for-go/sdk/azcore/arm/policy" azcorepolicy "github.com/Azure/azure-sdk-for-go/sdk/azcore/policy" - "github.com/Azure/azure-sdk-for-go/sdk/azcore/runtime" sdkcosmos "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos/v2" "github.com/sirupsen/logrus" "github.com/ugorji/go/codec" @@ -114,28 +113,3 @@ func NewJSONHandle(aead encryption.AEAD) (*codec.JsonHandle, error) { return h, nil } - -func createTriggers(ctx context.Context, sqlResourceClient *sdkcosmos.SQLResourcesClient, triggerResources []*sdkcosmos.SQLTriggerResource, resourceGroup, dbName, dbAccountName, location, containerName string) error { - for _, triggerResource := range triggerResources { - createUpdateSQLTriggerParameters := sdkcosmos.SQLTriggerCreateUpdateParameters{ - Properties: &sdkcosmos.SQLTriggerCreateUpdateProperties{ - Options: &sdkcosmos.CreateUpdateOptions{}, - Resource: triggerResource, - }, - Location: &location, - } - ctx, cancel := context.WithTimeout(ctx, time.Minute*5) - defer cancel() - - poller, err := sqlResourceClient.BeginCreateUpdateSQLTrigger(ctx, resourceGroup, dbAccountName, dbName, containerName, *triggerResource.ID, createUpdateSQLTriggerParameters, nil) - if err != nil { - return err - } - - _, err = poller.PollUntilDone(ctx, &runtime.PollUntilDoneOptions{Frequency: 1 * time.Second}) - if err != nil { - return err - } - } - return nil -} diff --git a/pkg/database/monitors.go b/pkg/database/monitors.go index b6c65ba31d3..5ae20afdbb7 100644 --- a/pkg/database/monitors.go +++ b/pkg/database/monitors.go @@ -35,26 +35,6 @@ type Monitors interface { func NewMonitors(ctx context.Context, dbc cosmosdb.DatabaseClient, dbName string, sqlResourceClient *armcosmos.SQLResourcesClient, location, resourceGroup, dbAccountName string) (Monitors, error) { collc := cosmosdb.NewCollectionClient(dbc, dbName) - // triggerResources := []*armcosmos.SQLTriggerResource{ - // { - // ID: to.Ptr("renewLease"), - // Body: to.Ptr(`function trigger() { - // var request = getContext().getRequest(); - // var body = request.getBody(); - // var date = new Date(); - // body["leaseExpires"] = Math.floor(date.getTime() / 1000) + 60; - // request.setBody(body); - // }`), - // TriggerOperation: to.Ptr(armcosmos.TriggerOperation(cosmosdb.TriggerOperationAll)), - // TriggerType: to.Ptr(armcosmos.TriggerType(cosmosdb.TriggerTypePre)), - // }, - // } - - // err := createTriggers(ctx, sqlResourceClient, triggerResources, resourceGroup, dbName, dbAccountName, location, collMonitors) - // if err != nil { - // return nil, err - // } - return &monitors{ c: cosmosdb.NewMonitorDocumentClient(collc, collMonitors), uuid: uuid.DefaultGenerator.Generate(), diff --git a/pkg/database/openshiftclusters.go b/pkg/database/openshiftclusters.go index 5d7ba7741b4..f7bd95d8d79 100644 --- a/pkg/database/openshiftclusters.go +++ b/pkg/database/openshiftclusters.go @@ -60,25 +60,6 @@ type OpenShiftClusters interface { func NewOpenShiftClusters(ctx context.Context, dbc cosmosdb.DatabaseClient, dbName string, sqlResourceClient *armcosmos.SQLResourcesClient, location, resourceGroup, dbAccountName string) (OpenShiftClusters, error) { collc := cosmosdb.NewCollectionClient(dbc, dbName) - // triggerResources := []*armcosmos.SQLTriggerResource{ - // { - // ID: to.Ptr("renewLease"), - // Body: to.Ptr(`function trigger() { - // var request = getContext().getRequest(); - // var body = request.getBody(); - // var date = new Date(); - // body["leaseExpires"] = Math.floor(date.getTime() / 1000) + 60; - // request.setBody(body); - // }`), - // TriggerOperation: to.Ptr(armcosmos.TriggerOperation(cosmosdb.TriggerOperationAll)), - // TriggerType: to.Ptr(armcosmos.TriggerType(cosmosdb.TriggerTypePre)), - // }, - // } - // err := createTriggers(ctx, sqlResourceClient, triggerResources, resourceGroup, dbName, dbAccountName, location, collOpenShiftClusters) - // if err != nil { - // return nil, err - // } - documentClient := cosmosdb.NewOpenShiftClusterDocumentClient(collc, collOpenShiftClusters) return NewOpenShiftClustersWithProvidedClient(documentClient, collc, uuid.DefaultGenerator.Generate(), uuid.DefaultGenerator), nil } diff --git a/pkg/database/subscriptions.go b/pkg/database/subscriptions.go index 87552c9a285..f18ab626744 100644 --- a/pkg/database/subscriptions.go +++ b/pkg/database/subscriptions.go @@ -40,38 +40,6 @@ type Subscriptions interface { func NewSubscriptions(ctx context.Context, dbc cosmosdb.DatabaseClient, dbName string, sqlResourceClient *armcosmos.SQLResourcesClient, location, resourceGroup, dbAccountName string) (Subscriptions, error) { collc := cosmosdb.NewCollectionClient(dbc, dbName) - // triggerResources := []*armcosmos.SQLTriggerResource{ - // { - // ID: to.Ptr("renewLease"), - // Body: to.Ptr(`function trigger() { - // var request = getContext().getRequest(); - // var body = request.getBody(); - // var date = new Date(); - // body["leaseExpires"] = Math.floor(date.getTime() / 1000) + 60; - // request.setBody(body); - // }`), - // TriggerOperation: to.Ptr(armcosmos.TriggerOperation(cosmosdb.TriggerOperationAll)), - // TriggerType: to.Ptr(armcosmos.TriggerType(cosmosdb.TriggerTypePre)), - // }, - // { - // ID: to.Ptr("retryLater"), - // Body: to.Ptr(`function trigger() { - // var request = getContext().getRequest(); - // var body = request.getBody(); - // var date = new Date(); - // body["leaseExpires"] = Math.floor(date.getTime() / 1000) + 600; - // request.setBody(body); - // }`), - // TriggerOperation: to.Ptr(armcosmos.TriggerOperation(cosmosdb.TriggerOperationAll)), - // TriggerType: to.Ptr(armcosmos.TriggerType(cosmosdb.TriggerTypePre)), - // }, - // } - - // err := createTriggers(ctx, sqlResourceClient, triggerResources, resourceGroup, dbName, dbAccountName, location, collSubscriptions) - // if err != nil { - // return nil, err - // } - documentClient := cosmosdb.NewSubscriptionDocumentClient(collc, collSubscriptions) return NewSubscriptionsWithProvidedClient(documentClient, uuid.DefaultGenerator.Generate()), nil }