Skip to content

Commit e704836

Browse files
CisphyxCisphyx
committed
move trigger schema to schemas.py
1 parent 7d3d1b8 commit e704836

File tree

4 files changed

+62
-67
lines changed

4 files changed

+62
-67
lines changed

‎synapse/lib/schemas.py

+58
Original file line numberDiff line numberDiff line change
@@ -1141,3 +1141,61 @@
11411141
'required': ['access_token', 'expires_in'],
11421142
}
11431143
reqValidOauth2TokenResponse = s_config.getJsValidator(_reqValidOauth2TokenResponseSchema)
1144+
1145+
tagrestr = r'((\w+|\*|\*\*)\.)*(\w+|\*|\*\*)' # tag with optional single or double * as segment
1146+
_tagre, _formre, _propre = (f'^{re}$' for re in (tagrestr, s_grammar.formrestr, s_grammar.proporunivrestr))
1147+
1148+
TrigSchema = {
1149+
'type': 'object',
1150+
'properties': {
1151+
'iden': {'type': 'string', 'pattern': s_config.re_iden},
1152+
'user': {'type': 'string', 'pattern': s_config.re_iden},
1153+
'creator': {'type': 'string', 'pattern': s_config.re_iden},
1154+
'view': {'type': 'string', 'pattern': s_config.re_iden},
1155+
'form': {'type': 'string', 'pattern': _formre},
1156+
'n2form': {'type': 'string', 'pattern': _formre},
1157+
'tag': {'type': 'string', 'pattern': _tagre},
1158+
'prop': {'type': 'string', 'pattern': _propre},
1159+
'verb': {'type': 'string', },
1160+
'name': {'type': 'string', },
1161+
'doc': {'type': 'string', },
1162+
'cond': {'enum': ['node:add', 'node:del', 'tag:add', 'tag:del', 'prop:set', 'edge:add', 'edge:del']},
1163+
'storm': {'type': 'string'},
1164+
'async': {'type': 'boolean'},
1165+
'enabled': {'type': 'boolean'},
1166+
'created': {'type': 'integer', 'minimum': 0},
1167+
},
1168+
'additionalProperties': True,
1169+
'required': ['iden', 'user', 'storm', 'enabled', 'creator'],
1170+
'allOf': [
1171+
{
1172+
'if': {'properties': {'cond': {'const': 'node:add'}}},
1173+
'then': {'required': ['form']},
1174+
},
1175+
{
1176+
'if': {'properties': {'cond': {'const': 'node:del'}}},
1177+
'then': {'required': ['form']},
1178+
},
1179+
{
1180+
'if': {'properties': {'cond': {'const': 'tag:add'}}},
1181+
'then': {'required': ['tag']},
1182+
},
1183+
{
1184+
'if': {'properties': {'cond': {'const': 'tag:del'}}},
1185+
'then': {'required': ['tag']},
1186+
},
1187+
{
1188+
'if': {'properties': {'cond': {'const': 'prop:set'}}},
1189+
'then': {'required': ['prop']},
1190+
},
1191+
{
1192+
'if': {'properties': {'cond': {'const': 'edge:add'}}},
1193+
'then': {'required': ['verb']},
1194+
},
1195+
{
1196+
'if': {'properties': {'cond': {'const': 'edge:del'}}},
1197+
'then': {'required': ['verb']},
1198+
},
1199+
],
1200+
}
1201+
reqValidTriggerDef = s_config.getJsValidator(TrigSchema)

‎synapse/lib/stormtypes.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import synapse.lib.queue as s_queue
3434
import synapse.lib.scope as s_scope
3535
import synapse.lib.msgpack as s_msgpack
36-
import synapse.lib.trigger as s_trigger
36+
import synapse.lib.schemas as s_schemas
3737
import synapse.lib.urlhelp as s_urlhelp
3838
import synapse.lib.version as s_version
3939
import synapse.lib.stormctrl as s_stormctrl
@@ -8495,7 +8495,7 @@ async def move(self, viewiden):
84958495
tdef['creator'] = useriden
84968496

84978497
try:
8498-
s_trigger.reqValidTdef(tdef)
8498+
s_schemas.reqValidTriggerDef(tdef)
84998499
await self.runt.view.core.reqValidStorm(tdef['storm'])
85008500
except (s_exc.SchemaViolation, s_exc.BadSyntax) as exc:
85018501
raise s_exc.StormRuntimeError(mesg=f'Cannot move invalid trigger {trigiden}: {str(exc)}') from None

‎synapse/lib/trigger.py

-63
Original file line numberDiff line numberDiff line change
@@ -26,69 +26,6 @@
2626

2727
RecursionDepth = contextvars.ContextVar('RecursionDepth', default=0)
2828

29-
# TODO: standardize locations for form/prop/tags regex
30-
31-
tagrestr = r'((\w+|\*|\*\*)\.)*(\w+|\*|\*\*)' # tag with optional single or double * as segment
32-
_tagre, _formre, _propre = (f'^{re}$' for re in (tagrestr, s_grammar.formrestr, s_grammar.proporunivrestr))
33-
34-
TrigSchema = {
35-
'type': 'object',
36-
'properties': {
37-
'iden': {'type': 'string', 'pattern': s_config.re_iden},
38-
'user': {'type': 'string', 'pattern': s_config.re_iden},
39-
'creator': {'type': 'string', 'pattern': s_config.re_iden},
40-
'view': {'type': 'string', 'pattern': s_config.re_iden},
41-
'form': {'type': 'string', 'pattern': _formre},
42-
'n2form': {'type': 'string', 'pattern': _formre},
43-
'tag': {'type': 'string', 'pattern': _tagre},
44-
'prop': {'type': 'string', 'pattern': _propre},
45-
'verb': {'type': 'string', },
46-
'name': {'type': 'string', },
47-
'doc': {'type': 'string', },
48-
'cond': {'enum': ['node:add', 'node:del', 'tag:add', 'tag:del', 'prop:set', 'edge:add', 'edge:del']},
49-
'storm': {'type': 'string'},
50-
'async': {'type': 'boolean'},
51-
'enabled': {'type': 'boolean'},
52-
'created': {'type': 'integer', 'minimum': 0},
53-
},
54-
'additionalProperties': True,
55-
'required': ['iden', 'user', 'storm', 'enabled', 'creator'],
56-
'allOf': [
57-
{
58-
'if': {'properties': {'cond': {'const': 'node:add'}}},
59-
'then': {'required': ['form']},
60-
},
61-
{
62-
'if': {'properties': {'cond': {'const': 'node:del'}}},
63-
'then': {'required': ['form']},
64-
},
65-
{
66-
'if': {'properties': {'cond': {'const': 'tag:add'}}},
67-
'then': {'required': ['tag']},
68-
},
69-
{
70-
'if': {'properties': {'cond': {'const': 'tag:del'}}},
71-
'then': {'required': ['tag']},
72-
},
73-
{
74-
'if': {'properties': {'cond': {'const': 'prop:set'}}},
75-
'then': {'required': ['prop']},
76-
},
77-
{
78-
'if': {'properties': {'cond': {'const': 'edge:add'}}},
79-
'then': {'required': ['verb']},
80-
},
81-
{
82-
'if': {'properties': {'cond': {'const': 'edge:del'}}},
83-
'then': {'required': ['verb']},
84-
},
85-
],
86-
}
87-
TrigSchemaValidator = s_config.getJsValidator(TrigSchema)
88-
89-
def reqValidTdef(conf):
90-
TrigSchemaValidator(conf)
91-
9229
class Triggers:
9330
'''
9431
Manages "triggers", conditions where changes in data result in new storm queries being executed.

‎synapse/lib/view.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -2256,14 +2256,14 @@ async def addTrigger(self, tdef):
22562256
tdef.setdefault('async', False)
22572257
tdef.setdefault('enabled', True)
22582258

2259-
s_trigger.reqValidTdef(tdef)
2259+
s_schemas.reqValidTriggerDef(tdef)
22602260

22612261
return await self._push('trigger:add', tdef)
22622262

22632263
@s_nexus.Pusher.onPush('trigger:add')
22642264
async def _onPushAddTrigger(self, tdef):
22652265

2266-
s_trigger.reqValidTdef(tdef)
2266+
s_schemas.reqValidTriggerDef(tdef)
22672267

22682268
trig = self.trigdict.get(tdef['iden'])
22692269
if trig is not None:

0 commit comments

Comments
 (0)