Merge branch 'main' into release/gateway-3.8.1.0

Kong · Nov 18, 2024 · 8218dee · 8218dee
2 parents 379e018 + 630a6fa
commit 8218dee
Show file tree

Hide file tree

Showing 311 changed files with 14,847 additions and 1,707 deletions.
diff --git a/.github/styles/kong/dictionary.txt b/.github/styles/kong/dictionary.txt
@@ -8,6 +8,7 @@ Amal
 Amberflo
 apiVersion
 Arya
+auditability
 Autonegotiation
 autoscale
 autoscales
@@ -230,6 +231,7 @@ ElastiCache
 elbs
 enablement
 enqueued
+enqueues
 enum
 env
 Equinix
@@ -242,6 +244,8 @@ favicon
 filepath
 filetype
 filetypes
+finalizer
+finalizers
 firewalled
 flamegraph
 full_name
@@ -374,6 +378,7 @@ mimetype
 minifier
 minikube
 minio
+misconfigurations
 misconfigured
 Moesif
 MongoDB
@@ -470,6 +475,7 @@ remediation
 remediations
 repo
 requery
+Requeue
 Resty
 retryOn
 reusability
@@ -482,8 +488,8 @@ routable
 ruleset
 runloop
 runtime
-runtime_groups
 runtimes
+runtime_groups
 SAML
 sandboxed
 sandboxing
@@ -504,8 +510,8 @@ sni
 snis
 Splunk
 ssl
-ssl_cert_key
 ssl_certificate
+ssl_cert_key
 sso
 Stap
 stapxx

diff --git a/.github/workflows/dispatch-docs-update.yml b/.github/workflows/dispatch-docs-update.yml
@@ -0,0 +1,16 @@
+name: Dispatch docs update
+on:
+  push:
+    branches:
+      - 'main'
+
+jobs:
+  dispatch:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Repository Dispatch
+        uses: peter-evans/repository-dispatch@v3
+        with:
+          token: ${{ secrets.PAT }}
+          repository: Kong/docs.konghq.com-jp
+          event-type: DOCS_UPDATED
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -64,6 +64,9 @@ jobs:
           exe/build
 
       - name: Run Smoke Tests
+        env:
+          JEKYLL_ENV: production
+          JEKYLL_CONFIG_FILES: jekyll.yml
         run: |
           npm install -g wait-on
           netlify dev & wait-on http://localhost:8888

diff --git a/.github/workflows/send-docs-for-translation.yml b/.github/workflows/send-docs-for-translation.yml
@@ -0,0 +1,49 @@
+name: Upload Docs for translation
+on:
+  workflow_dispatch:
+    inputs:
+      product:
+        type: string
+        description: |
+          Kong product to translate.
+          If specified, only files related to that speciific product will be translated.
+          Otherwise, the config file in tools/smartling-integration/config.yml will be used.
+      versions:
+        type: string
+        description: |
+          This param only makes sense if the `product` is provided.
+          Comma-separated list of versions for a specific product to translate.
+          If not provided, the config file in tools/smartling-integration/config.yml will be used.
+      locale:
+        type: string
+        default: 'ja-JP'
+        description: "Target locale, it must match the same format that the Job has, e.g. `ja-JP`."
+      jobId:
+        type: string
+        description: "Smarting's JobUId in case we want to re-upload some files to an existing Job"
+
+jobs:
+  upload-docs:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+      - name: Install dependencies
+        run: |
+          cd tools/smartling-integration
+          npm ci
+      - name: Run upload tool
+        run: |
+          node tools/smartling-integration/upload_docs.js
+        env:
+          PROJECT_ID: ${{ secrets.SMARTLING_PROJECT_ID }}
+          USER_IDENTIFIER: ${{ secrets.SMARTLING_USER_IDENTIFIER }}
+          USER_SECRET: ${{ secrets.SMARTLING_USER_SECRET }}
+          JOB_ID: ${{ github.event.inputs.jobId }}
+          LOCALE: ${{ github.event.inputs.locale }}
+          PRODUCT: ${{ github.event.inputs.product }}
+          VERSIONS: ${{ github.event.inputs.versions }}
diff --git a/.github/workflows/send-plugins-for-translation.yml b/.github/workflows/send-plugins-for-translation.yml
@@ -0,0 +1,41 @@
+name: Upload Plugins for translation
+on:
+  workflow_dispatch:
+    inputs:
+      versions:
+        type: string
+        description: |
+          Comma-separated list of gateway versions to translate.
+          If not provided, the config file in tools/smartling-integration/config.yml will be used.
+      locale:
+        type: string
+        default: 'ja-JP'
+        description: "Target locale, it must match the same format that the Job has, e.g. `ja-JP`."
+      jobId:
+        type: string
+        description: "Smarting's JobUId in case we want to re-upload some files to an existing Job"
+
+jobs:
+  upload-plugins:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: 'recursive'
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+      - name: Install dependencies
+        run: |
+          cd tools/smartling-integration
+          npm ci
+      - name: Run upload tool
+        run: |
+          node tools/smartling-integration/upload_plugins.js
+        env:
+          PROJECT_ID: ${{ secrets.SMARTLING_PROJECT_ID }}
+          USER_IDENTIFIER: ${{ secrets.SMARTLING_USER_IDENTIFIER }}
+          USER_SECRET: ${{ secrets.SMARTLING_USER_SECRET }}
+          JOB_ID: ${{ github.event.inputs.jobId }}
+          LOCALE: ${{ github.event.inputs.locale }}
+          VERSIONS: ${{ github.event.inputs.versions }}
diff --git a/.node-version b/.node-version
@@ -1 +1 @@
-20
+22
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.3.5
+3.3.6
diff --git a/Gemfile b/Gemfile
@@ -2,17 +2,19 @@
 
 source 'https://rubygems.org'
 gem 'jekyll'
-gem 'jekyll-include-cache'
-gem 'jekyll-redirect-from'
-gem 'jekyll-generator-single-source'
 gem 'kramdown-parser-gfm'
 gem 'liquid-c'
-gem 'rouge', '4.4.0'
+gem 'rouge', '4.5.0'
 gem 'activesupport'
 gem 'nokogiri'
-gem 'jekyll-kuma-plugins', path: './app/_src/.repos/kuma/jekyll-kuma-plugins'
 gem 'jekyll-vite'
+gem 'i18n'
 
+group :jekyll_plugins do
+  gem 'jekyll-include-cache'
+  gem 'jekyll-redirect-from'
+  gem 'jekyll-generator-single-source'
+end
 
 group :development do
   gem 'pry'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,14 +1,9 @@
-PATH
-  remote: app/_src/.repos/kuma/jekyll-kuma-plugins
-  specs:
-    jekyll-kuma-plugins (0.1.0)
-      jekyll (>= 4.2, < 5.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.2.1.1)
+    activesupport (8.0.0)
       base64
+      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
@@ -18,10 +13,12 @@ GEM
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     addressable (2.8.6)
       public_suffix (>= 2.0.2, < 6.0)
     ast (2.4.2)
     base64 (0.2.0)
+    benchmark (0.4.0)
     bigdecimal (3.1.8)
     capybara (3.40.0)
       addressable
@@ -92,7 +89,8 @@ GEM
       safe_yaml (~> 1.0)
       terminal-table (>= 1.8, < 4.0)
       webrick (~> 1.7)
-    jekyll-generator-single-source (0.0.14)
+    jekyll-generator-single-source (0.0.15)
+      i18n (~> 1)
       jekyll (>= 4.2, < 5.0)
     jekyll-include-cache (0.2.1)
       jekyll (>= 3.7, < 5.0)
@@ -106,7 +104,7 @@ GEM
       vite_ruby (~> 3.2)
     jekyll-watch (2.2.1)
       listen (~> 3.0)
-    json (2.7.2)
+    json (2.7.5)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
@@ -130,7 +128,7 @@ GEM
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     parallel (1.26.3)
-    parser (3.3.5.0)
+    parser (3.3.5.1)
       ast (~> 2.4.1)
       racc
     pathutil (0.16.2)
@@ -163,8 +161,8 @@ GEM
       rainbow (>= 2.0, < 4.0)
       rexml (~> 3.1)
     regexp_parser (2.9.2)
-    rexml (3.3.7)
-    rouge (4.4.0)
+    rexml (3.3.9)
+    rouge (4.5.0)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -178,7 +176,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.0)
-    rubocop (1.67.0)
+    rubocop (1.68.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -188,7 +186,7 @@ GEM
       rubocop-ast (>= 1.32.2, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.32.3)
+    rubocop-ast (1.33.1)
       parser (>= 3.3.1.0)
     ruby-lsp (0.17.16)
       language_server-protocol (~> 3.17.0)
@@ -200,12 +198,13 @@ GEM
     sassc (2.4.0)
       ffi (~> 1.9)
     securerandom (0.3.1)
-    sorbet-runtime (0.5.11609)
+    sorbet-runtime (0.5.11645)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.6.0)
+    uri (1.0.1)
     vite_ruby (3.5.0)
       dry-cli (>= 0.7, < 2)
       rack-proxy (~> 0.6, >= 0.6.1)
@@ -222,10 +221,10 @@ DEPENDENCIES
   activesupport
   capybara
   foreman
+  i18n
   jekyll
   jekyll-generator-single-source
   jekyll-include-cache
-  jekyll-kuma-plugins!
   jekyll-redirect-from
   jekyll-vite
   kramdown-parser-gfm
@@ -234,7 +233,7 @@ DEPENDENCIES
   pry
   puma
   reek
-  rouge (= 4.4.0)
+  rouge (= 4.5.0)
   rspec
   rubocop
   ruby-lsp

diff --git a/Procfile b/Procfile
@@ -1,3 +1,3 @@
 
 vite: bin/vite dev
-jekyll: bin/jekyll-vite wait && bundle exec jekyll serve --livereload --config jekyll-dev.yml --profile
+jekyll: bin/jekyll-vite wait && bundle exec jekyll serve --livereload --config jekyll-dev.yml${JEKYLL_CONFIG_FILES:+,$JEKYLL_CONFIG_FILES}  --profile
diff --git a/api-specs/Gateway-EE/latest/kong-ee.yaml b/api-specs/Gateway-EE/latest/kong-ee.yaml
@@ -5907,7 +5907,7 @@ info:
     name: Apache 2.0
     url: 'https://www.apache.org/licenses/LICENSE-2.0.html'
   title: Enterprise Kong Admin API
-  version: 3.7.0
+  version: 3.8.0
 openapi: 3.0.0
 paths:
   /:
@@ -16343,4 +16343,4 @@ tags:
     name: clustering
   - description: |
       Querying and managing cache entries.
-    name: cache
+    name: cache
diff --git a/api-specs/Gateway-OSS/latest/kong-oss.yaml b/api-specs/Gateway-OSS/latest/kong-oss.yaml
@@ -3621,7 +3621,7 @@ info:
     name: Apache 2.0
     url: 'https://www.apache.org/licenses/LICENSE-2.0.html'
   title: Kong Admin API
-  version: 3.7.1
+  version: 3.8.0
 openapi: 3.0.0
 paths:
   /:

diff --git a/api-specs/Konnect/v2/yaml/api-products.yaml b/api-specs/Konnect/v2/yaml/api-products.yaml
@@ -658,6 +658,8 @@ components:
           $ref: '#/components/schemas/StringFieldFilter'
         publish_status:
           $ref: '#/components/schemas/StringFieldFilter'
+        gateway_service_id:
+          $ref: '#/components/schemas/UuidFieldFilter'
       title: APIProductVersionFilterParameters
     SortQuery:
       description: |
@@ -2142,6 +2144,21 @@ components:
       required:
         - checked
         - type
+    UuidFieldFilter:
+      description: Filters on the given UUID field value by exact match.
+      oneOf:
+        - $ref: '#/components/schemas/StringFieldEqualsFilter'
+        - $ref: '#/components/schemas/StringFieldOEQFilter'
+        - $ref: '#/components/schemas/StringFieldNEQFilter'
+      title: UuidFieldFilter
+      x-examples:
+        example-1: 3bbfd3a-e9ab-48a9-9881-ed589e4615d1
+        example-2:
+          eq: 3bbfd3a-e9ab-48a9-9881-ed589e4615d1
+        example-3:
+          oeq: 3bbfd3a-e9ab-48a9-9881-ed589e4615d1
+        example-4:
+          neq: 3bbfd3a-e9ab-48a9-9881-ed589e4615d1
     ConflictError:
       allOf:
         - $ref: '#/components/schemas/BaseError'