Merge branch 'main' into mdk/rfc-9535

Author: ralfhandl

.github/CODEOWNERS

@@ -1 +1 @@
-* @oai/tsc @OAI/overlay-maintainers
+* @OAI/overlay-maintainers

.github/workflows/agenda.yaml

@@ -7,12 +7,15 @@ on:
     - cron: '0 17 * * 2'
 
 jobs:
-  create-discussion:
-    permissions:
-      discussions: write
+  get-next-dates:
+    permissions: {}
     runs-on: ubuntu-22.04
+    outputs:
+      meeting_dates: ${{ steps.get-next-meeting-dates.outputs.MEETING_DATES }}
+    env:
+      NUMBER_OF_INSTANCES: 2
+      MEETING_INTERVAL_WEEKS: 2
     steps:
-      - uses: actions/checkout@v5
       - name: Check if it's an alternate week
         id: check-week
         run: |
@@ -26,37 +29,109 @@ jobs:
             echo "Skipping odd week: $WEEK_NUMBER"
             echo "should_run=false" >> $GITHUB_OUTPUT
           fi
-      - name: Get agenda text from template
+      - name: Get Next Meeting Dates
         if: steps.check-week.outputs.should_run == 'true'
+        id: get-next-meeting-dates
+        run: |
+          # Generate multiple meeting dates based on NUMBER_OF_INSTANCES
+          MEETING_DATES="["
+          for i in $(seq 1 $NUMBER_OF_INSTANCES); do
+            # Calculate the date for the i-th Tuesday from now
+            # For i=1, get next Tuesday; for i=2, get Tuesday after next, etc.
+            WEEKS_AHEAD=$(((i - 1)*MEETING_INTERVAL_WEEKS))
+            if [ $i -eq 1 ]; then
+              DATE_CMD="next Tuesday"
+            else
+              DATE_CMD="next Tuesday +${WEEKS_AHEAD} weeks"
+            fi
+            MEETING_DATE=$(date -d "$DATE_CMD" +%Y-%m-%d)
+            if [ $i -eq 1 ]; then
+              MEETING_DATES="$MEETING_DATES\"$MEETING_DATE\""
+            else
+              MEETING_DATES="$MEETING_DATES,\"$MEETING_DATE\""
+            fi
+          done
+          MEETING_DATES="$MEETING_DATES]"
+          echo "MEETING_DATES=$MEETING_DATES" >> $GITHUB_OUTPUT
+      - name: Set No Next Meeting Dates
+        if: steps.check-week.outputs.should_run == 'false'
+        run: |
+          echo "MEETING_DATES=[]" >> $GITHUB_OUTPUT
+
+  create-discussion:
+    needs: get-next-dates
+    strategy:
+      matrix:
+        next_meeting_date: ${{ fromJson(needs.get-next-dates.outputs.meeting_dates) }}
+    runs-on: ubuntu-22.04
+    env:
+      CATEGORY_ID: 'DIC_kwDOFXMeLs4COVB8'
+      REPOSITORY_ID: 'MDEwOlJlcG9zaXRvcnkzNTk4NjU5MDI='
+    permissions:
+      discussions: write
+      contents: read
+    steps:
+      - uses: actions/checkout@v5
+      - name: Get agenda text from template
         id: get-agenda
         run: |
           echo 'AGENDA<<EOF' >> $GITHUB_ENV
           cat .github/templates/agenda.md >> $GITHUB_ENV
           echo 'EOF' >> $GITHUB_ENV
-      - name: Get Next Meeting Date
-        if: steps.check-week.outputs.should_run == 'true'
-        id: get-next-meeting-date
+      - name: Define discussion title
+        id: define-title
+        run: |
+          DISCUSSION_TITLE="Overlays Meeting (${{ matrix.next_meeting_date }})"
+          echo "DISCUSSION_TITLE=$DISCUSSION_TITLE" >> $GITHUB_ENV
+      - name: Search for existing discussion
+        id: search-discussion
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
-          NEXT_MEETING_DATE=$(date -d "next Tuesday" +%Y-%m-%d)
-          echo "NEXT_MEETING_DATE=$NEXT_MEETING_DATE" >> $GITHUB_ENV
+          FOUND_DISCUSSIONS=$(gh api graphql -f query='
+            query SearchDiscussionMutation ($repositoryOwner: String!, $repositoryName: String!, $categoryId: ID!) {
+              repository(owner: $repositoryOwner, name: $repositoryName) {
+                discussions(first: 10, orderBy: {direction: DESC, field: CREATED_AT}, categoryId: $categoryId) {
+                  nodes {
+                    title
+                  }
+                }
+              }
+            }' \
+            -f repositoryOwner="${{ github.repository_owner }}" \
+            -f repositoryName="${{ github.event.repository.name }}" \
+            -f categoryId="${{ env.CATEGORY_ID }}" \
+            --jq '.data.repository.discussions.nodes[].title')
+          
+          DISCUSSION_COUNT=0
+          TARGET_TITLE="${{ env.DISCUSSION_TITLE }}"
+          
+          # Iterate through all returned discussion titles
+          while IFS= read -r discussion_title; do
+            if [ "$discussion_title" = "$TARGET_TITLE" ]; then
+              DISCUSSION_COUNT=1
+              break
+            fi
+          done <<< "$FOUND_DISCUSSIONS"
+          
+          echo "DISCUSSION_COUNT=$DISCUSSION_COUNT" >> $GITHUB_OUTPUT
+          echo "Found $DISCUSSION_COUNT existing discussions with title: $TARGET_TITLE"
       - name: Create discussion with agenda
-        if: steps.check-week.outputs.should_run == 'true'
+        if: steps.search-discussion.outputs.DISCUSSION_COUNT == '0'
         id: create-repository-discussion
-        uses: octokit/[email protected]
         env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        with:
-          variables: | 
-            body: "${{ env.AGENDA }}"
-            title: "Overlays Meeting (${{ env.NEXT_MEETING_DATE }})"
-            repositoryId: 'MDEwOlJlcG9zaXRvcnkzNTk4NjU5MDI='
-            categoryId: 'DIC_kwDOFXMeLs4COVB8'
-          query: |
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          gh api graphql -f query='
             mutation CreateDiscussionMutation ($title: String!, $body: String!, $repositoryId: ID!, $categoryId: ID!) {
               createDiscussion(input: { title: $title, body: $body, repositoryId: $repositoryId, categoryId: $categoryId }) {
                 discussion {
                   title
+                  url
                 }
               }
-            }
-
+            }' \
+            -f title="${{ env.DISCUSSION_TITLE }}" \
+            -f body="${{ env.AGENDA }}" \
+            -f repositoryId="${{ env.REPOSITORY_ID }}" \
+            -f categoryId="${{ env.CATEGORY_ID }}"

.github/workflows/check-restricted-files.yaml

@@ -33,6 +33,6 @@ jobs:
 
           echo This PR contains changes to files that should not be changed:
           echo
-          git diff --compact-summary origin/${{ github.event.pull_request.base.ref }} origin/${{ github.event.pull_request.head.ref }} -- versions/[0-9].[0-9].[0-9].md
+          git diff --compact-summary origin/${{ github.event.pull_request.base.ref }} -- versions/[0-9].[0-9].[0-9].md
 
           exit 1

.github/workflows/validate-markdown.yaml

@@ -13,20 +13,24 @@ on:
   workflow_dispatch: {}
 
 jobs:
-  mdv:
+  lint:
     runs-on: ubuntu-latest
 
     steps:
       - uses: actions/checkout@v5 # checkout repo content
         with:
           fetch-depth: 0
-      # - name: use the javascript environment from main
-      #   run: |
-      #     git checkout remotes/origin/main -- package.json package-lock.json .markdownlint.yaml
+
       - uses: actions/setup-node@v6 # setup Node.js
         with:
           node-version: "22.x"
-      - name: Validate markdown
-        run: npx --yes mdv versions/*.md
+
       - name: Lint markdown
-        run: npx --yes markdownlint-cli --config .markdownlint.yaml versions/*.md
+        run: npx --yes markdownlint-cli2 --config .markdownlint.yaml npx markdownlint-cli2 *.md schemas/**/*.md versions/*.md
+
+      - name: Check links in markdown files
+        uses: umbrelladocs/action-linkspector@v1
+        with:
+          reporter: github-check
+          fail_level: any
+          filter_mode: file

.linkspector.yml

@@ -0,0 +1,3 @@
+dirs:
+  - ./
+useGitIgnore: true

CONTRIBUTING.md

@@ -34,10 +34,11 @@ Pull requests must come from a fork; create a fresh branch on your fork based on
 
 Overview of branches:
 
-The `main` branch holds 
+The `main` branch holds
+
 - published versions of the specification, named `versions/X.Y.Z.md`,
 - work-in-progress versions of the specification, named `versions/X.Y.Z-dev.md`,
-- sources for published schema versions in  `schemas/vX.Y` folders and their tests in `tests/vX.Y` folders,
+- sources for published schema versions in `schemas/vX.Y` folders and their tests in `tests/vX.Y` folders,
 - sources for work-in-progress schema versions in `schemas/vX.Y-dev` folders and their tests in `tests/vX.Y-dev` folders,
 - utility scripts and supporting documentation.
 

EDITORS.md

@@ -2,14 +2,14 @@
 
 ## Active
 
-* Lorna Mitchell [@lornajane](https://github.com/lornajane)
-* Mike Kistler [@mikekistler](https://github.com/mikekistler)
-* Vincent Biret [@baywet](https://github.com/baywet)
+- Lorna Mitchell [@lornajane](https://github.com/lornajane)
+- Mike Kistler [@mikekistler](https://github.com/mikekistler)
+- Vincent Biret [@baywet](https://github.com/baywet)
 
 ## Emeritus
 
-* Darrel Miller [@darrelmiller](https://github.com/darrelmiller)
-* Greg Dennis [@gregsdennis](https://github.com/gregsdennis)
-* Kevin Swiber [@kevinswiber](https://github.com/kevinswiber)
-* Mike Ralphson [@MikeRalphson](https://github.com/MikeRalphson)
-* Ron Ratovsky [@webron](https://github.com/webron)
+- Darrel Miller [@darrelmiller](https://github.com/darrelmiller)
+- Greg Dennis [@gregsdennis](https://github.com/gregsdennis)
+- Kevin Swiber [@kevinswiber](https://github.com/kevinswiber)
+- Mike Ralphson [@MikeRalphson](https://github.com/MikeRalphson)
+- Ron Ratovsky [@webron](https://github.com/webron)

README.md

@@ -30,6 +30,24 @@ If you are looking for tools to use with Overlays, try these:
 
 (Is something missing from the list? Send us a pull request to add it!)
 
+## Support for RFC9535 JSONPath
+
+[RFC9535](https://www.rfc-editor.org/rfc/rfc9535) is a recent specification and libraries implementing JSONPath support might predate the RFC. Those libraries might differ entirely (expressions syntax is incompatible), implement additional capabilities (superset of the RFC), or support only a subset of the RFC.
+
+In case the tool being use is not fully compliant with RFC9535, users MIGHT have to update some JSONPath query expressions to accommodate for the implementation in use.
+
+This example JSONPath query expression:
+
+```jsonpath
+$.paths.*.get.parameters[[email protected]=='filter' && @.in=='query']
+```
+
+might require additional optional parenthesis with some implementations like so:
+
+```jsonpath
+$.paths.*.get.parameters[?(@.name=='filter' && @.in=='query)']
+```
+
 ## Licensing
 
 See: [License (Apache-2.0)](./LICENSE)