Configure page

Romanow · Sep 12, 2024 · 3ebbcaa · 3ebbcaa
1 parent 8e6812b
commit 3ebbcaa
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 41 deletions.
diff --git a/README.md b/README.md
@@ -90,11 +90,10 @@ curl --location --request POST 'https://romanowalex.eu.auth0.com/oauth/token' \
 ```shell
 $ brew install k6
 
-$ $ docker compose \
+$ docker compose \
     -f docker-compose.yml \
     -f docker-compose.tracing.yml \
     -f docker-compose.monitoring.yml \
-    -f docker-compose.load-testing.yml \
     up -d --wait
 
 $ K6_WEB_DASHBOARD=true K6_WEB_DASHBOARD_EXPORT=report.html \

diff --git a/build.gradle b/build.gradle
@@ -1,27 +1,27 @@
 plugins {
     id "idea"
     id "java-library"
-    id "org.jetbrains.kotlin.jvm" version "1.9.22"
-    id "org.jetbrains.kotlin.kapt" version "1.9.22" apply false
-    id "org.jetbrains.kotlin.plugin.jpa" version "1.9.22" apply false
-    id "org.jetbrains.kotlin.plugin.spring" version "1.9.22" apply false
+    id "org.jetbrains.kotlin.jvm" version "1.9.25"
+    id "org.jetbrains.kotlin.kapt" version "1.9.25" apply false
+    id "org.jetbrains.kotlin.plugin.jpa" version "1.9.25" apply false
+    id "org.jetbrains.kotlin.plugin.spring" version "1.9.25" apply false
     id "org.jlleitschuh.gradle.ktlint" version "12.1.1" apply false
     id "org.springframework.boot" version "3.2.8" apply false
     id "com.gorylenko.gradle-git-properties" version "2.4.1" apply false
     id "com.adarshr.test-logger" version "4.0.0" apply false
-    id "io.spring.dependency-management" version "1.1.3"
+    id "io.spring.dependency-management" version "1.1.6"
 }
 
 ext {
-    kotlinVersion = "1.9.22"
+    kotlinVersion = "1.9.25"
     springBootVersion = "3.2.8"
     springCircuitBreakerVersion = "3.1.1"
     validationApiVersion = "2.0.1.Final"
     gsonVersion = "2.8.5"
     jwtVersion = "4.4.0"
-    openApiVersion = "2.1.0"
+    openApiVersion = "2.6.0"
     logbookVersion = "2.16.0"
-    logstashEncoderVersion = "7.3"
+    logstashEncoderVersion = "7.4"
     postgresContainerVersion = "1.19.0"
 }
 

diff --git a/docker-compose.load-testing.yml b/docker-compose.load-testing.yml
diff --git a/docker-compose.logging.yml b/docker-compose.logging.yml
@@ -1,4 +1,3 @@
-version: "3.9"
 services:
   elastic:
     image: elasticsearch:8.12.2

diff --git a/docker-compose.moniroting.yml → docker-compose.monitoring.yml b/docker-compose.moniroting.yml → docker-compose.monitoring.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   prometheus:
     image: prom/prometheus:v2.52.0

diff --git a/docker-compose.tracing.yml b/docker-compose.tracing.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   jaeger:
     image: "jaegertracing/all-in-one:1.57"

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: "3"
 services:
   postgres:
     image: postgres:15

diff --git a/tests/postman/collection.json b/tests/postman/collection.json
@@ -457,16 +457,18 @@
                         "type": "text/javascript",
                         "exec": [
                             "const moment = require(\"moment\")",
+                            "const crypto = require(\"crypto-js\")",
+                            "const lodash = require(\"lodash\")",
                             "const token = pm.environment.get(\"token\")",
                             "",
                             "var expire = true",
                             "if (token) {",
                             "    const payload = token.split(\".\")[1]",
-                            "    const json = JSON.parse(CryptoJS.enc.Base64.parse(payload).toString(CryptoJS.enc.Utf8))",
+                            "    const json = JSON.parse(crypto.enc.Base64.parse(payload).toString(crypto.enc.Utf8))",
                             "    expire = moment.unix(json.exp).isBefore(moment())",
                             "}",
                             "",
-                            "if (_.isEmpty(token) || expire) {",
+                            "if (lodash.isEmpty(token) || expire) {",
                             "",
                             "    pm.sendRequest({",
                             "        url: 'https://romanowalex.eu.auth0.com/oauth/token',",
@@ -948,16 +950,18 @@
                         "type": "text/javascript",
                         "exec": [
                             "const moment = require(\"moment\")",
+                            "const crypto = require(\"crypto-js\")",
+                            "const lodash = require(\"lodash\")",
                             "const token = pm.environment.get(\"token\")",
                             "",
                             "var expire = true",
                             "if (token) {",
                             "    const payload = token.split(\".\")[1]",
-                            "    const json = JSON.parse(CryptoJS.enc.Base64.parse(payload).toString(CryptoJS.enc.Utf8))",
+                            "    const json = JSON.parse(crypto.enc.Base64.parse(payload).toString(crypto.enc.Utf8))",
                             "    expire = moment.unix(json.exp).isBefore(moment())",
                             "}",
                             "",
-                            "if (_.isEmpty(token) || expire) {",
+                            "if (lodash.isEmpty(token) || expire) {",
                             "",
                             "    pm.sendRequest({",
                             "        url: 'https://romanowalex.eu.auth0.com/oauth/token',",
@@ -1406,16 +1410,18 @@
                         "type": "text/javascript",
                         "exec": [
                             "const moment = require(\"moment\")",
+                            "const crypto = require(\"crypto-js\")",
+                            "const lodash = require(\"lodash\")",
                             "const token = pm.environment.get(\"token\")",
                             "",
                             "var expire = true",
                             "if (token) {",
                             "    const payload = token.split(\".\")[1]",
-                            "    const json = JSON.parse(CryptoJS.enc.Base64.parse(payload).toString(CryptoJS.enc.Utf8))",
+                            "    const json = JSON.parse(crypto.enc.Base64.parse(payload).toString(crypto.enc.Utf8))",
                             "    expire = moment.unix(json.exp).isBefore(moment())",
                             "}",
                             "",
-                            "if (_.isEmpty(token) || expire) {",
+                            "if (lodash.isEmpty(token) || expire) {",
                             "",
                             "    pm.sendRequest({",
                             "        url: 'https://romanowalex.eu.auth0.com/oauth/token',",
@@ -1787,16 +1793,18 @@
                         "type": "text/javascript",
                         "exec": [
                             "const moment = require(\"moment\")",
+                            "const crypto = require(\"crypto-js\")",
+                            "const lodash = require(\"lodash\")",
                             "const token = pm.environment.get(\"token\")",
                             "",
                             "var expire = true",
                             "if (token) {",
                             "    const payload = token.split(\".\")[1]",
-                            "    const json = JSON.parse(CryptoJS.enc.Base64.parse(payload).toString(CryptoJS.enc.Utf8))",
+                            "    const json = JSON.parse(crypto.enc.Base64.parse(payload).toString(crypto.enc.Utf8))",
                             "    expire = moment.unix(json.exp).isBefore(moment())",
                             "}",
                             "",
-                            "if (_.isEmpty(token) || expire) {",
+                            "if (lodash.isEmpty(token) || expire) {",
                             "",
                             "    pm.sendRequest({",
                             "        url: 'https://romanowalex.eu.auth0.com/oauth/token',",