From 777b778409befa0ba120d2fd32f0c1d165ba9849 Mon Sep 17 00:00:00 2001 From: Andrew Eisenberg Date: Wed, 15 Jun 2022 17:18:35 -0700 Subject: [PATCH] Spelling, capitalization, and better descriptions --- .github/query-filter-test/action.yml | 6 +++--- .github/workflows/query-filters.yml | 6 +++--- CHANGELOG.md | 2 +- .../.github/codeql/codeql-config-query-filters1.yml | 4 ++-- .../.github/codeql/codeql-config-query-filters2.yml | 4 ++-- .../.github/codeql/codeql-config-query-filters3.yml | 4 ++-- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/query-filter-test/action.yml b/.github/query-filter-test/action.yml index 805ec76c8..89d5172eb 100644 --- a/.github/query-filter-test/action.yml +++ b/.github/query-filter-test/action.yml @@ -1,9 +1,9 @@ name: Query Filter Test -description: Runs a test of query filters using the check sarif action +description: Runs a test of query filters using the check SARIF action inputs: sarif-file: required: true - description: The sarif file to check + description: The SARIF file to check queries-run: required: true @@ -41,7 +41,7 @@ runs: upload: false env: TEST_MODE: "true" - - name: Check Sarif + - name: Check SARIF uses: ./../action/.github/check-sarif with: sarif-file: ${{ inputs.sarif-file }} diff --git a/.github/workflows/query-filters.yml b/.github/workflows/query-filters.yml index 0a30759b7..693f2b806 100644 --- a/.github/workflows/query-filters.yml +++ b/.github/workflows/query-filters.yml @@ -27,7 +27,7 @@ jobs: with: version: latest - - name: Check Sarif for default queries with Single include, Single exclude + - name: Check SARIF for default queries with Single include, Single exclude uses: ./../action/.github/query-filter-test with: sarif-file: ${{ runner.temp }}/results/javascript.sarif @@ -36,7 +36,7 @@ jobs: config-file: ./.github/codeql/codeql-config-query-filters1.yml tools: ${{ steps.prepare-test.outputs.tools-url }} - - name: Check Sarif for query packs with Single include, Single exclude + - name: Check SARIF for query packs with Single include, Single exclude uses: ./../action/.github/query-filter-test with: sarif-file: ${{ runner.temp }}/results/javascript.sarif @@ -45,7 +45,7 @@ jobs: config-file: ./.github/codeql/codeql-config-query-filters2.yml tools: ${{ steps.prepare-test.outputs.tools-url }} - - name: Check Sarif for query packs and local queries with Single include, Single exclude + - name: Check SARIF for query packs and local queries with Single include, Single exclude uses: ./../action/.github/query-filter-test with: sarif-file: ${{ runner.temp }}/results/javascript.sarif diff --git a/CHANGELOG.md b/CHANGELOG.md index b136534e3..97f31a473 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## [UNRELEASED] -- Add the ability to filter queries from a code scanning run by using the `query-filters` option in the code scanning configuration file.[#1098](https://github.com/github/codeql-action/pull/1098) +- Add the ability to filter queries from a code scanning run by using the `query-filters` option in the code scanning configuration file. [#1098](https://github.com/github/codeql-action/pull/1098) ## 2.1.12 - 01 Jun 2022 diff --git a/tests/multi-language-repo/.github/codeql/codeql-config-query-filters1.yml b/tests/multi-language-repo/.github/codeql/codeql-config-query-filters1.yml index 811b9c2f8..d0376a1b2 100644 --- a/tests/multi-language-repo/.github/codeql/codeql-config-query-filters1.yml +++ b/tests/multi-language-repo/.github/codeql/codeql-config-query-filters1.yml @@ -1,10 +1,10 @@ -name: "CodeQL config 1" +name: "Check SARIF for default queries with Single include, Single exclude" query-filters: # This should run js/path-injection and js/zipslip - include: tags contain: external/cwe/cwe-022 -# Removes out js/path-injection +# Removes js/path-injection - exclude: id: js/path-injection diff --git a/tests/multi-language-repo/.github/codeql/codeql-config-query-filters2.yml b/tests/multi-language-repo/.github/codeql/codeql-config-query-filters2.yml index 219b809bc..8f9321c86 100644 --- a/tests/multi-language-repo/.github/codeql/codeql-config-query-filters2.yml +++ b/tests/multi-language-repo/.github/codeql/codeql-config-query-filters2.yml @@ -1,4 +1,4 @@ -name: "CodeQL config 2" +name: "Check SARIF for query packs with Single include, Single exclude" disable-default-queries: true @@ -12,7 +12,7 @@ query-filters: - include: tags contain: external/cwe/cwe-022 -# Removes out js/path-injection +# Removes js/path-injection - exclude: id: js/path-injection diff --git a/tests/multi-language-repo/.github/codeql/codeql-config-query-filters3.yml b/tests/multi-language-repo/.github/codeql/codeql-config-query-filters3.yml index 482860ab0..e3ec3b32d 100644 --- a/tests/multi-language-repo/.github/codeql/codeql-config-query-filters3.yml +++ b/tests/multi-language-repo/.github/codeql/codeql-config-query-filters3.yml @@ -1,4 +1,4 @@ -name: "CodeQL config 3" +name: "Check SARIF for query packs and local queries with Single include, Single exclude" disable-default-queries: true @@ -22,7 +22,7 @@ query-filters: - include: tags contain: external/cwe/cwe-022 -# Removes out js/path-injection +# Removes js/path-injection - exclude: id: js/path-injection