Skip to content

Commit 4b47b08

Browse files
michaelnebelmichaelnebel
authored
Merge pull request github#11760 from michaelnebel/movemodelgenerator
C#/Java: Move the modelgenerator.
2 parents c6d9e1e + 11ca3f4 commit 4b47b08

File tree

76 files changed

+54
-54
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+54
-54
lines changed

‎.github/workflows/mad_modelDiff.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ on:
1111
branches:
1212
- main
1313
paths:
14-
- "java/ql/src/utils/model-generator/**/*.*"
14+
- "java/ql/src/utils/modelgenerator/**/*.*"
1515
- ".github/workflows/mad_modelDiff.yml"
1616

1717
permissions:
@@ -61,7 +61,7 @@ jobs:
6161
DATABASE=$2
6262
cd codeql-$QL_VARIANT
6363
SHORTNAME=`basename $DATABASE`
64-
python java/ql/src/utils/model-generator/GenerateFlowModel.py --with-summaries --with-sinks $DATABASE ${SHORTNAME}.temp.model.yml
64+
python java/ql/src/utils/modelgenerator/GenerateFlowModel.py --with-summaries --with-sinks $DATABASE ${SHORTNAME}.temp.model.yml
6565
mv java/ql/lib/ext/generated/${SHORTNAME}.temp.model.yml $MODELS/${SHORTNAME}Generated_${QL_VARIANT}.model.yml
6666
cd ..
6767
}

‎.github/workflows/mad_regenerate-models.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
SLUG: ${{ matrix.slug }}
5151
run: |
5252
SHORTNAME=${SLUG//[^a-zA-Z0-9_]/}
53-
java/ql/src/utils/model-generator/RegenerateModels.py "${SLUG}" dbs/${SHORTNAME}
53+
java/ql/src/utils/modelgenerator/RegenerateModels.py "${SLUG}" dbs/${SHORTNAME}
5454
- name: Stage changes
5555
run: |
5656
find java -name "*.model.yml" -print0 | xargs -0 git add

‎csharp/ql/src/utils/model-generator/CaptureDiscardedSummaryModels.ql renamed to ‎csharp/ql/src/utils/modelgenerator/CaptureDiscardedSummaryModels.ql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/**
22
* @name Capture discarded summary models.
33
* @description Finds summary models that are discarded as handwritten counterparts exist.
4-
* @id cs/utils/model-generator/discarded-summary-models
4+
* @id cs/utils/modelgenerator/discarded-summary-models
55
*/
66

77
import semmle.code.csharp.dataflow.ExternalFlow
8-
import utils.modelgenerator.internal.CaptureModels
9-
import utils.modelgenerator.internal.CaptureSummaryFlow
8+
import internal.CaptureModels
9+
import internal.CaptureSummaryFlow
1010

1111
from DataFlowTargetApi api, string flow
1212
where flow = captureFlow(api) and hasSummary(api, false)

‎csharp/ql/src/utils/model-generator/CaptureNeutralModels.ql renamed to ‎csharp/ql/src/utils/modelgenerator/CaptureNeutralModels.ql

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
* @name Capture neutral models.
33
* @description Finds neutral models to be used by other queries.
44
* @kind diagnostic
5-
* @id cs/utils/model-generator/neutral-models
6-
* @tags model-generator
5+
* @id cs/utils/modelgenerator/neutral-models
6+
* @tags modelgenerator
77
*/
88

99
import semmle.code.csharp.dataflow.ExternalFlow
10-
import utils.modelgenerator.internal.CaptureModels
11-
import utils.modelgenerator.internal.CaptureSummaryFlow
10+
import internal.CaptureModels
11+
import internal.CaptureSummaryFlow
1212

1313
from DataFlowTargetApi api, string noflow
1414
where

‎csharp/ql/src/utils/model-generator/CaptureSinkModels.ql renamed to ‎csharp/ql/src/utils/modelgenerator/CaptureSinkModels.ql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
* @name Capture sink models.
33
* @description Finds public methods that act as sinks as they flow into a known sink.
44
* @kind diagnostic
5-
* @id cs/utils/model-generator/sink-models
6-
* @tags model-generator
5+
* @id cs/utils/modelgenerator/sink-models
6+
* @tags modelgenerator
77
*/
88

9-
import utils.modelgenerator.internal.CaptureModels
9+
import internal.CaptureModels
1010

1111
class Activate extends ActiveConfiguration {
1212
override predicate activateToSinkConfig() { any() }

‎csharp/ql/src/utils/model-generator/CaptureSourceModels.ql renamed to ‎csharp/ql/src/utils/modelgenerator/CaptureSourceModels.ql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
* @name Capture source models.
33
* @description Finds APIs that act as sources as they expose already known sources.
44
* @kind diagnostic
5-
* @id cs/utils/model-generator/source-models
6-
* @tags model-generator
5+
* @id cs/utils/modelgenerator/source-models
6+
* @tags modelgenerator
77
*/
88

9-
import utils.modelgenerator.internal.CaptureModels
9+
import internal.CaptureModels
1010

1111
class Activate extends ActiveConfiguration {
1212
override predicate activateFromSourceConfig() { any() }

‎csharp/ql/src/utils/model-generator/CaptureSummaryModels.ql renamed to ‎csharp/ql/src/utils/modelgenerator/CaptureSummaryModels.ql

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
* @name Capture summary models.
33
* @description Finds applicable summary models to be used by other queries.
44
* @kind diagnostic
5-
* @id cs/utils/model-generator/summary-models
6-
* @tags model-generator
5+
* @id cs/utils/modelgenerator/summary-models
6+
* @tags modelgenerator
77
*/
88

99
import semmle.code.csharp.dataflow.ExternalFlow
10-
import utils.modelgenerator.internal.CaptureModels
11-
import utils.modelgenerator.internal.CaptureSummaryFlow
10+
import internal.CaptureModels
11+
import internal.CaptureSummaryFlow
1212

1313
from DataFlowTargetApi api, string flow
1414
where flow = captureFlow(api) and not hasSummary(api, false)

‎csharp/ql/src/utils/model-generator/CaptureTypeBasedSummaryModels.ql renamed to ‎csharp/ql/src/utils/modelgenerator/CaptureTypeBasedSummaryModels.ql

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
* @name Capture typed based summary models.
33
* @description Finds applicable summary models to be used by other queries.
44
* @kind diagnostic
5-
* @id cs/utils/model-generator/summary-models-typed-based
6-
* @tags model-generator
5+
* @id cs/utils/modelgenerator/summary-models-typed-based
6+
* @tags modelgenerator
77
*/
88

9-
import utils.modelgenerator.internal.CaptureTypeBasedSummaryModels
9+
import internal.CaptureTypeBasedSummaryModels
1010

1111
from TypeBasedFlowTargetApi api, string flow
1212
where flow = captureFlow(api)

‎csharp/ql/src/utils/model-generator/GenerateFlowModel.py renamed to ‎csharp/ql/src/utils/modelgenerator/GenerateFlowModel.py

File renamed without changes.

‎csharp/ql/test/utils/model-generator/dataflow/CaptureNeutralModels.qlref

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)