From e0c716339f8f9542e457d563e0420e2bda39f00f Mon Sep 17 00:00:00 2001 From: Michael Mainer Date: Fri, 29 Sep 2023 12:50:00 -0700 Subject: [PATCH 1/4] chore: enable codeql --- .github/workflows/codeql.yml | 82 ++++++++++++++++++++++++++++++++++++ 1 file changed, 82 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 00000000000..aa28d9bc62a --- /dev/null +++ b/.github/workflows/codeql.yml @@ -0,0 +1,82 @@ +# 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" + +on: + push: + branches: [ "main" ] + pull_request: + # The branches below must be a subset of the branches above + branches: [ "main" ] + schedule: + - cron: 1 * * * 1 # At minute 0 on Monday + +jobs: + analyze: + name: Analyze + # 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 + # Consider using larger runners for possible analysis time improvements. + runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }} + timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }} + permissions: + actions: read + contents: read + security-events: write + + strategy: + fail-fast: false + matrix: + language: [ 'csharp' ] + # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby', 'swift' ] + # Use only 'java' to analyze code written in Java, Kotlin or both + # Use only 'javascript' to analyze code written in JavaScript, TypeScript or both + # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support + + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + # Initializes the CodeQL tools for scanning. + - name: Initialize CodeQL + uses: github/codeql-action/init@v2 + with: + languages: ${{ matrix.language }} + # 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 + + + # Autobuild attempts to build any compiled languages (C/C++, C#, Go, Java, or Swift). + # If this step fails, then you should remove it and run the build manually (see below) + - name: Autobuild + uses: github/codeql-action/autobuild@v2 + + # ℹī¸ 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 the Autobuild fails above, remove it and uncomment the following three lines. + # modify them (or add more) to build your code if your project, please refer to the EXAMPLE below for guidance. + + # - run: | + # echo "Run, Build Application using script" + # ./location_of_script_within_repo/buildscript.sh + + - name: Perform CodeQL Analysis + uses: github/codeql-action/analyze@v2 + with: + category: "/language:${{matrix.language}}" From 48163ee8c003a6ebf6c38cce479a1e6a13fd962e Mon Sep 17 00:00:00 2001 From: Michael Mainer Date: Fri, 29 Sep 2023 12:50:43 -0700 Subject: [PATCH 2/4] chore: add issue management workflow --- .github/policies/resourceManagement.yml | 156 ++++++++++++++++++++++++ 1 file changed, 156 insertions(+) create mode 100644 .github/policies/resourceManagement.yml diff --git a/.github/policies/resourceManagement.yml b/.github/policies/resourceManagement.yml new file mode 100644 index 00000000000..7cca242fd5f --- /dev/null +++ b/.github/policies/resourceManagement.yml @@ -0,0 +1,156 @@ +id: +name: GitOps.PullRequestIssueManagement +description: GitOps.PullRequestIssueManagement primitive +owner: +resource: repository +disabled: false +where: +configuration: + resourceManagementConfiguration: + scheduledSearches: + - description: + frequencies: + - hourly: + hour: 1 + filters: + - isIssue + - isOpen + - hasLabel: + label: 'Needs: Author Feedback' + - hasLabel: + label: 'Status: No Recent Activity' + - noActivitySince: + days: 3 + - isNotLabeledWith: + label: Service Bug + actions: + - closeIssue + - description: + frequencies: + - hourly: + hour: 1 + filters: + - isIssue + - isOpen + - hasLabel: + label: 'Needs: Author Feedback' + - noActivitySince: + days: 4 + - isNotLabeledWith: + label: 'Status: No Recent Activity' + - isNotLabeledWith: + label: Service Bug + actions: + - addLabel: + label: 'Status: No Recent Activity' + - addReply: + reply: This issue has been automatically marked as stale because it has been marked as requiring author feedback but has not had any activity for **4 days**. It will be closed if no further activity occurs **within 3 days of this comment**. + - description: + frequencies: + - hourly: + hour: 1 + filters: + - isIssue + - isOpen + - hasLabel: + label: duplicate + - noActivitySince: + days: 1 + actions: + - addReply: + reply: This issue has been marked as duplicate and has not had any activity for **1 day**. It will be closed for housekeeping purposes. + - closeIssue + - description: + frequencies: + - hourly: + hour: 1 + filters: + - isOpen + - hasLabel: + label: 'API: Graph' + - noActivitySince: + days: 14 + actions: + - addLabel: + label: Service issue + - addReply: + reply: >- + Hello @${issueAuthor} + + + Thank you for reporting your concern. Unfortunately, we in the Graph Explorer team do not have any ownership of the APIs that are causing you issues. If you report this issue in the Microsoft Q&A forum, it will get routed to the appropriate team for them to triage. + + + https://aka.ms/askgraph + eventResponderTasks: + - if: + - payloadType: Issues + - and: + - isOpen + - not: + and: + - isAssignedToSomeone + - isLabeled + then: + - addLabel: + label: 'ToTriage' + - if: + - payloadType: Issue_Comment + - isAction: + action: Created + - isActivitySender: + issueAuthor: True + - hasLabel: + label: 'Needs: Author Feedback' + then: + - addLabel: + label: "Needs: Attention \U0001F44B" + - removeLabel: + label: 'Needs: Author Feedback' + description: + - if: + - payloadType: Issues + - not: + isAction: + action: Closed + - hasLabel: + label: 'Status: No Recent Activity' + then: + - removeLabel: + label: 'Status: No Recent Activity' + description: + - if: + - payloadType: Issue_Comment + - activitySenderHasAssociation: + association: Contributor + - bodyContains: + pattern: '?' + isRegex: False + - bodyContains: + pattern: '@' + isRegex: False + then: + - addLabel: + label: 'Needs: Author Feedback' + description: + - if: + - payloadType: Issue_Comment + - hasLabel: + label: 'API: Graph' + then: + - addReply: + reply: >- + Hello @${issueAuthor} + + + Thank you for reporting your concern. Unfortunately, we in the Graph Explorer team do not have any ownership of the APIs that are causing you issues. If you report this issue in the Microsoft Q&A forum, it will get routed to the appropriate team for them to triage. + + https://aka.ms/askgraph + + This issue will now be closed. If you encounter any issues with Graph Explorer in the future, please feel free to open an issue. + - addLabel: + label: Service issue + - closeIssue + description: +onFailure: +onSuccess: From e24205397f341121ef648ca8b5196d6c0dc55f0c Mon Sep 17 00:00:00 2001 From: Michael Mainer Date: Fri, 29 Sep 2023 12:52:02 -0700 Subject: [PATCH 3/4] chore: update branch protection rules --- .github/policies/msgraph-cli-branch-protection.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/policies/msgraph-cli-branch-protection.yml b/.github/policies/msgraph-cli-branch-protection.yml index 9af7fc0050e..6ab6766e9e7 100644 --- a/.github/policies/msgraph-cli-branch-protection.yml +++ b/.github/policies/msgraph-cli-branch-protection.yml @@ -30,15 +30,16 @@ configuration: # Are commits required to be signed. boolean. TODO: all contributors must have commit signing on local machines. requiresCommitSignatures: false # Are conversations required to be resolved before merging? boolean - requiresConversationResolution: false + requiresConversationResolution: true # Are merge commits prohibited from being pushed to this branch. boolean requiresLinearHistory: false # Required status checks to pass before merging. Values can be any string, but if the value does not correspond to any existing status check, the status check will be stuck on pending for status since nothing exists to push an actual status requiredStatusChecks: - license/cla - Microsoft Graph CLI - Release + - CodeQL # Require branches to be up to date before merging. Requires requiredStatusChecks. boolean - requiresStrictStatusChecks: false + requiresStrictStatusChecks: true # Indicates whether there are restrictions on who can push. boolean. Should be set with whoCanPush. restrictsPushes: false # Restrict who can dismiss pull request reviews. boolean From e50ad61e1c184c612f84925e578f1979a49dd74a Mon Sep 17 00:00:00 2001 From: Michael Mainer <8527305+MIchaelMainer@users.noreply.github.com> Date: Tue, 10 Oct 2023 13:26:55 -0700 Subject: [PATCH 4/4] Update resourceManagement.yml --- .github/policies/resourceManagement.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/policies/resourceManagement.yml b/.github/policies/resourceManagement.yml index 7cca242fd5f..ee9483325c9 100644 --- a/.github/policies/resourceManagement.yml +++ b/.github/policies/resourceManagement.yml @@ -78,7 +78,7 @@ configuration: Hello @${issueAuthor} - Thank you for reporting your concern. Unfortunately, we in the Graph Explorer team do not have any ownership of the APIs that are causing you issues. If you report this issue in the Microsoft Q&A forum, it will get routed to the appropriate team for them to triage. + Thank you for reporting your concern. If you report this issue in the Microsoft Q&A forum, it will get routed to the appropriate team for them to triage. https://aka.ms/askgraph @@ -143,11 +143,11 @@ configuration: Hello @${issueAuthor} - Thank you for reporting your concern. Unfortunately, we in the Graph Explorer team do not have any ownership of the APIs that are causing you issues. If you report this issue in the Microsoft Q&A forum, it will get routed to the appropriate team for them to triage. + Thank you for reporting your concern. If you report this issue in the Microsoft Q&A forum, it will get routed to the appropriate team for them to triage. https://aka.ms/askgraph - This issue will now be closed. If you encounter any issues with Graph Explorer in the future, please feel free to open an issue. + This issue will now be closed. If you encounter any issues in the future, please feel free to open an issue. - addLabel: label: Service issue - closeIssue