Skip to content

Commit

Permalink
fixed json marshal issue
Browse files Browse the repository at this point in the history
  • Loading branch information
@anshulvermapatel
anshulvermapatel committed Jun 5, 2024
1 parent 4e258b1 commit fd7b903
Show file tree
Hide file tree
Showing 8 changed files with 272 additions and 287 deletions.
79 changes: 39 additions & 40 deletions pkg/database/billing.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import (
"fmt"
"strings"

"github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
sdkcosmos "github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos/v2"

"github.com/Azure/ARO-RP/pkg/api"
Expand All @@ -34,45 +33,45 @@ 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
}
// 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
Expand Down
39 changes: 19 additions & 20 deletions pkg/database/monitors.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"net/http"
"strings"

"github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos/v2"

"github.com/Azure/ARO-RP/pkg/api"
Expand All @@ -36,25 +35,25 @@ 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
}
// 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),
Expand Down
37 changes: 18 additions & 19 deletions pkg/database/openshiftclusters.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"net/http"
"strings"

"github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos/v2"
"github.com/Azure/go-autorest/autorest/azure"

Expand Down Expand Up @@ -61,24 +60,24 @@ 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
}
// 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
Expand Down
63 changes: 31 additions & 32 deletions pkg/database/subscriptions.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import (
"net/http"
"strings"

"github.com/Azure/azure-sdk-for-go/sdk/azcore/to"
"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/cosmos/armcosmos/v2"

"github.com/Azure/ARO-RP/pkg/api"
Expand Down Expand Up @@ -41,37 +40,37 @@ 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
}
// 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
Expand Down
Loading

0 comments on commit fd7b903

Please sign in to comment.