@oneuptime/common 13.0.1 → 13.0.3

package/build/dist/Server/Services/ServerlessFunctionOwnerRuleEngineService.js

@@ -18,6 +18,7 @@ import ObjectID from "../../Types/ObjectID";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import logger from "../Utils/Logger";
 import { MAX_RULES_EVALUATED_PER_PROJECT } from "../../Utils/Rules/RuleEngineLimits";
+import { RuleCriteriaMatcher } from "../../Utils/Rules/RuleCriteriaMatcher";
 import logIfRuleReadWasTruncated from "../Utils/Rules/RuleEngineRuleRead";
 class ServerlessFunctionOwnerRuleEngineServiceClass {
     /**
@@ -40,6 +41,7 @@ class ServerlessFunctionOwnerRuleEngineServiceClass {
                 select: {
                     _id: true,
                     name: true,
+                    criteria: true,
                     notifyOwners: true,
                     matchLabels: { _id: true },
                     nameRegexPattern: true,
@@ -135,6 +137,20 @@ class ServerlessFunctionOwnerRuleEngineServiceClass {
         }
     }
     doesMatchRule(serverlessFunction, rule) {
+        return RuleCriteriaMatcher.matchesWithLegacySync({
+            rule: rule,
+            legacyFields: [
+                "matchLabels",
+                "nameRegexPattern",
+                "descriptionRegexPattern",
+            ],
+            emptyResult: true,
+            matchesLegacyRule: (serverlessFunctionRule) => {
+                return this.doesMatchRuleLegacy(serverlessFunction, serverlessFunctionRule);
+            },
+        });
+    }
+    doesMatchRuleLegacy(serverlessFunction, rule) {
         if (rule.matchLabels && rule.matchLabels.length > 0) {
             if (!serverlessFunction.labels ||
                 serverlessFunction.labels.length === 0) {

package/build/dist/Server/Services/ServerlessFunctionOwnerRuleEngineService.js.map

@@ -1 +1 @@
-{"version":3,"file":"ServerlessFunctionOwnerRuleEngineService.js","sourceRoot":"","sources":["../../../../Server/Services/ServerlessFunctionOwnerRuleEngineService.ts"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,kBAAkB,MAAM,gDAAgD,CAAC;AAEhF,OAAO,2BAA2B,MAAM,yDAAyD,CAAC;AAClG,OAAO,2BAA2B,MAAM,yDAAyD,CAAC;AAClG,OAAO,kCAAkC,MAAM,sCAAsC,CAAC;AACtF,OAAO,kCAAkC,MAAM,sCAAsC,CAAC;AACtF,OAAO,kCAAkC,MAAM,sCAAsC,CAAC;AACtF,OAAO,yBAAyB,MAAM,6BAA6B,CAAC;AACpE,OAAO,QAAQ,MAAM,sBAAsB,CAAC;AAC5C,OAAO,WAAW,MAAM,gCAAgC,CAAC;AACzD,OAAO,MAAyB,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,+BAA+B,EAAE,MAAM,oCAAoC,CAAC;AACrF,OAAO,yBAAyB,MAAM,mCAAmC,CAAC;AAE1E,MAAM,6CAA6C;IACjD;;;;OAIG;IAEU,AAAN,KAAK,CAAC,8BAA8B,CACzC,kBAAsC;;QAEtC,IAAI,CAAC,kBAAkB,CAAC,EAAE,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,CAAC;YAC5D,OAAO;QACT,CAAC;QAED,IAAI,CAAC;YACH,MAAM,KAAK,GACT,MAAM,kCAAkC,CAAC,MAAM,CAAC;gBAC9C,KAAK,EAAE;oBACL,SAAS,EAAE,kBAAkB,CAAC,SAAS;oBACvC,SAAS,EAAE,IAAI;iBAChB;gBACD,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;gBACvB,MAAM,EAAE;oBACN,GAAG,EAAE,IAAI;oBACT,IAAI,EAAE,IAAI;oBACV,YAAY,EAAE,IAAI;oBAClB,WAAW,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE;oBAC1B,gBAAgB,EAAE,IAAI;oBACtB,uBAAuB,EAAE,IAAI;oBAC7B,UAAU,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE;oBACzB,UAAU,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE;iBAC1B;gBACD,KAAK,EAAE,+BAA+B;gBACtC,IAAI,EAAE,CAAC;aACR,CAAC,CAAC;YAEL,yBAAyB,CAAC;gBACxB,QAAQ,EAAE,6BAA6B;gBACvC,SAAS,EAAE,kBAAkB,CAAC,SAAS;gBACvC,SAAS,EAAE,KAAK,CAAC,MAAM;aACxB,CAAC,CAAC;YAEH,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACvB,OAAO;YACT,CAAC;YAED,MAAM,aAAa,GACjB,MAAM,yBAAyB,CAAC,WAAW,CAAC;gBAC1C,EAAE,EAAE,kBAAkB,CAAC,EAAE;gBACzB,MAAM,EAAE;oBACN,IAAI,EAAE,IAAI;oBACV,WAAW,EAAE,IAAI;oBACjB,MAAM,EAAE,EAAE,GAAG,EAAE,IAAI,EAAE;iBACtB;gBACD,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;aACxB,CAAC,CAAC;YAEL,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,OAAO;YACT,CAAC;YAED,MAAM,aAAa,GAA8B,IAAI,GAAG,CAAC;gBACvD,CAAC,IAAI,EAAE,IAAI,GAAG,EAAE,CAAC;gBACjB,CAAC,KAAK,EAAE,IAAI,GAAG,EAAE,CAAC;aACnB,CAAC,CAAC;YACH,MAAM,aAAa,GAA8B,IAAI,GAAG,CAAC;gBACvD,CAAC,IAAI,EAAE,IAAI,GAAG,EAAE,CAAC;gBACjB,CAAC,KAAK,EAAE,IAAI,GAAG,EAAE,CAAC;aACnB,CAAC,CAAC;YAEH,IAAI,UAAU,GAAY,KAAK,CAAC;YAEhC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,aAAa,EAAE,IAAI,CAAC,EAAE,CAAC;oBAC7C,SAAS;gBACX,CAAC;gBACD,MAAM,MAAM,GAAY,IAAI,CAAC,YAAY,KAAK,KAAK,CAAC;gBACpD,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,UAAU,IAAI,EAAE,EAAE,CAAC;oBACzC,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;wBACZ,aAAa,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;wBACnD,UAAU,GAAG,IAAI,CAAC;oBACpB,CAAC;gBACH,CAAC;gBACD,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,UAAU,IAAI,EAAE,EAAE,CAAC;oBACzC,IAAI,IAAI,CAAC,EAAE,EAAE,CAAC;wBACZ,aAAa,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC,CAAC;wBACnD,UAAU,GAAG,IAAI,CAAC;oBACpB,CAAC;gBACH,CAAC;YACH,CAAC;YAED,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,OAAO;YACT,CAAC;YAED,KAAK,MAAM,MAAM,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC;gBACnC,MAAM,OAAO,GAAgB,aAAa,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC;gBACxD,MAAM,OAAO,GAAgB,aAAa,CAAC,GAAG,CAAC,MAAM,CAAE,CAAC;gBAExD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;oBAC7B,MAAM,KAAK,GACT,IAAI,2BAA2B,EAAE,CAAC;oBACpC,KAAK,CAAC,oBAAoB,GAAG,kBAAkB,CAAC,EAAE,CAAC;oBACnD,KAAK,CAAC,SAAS,GAAG,kBAAkB,CAAC,SAAS,CAAC;oBAC/C,KAAK,CAAC,MAAM,GAAG,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC;oBACpC,KAAK,CAAC,eAAe,GAAG,CAAC,MAAM,CAAC;oBAChC,MAAM,kCAAkC,CAAC,MAAM,CAAC;wBAC9C,IAAI,EAAE,KAAK;wBACX,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;qBACxB,CAAC,CAAC;gBACL,CAAC;gBAED,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;oBAC7B,MAAM,KAAK,GACT,IAAI,2BAA2B,EAAE,CAAC;oBACpC,KAAK,CAAC,oBAAoB,GAAG,kBAAkB,CAAC,EAAE,CAAC;oBACnD,KAAK,CAAC,SAAS,GAAG,kBAAkB,CAAC,SAAS,CAAC;oBAC/C,KAAK,CAAC,MAAM,GAAG,IAAI,QAAQ,CAAC,MAAM,CAAC,CAAC;oBACpC,KAAK,CAAC,eAAe,GAAG,CAAC,MAAM,CAAC;oBAChC,MAAM,kCAAkC,CAAC,MAAM,CAAC;wBAC9C,IAAI,EAAE,KAAK;wBACX,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;qBACxB,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,CAAC,KAAK,CAAC,mDAAmD,KAAK,EAAE,EAAE;gBACvE,SAAS,EAAE,MAAA,kBAAkB,CAAC,SAAS,0CAAE,QAAQ,EAAE;gBACnD,oBAAoB,EAAE,MAAA,kBAAkB,CAAC,EAAE,0CAAE,QAAQ,EAAE;aACvC,CAAC,CAAC;QACtB,CAAC;IACH,CAAC;IAEO,aAAa,CACnB,kBAAsC,EACtC,IAAiC;QAEjC,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACpD,IACE,CAAC,kBAAkB,CAAC,MAAM;gBAC1B,kBAAkB,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,EACtC,CAAC;gBACD,OAAO,KAAK,CAAC;YACf,CAAC;YACD,MAAM,YAAY,GAAkB,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAQ,EAAE,EAAE;;gBACpE,OAAO,CAAA,MAAA,CAAC,CAAC,EAAE,0CAAE,QAAQ,EAAE,KAAI,EAAE,CAAC;YAChC,CAAC,CAAC,CAAC;YACH,MAAM,QAAQ,GAAkB,kBAAkB,CAAC,MAAM,CAAC,GAAG,CAC3D,CAAC,CAAQ,EAAE,EAAE;;gBACX,OAAO,CAAA,MAAA,CAAC,CAAC,EAAE,0CAAE,QAAQ,EAAE,KAAI,EAAE,CAAC;YAChC,CAAC,CACF,CAAC;YACF,IACE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,EAAU,EAAE,EAAE;gBAChC,OAAO,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YAC/B,CAAC,CAAC,EACF,CAAC;gBACD,OAAO,KAAK,CAAC;YACf,CAAC;QACH,CAAC;QAED,IACE,IAAI,CAAC,gBAAgB;YACrB,CAAC,CAAC,kBAAkB,CAAC,IAAI;gBACvB,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,gBAAgB,EAAE,kBAAkB,CAAC,IAAI,CAAC,CAAC,EAClE,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IACE,IAAI,CAAC,uBAAuB;YAC5B,CAAC,CAAC,kBAAkB,CAAC,WAAW;gBAC9B,CAAC,IAAI,CAAC,SAAS,CACb,IAAI,CAAC,uBAAuB,EAC5B,kBAAkB,CAAC,WAAW,CAC/B,CAAC,EACJ,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,SAAS,CAAC,OAAe,EAAE,KAAa;QAC9C,IAAI,CAAC;YACH,MAAM,KAAK,GAAW,IAAI,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;YAC/C,OAAO,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC3B,CAAC;QAAC,WAAM,CAAC;YACP,MAAM,CAAC,IAAI,CACT,oDAAoD,OAAO,EAAE,CAC9D,CAAC;YACF,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;CACF;AA3Lc;IADZ,WAAW,EAAE;;qCAEQ,kBAAkB;;mGA2HvC;AAiEH,eAAe,IAAI,6CAA6C,EAAE,CAAC"}
+{"version":3,"file":"ServerlessFunctionOwnerRuleEngineService.js","sourceRoot":"","sources":["../../../../Server/Services/ServerlessFunctionOwnerRuleEngineService.ts"],"names":[],"mappings":"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"}

package/build/dist/Server/Services/ServiceLabelRuleEngineService.js

@@ -18,6 +18,7 @@ import ObjectID from "../../Types/ObjectID";
 import CaptureSpan from "../Utils/Telemetry/CaptureSpan";
 import logger from "../Utils/Logger";
 import { MAX_RULES_EVALUATED_PER_PROJECT } from "../../Utils/Rules/RuleEngineLimits";
+import { RuleCriteriaMatcher } from "../../Utils/Rules/RuleCriteriaMatcher";
 import logIfRuleReadWasTruncated from "../Utils/Rules/RuleEngineRuleRead";
 class ServiceLabelRuleEngineServiceClass {
     /**
@@ -40,6 +41,7 @@ class ServiceLabelRuleEngineServiceClass {
                 select: {
                     _id: true,
                     name: true,
+                    criteria: true,
                     serviceLabels: { _id: true },
                     serviceNamePattern: true,
                     serviceDescriptionPattern: true,
@@ -146,6 +148,20 @@ class ServiceLabelRuleEngineServiceClass {
         }
     }
     doesServiceMatchRule(service, rule) {
+        return RuleCriteriaMatcher.matchesWithLegacySync({
+            rule: rule,
+            legacyFields: [
+                "serviceLabels",
+                "serviceNamePattern",
+                "serviceDescriptionPattern",
+            ],
+            emptyResult: true,
+            matchesLegacyRule: (serviceRule) => {
+                return this.doesServiceMatchRuleLegacy(service, serviceRule);
+            },
+        });
+    }
+    doesServiceMatchRuleLegacy(service, rule) {
         if (rule.serviceLabels && rule.serviceLabels.length > 0) {
             if (!service.labels || service.labels.length === 0) {
                 return false;

package/build/dist/Server/Services/ServiceLabelRuleEngineService.js.map

@@ -1 +1 @@
-{"version":3,"file":"ServiceLabelRuleEngineService.js","sourceRoot":"","sources":["../../../../Server/Services/ServiceLabelRuleEngineService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ServiceLabelRuleEngineService.js","sourceRoot":"","sources":["../../../../Server/Services/ServiceLabelRuleEngineService.ts"],"names":[],"mappings":"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"}