Merge branch 'main' into smritikjaggi-patch-1

Kong · Oct 30, 2024 · 31d941e · 31d941e
2 parents 776b0da + de0a7b0
commit 31d941e
Show file tree

Hide file tree

Showing 773 changed files with 29,655 additions and 87,851 deletions.
diff --git a/.github/styles/kong/auto-ignore.txt b/.github/styles/kong/auto-ignore.txt
@@ -36,10 +36,12 @@ ingress_controller_fallback_configuration_push_duration_milliseconds
 ingress_controller_fallback_configuration_push_last
 ingress_controller_fallback_translation_broken_resource_count
 ingress_controller_fallback_translation_count
+ingress_controller_fallback_translation_duration_milliseconds
 ingress_controller_processed_config_snapshot_cache_hit
 ingress_controller_processed_config_snapshot_cache_miss
 ingress_controller_translation_broken_resource_count
 ingress_controller_translation_count
+ingress_controller_translation_duration_milliseconds
 inlineString
 involvedObject
 kuma
@@ -103,4 +105,4 @@ KongClusterPlugin
 KongConsumer
 Rekor
 Sigstore
-Hasura
+Hasura
diff --git a/.github/styles/kong/dictionary.txt b/.github/styles/kong/dictionary.txt
@@ -230,17 +230,21 @@ ElastiCache
 elbs
 enablement
 enqueued
+enqueues
 enum
 env
 Equinix
 Equinix
+etag
 etcd
 failover
 Fargate
 favicon
 filepath
 filetype
 filetypes
+finalizer
+finalizers
 firewalled
 flamegraph
 full_name
@@ -282,6 +286,7 @@ httpbin
 HTTPie
 https
 IdPs
+If-Match
 impactful
 Imperva
 inbounds
@@ -468,6 +473,7 @@ remediation
 remediations
 repo
 requery
+Requeue
 Resty
 retryOn
 reusability
@@ -480,8 +486,8 @@ routable
 ruleset
 runloop
 runtime
-runtime_groups
 runtimes
+runtime_groups
 SAML
 sandboxed
 sandboxing
@@ -502,8 +508,8 @@ sni
 snis
 Splunk
 ssl
-ssl_cert_key
 ssl_certificate
+ssl_cert_key
 sso
 Stap
 stapxx
@@ -580,6 +586,7 @@ unnormalized
 unpackage
 unparsed
 unprocessable
+unproxied
 unpublish
 unpublishing
 unregister

diff --git a/.github/workflows/fetch-konnect-changelog.yml b/.github/workflows/fetch-konnect-changelog.yml
@@ -28,7 +28,7 @@ jobs:
           node fetch-beamer-posts.js
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           title: Automated Konnect changelog update [skip-ci]
           body: |

diff --git a/.github/workflows/generate-changelog.yml b/.github/workflows/generate-changelog.yml
@@ -29,7 +29,7 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           title: Automated Changelog update [skip-ci]
           body: |

diff --git a/.github/workflows/sync-konnect-oas-data.yml b/.github/workflows/sync-konnect-oas-data.yml
@@ -17,7 +17,7 @@ jobs:
           npm ci
           node run.js --url ${{ vars.VITE_PORTAL_API_URL }}
       - name: Create pull request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         with:
           title: Sync Konnect OAS Data
           commit-message: Sync Konnect OAS Data

diff --git a/.github/workflows/sync-kuma-submodule.yml b/.github/workflows/sync-kuma-submodule.yml
@@ -62,7 +62,7 @@ jobs:
           echo "EOF" >> $GITHUB_ENV
       - name: 'Create pull request'
         # https://github.com/peter-evans/create-pull-request
-        uses: peter-evans/create-pull-request@v6
+        uses: peter-evans/create-pull-request@v7
         id: newPR
         with:
           base: main

diff --git a/Gemfile b/Gemfile
@@ -7,7 +7,7 @@ gem 'jekyll-redirect-from'
 gem 'jekyll-generator-single-source'
 gem 'kramdown-parser-gfm'
 gem 'liquid-c'
-gem 'rouge', '4.3.0'
+gem 'rouge', '4.4.0'
 gem 'activesupport'
 gem 'nokogiri'
 gem 'jekyll-kuma-plugins', path: './app/_src/.repos/kuma/jekyll-kuma-plugins'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -7,7 +7,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (7.2.1)
+    activesupport (7.2.1.1)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
@@ -74,7 +74,7 @@ GEM
     foreman (0.88.1)
     forwardable-extended (2.6.0)
     http_parser.rb (0.8.0)
-    i18n (1.14.5)
+    i18n (1.14.6)
       concurrent-ruby (~> 1.0)
     jekyll (4.3.3)
       addressable (~> 2.4)
@@ -125,7 +125,7 @@ GEM
     mini_mime (1.1.5)
     mini_portile2 (2.8.7)
     minitest (5.25.1)
-    nio4r (2.7.0)
+    nio4r (2.7.3)
     nokogiri (1.16.7)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
@@ -135,12 +135,12 @@ GEM
       racc
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    prism (0.29.0)
+    prism (0.30.0)
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     public_suffix (5.0.4)
-    puma (6.4.2)
+    puma (6.4.3)
       nio4r (~> 2.0)
     racc (1.8.1)
     rack (3.0.9.1)
@@ -155,7 +155,7 @@ GEM
     rb-fsevent (0.11.2)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbs (3.5.3)
+    rbs (3.6.1)
       logger
     reek (6.3.0)
       dry-schema (~> 1.13.0)
@@ -164,7 +164,7 @@ GEM
       rexml (~> 3.1)
     regexp_parser (2.9.2)
     rexml (3.3.7)
-    rouge (4.3.0)
+    rouge (4.4.0)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
@@ -178,7 +178,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.0)
-    rubocop (1.66.1)
+    rubocop (1.67.0)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
@@ -200,17 +200,17 @@ GEM
     sassc (2.4.0)
       ffi (~> 1.9)
     securerandom (0.3.1)
-    sorbet-runtime (0.5.11558)
+    sorbet-runtime (0.5.11609)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.5.0)
+    unicode-display_width (2.6.0)
     vite_ruby (3.5.0)
       dry-cli (>= 0.7, < 2)
       rack-proxy (~> 0.6, >= 0.6.1)
       zeitwerk (~> 2.2)
-    webrick (1.8.1)
+    webrick (1.8.2)
     xpath (3.2.0)
       nokogiri (~> 1.8)
     zeitwerk (2.6.12)
@@ -234,7 +234,7 @@ DEPENDENCIES
   pry
   puma
   reek
-  rouge (= 4.3.0)
+  rouge (= 4.4.0)
   rspec
   rubocop
   ruby-lsp

diff --git a/api-specs/Gateway-EE/3.3/kong-ee-3.3.json b/api-specs/Gateway-EE/3.3/kong-ee-3.3.json
@@ -13414,6 +13414,35 @@
                 }
               }
             }
+          },
+          "409": {
+            "description": "Conflict",
+            "content": {
+              "application/json": {
+                "schema" :{
+                  "type": "object",
+                  "properties": {
+                    "message": {
+                      "type": "string",
+                      "description": "Detail about the conflict",
+                      "example": "user already exists with same username, email, or custom_id"
+                    }
+                  },
+                  "x-exmples": {
+                    "Example 1": {
+                      "message": "user already exists with same username, email, or custom_id"
+                    }
+                  }
+                },
+                "examples": {
+                  "Constraint violation": {
+                    "value": {
+                      "message": "user already exists with same username, email, or custom_id"
+                    }
+                  }
+                }
+              }
+            }
           }
         },
         "tags": [

diff --git a/api-specs/Gateway-EE/3.3/kong-ee-3.3.yaml b/api-specs/Gateway-EE/3.3/kong-ee-3.3.yaml
@@ -9256,6 +9256,24 @@ paths:
                       username: string
                       email: string
                       rbac_token_enabled: true
+        '409':
+          description: Conflict
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  message:
+                    type: string
+                    description: Detail about the conflict
+                    example: user already exists with same username, email, or custom_id
+                x-exmples:
+                  Example 1:
+                    message: user already exists with same username, email, or custom_id
+              examples:
+                Constraint violation:
+                  value:
+                    message: user already exists with same username, email, or custom_id
       tags:
         - Admins
       description: Invite an admin to your organization.

diff --git a/api-specs/Gateway-EE/3.4/kong-ee-3.4.json b/api-specs/Gateway-EE/3.4/kong-ee-3.4.json
@@ -14332,6 +14332,35 @@
                 }
               }
             }
+          },
+          "409": {
+            "description": "Conflict",
+            "content": {
+              "application/json": {
+                "schema" :{
+                  "type": "object",
+                  "properties": {
+                    "message": {
+                      "type": "string",
+                      "description": "Detail about the conflict",
+                      "example": "user already exists with same username, email, or custom_id"
+                    }
+                  },
+                  "x-exmples": {
+                    "Example 1": {
+                      "message": "user already exists with same username, email, or custom_id"
+                    }
+                  }
+                },
+                "examples": {
+                  "Constraint violation": {
+                    "value": {
+                      "message": "user already exists with same username, email, or custom_id"
+                    }
+                  }
+                }
+              }
+            }
           }
         },
         "tags": [

diff --git a/api-specs/Gateway-EE/3.4/kong-ee-3.4.yaml b/api-specs/Gateway-EE/3.4/kong-ee-3.4.yaml
@@ -9857,6 +9857,24 @@ paths:
                       username: string
                       email: string
                       rbac_token_enabled: true
+        '409':
+          description: Conflict
+          content:
+            application/json:
+              schema:
+                type: object
+                properties:
+                  message:
+                    type: string
+                    description: Detail about the conflict
+                    example: user already exists with same username, email, or custom_id
+                x-exmples:
+                  Example 1:
+                    message: user already exists with same username, email, or custom_id
+              examples:
+                Constraint violation:
+                  value:
+                    message: user already exists with same username, email, or custom_id
       tags:
         - Admins
       description: Invite an admin to your organization.

diff --git a/api-specs/Gateway-EE/3.5/kong-ee-3.5.yaml b/api-specs/Gateway-EE/3.5/kong-ee-3.5.yaml
@@ -11887,6 +11887,24 @@ paths:
                                             username: string
                                             email: string
                                             rbac_token_enabled: true
+                '409':
+                  description: Conflict
+                  content:
+                    application/json:
+                      schema:
+                        type: object
+                        properties:
+                          message:
+                            type: string
+                            description: Detail about the conflict
+                            example: user already exists with same username, email, or custom_id
+                        x-exmples:
+                          Example 1:
+                            message: user already exists with same username, email, or custom_id
+                      examples:
+                        Constraint violation:
+                          value:
+                            message: user already exists with same username, email, or custom_id
             tags:
                 - admins
             description: Invite an admin to your organization.