Checking explicitly for default space id

elastic · Aug 16, 2021 · f9deb90 · f9deb90
1 parent 5f96d6f
commit f9deb90
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/x-pack/plugins/alerting/server/routes/create_rule.test.ts b/x-pack/plugins/alerting/server/routes/create_rule.test.ts
@@ -203,6 +203,7 @@ describe('createRuleRoute', () => {
       ...mockedAlert,
       id: 'custom-id',
     });
+    rulesClient.getSpaceId.mockReturnValueOnce('default');
 
     const [context, req, res] = mockHandlerArguments(
       { rulesClient },

diff --git a/x-pack/plugins/alerting/server/routes/create_rule.ts b/x-pack/plugins/alerting/server/routes/create_rule.ts
@@ -114,9 +114,10 @@ export const createRuleRoute = ({ router, licenseState, usageCounter }: RouteOpt
 
           if (params?.id) {
             if (usageCounter) {
-              const usageCounterName = rulesClient.getSpaceId()
-                ? 'ruleCreatedWithPredefinedIdInCustomSpace'
-                : 'ruleCreatedWithPredefinedIdInDefaultSpace';
+              const usageCounterName =
+                rulesClient.getSpaceId() !== 'default'
+                  ? 'ruleCreatedWithPredefinedIdInCustomSpace'
+                  : 'ruleCreatedWithPredefinedIdInDefaultSpace';
               usageCounter?.incrementCounter({
                 counterName: usageCounterName,
                 incrementBy: 1,

diff --git a/x-pack/plugins/alerting/server/routes/legacy/create.test.ts b/x-pack/plugins/alerting/server/routes/legacy/create.test.ts
@@ -172,6 +172,7 @@ describe('createAlertRoute', () => {
     expect(config.path).toMatchInlineSnapshot(`"/api/alerts/alert/{id?}"`);
 
     rulesClient.create.mockResolvedValueOnce(expectedResult);
+    rulesClient.getSpaceId.mockReturnValueOnce('default');
 
     const [context, req, res] = mockHandlerArguments(
       { rulesClient },

diff --git a/x-pack/plugins/alerting/server/routes/legacy/create.ts b/x-pack/plugins/alerting/server/routes/legacy/create.ts
@@ -69,9 +69,10 @@ export const createAlertRoute = ({ router, licenseState, usageCounter }: RouteOp
 
         if (params?.id) {
           if (usageCounter) {
-            const usageCounterName = rulesClient.getSpaceId()
-              ? 'ruleCreatedWithPredefinedIdInCustomSpace'
-              : 'ruleCreatedWithPredefinedIdInDefaultSpace';
+            const usageCounterName =
+              rulesClient.getSpaceId() !== 'default'
+                ? 'ruleCreatedWithPredefinedIdInCustomSpace'
+                : 'ruleCreatedWithPredefinedIdInDefaultSpace';
             usageCounter?.incrementCounter({
               counterName: usageCounterName,
               incrementBy: 1,