Skip to content

fix: correct setDeletionBillingTimeStamp trigger to set deletionTime #4577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mociarain merged 12 commits into from
Feb 3, 2026
+117 −19
Merged

fix: correct setDeletionBillingTimeStamp trigger to set deletionTime #4577

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9f943dc
fix: correct setDeletionBillingTimeStamp trigger to set deletionTime
Jan 30, 2026
bf8f9e1
refactor: improve CosmosDB trigger function readability
Jan 30, 2026
84b355f
Change to patch rather than update
mociarain Jan 28, 2026
863502a
Update tests
mociarain Jan 28, 2026
e9fa531
Lint
mociarain Jan 28, 2026
6cef382
Correctly construct payload
mociarain Jan 29, 2026
2f4f668
Split out the test conditions for more clarity
mociarain Jan 29, 2026
2b7175f
Use MergePatchType
mociarain Jan 30, 2026
7a63d4f
Use the existing annotations
mociarain Jan 30, 2026
0ec1047
Add retry-on-conflict to subnet annotation update
tuxerrante Jan 30, 2026
d4edb6e
Add function comments to subnet_nsg.go
tuxerrante Jan 30, 2026
df19a68
Merge branch 'pr-4572' into gniranjan/CosmosbugFix
Feb 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/deploy/assets/databases-development.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@
"name": "[concat(parameters('databaseAccountName'), '/', parameters('databaseName'), '/Billing/setDeletionBillingTimeStamp')]",
"properties": {
"resource": {
"body": "function trigger() {\n\t\t\t\tvar request = getContext().getRequest();\n\t\t\t\tvar body = request.getBody();\n\t\t\t\tvar date = new Date();\n\t\t\t\tvar now = Math.floor(date.getTime() / 1000);\n\t\t\t\tvar billingBody = body[\"billing\"];\n\t\t\t\tif (!billingBody[\"creationTime\"]) {\n\t\t\t\t\tbillingBody[\"creationTime\"] = now;\n\t\t\t\t}\n\t\t\t\trequest.setBody(body);\n\t\t\t}",
"body": "function trigger() {\n\t\t\t\tvar request = getContext().getRequest();\n\t\t\t\tvar body = request.getBody();\n\t\t\t\tvar date = new Date();\n\t\t\t\tvar now = Math.floor(date.getTime() / 1000);\n\t\t\t\tvar billingBody = body[\"billing\"];\n\t\t\t\tif (!billingBody[\"deletionTime\"]) {\n\t\t\t\t\tbillingBody[\"deletionTime\"] = now;\n\t\t\t\t}\n\t\t\t\trequest.setBody(body);\n\t\t\t}",
"id": "setDeletionBillingTimeStamp",
"triggerOperation": "Replace",
"triggerType": "Pre"
Expand Down
2 changes: 1 addition & 1 deletion pkg/deploy/assets/rp-production.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1065,7 +1065,7 @@
"name": "[concat(parameters('databaseAccountName'), '/', 'ARO', '/Billing/setDeletionBillingTimeStamp')]",
"properties": {
"resource": {
"body": "function trigger() {\n\t\t\t\tvar request = getContext().getRequest();\n\t\t\t\tvar body = request.getBody();\n\t\t\t\tvar date = new Date();\n\t\t\t\tvar now = Math.floor(date.getTime() / 1000);\n\t\t\t\tvar billingBody = body[\"billing\"];\n\t\t\t\tif (!billingBody[\"creationTime\"]) {\n\t\t\t\t\tbillingBody[\"creationTime\"] = now;\n\t\t\t\t}\n\t\t\t\trequest.setBody(body);\n\t\t\t}",
"body": "function trigger() {\n\t\t\t\tvar request = getContext().getRequest();\n\t\t\t\tvar body = request.getBody();\n\t\t\t\tvar date = new Date();\n\t\t\t\tvar now = Math.floor(date.getTime() / 1000);\n\t\t\t\tvar billingBody = body[\"billing\"];\n\t\t\t\tif (!billingBody[\"deletionTime\"]) {\n\t\t\t\t\tbillingBody[\"deletionTime\"] = now;\n\t\t\t\t}\n\t\t\t\trequest.setBody(body);\n\t\t\t}",
"id": "setDeletionBillingTimeStamp",
"triggerOperation": "Replace",
"triggerType": "Pre"
Expand Down
44 changes: 40 additions & 4 deletions pkg/deploy/generator/const.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,44 @@ const (
tagKeyExemptPublicBlob = "Az.Sec.AnonymousBlobAccessEnforcement::Skip"
tagValueExemptPublicBlob = "PublicRelease"

renewLeaseTriggerFunction = "function trigger() {\n\t\t\t\tvar request = getContext().getRequest();\n\t\t\t\tvar body = request.getBody();\n\t\t\t\tvar date = new Date();\n\t\t\t\tbody[\"leaseExpires\"] = Math.floor(date.getTime() / 1000) + 60;\n\t\t\t\trequest.setBody(body);\n\t\t\t}"
retryLaterTriggerFunction = "function trigger() {\n\t\t\t\tvar request = getContext().getRequest();\n\t\t\t\tvar body = request.getBody();\n\t\t\t\tvar date = new Date();\n\t\t\t\tbody[\"leaseExpires\"] = Math.floor(date.getTime() / 1000) + 600;\n\t\t\t\trequest.setBody(body);\n\t\t\t}"
setCreationBillingTimeStampTriggerFunction = "function trigger() {\n\t\t\t\tvar request = getContext().getRequest();\n\t\t\t\tvar body = request.getBody();\n\t\t\t\tvar date = new Date();\n\t\t\t\tvar now = Math.floor(date.getTime() / 1000);\n\t\t\t\tvar billingBody = body[\"billing\"];\n\t\t\t\tif (!billingBody[\"creationTime\"]) {\n\t\t\t\t\tbillingBody[\"creationTime\"] = now;\n\t\t\t\t}\n\t\t\t\trequest.setBody(body);\n\t\t\t}"
setDeletionBillingTimeStampTriggerFunction = "function trigger() {\n\t\t\t\tvar request = getContext().getRequest();\n\t\t\t\tvar body = request.getBody();\n\t\t\t\tvar date = new Date();\n\t\t\t\tvar now = Math.floor(date.getTime() / 1000);\n\t\t\t\tvar billingBody = body[\"billing\"];\n\t\t\t\tif (!billingBody[\"creationTime\"]) {\n\t\t\t\t\tbillingBody[\"creationTime\"] = now;\n\t\t\t\t}\n\t\t\t\trequest.setBody(body);\n\t\t\t}"
// CosmosDB Trigger Functions
renewLeaseTriggerFunction = `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);
}`

retryLaterTriggerFunction = `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);
}`

setCreationBillingTimeStampTriggerFunction = `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);
}`

setDeletionBillingTimeStampTriggerFunction = `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["deletionTime"]) {
billingBody["deletionTime"] = now;
}
request.setBody(body);
}`
)
Loading