From f268ce0bd9195ec0645d50afbbc10633c990cf13 Mon Sep 17 00:00:00 2001 From: Thomas Pierce Date: Mon, 22 Sep 2025 19:31:23 -0700 Subject: [PATCH 1/5] Update pr-build.yml --- .github/workflows/pr-build.yml | 37 +++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index f5a149112..d0c929197 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -21,4 +21,39 @@ jobs: uses: gradle/actions/setup-gradle@v3 - name: Build with Gradle - run: ./gradlew build \ No newline at end of file + run: ./gradlew build + + all-pr-checks-pass: + runs-on: ubuntu-latest + needs: [build] + if: always() + steps: + - name: Checkout to get workflow file + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #5.0.0 + + - name: Check all jobs succeeded and none missing + run: | + # Check if all needed jobs succeeded + results='${{ toJSON(needs) }}' + if echo "$results" | jq -r '.[] | .result' | grep -v success; then + echo "Some jobs failed" + exit 1 + fi + + # Extract all job names from workflow (excluding this gate job) + all_jobs=$(yq eval '.jobs | keys | .[]' .github/workflows/pr-build.yml | grep -v "all-pr-checks-pass" | sort) + + # Extract job names from needs array + needed_jobs='${{ toJSON(needs) }}' + needs_list=$(echo "$needed_jobs" | jq -r 'keys[]' | sort) + + # Check if any jobs are missing from needs + missing_jobs=$(comm -23 <(echo "$all_jobs") <(echo "$needs_list")) + if [ -n "$missing_jobs" ]; then + echo "ERROR: Jobs missing from needs array in all-pr-checks-pass:" + echo "$missing_jobs" + echo "Please add these jobs to the needs array of all-pr-checks-pass" + exit 1 + fi + + echo "All checks passed and no jobs missing from gate!" From 9ebcd3c39dbf7f5c9dcf18ab7b20c1a5c54393e1 Mon Sep 17 00:00:00 2001 From: Thomas Pierce Date: Mon, 22 Sep 2025 19:38:02 -0700 Subject: [PATCH 2/5] add codql --- .github/workflows/codeql.yml | 141 +++++++++++++++++++++++++++++++++++ 1 file changed, 141 insertions(+) create mode 100644 .github/workflows/codeql.yml diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml new file mode 100644 index 000000000..2443d3fdb --- /dev/null +++ b/.github/workflows/codeql.yml @@ -0,0 +1,141 @@ +# For most projects, this workflow file will not need changing; you simply need +# to commit it to your repository. +# +# You may wish to alter this file to override the set of languages analyzed, +# or to provide custom queries or build logic. +# +# ******** NOTE ******** +# We have attempted to detect the languages in your repository. Please check +# the `language` matrix defined below to confirm you have the correct set of +# supported CodeQL languages. +# +name: "CodeQL Advanced" + +on: + push: + branches: [ "main", "release/*" ] + pull_request: + branches: [ "main", "release/*" ] + schedule: + - cron: '33 6 * * 1' + +jobs: + analyze: + name: Analyze (${{ matrix.language }}) + # Runner size impacts CodeQL analysis time. To learn more, please see: + # - https://gh.io/recommended-hardware-resources-for-running-codeql + # - https://gh.io/supported-runners-and-hardware-resources + # - https://gh.io/using-larger-runners (GitHub.com only) + # Consider using larger runners or machines with greater resources for possible analysis time improvements. + runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }} + permissions: + # required for all workflows + security-events: write + + # required to fetch internal or private CodeQL packs + packages: read + + # only required for workflows in private repositories + actions: read + contents: read + + strategy: + fail-fast: false + matrix: + include: + - language: actions + build-mode: none + - language: csharp + build-mode: none + - language: java-kotlin + build-mode: none # This mode only analyzes Java. Set this to 'autobuild' or 'manual' to analyze Kotlin too. + - language: javascript-typescript + build-mode: none + - language: python + build-mode: none + # CodeQL supports the following values keywords for 'language': 'actions', 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'rust', 'swift' + # Use `c-cpp` to analyze code written in C, C++ or both + # Use 'java-kotlin' to analyze code written in Java, Kotlin or both + # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both + # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis, + # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning. + # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how + # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + # Add any setup steps before running the `github/codeql-action/init` action. + # This includes steps like installing compilers or runtimes (`actions/setup-node` + # or others). This is typically only required for manual builds. + # - name: Setup runtime (example) + # uses: actions/setup-example@v1 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v3 + with: + languages: ${{ matrix.language }} + build-mode: ${{ matrix.build-mode }} + # If you wish to specify custom queries, you can do so here or in a config file. + # By default, queries listed here will override any specified in a config file. + # Prefix the list here with "+" to use these queries and those in the config file. + + # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs + # queries: security-extended,security-and-quality + + # If the analyze step fails for one of the languages you are analyzing with + # "We were unable to automatically build your code", modify the matrix above + # to set the build mode to "manual" for that language. Then modify this step + # to build your code. + # ℹī¸ Command-line programs to run using the OS shell. + # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun + - if: matrix.build-mode == 'manual' + shell: bash + run: | + echo 'If you are using a "manual" build mode for one or more of the' \ + 'languages you are analyzing, replace this with the commands to build' \ + 'your code, for example:' + echo ' make bootstrap' + echo ' make release' + exit 1 + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v3 + with: + category: "/language:${{matrix.language}}" + + all-codeql-checks-pass: + runs-on: ubuntu-latest + needs: [analyze] + if: always() + steps: + - name: Checkout to get workflow file + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #5.0.0 + + - name: Check all jobs succeeded and none missing + run: | + # Check if all needed jobs succeeded + results='${{ toJSON(needs) }}' + if echo "$results" | jq -r '.[] | .result' | grep -v success; then + echo "Some jobs failed" + exit 1 + fi + + # Extract all job names from workflow (excluding this gate job) + all_jobs=$(yq eval '.jobs | keys | .[]' .github/workflows/codeql.yml | grep -v "all-codeql-checks-pass" | sort) + + # Extract job names from needs array + needed_jobs='${{ toJSON(needs) }}' + needs_list=$(echo "$needed_jobs" | jq -r 'keys[]' | sort) + + # Check if any jobs are missing from needs + missing_jobs=$(comm -23 <(echo "$all_jobs") <(echo "$needs_list")) + if [ -n "$missing_jobs" ]; then + echo "ERROR: Jobs missing from needs array in all-codeql-checks-pass:" + echo "$missing_jobs" + echo "Please add these jobs to the needs array of all-codeql-checks-pass" + exit 1 + fi + + echo "All CodeQL checks passed and no jobs missing from gate!" \ No newline at end of file From 3a3a3f14395a4b49ed6edfb6d19ea55df3f5ee9d Mon Sep 17 00:00:00 2001 From: Thomas Pierce Date: Mon, 22 Sep 2025 19:45:44 -0700 Subject: [PATCH 3/5] fix --- aws-application-signals-test-framework.sln | 39 ++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 aws-application-signals-test-framework.sln diff --git a/aws-application-signals-test-framework.sln b/aws-application-signals-test-framework.sln new file mode 100644 index 000000000..00d15c1fb --- /dev/null +++ b/aws-application-signals-test-framework.sln @@ -0,0 +1,39 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.5.2.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample-apps", "sample-apps", "{9620DEB7-9EDC-A275-A5A9-C1B625303503}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet", "dotnet", "{CE3F8608-FC11-D0E7-168E-A1FEAA9053EC}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "asp_remote_service", "sample-apps\dotnet\asp_remote_service\asp_remote_service.csproj", "{7DB37DA4-8925-1A12-9299-5D1F6A3A54C5}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "asp_frontend_service", "sample-apps\dotnet\asp_frontend_service\asp_frontend_service.csproj", "{FE31B878-A9AF-CA9E-3DE6-DAEB1DC37FDF}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {7DB37DA4-8925-1A12-9299-5D1F6A3A54C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7DB37DA4-8925-1A12-9299-5D1F6A3A54C5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7DB37DA4-8925-1A12-9299-5D1F6A3A54C5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7DB37DA4-8925-1A12-9299-5D1F6A3A54C5}.Release|Any CPU.Build.0 = Release|Any CPU + {FE31B878-A9AF-CA9E-3DE6-DAEB1DC37FDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FE31B878-A9AF-CA9E-3DE6-DAEB1DC37FDF}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FE31B878-A9AF-CA9E-3DE6-DAEB1DC37FDF}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FE31B878-A9AF-CA9E-3DE6-DAEB1DC37FDF}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {CE3F8608-FC11-D0E7-168E-A1FEAA9053EC} = {9620DEB7-9EDC-A275-A5A9-C1B625303503} + {7DB37DA4-8925-1A12-9299-5D1F6A3A54C5} = {CE3F8608-FC11-D0E7-168E-A1FEAA9053EC} + {FE31B878-A9AF-CA9E-3DE6-DAEB1DC37FDF} = {CE3F8608-FC11-D0E7-168E-A1FEAA9053EC} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {3E50A6B2-0E50-43B6-91B1-7DC7842716C3} + EndGlobalSection +EndGlobal From 8e37d3cd2b7684c23a4dd6566c33cc468381628d Mon Sep 17 00:00:00 2001 From: Thomas Pierce Date: Mon, 22 Sep 2025 19:51:58 -0700 Subject: [PATCH 4/5] fix --- .github/workflows/codeql.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 2443d3fdb..b2061e135 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -63,7 +63,7 @@ jobs: # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages steps: - name: Checkout repository - uses: actions/checkout@v4 + uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 #5.0.0 # Add any setup steps before running the `github/codeql-action/init` action. # This includes steps like installing compilers or runtimes (`actions/setup-node` @@ -73,7 +73,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v3 + uses: github/codeql-action/init@16df4fbc19aea13d921737861d6c622bf3cefe23 #v2.23.0 with: languages: ${{ matrix.language }} build-mode: ${{ matrix.build-mode }} @@ -101,7 +101,7 @@ jobs: exit 1 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v3 + uses: github/codeql-action/analyze@16df4fbc19aea13d921737861d6c622bf3cefe23 #v2.23.0 with: category: "/language:${{matrix.language}}" From 60ac9f9a2a477e338ce36c34a4b2ed7e90093b84 Mon Sep 17 00:00:00 2001 From: Thomas Pierce Date: Mon, 22 Sep 2025 19:52:58 -0700 Subject: [PATCH 5/5] remove file --- aws-application-signals-test-framework.sln | 39 ---------------------- 1 file changed, 39 deletions(-) delete mode 100644 aws-application-signals-test-framework.sln diff --git a/aws-application-signals-test-framework.sln b/aws-application-signals-test-framework.sln deleted file mode 100644 index 00d15c1fb..000000000 --- a/aws-application-signals-test-framework.sln +++ /dev/null @@ -1,39 +0,0 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.5.2.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sample-apps", "sample-apps", "{9620DEB7-9EDC-A275-A5A9-C1B625303503}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dotnet", "dotnet", "{CE3F8608-FC11-D0E7-168E-A1FEAA9053EC}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "asp_remote_service", "sample-apps\dotnet\asp_remote_service\asp_remote_service.csproj", "{7DB37DA4-8925-1A12-9299-5D1F6A3A54C5}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "asp_frontend_service", "sample-apps\dotnet\asp_frontend_service\asp_frontend_service.csproj", "{FE31B878-A9AF-CA9E-3DE6-DAEB1DC37FDF}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7DB37DA4-8925-1A12-9299-5D1F6A3A54C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7DB37DA4-8925-1A12-9299-5D1F6A3A54C5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7DB37DA4-8925-1A12-9299-5D1F6A3A54C5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7DB37DA4-8925-1A12-9299-5D1F6A3A54C5}.Release|Any CPU.Build.0 = Release|Any CPU - {FE31B878-A9AF-CA9E-3DE6-DAEB1DC37FDF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FE31B878-A9AF-CA9E-3DE6-DAEB1DC37FDF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FE31B878-A9AF-CA9E-3DE6-DAEB1DC37FDF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FE31B878-A9AF-CA9E-3DE6-DAEB1DC37FDF}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {CE3F8608-FC11-D0E7-168E-A1FEAA9053EC} = {9620DEB7-9EDC-A275-A5A9-C1B625303503} - {7DB37DA4-8925-1A12-9299-5D1F6A3A54C5} = {CE3F8608-FC11-D0E7-168E-A1FEAA9053EC} - {FE31B878-A9AF-CA9E-3DE6-DAEB1DC37FDF} = {CE3F8608-FC11-D0E7-168E-A1FEAA9053EC} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {3E50A6B2-0E50-43B6-91B1-7DC7842716C3} - EndGlobalSection -EndGlobal