Merge pull request #418 from gravwell/release/2.1.0

chore: Merge release/2.1.0 to main

package.json

@@ -46,7 +46,7 @@
 		"@types/node": "14.14.27",
 		"base-64": "^1.0.0",
 		"date-fns": "^2.17.0",
-		"decoders": "^1.25.5",
+		"decoders": "^2.0.4",
 		"form-data": "^3.0.0",
 		"isomorphic-ws": "^4.0.1",
 		"lodash": "^4.17.15",

src/functions/groups/create-one-group.spec.ts

@@ -7,7 +7,7 @@
  * license. See the LICENSE file for details.
  */
 
-import { CreatableGroup, isGroup } from '~/models';
+import { CreatableGroup, groupDecoder } from '~/models';
 import { integrationTest, integrationTestSpecDef, TEST_BASE_API_CONTEXT } from '~/tests';
 import { makeCreateOneGroup } from './create-one-group';
 import { makeDeleteOneGroup } from './delete-one-group';
@@ -46,7 +46,7 @@ describe(
 				};
 
 				const group = await createOneGroup(data);
-				expect(isGroup(group)).toBeTrue();
+				expect(groupDecoder.guard(group)).toBeTrue();
 				expect(group).toEqual(jasmine.objectContaining(data));
 
 				const currentGroups = await getAllGroups();
@@ -63,7 +63,7 @@ describe(
 				};
 
 				const group = await createOneGroup(data);
-				expect(isGroup(group)).toBeTrue();
+				expect(groupDecoder.guard(group)).toBeTrue();
 				expect(group).toEqual(jasmine.objectContaining(data));
 
 				const currentGroups = await getAllGroups();

src/functions/groups/get-all-groups.spec.ts

@@ -7,7 +7,7 @@
  * license. See the LICENSE file for details.
  */
 
-import { CreatableGroup, isGroup } from '~/models';
+import { CreatableGroup, groupDecoder } from '~/models';
 import { integrationTest, integrationTestSpecDef, TEST_BASE_API_CONTEXT } from '~/tests';
 import { makeCreateOneGroup } from './create-one-group';
 import { makeDeleteOneGroup } from './delete-one-group';
@@ -47,7 +47,7 @@ describe(
 
 				const groups = await getAllGroups();
 				expect(groups.length).toBe(2);
-				expect(groups.every(isGroup)).toBeTrue();
+				expect(groups.every(group => groupDecoder.guard(group))).toBeTrue();
 			}),
 		);
 

src/functions/groups/get-groups-by-user.spec.ts

@@ -7,7 +7,7 @@
  * license. See the LICENSE file for details.
  */
 
-import { CreatableGroup, CreatableUser, isGroup, User } from '~/models';
+import { CreatableGroup, CreatableUser, groupDecoder, User } from '~/models';
 import { integrationTest, integrationTestSpecDef, TEST_BASE_API_CONTEXT } from '~/tests';
 import { NumericID } from '~/value-objects';
 import { makeCreateOneUser, makeDeleteOneUser } from '../users';
@@ -94,7 +94,7 @@ describe(
 
 					const groups = await getGroupsByUser(user.id);
 					expect(groups.length).toBe(addedGroupIDs.length);
-					expect(groups.every(isGroup)).toBeTrue();
+					expect(groups.every(group => groupDecoder.guard(group))).toBeTrue();
 					expect(groups.map(g => g.id).sort()).toEqual(addedGroupIDs.sort());
 
 					// const _user = await getOneUser( user.id);

src/functions/groups/get-one-group.spec.ts

@@ -7,7 +7,7 @@
  * license. See the LICENSE file for details.
  */
 
-import { CreatableGroup, isGroup } from '~/models';
+import { CreatableGroup, groupDecoder } from '~/models';
 import { integrationTest, integrationTestSpecDef, TEST_BASE_API_CONTEXT } from '~/tests';
 import { NumericID } from '~/value-objects';
 import { makeCreateOneGroup } from './create-one-group';
@@ -48,7 +48,7 @@ describe(
 			'Should return a group',
 			integrationTest(async () => {
 				const group = await getOneGroup(groupID);
-				expect(isGroup(group)).toBeTrue();
+				expect(groupDecoder.guard(group)).toBeTrue();
 			}),
 		);
 	}),

src/functions/groups/update-one-group.spec.ts

@@ -7,7 +7,7 @@
  * license. See the LICENSE file for details.
  */
 
-import { CreatableGroup, Group, isGroup, UpdatableGroup } from '~/models';
+import { CreatableGroup, Group, groupDecoder, UpdatableGroup } from '~/models';
 import { integrationTest, integrationTestSpecDef, TEST_BASE_API_CONTEXT } from '~/tests';
 import { makeCreateOneGroup } from './create-one-group';
 import { makeDeleteOneGroup } from './delete-one-group';
@@ -75,7 +75,7 @@ describe(
 					const data: UpdatableGroup = { ...test, id: createdGroup.id };
 					await updateOneGroup(data);
 					const group = await getOneGroup(data.id);
-					expect(isGroup(group)).toBeTrue();
+					expect(groupDecoder.guard(group)).toBeTrue();
 					expect(group).toEqual(jasmine.objectContaining(data));
 				}
 			}),

src/functions/notifications/create-one-targeted-notification.ts

@@ -10,7 +10,7 @@
 import {
 	CreatableTargetedNotification,
 	CreatableTargetedNotificationByTargetType,
-	creatableTargetedNotificationGuard,
+	creatableTargetedNotificationDecoder,
 	TargetedNotificationTargetType,
 	toRawCreatableTargetedNotification,
 } from '~/models';
@@ -32,7 +32,7 @@ export const makeCreateOneTargetedNotification =
 		try {
 			// There may be some trick to make {...creatable, targetType} pass as a CreatableTargetedNotification,
 			// but I couldn't make it work. Until someone figures that out, this guard will work.
-			const _creatable: CreatableTargetedNotification = creatableTargetedNotificationGuard({
+			const _creatable: CreatableTargetedNotification = creatableTargetedNotificationDecoder.verify({
 				...creatable,
 				targetType,
 			});

src/functions/scheduled-tasks/create-many-schedules-queries.spec.ts

@@ -7,7 +7,7 @@
  * license. See the LICENSE file for details.
  */
 
-import { CreatableScheduledQuery, isScheduledQuery } from '~/models';
+import { CreatableScheduledQuery, scheduledQueryDecoder } from '~/models';
 import { integrationTest, integrationTestSpecDef, myCustomMatchers, TEST_BASE_API_CONTEXT } from '~/tests';
 import { NumericID } from '~/value-objects';
 import { makeCreateOneGroup } from '../groups/create-one-group';
@@ -71,6 +71,9 @@ describe(
 
 						oneShot: true,
 						isDisabled: true,
+
+						timeframeOffset: { days: 0, hours: 0, minutes: 0, seconds: 0 },
+						backfillEnabled: false,
 					},
 					{
 						groupIDs,
@@ -86,12 +89,15 @@ describe(
 
 						oneShot: false,
 						isDisabled: false,
+
+						timeframeOffset: { days: 0, hours: 0, minutes: 0, seconds: 0 },
+						backfillEnabled: false,
 					},
 				];
 
 				const scheduledQueries = await createManyScheduledQueries(data);
 				for (const q of scheduledQueries) {
-					expect(isScheduledQuery(q)).toBeTrue();
+					expect(scheduledQueryDecoder.guard(q)).toBeTrue();
 				}
 				expect(scheduledQueries).toPartiallyEqual(data);
 			}),

src/functions/scheduled-tasks/create-one-scheduled-query.spec.ts

@@ -7,7 +7,7 @@
  * license. See the LICENSE file for details.
  */
 
-import { CreatableScheduledQuery, isScheduledQuery } from '~/models';
+import { CreatableScheduledQuery, scheduledQueryDecoder } from '~/models';
 import { integrationTest, integrationTestSpecDef, myCustomMatchers, TEST_BASE_API_CONTEXT } from '~/tests';
 import { NumericID } from '~/value-objects';
 import { makeCreateOneGroup } from '../groups/create-one-group';
@@ -70,10 +70,13 @@ describe(
 
 					oneShot: true,
 					isDisabled: true,
+
+					timeframeOffset: { days: 0, hours: 0, minutes: 0, seconds: 0 },
+					backfillEnabled: false,
 				};
 
 				const scheduledQuery = await createOneScheduledQuery(data);
-				expect(isScheduledQuery(scheduledQuery)).toBeTrue();
+				expect(scheduledQueryDecoder.guard(scheduledQuery)).toBeTrue();
 				expect(scheduledQuery).toPartiallyEqual(data);
 			}),
 		);

src/functions/scheduled-tasks/delete-all-scheduled-queries.spec.ts

@@ -55,13 +55,17 @@ describe(
 					schedule: '0 1 * * *',
 					query: 'tag=netflow',
 					searchSince: { secondsAgo: 60 * 60 },
+					timeframeOffset: { days: 0, hours: 0, minutes: 0, seconds: 0 },
+					backfillEnabled: true,
 				},
 				{
 					name: 'Q2',
 					description: 'D2',
 					schedule: '0 1 * * *',
 					query: 'tag=default',
 					searchSince: { lastRun: true, secondsAgo: 90 },
+					timeframeOffset: { days: 0, hours: 0, minutes: 0, seconds: 0 },
+					backfillEnabled: true,
 				},
 			]);
 
@@ -90,20 +94,26 @@ describe(
 					schedule: '0 1 * * *',
 					query: 'tag=netflow',
 					searchSince: { secondsAgo: 60 * 60 },
+					timeframeOffset: { days: 0, hours: 0, minutes: 0, seconds: 0 },
+					backfillEnabled: true,
 				},
 				{
 					name: 'Q4',
 					description: 'D4',
 					schedule: '0 1 * * *',
 					query: 'tag=default',
 					searchSince: { lastRun: true, secondsAgo: 90 },
+					timeframeOffset: { days: 0, hours: 0, minutes: 0, seconds: 0 },
+					backfillEnabled: true,
 				},
 				{
 					name: 'Q5',
 					description: 'D5',
 					schedule: '0 1 * * *',
 					query: 'tag=test',
-					searchSince: { lastRun: true },
+					searchSince: { lastRun: true, secondsAgo: 60 },
+					timeframeOffset: { days: 0, hours: 0, minutes: 0, seconds: 0 },
+					backfillEnabled: true,
 				},
 			]);
 		});

src/functions/scheduled-tasks/delete-many-scheduled-queries.spec.ts

@@ -59,13 +59,17 @@ describe(
 					schedule: '0 1 * * *',
 					query: 'tag=netflow',
 					searchSince: { secondsAgo: 60 * 60 },
+					timeframeOffset: { days: 0, hours: 0, minutes: 0, seconds: 0 },
+					backfillEnabled: true,
 				},
 				{
 					name: 'Q2',
 					description: 'D2',
 					schedule: '0 1 * * *',
 					query: 'tag=default',
 					searchSince: { lastRun: true, secondsAgo: 90 },
+					timeframeOffset: { days: 0, hours: 0, minutes: 0, seconds: 0 },
+					backfillEnabled: true,
 				},
 			]);
 
@@ -94,20 +98,26 @@ describe(
 					schedule: '0 1 * * *',
 					query: 'tag=netflow',
 					searchSince: { secondsAgo: 60 * 60 },
+					timeframeOffset: { days: 0, hours: 0, minutes: 0, seconds: 0 },
+					backfillEnabled: true,
 				},
 				{
 					name: 'Q4',
 					description: 'D4',
 					schedule: '0 1 * * *',
 					query: 'tag=default',
 					searchSince: { lastRun: true, secondsAgo: 90 },
+					timeframeOffset: { days: 0, hours: 0, minutes: 0, seconds: 0 },
+					backfillEnabled: true,
 				},
 				{
 					name: 'Q5',
 					description: 'D5',
 					schedule: '0 1 * * *',
 					query: 'tag=test',
-					searchSince: { lastRun: true },
+					searchSince: { lastRun: true, secondsAgo: 60 },
+					timeframeOffset: { days: 0, hours: 0, minutes: 0, seconds: 0 },
+					backfillEnabled: true,
 				},
 			]);
 		});

src/functions/scheduled-tasks/delete-one-scheduled-query.spec.ts

@@ -50,13 +50,17 @@ describe(
 					schedule: '0 1 * * *',
 					query: 'tag=netflow',
 					searchSince: { secondsAgo: 60 * 60 },
+					timeframeOffset: { days: 0, hours: 0, minutes: 0, seconds: 0 },
+					backfillEnabled: true,
 				},
 				{
 					name: 'Q2',
 					description: 'D2',
 					schedule: '0 1 * * *',
 					query: 'tag=default',
 					searchSince: { lastRun: true, secondsAgo: 90 },
+					timeframeOffset: { days: 0, hours: 0, minutes: 0, seconds: 0 },
+					backfillEnabled: true,
 				},
 			]);