Merge pull request #180 from TykTechnologies/update_and_fix

Updated api def and version bump
TykTechnologies · Feb 1, 2023 · 5428571 · 5428571
2 parents 206493a + b665681
commit 5428571
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/deployments/tyk/data/tyk-dashboard/1/apis/api-5ead7120575961000181867b.json b/deployments/tyk/data/tyk-dashboard/1/apis/api-5ead7120575961000181867b.json
@@ -255,7 +255,7 @@
         "raw_body_only": false
       },
       "response": [],
-      "driver": "",
+      "driver": "otto",
       "id_extractor": {
         "extract_from": "",
         "extract_with": "",
@@ -363,4 +363,4 @@
   "sort_by": 0,
   "user_group_owners": [],
   "user_owners": []
-}
+}
diff --git a/deployments/tyk/docker-compose.yml b/deployments/tyk/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.8'
 services:
   tyk-dashboard:
-    image: tykio/tyk-dashboard:${DASHBOARD_VERSION:-v4.2.0}
+    image: tykio/tyk-dashboard:${DASHBOARD_VERSION:-v4.3.2}
     ports:
       - 3000:3000
     networks:
@@ -17,12 +17,12 @@ services:
       - TYK_LOGLEVEL=${DASHBOARD_LOGLEVEL:-info}
       - TYK_INSTRUMENTATION=${INSTRUMENTATION_ENABLED:-0}
     env_file:
-    - .env
+      - .env
     depends_on:
       - tyk-redis
       - tyk-mongo
   tyk-gateway:
-    image: tykio/tyk-gateway:${GATEWAY_VERSION:-v4.2.0}
+    image: tykio/tyk-gateway:${GATEWAY_VERSION:-v4.3.2}
     ports:
       - 8080:8080
       - 8086:8086
@@ -41,7 +41,7 @@ services:
       - TYK_GW_ANALYTICSCONFIG_ENABLEGEOIP=true
       - TYK_GW_ANALYTICSCONFIG_GEOIPDBLOCATION=/opt/tyk-gateway/databases/GeoLite2-Country.mmdb
     env_file:
-    - .env
+      - .env
     volumes:
       - ./deployments/tyk/volumes/tyk-gateway/tyk.conf:/opt/tyk-gateway/tyk.conf
       - ./deployments/tyk/volumes/tyk-gateway/certs:/opt/tyk-gateway/certs
@@ -52,7 +52,7 @@ services:
     depends_on:
       - tyk-redis
   tyk-gateway-2:
-    image: tykio/tyk-gateway:${GATEWAY2_VERSION:-v4.2.0}
+    image: tykio/tyk-gateway:${GATEWAY2_VERSION:-v4.3.2}
     ports:
       - 8081:8080
     networks:
@@ -62,7 +62,7 @@ services:
       - TYK_INSTRUMENTATION=${INSTRUMENTATION_ENABLED:-0}
       - TYK_GW_TRACER_ENABLED=${TRACING_ENABLED:-false}
     env_file:
-    - .env
+      - .env
     volumes:
       - ./deployments/tyk/volumes/tyk-gateway/tyk-2.conf:/opt/tyk-gateway/tyk.conf
       - ./deployments/tyk/volumes/tyk-gateway/certs:/opt/tyk-gateway/certs
@@ -73,7 +73,7 @@ services:
   tyk-pump:
     image: tykio/tyk-pump-docker-pub:${PUMP_VERSION:-v1.5.1}
     ports:
-    - 8083:8083
+      - 8083:8083
     networks:
       - tyk
     volumes:
@@ -82,7 +82,7 @@ services:
       - TYK_INSTRUMENTATION=${INSTRUMENTATION_ENABLED:-0}
       - TYK_LOGLEVEL=${PUMP_LOGLEVEL:-info}
     env_file:
-    - .env
+      - .env
     depends_on:
       - tyk-redis
       - tyk-mongo
@@ -96,7 +96,7 @@ services:
       - tyk
   tyk-mongo:
     image: mongo:4.0
-    command: ["mongod", "--smallfiles"]
+    command: [ "mongod", "--smallfiles" ]
     ports:
       - "27017:27017"
     volumes:
@@ -144,5 +144,6 @@ volumes:
   tyk-redis-data:
   tyk-mongo-data:
 
+
 networks:
   tyk:
diff --git a/deployments/tyk/tyk_demo_tyk.postman_collection.json b/deployments/tyk/tyk_demo_tyk.postman_collection.json
@@ -1,6 +1,6 @@
 {
 	"info": {
-		"_postman_id": "48438e95-9424-4ae6-b50a-627dd7cb53b6",
+		"_postman_id": "83f72dbf-9430-4886-840c-5ffae29b8615",
 		"name": "Tyk Demo",
 		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
 	},
@@ -7136,7 +7136,8 @@
 													"    pm.expect(jsonData.user_permissions.IsAdmin).to.equal(\"admin\");",
 													"    pm.expect(jsonData.first_name).to.equal(pm.variables.get(\"user-first-name\"));",
 													"    pm.expect(jsonData.last_name).to.equal(pm.variables.get(\"user-last-name\"));",
-													"    pm.expect(jsonData.email_address).to.equal(pm.variables.get(\"user-email-address\"));",
+													"    // Tyk converts email addresses to lower case, so we validate against a lower case email address",
+													"    pm.expect(jsonData.email_address).to.equal(pm.variables.get(\"user-email-address\").toLowerCase());",
 													"});",
 													"",
 													"// tidy up",