C#/Java: Remove all dashes in mode-generator.

2025-12-17 01:03:14 +01:00 · 2022-12-20 13:39:36 +01:00
parent 466f24663e
commit 178fd0e9e1
27 changed files with 38 additions and 38 deletions
--- a/.github/workflows/mad_modelDiff.yml
+++ b/.github/workflows/mad_modelDiff.yml
@@ -11,7 +11,7 @@ on:
    branches:
      - main
    paths:
-      - "java/ql/src/utils/model-generator/**/*.*"
+      - "java/ql/src/utils/modelgenerator/**/*.*"
      - ".github/workflows/mad_modelDiff.yml"

 permissions:
@@ -61,7 +61,7 @@ jobs:
            DATABASE=$2
            cd codeql-$QL_VARIANT
            SHORTNAME=`basename $DATABASE`
-            python java/ql/src/utils/model-generator/GenerateFlowModel.py --with-summaries --with-sinks $DATABASE ${SHORTNAME}.temp.model.yml
+            python java/ql/src/utils/modelgenerator/GenerateFlowModel.py --with-summaries --with-sinks $DATABASE ${SHORTNAME}.temp.model.yml
            mv java/ql/lib/ext/generated/${SHORTNAME}.temp.model.yml $MODELS/${SHORTNAME}Generated_${QL_VARIANT}.model.yml
            cd ..
          }
--- a/.github/workflows/mad_regenerate-models.yml
+++ b/.github/workflows/mad_regenerate-models.yml
@@ -50,7 +50,7 @@ jobs:
          SLUG: ${{ matrix.slug }}
        run: |
          SHORTNAME=${SLUG//[^a-zA-Z0-9_]/}
-          java/ql/src/utils/model-generator/RegenerateModels.py "${SLUG}" dbs/${SHORTNAME}
+          java/ql/src/utils/modelgenerator/RegenerateModels.py "${SLUG}" dbs/${SHORTNAME}
      - name: Stage changes
        run: |
          find java -name "*.model.yml" -print0 | xargs -0 git add
--- a/csharp/ql/src/utils/model-generator/CaptureDiscardedSummaryModels.ql
+++ b/csharp/ql/src/utils/model-generator/CaptureDiscardedSummaryModels.ql
@@ -1,7 +1,7 @@
 /**
 * @name Capture discarded summary models.
 * @description Finds summary models that are discarded as handwritten counterparts exist.
- * @id cs/utils/model-generator/discarded-summary-models
+ * @id cs/utils/modelgenerator/discarded-summary-models
 */

 import semmle.code.csharp.dataflow.ExternalFlow
--- a/csharp/ql/src/utils/model-generator/CaptureNeutralModels.ql
+++ b/csharp/ql/src/utils/model-generator/CaptureNeutralModels.ql
@@ -2,8 +2,8 @@
 * @name Capture neutral models.
 * @description Finds neutral models to be used by other queries.
 * @kind diagnostic
- * @id cs/utils/model-generator/neutral-models
- * @tags model-generator
+ * @id cs/utils/modelgenerator/neutral-models
+ * @tags modelgenerator
 */

 import semmle.code.csharp.dataflow.ExternalFlow
--- a/csharp/ql/src/utils/model-generator/CaptureSinkModels.ql
+++ b/csharp/ql/src/utils/model-generator/CaptureSinkModels.ql
@@ -2,8 +2,8 @@
 * @name Capture sink models.
 * @description Finds public methods that act as sinks as they flow into a known sink.
 * @kind diagnostic
- * @id cs/utils/model-generator/sink-models
- * @tags model-generator
+ * @id cs/utils/modelgenerator/sink-models
+ * @tags modelgenerator
 */

 import utils.modelgenerator.internal.CaptureModels
--- a/csharp/ql/src/utils/model-generator/CaptureSourceModels.ql
+++ b/csharp/ql/src/utils/model-generator/CaptureSourceModels.ql
@@ -2,8 +2,8 @@
 * @name Capture source models.
 * @description Finds APIs that act as sources as they expose already known sources.
 * @kind diagnostic
- * @id cs/utils/model-generator/source-models
- * @tags model-generator
+ * @id cs/utils/modelgenerator/source-models
+ * @tags modelgenerator
 */

 import utils.modelgenerator.internal.CaptureModels
--- a/csharp/ql/src/utils/model-generator/CaptureSummaryModels.ql
+++ b/csharp/ql/src/utils/model-generator/CaptureSummaryModels.ql
@@ -2,8 +2,8 @@
 * @name Capture summary models.
 * @description Finds applicable summary models to be used by other queries.
 * @kind diagnostic
- * @id cs/utils/model-generator/summary-models
- * @tags model-generator
+ * @id cs/utils/modelgenerator/summary-models
+ * @tags modelgenerator
 */

 import semmle.code.csharp.dataflow.ExternalFlow
--- a/csharp/ql/src/utils/model-generator/CaptureTypeBasedSummaryModels.ql
+++ b/csharp/ql/src/utils/model-generator/CaptureTypeBasedSummaryModels.ql
@@ -2,8 +2,8 @@
 * @name Capture typed based summary models.
 * @description Finds applicable summary models to be used by other queries.
 * @kind diagnostic
- * @id cs/utils/model-generator/summary-models-typed-based
- * @tags model-generator
+ * @id cs/utils/modelgenerator/summary-models-typed-based
+ * @tags modelgenerator
 */

 import utils.modelgenerator.internal.CaptureTypeBasedSummaryModels
--- a/csharp/ql/test/utils/model-generator/dataflow/CaptureNeutralModels.qlref
+++ b/csharp/ql/test/utils/model-generator/dataflow/CaptureNeutralModels.qlref
@@ -1 +1 @@
-utils/model-generator/CaptureNeutralModels.ql
+utils/modelgenerator/CaptureNeutralModels.ql
--- a/csharp/ql/test/utils/model-generator/dataflow/CaptureSinkModels.qlref
+++ b/csharp/ql/test/utils/model-generator/dataflow/CaptureSinkModels.qlref
@@ -1 +1 @@
-utils/model-generator/CaptureSinkModels.ql
+utils/modelgenerator/CaptureSinkModels.ql
--- a/csharp/ql/test/utils/model-generator/dataflow/CaptureSourceModels.qlref
+++ b/csharp/ql/test/utils/model-generator/dataflow/CaptureSourceModels.qlref
@@ -1 +1 @@
-utils/model-generator/CaptureSourceModels.ql
+utils/modelgenerator/CaptureSourceModels.ql
--- a/csharp/ql/test/utils/model-generator/dataflow/CaptureSummaryModels.qlref
+++ b/csharp/ql/test/utils/model-generator/dataflow/CaptureSummaryModels.qlref
@@ -1 +1 @@
-utils/model-generator/CaptureSummaryModels.ql
+utils/modelgenerator/CaptureSummaryModels.ql
--- a/csharp/ql/test/utils/model-generator/typebasedflow/CaptureTypeBasedSummaryModels.qlref
+++ b/csharp/ql/test/utils/model-generator/typebasedflow/CaptureTypeBasedSummaryModels.qlref
@@ -1 +1 @@
-utils/model-generator/CaptureTypeBasedSummaryModels.ql
+utils/modelgenerator/CaptureTypeBasedSummaryModels.ql
--- a/java/ql/src/utils/model-generator/CaptureNeutralModels.ql
+++ b/java/ql/src/utils/model-generator/CaptureNeutralModels.ql
@@ -2,8 +2,8 @@
 * @name Capture neutral models.
 * @description Finds neutral models to be used by other queries.
 * @kind diagnostic
- * @id java/utils/model-generator/neutral-models
- * @tags model-generator
+ * @id java/utils/modelgenerator/neutral-models
+ * @tags modelgenerator
 */

 import utils.modelgenerator.internal.CaptureModels
--- a/java/ql/src/utils/model-generator/CaptureSinkModels.ql
+++ b/java/ql/src/utils/model-generator/CaptureSinkModels.ql
@@ -2,8 +2,8 @@
 * @name Capture sink models.
 * @description Finds public methods that act as sinks as they flow into a known sink.
 * @kind diagnostic
- * @id java/utils/model-generator/sink-models
- * @tags model-generator
+ * @id java/utils/modelgenerator/sink-models
+ * @tags modelgenerator
 */

 import utils.modelgenerator.internal.CaptureModels
--- a/java/ql/src/utils/model-generator/CaptureSourceModels.ql
+++ b/java/ql/src/utils/model-generator/CaptureSourceModels.ql
@@ -2,8 +2,8 @@
 * @name Capture source models.
 * @description Finds APIs that act as sources as they expose already known sources.
 * @kind diagnostic
- * @id java/utils/model-generator/source-models
- * @tags model-generator
+ * @id java/utils/modelgenerator/source-models
+ * @tags modelgenerator
 */

 import utils.modelgenerator.internal.CaptureModels
--- a/java/ql/src/utils/model-generator/CaptureSummaryModels.ql
+++ b/java/ql/src/utils/model-generator/CaptureSummaryModels.ql
@@ -2,8 +2,8 @@
 * @name Capture summary models.
 * @description Finds applicable summary models to be used by other queries.
 * @kind diagnostic
- * @id java/utils/model-generator/summary-models
- * @tags model-generator
+ * @id java/utils/modelgenerator/summary-models
+ * @tags modelgenerator
 */

 import utils.modelgenerator.internal.CaptureModels
--- a/java/ql/src/utils/model-generator/CaptureTypeBasedSummaryModels.ql
+++ b/java/ql/src/utils/model-generator/CaptureTypeBasedSummaryModels.ql
@@ -2,8 +2,8 @@
 * @name Capture typed based summary models.
 * @description Finds applicable summary models to be used by other queries.
 * @kind diagnostic
- * @id java/utils/model-generator/summary-models-typed-based
- * @tags model-generator
+ * @id java/utils/modelgenerator/summary-models-typed-based
+ * @tags modelgenerator
 */

 import utils.modelgenerator.internal.CaptureTypeBasedSummaryModels
--- a/java/ql/src/utils/model-generator/RegenerateModels.py
+++ b/java/ql/src/utils/model-generator/RegenerateModels.py
@@ -35,7 +35,7 @@ def regenerateModel(lgtmSlug, extractedDb):
        sys.exit(1)
    modelFile = lgtmSlugToModelFile[lgtmSlug]
    codeQlRoot = findGitRoot()
-    subprocess.check_call([codeQlRoot + "/java/ql/src/utils/model-generator/GenerateFlowModel.py",
+    subprocess.check_call([codeQlRoot + "/java/ql/src/utils/modelgenerator/GenerateFlowModel.py",
                           "--with-summaries", "--with-sinks", "--with-neutrals",
                           extractedDb, modelFile])
    print("Regenerated " + modelFile)
--- a/java/ql/test/utils/model-generator/dataflow/CaptureNeutralModels.qlref
+++ b/java/ql/test/utils/model-generator/dataflow/CaptureNeutralModels.qlref
@@ -1 +1 @@
-utils/model-generator/CaptureNeutralModels.ql
+utils/modelgenerator/CaptureNeutralModels.ql
--- a/java/ql/test/utils/model-generator/dataflow/CaptureSinkModels.qlref
+++ b/java/ql/test/utils/model-generator/dataflow/CaptureSinkModels.qlref
@@ -1 +1 @@
-utils/model-generator/CaptureSinkModels.ql
+utils/modelgenerator/CaptureSinkModels.ql
--- a/java/ql/test/utils/model-generator/dataflow/CaptureSourceModels.qlref
+++ b/java/ql/test/utils/model-generator/dataflow/CaptureSourceModels.qlref
@@ -1 +1 @@
-utils/model-generator/CaptureSourceModels.ql
+utils/modelgenerator/CaptureSourceModels.ql
--- a/java/ql/test/utils/model-generator/dataflow/CaptureSummaryModels.qlref
+++ b/java/ql/test/utils/model-generator/dataflow/CaptureSummaryModels.qlref
@@ -1 +1 @@
-utils/model-generator/CaptureSummaryModels.ql
+utils/modelgenerator/CaptureSummaryModels.ql
--- a/misc/scripts/models-as-data/generate_flow_model.py
+++ b/misc/scripts/models-as-data/generate_flow_model.py
@@ -33,7 +33,7 @@ class Generator:
        self.generateNeutrals = False
        self.generateTypeBasedSummaries = False
        self.dryRun = False
-        self.dirname = "model-generator"
+        self.dirname = "modelgenerator"


    def printHelp(self):
--- a/misc/suite-helpers/code-scanning-selectors.yml
+++ b/misc/suite-helpers/code-scanning-selectors.yml
@@ -30,4 +30,4 @@
      - /Diagnostics/Internal/.*/
 - exclude:
    tags contain:
-      - model-generator
+      - modelgenerator
--- a/misc/suite-helpers/security-and-quality-selectors.yml
+++ b/misc/suite-helpers/security-and-quality-selectors.yml
@@ -31,4 +31,4 @@
      - /Diagnostics/Internal/.*/
 - exclude:
    tags contain:
-      - model-generator
+      - modelgenerator
--- a/misc/suite-helpers/security-extended-selectors.yml
+++ b/misc/suite-helpers/security-extended-selectors.yml
@@ -36,4 +36,4 @@
      - /Diagnostics/Internal/.*/
 - exclude:
    tags contain:
-      - model-generator
+      - modelgenerator