Merge branch 'main' into http-headers

apollographql · Feb 2, 2024 · 7c675db · 7c675db
2 parents 57a132c + 80f17a1
commit 7c675db
Show file tree

Hide file tree

Showing 424 changed files with 7,291 additions and 4,819 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,7 +1,7 @@
 version: 2.1
 
 orbs:
-  secops: apollo/circleci-secops-orb@2.0.1
+  secops: apollo/circleci-secops-orb@2.0.6
 
 workflows:
   security-scans:
@@ -13,3 +13,8 @@ workflows:
             - secops-oidc
           git-base-revision: <<#pipeline.git.base_revision>><<pipeline.git.base_revision>><</pipeline.git.base_revision >>
           git-revision: << pipeline.git.revision >>
+      - secops/semgrep:
+          context:
+            - secops-oidc
+            - github-orb
+          git-base-revision: <<#pipeline.git.base_revision>><<pipeline.git.base_revision>><</pipeline.git.base_revision >>
diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -1,24 +1,24 @@
 name: benchmarks
 
 on:
-  #  pull_request:
-  #    branches: [ '*' ]
+#  pull_request:
+#     branches: [ '*' ]
   schedule:
     - cron: '0 3 * * *'
 env:
   GRADLE_ENTERPRISE_ACCESS_KEY: ${{ secrets.GRADLE_ENTERPRISE_ACCESS_KEY }}
 
 jobs:
   benchmarks:
-    runs-on: macos-11
+    runs-on: macos-14
     if: github.repository == 'apollographql/apollo-kotlin'
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0
-      - uses: actions/setup-java@1df8dbefe2a8cbc99770194893dd902763bee34b #v3.9.0
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
+      - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 #v4.0.0
         with:
           distribution: 'temurin'
           java-version: 17
-      - uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef #v2.3.3
+      - uses: gradle/gradle-build-action@42452daeb5b454a76f686a8e4de8234afd7b1f44 #v2.12.0
         with:
           gradle-home-cache-cleanup: true
       - run: |
@@ -35,23 +35,12 @@ jobs:
           ./gradlew -p benchmark assembleRelease assembleReleaseAndroidTest
       # Step can be removed if/when gcloud is added to the macos image - See https://github.com/actions/virtual-environments/issues/4639
       - name: Setup gcloud
-        uses: google-github-actions/setup-gcloud@d51b5346f85640ec2aa2fa057354d2b82c2fcbce #v1.0.1
-      - name: microbenchmarks
-        uses: martinbonnin/run-benchmarks@ef9043b9a646a109f7381a4bf20f82ead5cbd382 #main
-        with:
-          google_services_json: ${{ secrets.GOOGLE_SERVICES_JSON }}
-
-          app_apk: 'benchmark/app/build/outputs/apk/release/app-release.apk'
-          test_apk: 'benchmark/microbenchmark/build/outputs/apk/androidTest/release/microbenchmark-release-androidTest.apk'
-          device_model: 'redfin,locale=en,orientation=portrait'
-          directories_to_pull: '/sdcard/Download'
-          environment_variables: 'clearPackageData=true,additionalTestOutputDir=/sdcard/Download,no-isolated-storage=true'
-
-          dd_api_key: ${{ secrets.DD_API_KEY }}
-          dd_metric_prefix: 'apollo.kotlin'
-          dd_dashboard_url: 'https://p.datadoghq.com/sb/d11002689-48ff7001681977d5a09c3a0775632cfa'
-
-          github_token: ${{ github.token }}
+        uses: google-github-actions/setup-gcloud@98ddc00a17442e89a24bbf282954a3b65ce6d200 #v2.1.0
+      - run: ./scripts/run-benchmarks.main.kts
+        env:
+          GOOGLE_SERVICES_JSON: ${{ secrets.GOOGLE_SERVICES_JSON }}
+          DD_API_KEY: ${{ secrets.DD_API_KEY }}
+          GITHUB_TOKEN: ${{ github.token }}
       - name: nativebenchmarks
         run: |
           # Run the native benchmarks

diff --git a/.github/workflows/defer-with-router-tests.yml b/.github/workflows/defer-with-router-tests.yml
@@ -8,11 +8,11 @@ env:
 
 jobs:
   defer-with-router-tests:
-    runs-on: macos-11
+    runs-on: ubuntu-latest
     if: github.repository == 'apollographql/apollo-kotlin'
     steps:
       - name: Checkout project
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
 
       - name: Install and run subgraph
         working-directory: tests/defer/router/subgraphs/computers
@@ -29,13 +29,13 @@ jobs:
           ./router --supergraph tests/defer/router/simple-supergraph.graphqls &
 
       - name: Setup Java
-        uses: actions/setup-java@1df8dbefe2a8cbc99770194893dd902763bee34b #v3.9.0
+        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 #v4.0.0
         with:
           distribution: 'temurin'
           java-version: 17
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef #v2.3.3
+        uses: gradle/gradle-build-action@42452daeb5b454a76f686a8e4de8234afd7b1f44 #v2.12.0
 
       - name: Run Apollo Kotlin @defer tests
         env:

diff --git a/.github/workflows/platform-api-tests.yml b/.github/workflows/platform-api-tests.yml
@@ -12,20 +12,20 @@ env:
 
 jobs:
   platform-api-tests:
-    runs-on: macos-11
+    runs-on: macos-14
     if: github.repository == 'apollographql/apollo-kotlin'
     steps:
       - name: Checkout project
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
 
       - name: Setup Java
-        uses: actions/setup-java@1df8dbefe2a8cbc99770194893dd902763bee34b #v3.9.0
+        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 #v4.0.0
         with:
           distribution: 'temurin'
           java-version: 17
 
       - name: Setup Gradle
-        uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef #v2.3.3
+        uses: gradle/gradle-build-action@42452daeb5b454a76f686a8e4de8234afd7b1f44 #v2.12.0
 
       - name: Run tests against the Apollo Platform API
         env:

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -16,14 +16,14 @@ concurrency:
 jobs:
   tests-gradle:
     if: "!startsWith(github.head_ref, 'release-')"
-    runs-on: macos-11
+    runs-on: macos-14
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0
-      - uses: actions/setup-java@1df8dbefe2a8cbc99770194893dd902763bee34b #v3.9.0
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
+      - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 #v4.0.0
         with:
           distribution: 'temurin'
           java-version: 17
-      - uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef #v2.3.3
+      - uses: gradle/gradle-build-action@42452daeb5b454a76f686a8e4de8234afd7b1f44 #v2.12.0
         with:
           gradle-home-cache-cleanup: true
       - name: Build with Gradle
@@ -32,22 +32,22 @@ jobs:
       - name: Collect Diagnostics
         if: always()
         run: ./scripts/collect-diagnostics.main.kts
-      - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce #v3.1.2
+      - uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 #v4.3.0
         if: always()
         with:
           name: tests-gradle.zip
           path: diagnostics.zip
 
   tests-no-gradle:
     if: "!startsWith(github.head_ref, 'release-')"
-    runs-on: macos-11
+    runs-on: macos-14
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0
-      - uses: actions/setup-java@1df8dbefe2a8cbc99770194893dd902763bee34b #v3.9.0
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
+      - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 #v4.0.0
         with:
           distribution: 'temurin'
           java-version: 17
-      - uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef #v2.3.3
+      - uses: gradle/gradle-build-action@42452daeb5b454a76f686a8e4de8234afd7b1f44 #v2.12.0
         with:
           gradle-home-cache-cleanup: true
       - name: Build with Gradle
@@ -56,22 +56,22 @@ jobs:
       - name: Collect Diagnostics
         if: always()
         run: ./scripts/collect-diagnostics.main.kts
-      - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce #v3.1.2
+      - uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 #v4.3.0
         if: always()
         with:
           name: tests-no-gradle.zip
           path: diagnostics.zip
 
   tests-integration:
     if: "!startsWith(github.head_ref, 'release-')"
-    runs-on: macos-11
+    runs-on: macos-14
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0
-      - uses: actions/setup-java@1df8dbefe2a8cbc99770194893dd902763bee34b #v3.9.0
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
+      - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 #v4.0.0
         with:
           distribution: 'temurin'
           java-version: 17
-      - uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef #v2.3.3
+      - uses: gradle/gradle-build-action@42452daeb5b454a76f686a8e4de8234afd7b1f44 #v2.12.0
         with:
           gradle-home-cache-cleanup: true
       - name: Build with Gradle
@@ -80,7 +80,7 @@ jobs:
       - name: Collect Diagnostics
         if: always()
         run: ./scripts/collect-diagnostics.main.kts
-      - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce #v3.1.2
+      - uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 #v4.3.0
         if: always()
         with:
           name: tests-integration.zip
@@ -102,11 +102,11 @@ jobs:
 
       # Check out current repository
       - name: Fetch Sources
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
 
       # Setup Java 11 environment for the next steps
       - name: Setup Java
-        uses: actions/setup-java@1df8dbefe2a8cbc99770194893dd902763bee34b #v3.9.0
+        uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 #v4.0.0
         with:
           distribution: 'temurin'
           java-version: 17
@@ -136,14 +136,14 @@ jobs:
       # Collect Tests Result of failed tests
       - name: Collect Tests Result
         if: ${{ failure() }}
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce #v3.1.2
+        uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 #v4.3.0
         with:
           name: tests-result
           path: ${{ github.workspace }}/intellij-plugin/build/reports/tests
 
       # Cache Plugin Verifier IDEs
       - name: Setup Plugin Verifier IDEs Cache
-        uses: actions/cache@58c146cc91c5b9e778e71775dfe9bf1442ad9a12 #v3.2.3
+        uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 #v4.0.0
         with:
           path: ${{ steps.properties.outputs.pluginVerifierHomeDir }}/ides
           key: plugin-verifier-${{ hashFiles('intellij-plugin/build/listProductsReleases.txt') }}
@@ -155,7 +155,7 @@ jobs:
       # Collect Plugin Verifier Result
       - name: Collect Plugin Verifier Result
         if: ${{ always() }}
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce #v3.1.2
+        uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 #v4.3.0
         with:
           name: pluginVerifier-result
           path: ${{ github.workspace }}/intellij-plugin/build/reports/pluginVerifier
@@ -173,7 +173,7 @@ jobs:
 
       # Store already-built plugin as an artifact for downloading
       - name: Upload artifact
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce #v3.1.2
+        uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 #v4.3.0
         with:
           name: ${{ steps.artifact.outputs.filename }}
           path: ./intellij-plugin/build/distributions/content/*/*
diff --git a/.github/workflows/publish-ij-plugin-snapshot.yml b/.github/workflows/publish-ij-plugin-snapshot.yml
@@ -12,9 +12,9 @@ jobs:
     name: Publish IntelliJ plugin
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
 
-      - uses: actions/setup-java@1df8dbefe2a8cbc99770194893dd902763bee34b #v3.9.0
+      - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 #v4.0.0
         with:
           distribution: 'temurin'
           java-version: 17

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -11,21 +11,21 @@ env:
 
 jobs:
   deploy:
-    runs-on: macos-11
+    runs-on: macos-14
     if: github.repository == 'apollographql/apollo-kotlin'
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0
-      - uses: actions/setup-java@1df8dbefe2a8cbc99770194893dd902763bee34b #v3.9.0
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
+      - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 #v4.0.0
         with:
           distribution: 'temurin'
           java-version: 17
-      - uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef #v2.3.3
+      - uses: gradle/gradle-build-action@42452daeb5b454a76f686a8e4de8234afd7b1f44 #v2.12.0
         with:
           gradle-home-cache-cleanup: true
       - name: Build with Gradle
         run: |
           ./gradlew -p tests ciBuild -i
-          ./gradlew :apollo-kdoc:dokkatooGeneratePublicationHtml
+          ./gradlew :apollo-kdoc:dokkatooGeneratePublicationHtml --no-build-cache
           ./gradlew ciPublishSnapshot
         env:
           SONATYPE_NEXUS_PASSWORD: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
@@ -34,13 +34,13 @@ jobs:
       - name: Collect Diagnostics
         if: always()
         run: ./scripts/collect-diagnostics.main.kts
-      - uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce #v3.1.2
+      - uses: actions/upload-artifact@26f96dfa697d77e81fd5907df203aa23a56210a8 #v4.3.0
         if: always()
         with:
           name: push.zip
           path: push.zip
       - name: Deploy Kdoc to github pages
-        uses: JamesIves/github-pages-deploy-action@ba1486788b0490a235422264426c45848eac35c6 #v4.4.1
+        uses: JamesIves/github-pages-deploy-action@65b5dfd4f5bcd3a7403bbc2959c144256167464e #v4.5.0
         with:
           branch: gh-pages # The branch the action should deploy to.
           folder: libraries/apollo-kdoc/build/dokka/html # The folder the action should deploy.
diff --git a/.github/workflows/tag.yml b/.github/workflows/tag.yml
@@ -10,15 +10,15 @@ env:
 jobs:
   publish-libraries:
     name: Publish libraries
-    runs-on: macos-11
+    runs-on: macos-14
     if: github.repository == 'apollographql/apollo-kotlin'
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0
-      - uses: actions/setup-java@1df8dbefe2a8cbc99770194893dd902763bee34b #v3.9.0
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
+      - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 #v4.0.0
         with:
           distribution: 'temurin'
           java-version: 17
-      - uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef #v2.3.3
+      - uses: gradle/gradle-build-action@42452daeb5b454a76f686a8e4de8234afd7b1f44 #v2.12.0
         with:
           gradle-home-cache-cleanup: true
       - name: Publish to Maven Central
@@ -35,8 +35,8 @@ jobs:
     name: Publish IntelliJ plugin
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c #v3.3.0
-      - uses: actions/setup-java@1df8dbefe2a8cbc99770194893dd902763bee34b #v3.9.0
+      - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 #v4.1.1
+      - uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 #v4.0.0
         with:
           distribution: 'temurin'
           java-version: 17

diff --git a/.idea/runConfigurations/CodegenTest.xml b/.idea/runConfigurations/CodegenTest.xml
diff --git a/.idea/runConfigurations/ValidationTest.xml b/.idea/runConfigurations/ValidationTest.xml