From ad49eada489912b46bf51b4dae960c2fcd583a90 Mon Sep 17 00:00:00 2001
From: Rasmus Lerchedahl Petersen <yoff@github.com>
Date: Fri, 25 Aug 2023 11:46:41 +0200
Subject: [PATCH] Python: Do not alter `codeql-workspaces.yml` And remove the
 qlpack referred to therein. Instead we rename and duplicate the extesion file
 that this qlpack pointed to. These two extension files are kept in sync by
 `identical-files.json`.

---
 codeql-workspace.yml                           |  1 -
 config/identical-files.json                    |  6 +++++-
 ...llTests.ext.yml => InlineTaintTest.ext.yml} |  0
 .../model-summaries/NormalDataflowTest.ext.yml | 18 ++++++++++++++++++
 .../dataflow/model-summaries/qlpack.yml        | 11 -----------
 5 files changed, 23 insertions(+), 13 deletions(-)
 rename python/ql/test/experimental/dataflow/model-summaries/{AllTests.ext.yml => InlineTaintTest.ext.yml} (100%)
 create mode 100644 python/ql/test/experimental/dataflow/model-summaries/NormalDataflowTest.ext.yml
 delete mode 100644 python/ql/test/experimental/dataflow/model-summaries/qlpack.yml

diff --git a/codeql-workspace.yml b/codeql-workspace.yml
index bff93d79bdb..c2258bd1363 100644
--- a/codeql-workspace.yml
+++ b/codeql-workspace.yml
@@ -27,7 +27,6 @@ provide:
   - "swift/extractor-pack/codeql-extractor.yml"
   - "swift/integration-tests/qlpack.yml"
   - "ql/extractor-pack/codeql-extractor.yml"
-  - "python/ql/test/experimental/dataflow/model-summaries/qlpack.yml"
 
 versionPolicies:
   default:
diff --git a/config/identical-files.json b/config/identical-files.json
index 19103323a23..0438b5d1739 100644
--- a/config/identical-files.json
+++ b/config/identical-files.json
@@ -571,5 +571,9 @@
   "EncryptionKeySizes Python/Java": [
     "python/ql/lib/semmle/python/security/internal/EncryptionKeySizes.qll",
     "java/ql/lib/semmle/code/java/security/internal/EncryptionKeySizes.qll"
+  ],
+  "Python model summaries test extension": [
+    "python/ql/test/experimental/dataflow/model-summaries/InlineTaintTest.ext.yml",
+    "python/ql/test/experimental/dataflow/model-summaries/NormalDataflowTest.ext.yml"
   ]
-}
\ No newline at end of file
+}
diff --git a/python/ql/test/experimental/dataflow/model-summaries/AllTests.ext.yml b/python/ql/test/experimental/dataflow/model-summaries/InlineTaintTest.ext.yml
similarity index 100%
rename from python/ql/test/experimental/dataflow/model-summaries/AllTests.ext.yml
rename to python/ql/test/experimental/dataflow/model-summaries/InlineTaintTest.ext.yml
diff --git a/python/ql/test/experimental/dataflow/model-summaries/NormalDataflowTest.ext.yml b/python/ql/test/experimental/dataflow/model-summaries/NormalDataflowTest.ext.yml
new file mode 100644
index 00000000000..3e14c56d735
--- /dev/null
+++ b/python/ql/test/experimental/dataflow/model-summaries/NormalDataflowTest.ext.yml
@@ -0,0 +1,18 @@
+extensions:
+  - addsTo:
+      pack: codeql/python-all
+      extensible: summaryModel
+    data:
+      - ["foo", "Member[MS_identity]", "Argument[0]", "ReturnValue", "value"]
+      - ["foo", "Member[MS_apply_lambda]", "Argument[1]", "Argument[0].Parameter[0]", "value"]
+      - ["foo", "Member[MS_apply_lambda]", "Argument[0].ReturnValue", "ReturnValue", "value"]
+      - ["foo", "Member[MS_reversed]", "Argument[0].ListElement", "ReturnValue.ListElement", "value"]
+      - ["foo", "Member[MS_reversed]", "Argument[0]", "ReturnValue", "taint"]
+      - ["foo", "Member[MS_list_map]", "Argument[1].ListElement", "Argument[0].Parameter[0]", "value"]
+      - ["foo", "Member[MS_list_map]", "Argument[0].ReturnValue", "ReturnValue.ListElement", "value"]
+      - ["foo", "Member[MS_list_map]", "Argument[1]", "ReturnValue", "taint"]
+      - ["foo", "Member[MS_append_to_list]", "Argument[0].ListElement", "ReturnValue.ListElement", "value"]
+      - ["foo", "Member[MS_append_to_list]", "Argument[1]", "ReturnValue.ListElement", "value"]
+      - ["foo", "Member[MS_append_to_list]", "Argument[0]", "ReturnValue", "taint"]
+      - ["foo", "Member[MS_append_to_list]", "Argument[1]", "ReturnValue", "taint"]
+      - ["json", "Member[MS_loads]", "Argument[0]", "ReturnValue", "taint"]
diff --git a/python/ql/test/experimental/dataflow/model-summaries/qlpack.yml b/python/ql/test/experimental/dataflow/model-summaries/qlpack.yml
deleted file mode 100644
index 7e1eb0a97cd..00000000000
--- a/python/ql/test/experimental/dataflow/model-summaries/qlpack.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-name: python-model-summaries-tests
-groups:
-    - python
-    - test
-dependencies:
-    codeql/python-tests: ${workspace}
-extractor: python
-tests: .
-warnOnImplicitThis: true
-dataExtensions:
-  - AllTests.ext.yml