Merge remote-tracking branch 'upstream/master' into feat/net9.0-support

Author: mattkelly1991

.github/CODEOWNERS

@@ -0,0 +1,2 @@
+# All files should be reviewed by a member of the SDKs team
+* @stripe/api-library-reviewers

.github/workflows/ci.yml

@@ -21,9 +21,11 @@ jobs:
   build:
     name: Build and test
 
-    runs-on: ubuntu-latest
+    # TODO: this step is not compatible with ubuntu 24 LTS, so we pin the version here instead of using ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
+      - uses: extractions/setup-just@v2
       - uses: actions/checkout@master
 
       - name: Setup .NET
@@ -44,55 +46,55 @@ jobs:
       - name: Build Release
         run: dotnet build src -c Release /p:ContinuousIntegrationBuild=true
 
-      - name: Build Debug
-        run: dotnet build src -c Debug
-
-      - uses: stripe/openapi/actions/stripe-mock@master
-
-      - name: Run test suite
-        run: make ci-test
+      - name: Determine OpenAPI versions and extract specs
+        run: |
+          set -e -o pipefail
+
+          CURL_OPTS=(--retry 3 \
+            --retry-all-errors \
+            --fail \
+            --verbose \
+            --no-progress-meter \
+            --show-error)
+
+          LATEST_OPENAPI_VERSION=$(curl https://api.github.com/repos/stripe/openapi/releases/latest -s | jq .name -r)
+          CURRENT_OPENAPI_VERSION=$(cat OPENAPI_VERSION)
+          if [[ "$PR_BODY" == *"TEST USING LATEST OPENAPI"* ]]; then
+            OPENAPI_VERSION=$LATEST_OPENAPI_VERSION
+          else
+            OPENAPI_VERSION=$CURRENT_OPENAPI_VERSION
+          fi
 
-      - name: Run test suite (Debug)
-        run: make ci-test-debug
+          CURRENT_OPENAPI_SPEC=$(realpath latest.yaml)
+          CURRENT_OPENAPI_SPEC_JSON=${CURRENT_OPENAPI_SPEC%.yaml}.json
+          CURRENT_FIXTURES_JSON=${CURRENT_OPENAPI_SPEC%/*}/fixtures.json
 
-      - name: Collect coverage
-        run: dotnet test --no-build -c Debug -f netcoreapp3.1 src/StripeTests/StripeTests.csproj /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:ExcludeByAttribute=CompilerGenerated
+          SPEC_NAME="spec3.sdk.yaml"
+          FIXTURES_NAME="fixtures3.json"
+          if [[ "$GITHUB_BASE" == *"b"* ]]; then
+            SPEC_NAME="spec3.beta.sdk.yaml"
+            FIXTURES_NAME="fixtures3.beta.json"
+          fi
+          curl "${CURL_OPTS[@]}" https://raw.githubusercontent.com/stripe/openapi/$OPENAPI_VERSION/openapi/${SPEC_NAME%.yaml}.json -o $CURRENT_OPENAPI_SPEC_JSON
+          curl "${CURL_OPTS[@]}" https://raw.githubusercontent.com/stripe/openapi/$OPENAPI_VERSION/openapi/$FIXTURES_NAME -o $CURRENT_FIXTURES_JSON
 
-      - name: Get branch name (merge)
-        if: github.event_name != 'pull_request'
-        run: echo "commitBranch=$(echo ${GITHUB_REF#refs/heads/} | tr / -)" >> $GITHUB_ENV
+        env:
+          PR_BODY: ${{ github.event.pull_request.body }}
+          GITHUB_BASE: ${{ github.base_ref || github.ref_name }}
 
-      - name: Get branch name (pull request)
-        if: github.event_name == 'pull_request'
-        run: echo "commitBranch=$(echo ${GITHUB_HEAD_REF} | tr / -)" >> $GITHUB_ENV
+      - uses: stripe/openapi/actions/stripe-mock@master
+        with:
+          # Used to determine if stripe-mock runs in beta mode
+          base: ${{ github.base_ref || github.ref_name }}
+          fixtures: "/workspace/fixtures.json"
+          spec_path: "/workspace/latest.json"
 
-      - name: Send code coverage report to coveralls.io
-        if: env.COVERALLS_REPO_TOKEN
-        run: |
-          export ARGS="--opencover \
-            -i src/StripeTests/coverage.netcoreapp3.1.opencover.xml \
-            --repoToken $COVERALLS_REPO_TOKEN \
-            --useRelativePaths \
-            --commitId $commitId \
-            --commitBranch $commitBranch \
-            --commitAuthor $commitAuthor \
-            --jobId $jobId"
-          if [ ! -z "${pullRequestId}" ];
-          then
-            export ARGS="$ARGS \
-              --pullRequest $pullRequestId"
-          fi
-          dotnet tool run csmacnz.Coveralls $ARGS
-        env:
-          COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
-          commitId: ${{ github.sha }}
-          commitAuthor: ${{ github.actor }}
-          jobId: ${{ github.run_id }}
-          pullRequestId: ${{ github.event.pull_request.number }}
+      - name: Run test suite
+        run: just ci-test
 
       - name: Pack
         run: dotnet pack src/Stripe.net -c Release --no-build --output nuget
-      - name: 'Upload Artifact'
+      - name: "Upload Artifact"
         uses: actions/upload-artifact@v4
         with:
           name: nuget
@@ -103,32 +105,32 @@ jobs:
     if: github.event_name == 'pull_request'
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@master
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 8.0.x
-    - name: Run backcompat check
-      run: dotnet pack src/Stripe.net -p:RunBaselineCheck=true
+      - uses: actions/checkout@master
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 8.0.x
+      - name: Run backcompat check
+        run: dotnet pack src/Stripe.net -p:RunBaselineCheck=true
 
   publish:
     name: Publish
     if: (((github.event_name == 'push') || (github.event_name == 'workflow_dispatch')) && startsWith(github.ref, 'refs/tags/v') && endsWith(github.actor, '-stripe'))
     needs: [build]
     runs-on: ubuntu-latest
     steps:
-    - name: Download all workflow run artifacts
-      uses: actions/download-artifact@v4
-      with:
-        name: nuget
-        path: nuget
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 8.0.x
-    - name: Publish NuGet packages to NuGet
-      run: dotnet nuget push nuget/*.nupkg --api-key ${{ secrets.NUGET_KEY }} --source "nuget.org"
-    - uses: stripe/openapi/actions/notify-release@master
-      if: always()
-      with:
-        bot_token: ${{ secrets.SLACK_BOT_TOKEN }}
+      - name: Download all workflow run artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: nuget
+          path: nuget
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v1
+        with:
+          dotnet-version: 8.0.x
+      - name: Publish NuGet packages to NuGet
+        run: dotnet nuget push nuget/*.nupkg --api-key ${{ secrets.NUGET_KEY }} --source "nuget.org"
+      - uses: stripe/openapi/actions/notify-release@master
+        if: always()
+        with:
+          bot_token: ${{ secrets.SLACK_BOT_TOKEN }}

.github/workflows/rules.yml

@@ -0,0 +1,21 @@
+
+name: rules
+
+on:
+  workflow_dispatch: {}
+  pull_request:
+    types:
+      - auto_merge_enabled
+
+jobs:
+  require_merge_commit_on_merge_script_pr:
+    name: Merge script PRs must create merge commits
+    if: ${{ contains(github.head_ref, '/merge-') }}
+    runs-on: ubuntu-latest
+    steps:
+      - run: |
+          if ${{ github.event.pull_request.auto_merge.merge_method != 'merge' }}; then
+            echo "Auto-merge method must be 'merge' instead of '${{github.event.pull_request.auto_merge.merge_method}}'"
+            exit 1
+          fi
+