Fix pytests.sh

Ericsson · Jan 15, 2025 · 46af465 · 46af465
1 parent 0b9b371
commit 46af465
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 27 deletions.
diff --git a/application/src/main/resources/application.yml b/application/src/main/resources/application.yml
@@ -40,8 +40,8 @@ management:
 # and API doc at <ecchronos:port>/v3/api-docs.yaml
 springdoc:
   api-docs:
+    version: OPENAPI_3_0
     enabled: false
-    version: "openapi_3_0"
 
 # Security Config
 #server:

diff --git a/docs/autogenerated/openapi.yaml b/docs/autogenerated/openapi.yaml
@@ -283,15 +283,15 @@ paths:
             text/plain;version=0.0.4;charset=utf-8:
               schema:
                 type: string
-            application/openmetrics-text; version=1.0.0; charset=utf-8:
-              schema:
-                type: string
             application/openmetrics-text;version=1.0.0;charset=utf-8:
               schema:
                 type: string
             text/plain; version=0.0.4; charset=utf-8:
               schema:
                 type: string
+            application/openmetrics-text; version=1.0.0; charset=utf-8:
+              schema:
+                type: string
   /actuator:
     get:
       tags:
@@ -309,14 +309,14 @@ paths:
                   type: object
                   additionalProperties:
                     $ref: "#/components/schemas/Link"
-            application/json:
+            application/vnd.spring-boot.actuator.v2+json:
               schema:
                 type: object
                 additionalProperties:
                   type: object
                   additionalProperties:
                     $ref: "#/components/schemas/Link"
-            application/vnd.spring-boot.actuator.v2+json:
+            application/json:
               schema:
                 type: object
                 additionalProperties:
@@ -336,31 +336,12 @@ paths:
             application/vnd.spring-boot.actuator.v3+json:
               schema:
                 type: object
-            application/json:
-              schema:
-                type: object
             application/vnd.spring-boot.actuator.v2+json:
               schema:
                 type: object
-  /actuator/health/**:
-    get:
-      tags:
-      - Actuator
-      summary: Actuator web endpoint 'health-path'
-      operationId: health-path
-      responses:
-        "200":
-          description: OK
-          content:
-            application/vnd.spring-boot.actuator.v3+json:
-              schema:
-                type: object
             application/json:
               schema:
                 type: object
-            application/vnd.spring-boot.actuator.v2+json:
-              schema:
-                type: object
 components:
   schemas:
     OnDemandRepair:

diff --git a/ecchronos-binary/src/test/bin/pytests.sh b/ecchronos-binary/src/test/bin/pytests.sh
@@ -88,8 +88,8 @@ sed 's;^\(\s*\)\(<appender-ref ref="STDOUT" />\)\s*$;\1<!-- \2 -->;g' -i "$CONF_
 
 # springdoc
 
-sed '/springdoc:/{n;/api-docs/{n;s/enabled: .*/enabled: true/}}' -i "$CONF_DIR"/application.yml
-sed '/springdoc:/{n;/api-docs/{n;/enabled: true/{n;s/.*/  show-actuator: true\n/}}}' -i "$CONF_DIR"/application.yml
+sed '/springdoc:/{n;/api-docs/{n;/version: OPENAPI_3_0/{n;s/enabled: .*/enabled: true/}}}' -i "$CONF_DIR"/application.yml
+sed '/springdoc:/{n;/api-docs/{n;/version: OPENAPI_3_0/{n;/enabled: true/{n;s/.*/  show-actuator: true\n/}}}}' -i "$CONF_DIR"/application.yml
 
 ## Special config for test.table1