wip

Author: MichaelSquires

synapse/lib/parser.py

@@ -261,7 +261,7 @@ def embedquery(self, meta, kids):
 
         kids[0].astinfo = astinfo
 
-        return s_ast.EmbedQuery(astinfo, kids[0].text, kids=kids)
+        return s_ast.EmbedQuery(astinfo, kids[0].getAstText(), kids=kids)
 
     @lark.v_args(meta=True)
     def funccall(self, meta, kids):
@@ -271,8 +271,6 @@ def funccall(self, meta, kids):
         argkids = []
         kwargkids = []
         kwnames = set()
-        indx = 1
-        kcnt = len(kids)
 
         todo = collections.deque(kids)
 

synapse/tests/files/stormcov/dupesubs.storm

@@ -16,5 +16,13 @@ tee {
 } {
     [inet:fqdn=argv.com]
 }
-// coverage: 1, 2, 4,    7, 8, 9, 10, 12, 13,     16, 17
-// lines:    1, 2, 4, 5, 7, 8, 9, 10, 12, 13, 14,     17
+|
+tee
+{
+    [ inet:fqdn=dup00.com ]
+}
+{
+    [ inet:fqdn=dup00.com ]
+}
+// coverage: 1, 2, 4,    7, 8, 9, 10, 12, 13,     16, 17, 20, 21, 22, 24
+// lines:    1, 2, 4, 5, 7, 8, 9, 10, 12, 13, 14,     17, 20,     22,     25

synapse/tests/files/stormcov/embedquery.storm

@@ -11,7 +11,11 @@ $eq3 = ${
         [ inet:fqdn=vertex.link ]
     }
 }
+$eq4 = ${ [ inet:fqdn=vtx.lk ] }
+$eq5 = ${
 
-tee $eq1 $eq2 $eq3
-// coverage: 1, 2, 4, 5, 6, 9, 10,     15
-// lines:    1, 2, 4, 5, 6, 9, 10, 11, 15
+    [ inet:fqdn=v.vtx.lk ]
+}
+tee $eq1 $eq2 $eq3 $eq4 $eq5
+// coverage: 1, 2, 4, 5, 6, 9, 10,     14, 15, 17, 19
+// lines:    1, 2, 4, 5, 6, 9, 10, 11, 14, 15, 17, 19

synapse/tests/test_lib_grammar.py

@@ -51,7 +51,6 @@
     'try { inet:ip=asdf } catch FooBar as err { } catch * as err { }',
     'test:array*[=1.2.3.4]',
     'macro.set hehe ${ inet:ip }',
-    'macro.set hehe ${\n  inet:ip\ninet:fqdn }',
     '$q=${#foo.bar}',
     'metrics.edits.byprop inet:fqdn:domain --newv $lib.null',
     'tee // comment',
@@ -841,8 +840,7 @@
     'Query: [TryCatch: [Query: [LiftPropBy: [Const: inet:ip, Const: =, Const: asdf]], CatchBlock: [Const: TypeError, Const: err, Query: []]]]',
     'Query: [TryCatch: [Query: [LiftPropBy: [Const: inet:ip, Const: =, Const: asdf]], CatchBlock: [Const: FooBar, Const: err, Query: []], CatchBlock: [Const: *, Const: err, Query: []]]]',
     'Query: [LiftByArray: [Const: test:array, Const: =, Const: 1.2.3.4]]',
-    'Query: [CmdOper: [Const: macro.set, List: [Const: hehe, EmbedQuery: inet:ip]]]',
-    'Query: [CmdOper: [Const: macro.set, List: [Const: hehe, EmbedQuery: inet:ip\ninet:fqdn]]]',
+    'Query: [CmdOper: [Const: macro.set, List: [Const: hehe, EmbedQuery:  inet:ip ]]]',
     'Query: [SetVarOper: [Const: q, EmbedQuery: #foo.bar]]',
     'Query: [CmdOper: [Const: metrics.edits.byprop, List: [Const: inet:fqdn:domain, Const: --newv, VarDeref: [VarValue: [Const: lib], Const: null]]]]',
     'Query: [CmdOper: [Const: tee, Const: ()]]',
@@ -1421,7 +1419,7 @@
     'Query: [SetVarOper: [Const: p, Const: names], LiftPropBy: [Const: entity:contact:name, Const: =, Const: foo], EditPropSet: [RelProp: [VarValue: [Const: p]], Const: ?-=, Const: bar]]',
     'Query: [SetVarOper: [Const: pvar, Const: stuff], LiftProp: [Const: test:arrayprop], FiltOper: [Const: +, ArrayCond: [RelProp: [VarValue: [Const: pvar]], Const: =, Const: neato]]]',
     'Query: [SetVarOper: [Const: pvar, Const: ints], LiftProp: [Const: test:arrayprop], FiltOper: [Const: +, ArrayCond: [RelProp: [VarValue: [Const: pvar]], Const: =, VarValue: [Const: othervar]]]]',
-    'Query: [SetVarOper: [Const: foo, DollarExpr: [ExprDict: [Const: foo, EmbedQuery: inet:fqdn]]]]',
+    'Query: [SetVarOper: [Const: foo, DollarExpr: [ExprDict: [Const: foo, EmbedQuery:  inet:fqdn ]]]]',
     'Query: [EditPropSet: [RelProp: [Const: seen], Const: ?=, DollarExpr: [ExprNode: [VarDeref: [VarValue: [Const: foo], Const: bar], Const: *, Const: 1000]]]]',
     'Query: [EditPropSet: [RelProp: [Const: seen], Const: ?=, DollarExpr: [ExprNode: [RelPropValue: [RelProp: [Const: foo], VirtProps: [Const: virt]], Const: *, Const: 1000]]]]',
     'Query: [EditNodeAdd: [FormName: [Const: test:str], Const: =, Const: foo], EditCondPropSet: [RelProp: [Const: hehe], CondSetOper: [Const: unset], Const: heval]]',

synapse/tests/test_lib_stormlib_macro.py

@@ -89,7 +89,7 @@ async def test_stormlib_macro(self):
             name = 'v' * 491
             q = '$lib.macro.set($name, ${ help }) return ( $lib.macro.get($name) )'
             mdef = await core.callStorm(q, opts={'vars': {'name': name}})
-            self.eq(mdef.get('storm'), 'help')
+            self.eq(mdef.get('storm'), ' help ')
 
             badname = 'v' * 492
             with self.raises(s_exc.BadArg):
@@ -381,15 +381,15 @@ async def test_stormlib_behold_macro(self):
                     self.eq('storm:macro:add', addmesg['data']['event'])
                     macro = addmesg['data']['info']['macro']
                     self.eq(macro['name'], 'foobar')
-                    self.eq(macro['storm'], 'file:bytes | [+#neato]')
+                    self.eq(macro['storm'], ' file:bytes | [+#neato] ')
                     self.ne(visi.iden, macro['creator'])
                     self.nn(macro['iden'])
 
                     setmesg = await sock.receive_json()
                     self.eq('storm:macro:mod', setmesg['data']['event'])
                     event = setmesg['data']['info']
                     self.nn(event['macro'])
-                    self.eq(event['info']['storm'], 'inet:ip | [+#burrito]')
+                    self.eq(event['info']['storm'], ' inet:ip | [+#burrito] ')
                     self.nn(event['info']['updated'])
 
                     modmesg = await sock.receive_json()

synapse/tests/test_lib_stormtypes.py

@@ -687,7 +687,7 @@ async def test_storm_lib_base(self):
             self.stormIsInPrint("['1', 2, '3']", mesgs)
 
             mesgs = await core.stormlist('$lib.print(${ $foo=bar })')
-            self.stormIsInPrint('storm:query: "$foo=bar"', mesgs)
+            self.stormIsInPrint('storm:query: " $foo=bar "', mesgs)
 
             mesgs = await core.stormlist('$lib.print($lib.set(1,2,3))')
             self.stormIsInPrint("'1'", mesgs)
@@ -1055,7 +1055,8 @@ async def test_storm_lib_query(self):
             msgs = await core.stormlist(q)
             fires = [m for m in msgs if m[0] == 'storm:fire']
             self.len(1, fires)
-            self.eq(fires[0][1].get('data').get('q'), "$lib.print('fire in the hole')")
+            self.eq(fires[0][1].get('data').get('q'),
+                    " $lib.print('fire in the hole') ")
 
             q = '''
             $q=${ [test:int=1 test:int=2] }

synapse/tests/test_utils_stormcov.py

@@ -50,6 +50,10 @@ async def test_stormcov_basics(self):
         badstorm = s_files.getAssetPath('stormcov/badstorm.storm')
         stream.expect(f'Skipping invalid storm file: {badstorm}')
 
+        dupesubs = s_files.getAssetPath('stormcov/dupesubs.storm')
+        stream.expect(f'Duplicate argvquery in {dupesubs} at line 25, coverage will be reported on first instance in {dupesubs} at line 22')
+        stream.expect(f'Duplicate embedquery in {dupesubs} at line 5, coverage will be reported on first instance in {dupesubs} at line 2')
+
         self.sorteq(list(stormcov.guid_map.values()), stormfiles)
         stormcov.reset()
 
@@ -87,8 +91,8 @@ async def check_cov(filename):
 
                 stormcov.reset()
 
-            await check_cov('stormcov/dupesubs.storm')
             await check_cov('stormcov/embedquery.storm')
+            await check_cov('stormcov/dupesubs.storm')
             await check_cov('stormcov/argvquery.storm')
             await check_cov('stormcov/stormctrl.storm')
             await check_cov('stormcov/pivot.storm')

synapse/utils/stormcov.py

@@ -159,11 +159,15 @@ def find_subqueries(self, tree, path):
 
                 subg = s_common.guid(str(subq))
                 line = node.meta.line
+                offs = 0
+                if rule == 'embedquery':
+                    line -= 1
+                    offs += 1
 
                 if subg in self.subq_map:
                     (pname, pline) = self.subq_map[subg]
-                    logger.warning(f'Duplicate {rule} in {path} at line {line + 1}, coverage will '
-                                   f'be reported on first instance in {pname} at line {pline + 1}')
+                    logger.warning(f'Duplicate {rule} in {path} at line {line + 1 + offs}, coverage will '
+                                   f'be reported on first instance in {pname} at line {pline + 1 + offs}')
                     continue
 
                 self.subq_map[subg] = (path, line)