Merge pull request #175 from TykTechnologies/r4.1

R4.1
TykTechnologies · Aug 23, 2022 · 4be0cd0 · 4be0cd0
2 parents 065b70b + e57fed8
commit 4be0cd0
Show file tree

Hide file tree

Showing 46 changed files with 2,518 additions and 253 deletions.
diff --git a/deployments/mdcb/docker-compose.yml b/deployments/mdcb/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.3'
 services:
   tyk-mdcb:
-    image: tykio/tyk-mdcb-docker:${MDCB_VERSION:-v1.7.5}
+    image: tykio/tyk-mdcb-docker:${MDCB_VERSION:-v2.0.3}
     networks:
       - tyk
     volumes:
@@ -13,7 +13,7 @@ services:
       - tyk-redis
       - tyk-mongo
   tyk-worker-gateway:
-    image: tykio/tyk-gateway:${GATEWAY_WORKER_VERSION:-v4.0.0}
+    image: tykio/tyk-gateway:${GATEWAY_WORKER_VERSION:-v4.1.0}
     ports:
       - 8084:8080
     networks:

diff --git a/deployments/sso/docker-compose.yml b/deployments/sso/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.3'
 services:
   tyk-dashboard-sso:
-    image: tykio/tyk-dashboard:${DASHBOARD_SSO_VERSION:-v4.0.0}
+    image: tykio/tyk-dashboard:${DASHBOARD_SSO_VERSION:-v4.1.0}
     ports:
       - 3001:3000
     networks:

diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-5ead711f5759610001818678.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-5ead711f5759610001818678.json
@@ -4,6 +4,7 @@
   "api_definition": {
     "id": "5ead711f5759610001818678",
     "name": "Basic Protected API",
+    "expiration": "",
     "slug": "basic-protected-api",
     "listen_port": 0,
     "protocol": "",
@@ -23,16 +24,20 @@
       "auth_login_redirect": ""
     },
     "auth": {
+      "name": "",
       "use_param": false,
       "param_name": "",
       "use_cookie": false,
       "cookie_name": "",
+      "disable_header": false,
       "auth_header_name": "Authorization",
       "use_certificate": false,
       "validate_signature": false,
       "signature": {
         "algorithm": "",
         "header": "",
+        "use_param": false,
+        "param_name": "",
         "secret": "",
         "allowed_clock_skew": 0,
         "error_code": 0,
@@ -41,33 +46,41 @@
     },
     "auth_configs": {
       "authToken": {
+        "name": "",
         "use_param": false,
         "param_name": "",
         "use_cookie": false,
         "cookie_name": "",
+        "disable_header": false,
         "auth_header_name": "Authorization",
         "use_certificate": false,
         "validate_signature": false,
         "signature": {
           "algorithm": "",
           "header": "",
+          "use_param": false,
+          "param_name": "",
           "secret": "",
           "allowed_clock_skew": 0,
           "error_code": 0,
           "error_message": ""
         }
       },
       "jwt": {
+        "name": "",
         "use_param": false,
         "param_name": "",
         "use_cookie": false,
         "cookie_name": "",
+        "disable_header": false,
         "auth_header_name": "Authorization",
         "use_certificate": false,
         "validate_signature": false,
         "signature": {
           "algorithm": "",
           "header": "",
+          "use_param": false,
+          "param_name": "",
           "secret": "",
           "allowed_clock_skew": 0,
           "error_code": 0,
@@ -86,7 +99,9 @@
     "use_mutual_tls_auth": false,
     "client_certificates": [],
     "upstream_certificates": {},
+    "upstream_certificates_disabled": false,
     "pinned_public_keys": {},
+    "certificate_pinning_disabled": false,
     "enable_jwt": false,
     "use_standard_auth": true,
     "use_go_plugin_auth": false,
@@ -101,6 +116,16 @@
     "jwt_expires_at_validation_skew": 0,
     "jwt_not_before_validation_skew": 0,
     "jwt_skip_kid": false,
+    "scopes": {
+      "jwt": {
+        "scope_claim_name": "",
+        "scope_to_policy": {}
+      },
+      "oidc": {
+        "scope_claim_name": "",
+        "scope_to_policy": {}
+      }
+    },
     "jwt_scope_to_policy_mapping": {},
     "jwt_scope_claim_name": "",
     "notifications": {
@@ -121,9 +146,14 @@
     },
     "base_identity_provided_by": "",
     "definition": {
+      "enabled": false,
+      "name": "",
+      "default": "",
       "location": "header",
       "key": "x-api-version",
-      "strip_path": false
+      "strip_path": false,
+      "strip_versioning_data": false,
+      "versions": {}
     },
     "version_data": {
       "not_versioned": true,
@@ -141,7 +171,9 @@
           "extended_paths": {
             "ignored": [
               {
+                "disabled": false,
                 "path": "/anything/ignored",
+                "method": "",
                 "ignore_case": false,
                 "method_actions": {
                   "GET": {
@@ -265,7 +297,7 @@
               "api_model": {},
               "event_timeout": 60,
               "header_map": {},
-              "id": "61c3e93d8949360001da89a6",
+              "id": "62ff20d31732a70001610edc",
               "method": "POST",
               "name": "Webhook Receiver Post",
               "org_id": "5e9d9544a1dcd60001d0ed20",
@@ -296,9 +328,9 @@
       "debug": false
     },
     "domain": "",
+    "domain_disabled": false,
     "certificates": [],
     "do_not_track": false,
-    "tags": [],
     "enable_context_vars": false,
     "config_data": {},
     "tag_headers": [],
@@ -331,17 +363,26 @@
       "supergraph": {
         "subgraphs": [],
         "merged_sdl": "",
-        "global_headers": {}
+        "global_headers": {},
+        "disable_query_batching": false
       }
-    }
+    },
+    "analytics_plugin": {
+      "enable": false,
+      "plugin_path": "",
+      "func_name": ""
+    },
+    "tags_disabled": false,
+    "tags": [],
+    "is_oas": false
   },
   "hook_references": [
     {
       "event_name": "AuthFailure",
       "event_timeout": 60,
       "hook": {
         "api_model": {},
-        "id": "61c3e93d8949360001da89a6",
+        "id": "62ff20d31732a70001610edc",
         "org_id": "5e9d9544a1dcd60001d0ed20",
         "name": "Webhook Receiver Post",
         "method": "POST",

diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-5ead711f5759610001818679.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-5ead711f5759610001818679.json
@@ -4,6 +4,7 @@
   "api_definition": {
     "id": "5ead711f5759610001818679",
     "name": "Basic Open API",
+    "expiration": "",
     "slug": "basic-open-api",
     "listen_port": 0,
     "protocol": "",
@@ -23,16 +24,20 @@
       "auth_login_redirect": ""
     },
     "auth": {
+      "name": "",
       "use_param": false,
       "param_name": "",
       "use_cookie": false,
       "cookie_name": "",
+      "disable_header": false,
       "auth_header_name": "",
       "use_certificate": false,
       "validate_signature": false,
       "signature": {
         "algorithm": "",
         "header": "",
+        "use_param": false,
+        "param_name": "",
         "secret": "",
         "allowed_clock_skew": 0,
         "error_code": 0,
@@ -41,33 +46,41 @@
     },
     "auth_configs": {
       "authToken": {
+        "name": "",
         "use_param": false,
         "param_name": "",
         "use_cookie": false,
         "cookie_name": "",
+        "disable_header": false,
         "auth_header_name": "",
         "use_certificate": false,
         "validate_signature": false,
         "signature": {
           "algorithm": "",
           "header": "",
+          "use_param": false,
+          "param_name": "",
           "secret": "",
           "allowed_clock_skew": 0,
           "error_code": 0,
           "error_message": ""
         }
       },
       "jwt": {
+        "name": "",
         "use_param": false,
         "param_name": "",
         "use_cookie": false,
         "cookie_name": "",
+        "disable_header": false,
         "auth_header_name": "",
         "use_certificate": false,
         "validate_signature": false,
         "signature": {
           "algorithm": "",
           "header": "",
+          "use_param": false,
+          "param_name": "",
           "secret": "",
           "allowed_clock_skew": 0,
           "error_code": 0,
@@ -86,7 +99,9 @@
     "use_mutual_tls_auth": false,
     "client_certificates": [],
     "upstream_certificates": {},
+    "upstream_certificates_disabled": false,
     "pinned_public_keys": {},
+    "certificate_pinning_disabled": false,
     "enable_jwt": false,
     "use_standard_auth": false,
     "use_go_plugin_auth": false,
@@ -101,6 +116,16 @@
     "jwt_expires_at_validation_skew": 0,
     "jwt_not_before_validation_skew": 0,
     "jwt_skip_kid": false,
+    "scopes": {
+      "jwt": {
+        "scope_claim_name": "",
+        "scope_to_policy": {}
+      },
+      "oidc": {
+        "scope_claim_name": "",
+        "scope_to_policy": {}
+      }
+    },
     "jwt_scope_to_policy_mapping": {},
     "jwt_scope_claim_name": "",
     "notifications": {
@@ -121,9 +146,14 @@
     },
     "base_identity_provided_by": "",
     "definition": {
+      "enabled": false,
+      "name": "",
+      "default": "",
       "location": "header",
       "key": "x-api-version",
-      "strip_path": false
+      "strip_path": false,
+      "strip_versioning_data": false,
+      "versions": {}
     },
     "version_data": {
       "not_versioned": true,
@@ -266,11 +296,9 @@
       "debug": false
     },
     "domain": "",
+    "domain_disabled": false,
     "certificates": [],
     "do_not_track": false,
-    "tags": [
-      "tyk-gateway-2"
-    ],
     "enable_context_vars": true,
     "config_data": {},
     "tag_headers": [],
@@ -303,9 +331,20 @@
       "supergraph": {
         "subgraphs": [],
         "merged_sdl": "",
-        "global_headers": {}
+        "global_headers": {},
+        "disable_query_batching": false
       }
-    }
+    },
+    "analytics_plugin": {
+      "enable": false,
+      "plugin_path": "",
+      "func_name": ""
+    },
+    "tags_disabled": false,
+    "tags": [
+      "tyk-gateway-2"
+    ],
+    "is_oas": false
   },
   "hook_references": [],
   "is_site": false,