From c20613b1252d0728820c22d10a1a5e3af8853d9c Mon Sep 17 00:00:00 2001 From: "t.eitzenberger" Date: Thu, 23 Jan 2025 11:01:25 +0100 Subject: [PATCH 1/3] TGR-1120: provide a schema for the tiger test environment configuration file --- src/api/json/catalog.json | 9 + src/schemas/json/gematik-tiger.json | 906 ++++++++++++++++++++++++++++ src/test/gematik-tiger/tiger.yaml | 63 ++ 3 files changed, 978 insertions(+) create mode 100644 src/schemas/json/gematik-tiger.json create mode 100644 src/test/gematik-tiger/tiger.yaml diff --git a/src/api/json/catalog.json b/src/api/json/catalog.json index a2495be6fee..47c089a734e 100644 --- a/src/api/json/catalog.json +++ b/src/api/json/catalog.json @@ -7385,6 +7385,15 @@ "**/testdata/patient/patients.yaml" ], "url": "https://json.schemastore.org/gematik-test-patients.json" + }, + { + "name": "gematik tiger test environment configuration", + "description": "A configuration file for the test environment of the gematik Tiger test platform", + "fileMatch": [ + "**/tiger.yml", + "**/tiger.yaml" + ], + "url": "https://json.schemastore.org/gematik-tiger.json" } ] } diff --git a/src/schemas/json/gematik-tiger.json b/src/schemas/json/gematik-tiger.json new file mode 100644 index 00000000000..e83d1c478ab --- /dev/null +++ b/src/schemas/json/gematik-tiger.json @@ -0,0 +1,906 @@ +{ + "$schema": "http://json-schema.org/draft-07/schema#", + "$id": "https://json.schemastore.org/gematik-tiger.json", + "title": "Tiger environment configuration", + "description": "A configuration file for the test environment of the gematik Tiger test platform", + + "$defs": { + "CfgExternalJarOptions-nullable": { + "type": [ + "object", + "null" + ], + "properties": { + "activateLogs": { + "type": "boolean" + }, + "activateWorkflowLogs": { + "type": "boolean" + }, + "arguments": { + "type": [ + "array", + "null" + ], + "items": { + "type": "string" + } + }, + "options": { + "type": [ + "array", + "null" + ], + "items": { + "type": "string" + } + }, + "workingDir": { + "type": [ + "string", + "null" + ] + } + } + }, + "CfgHelmChartOptions-nullable": { + "type": [ + "object", + "null" + ], + "properties": { + "context": { + "type": [ + "string", + "null" + ] + }, + "debug": { + "type": "boolean" + }, + "exposedPorts": { + "type": [ + "array", + "null" + ], + "items": { + "type": "string" + } + }, + "healthcheckPods": { + "type": [ + "array", + "null" + ], + "items": { + "type": "string" + } + }, + "logPods": { + "type": [ + "array", + "null" + ], + "items": { + "type": "string" + } + }, + "nameSpace": { + "type": [ + "string", + "null" + ] + }, + "podName": { + "type": [ + "string", + "null" + ] + }, + "values": { + "type": [ + "array", + "null" + ], + "items": { + "type": "string" + } + }, + "workingDir": { + "type": [ + "string", + "null" + ] + } + } + }, + "CfgServer": { + "type": "object", + "properties": { + "active": { + "type": "boolean" + }, + "dependsUpon": { + "type": [ + "string", + "null" + ] + }, + "environment": { + "type": [ + "array", + "null" + ], + "items": { + "type": "string" + } + }, + "exports": { + "type": [ + "array", + "null" + ], + "items": { + "type": "string" + } + }, + "externalJarOptions": { + "$ref": "#/$defs/CfgExternalJarOptions-nullable" + }, + "healthcheckReturnCode": { + "type": [ + "integer", + "null" + ] + }, + "healthcheckUrl": { + "type": [ + "string", + "null" + ] + }, + "helmChartOptions": { + "$ref": "#/$defs/CfgHelmChartOptions-nullable" + }, + "hostname": { + "type": [ + "string", + "null" + ] + }, + "logFile": { + "type": [ + "string", + "null" + ] + }, + "source": { + "type": [ + "array", + "null" + ], + "items": { + "type": "string" + } + }, + "startupPollIntervalMs": { + "type": [ + "integer", + "null" + ] + }, + "startupTimeoutSec": { + "type": [ + "integer", + "null" + ] + }, + "tigerProxyConfiguration": { + "$ref": "#/$defs/TigerProxyConfiguration-nullable" + }, + "type": { + "type": [ + "string", + "null" + ] + }, + "uiRank": { + "type": "integer" + }, + "urlMappings": { + "type": [ + "array", + "null" + ], + "items": { + "type": "string" + } + }, + "version": { + "type": [ + "string", + "null" + ] + } + } + }, + "DirectReverseProxyInfo-nullable": { + "type": [ + "object", + "null" + ], + "properties": { + "hostname": { + "type": [ + "string", + "null" + ] + }, + "ignoreConnectionErrors": { + "type": "boolean" + }, + "port": { + "type": [ + "integer", + "null" + ] + } + } + }, + "ForwardProxyInfo-nullable": { + "type": [ + "object", + "null" + ], + "properties": { + "hostname": { + "type": [ + "string", + "null" + ] + }, + "noProxyHosts": { + "type": [ + "array", + "null" + ], + "items": { + "type": "string" + } + }, + "password": { + "type": [ + "string", + "null" + ] + }, + "port": { + "type": [ + "integer", + "null" + ] + }, + "type": { + "$ref": "#/$defs/TigerProxyType-nullable" + }, + "username": { + "type": [ + "string", + "null" + ] + } + } + }, + "Map(String,CfgServer)-nullable": { + "type": [ + "object", + "null" + ], + "additionalProperties": { + "$ref": "#/$defs/CfgServer" + } + }, + "PrivateKey-nullable": { + "type": [ + "object", + "null" + ] + }, + "RbelModificationDescription": { + "type": "object", + "properties": { + "condition": { + "type": [ + "string", + "null" + ] + }, + "deleteAfterNExecutions": { + "type": [ + "integer", + "null" + ] + }, + "name": { + "type": [ + "string", + "null" + ] + }, + "regexFilter": { + "type": [ + "string", + "null" + ] + }, + "replaceWith": { + "type": [ + "string", + "null" + ] + }, + "targetElement": { + "type": [ + "string", + "null" + ] + } + } + }, + "StoreType-nullable": { + "anyOf": [ + { + "type": "null" + }, + { + "type": "string", + "enum": [ + "PKCS12", + "JKS", + "BKS", + "PKCS8", + "PKCS1" + ] + } + ] + }, + "TigerConfigurationPkiIdentity": { + "type": "object", + "properties": { + "certificate": { + "$ref": "#/$defs/X509Certificate-nullable" + }, + "certificateChain": { + "type": [ + "array", + "null" + ], + "items": { + "$ref": "#/$defs/X509Certificate" + } + }, + "fileLoadingInformation": { + "$ref": "#/$defs/TigerPkiIdentityInformation-nullable" + }, + "keyId": { + "type": [ + "string", + "null" + ] + }, + "privateKey": { + "$ref": "#/$defs/PrivateKey-nullable" + } + } + }, + "TigerConfigurationPkiIdentity-nullable": { + "anyOf": [ + { + "type": "null" + }, + { + "$ref": "#/$defs/TigerConfigurationPkiIdentity" + } + ] + }, + "TigerConfigurationRoute": { + "type": "object", + "properties": { + "authentication": { + "$ref": "#/$defs/TigerRouteAuthenticationConfiguration-nullable" + }, + "criterions": { + "type": [ + "array", + "null" + ], + "items": { + "type": "string" + } + }, + "disableRbelLogging": { + "type": "boolean" + }, + "from": { + "type": [ + "string", + "null" + ] + }, + "hosts": { + "type": [ + "array", + "null" + ], + "items": { + "type": "string" + } + }, + "to": { + "type": [ + "array", + "null" + ], + "items": { + "type": "string" + } + } + } + }, + "TigerFileSaveInfo-nullable": { + "type": [ + "object", + "null" + ], + "properties": { + "clearFileOnBoot": { + "type": "boolean" + }, + "filename": { + "type": [ + "string", + "null" + ] + }, + "readFilter": { + "type": [ + "string", + "null" + ] + }, + "sourceFile": { + "type": [ + "string", + "null" + ] + }, + "writeToFile": { + "type": "boolean" + } + } + }, + "TigerPkiIdentityInformation-nullable": { + "type": [ + "object", + "null" + ], + "properties": { + "filenames": { + "type": [ + "array", + "null" + ], + "items": { + "type": "string" + } + }, + "password": { + "type": [ + "string", + "null" + ] + }, + "storeType": { + "$ref": "#/$defs/StoreType-nullable" + } + } + }, + "TigerProxyConfiguration-nullable": { + "type": [ + "object", + "null" + ], + "properties": { + "activateForwardAllLogging": { + "type": "boolean" + }, + "activateRbelParsing": { + "type": "boolean" + }, + "activateRbelParsingFor": { + "type": [ + "array", + "null" + ], + "items": { + "type": "string" + } + }, + "activateTlsTermination": { + "type": "boolean" + }, + "activateTrafficLogging": { + "type": "boolean" + }, + "adminPort": { + "type": "integer" + }, + "connectionTimeoutInSeconds": { + "type": "integer" + }, + "directReverseProxy": { + "$ref": "#/$defs/DirectReverseProxyInfo-nullable" + }, + "downloadInitialTrafficFromEndpoints": { + "type": "boolean" + }, + "failOnOfflineTrafficEndpoints": { + "type": "boolean" + }, + "fileSaveInfo": { + "$ref": "#/$defs/TigerFileSaveInfo-nullable" + }, + "forwardToProxy": { + "$ref": "#/$defs/ForwardProxyInfo-nullable" + }, + "keyFolders": { + "type": [ + "array", + "null" + ], + "items": { + "type": "string" + } + }, + "localResources": { + "type": "boolean" + }, + "maximumPartialMessageAgeInSeconds": { + "type": "integer" + }, + "maximumTrafficDownloadPageSize": { + "type": "integer" + }, + "modifications": { + "type": [ + "array", + "null" + ], + "items": { + "$ref": "#/$defs/RbelModificationDescription" + } + }, + "name": { + "type": [ + "string", + "null" + ] + }, + "notes": { + "type": [ + "array", + "null" + ], + "items": { + "$ref": "#/$defs/TigerProxyNoteCommand" + } + }, + "parsingShouldBlockCommunication": { + "type": "boolean" + }, + "password": { + "type": [ + "string", + "null" + ] + }, + "perMessageBufferSizeInMb": { + "type": "integer" + }, + "proxiedServer": { + "type": [ + "string", + "null" + ] + }, + "proxiedServerProtocol": { + "type": [ + "string", + "null" + ] + }, + "proxyLogLevel": { + "type": [ + "string", + "null" + ] + }, + "proxyPort": { + "type": [ + "integer", + "null" + ] + }, + "proxyRoutes": { + "type": [ + "array", + "null" + ], + "items": { + "$ref": "#/$defs/TigerConfigurationRoute" + } + }, + "rbelBufferSizeInMb": { + "type": "integer" + }, + "rewriteHostHeader": { + "type": "boolean" + }, + "rewriteLocationHeader": { + "type": "boolean" + }, + "skipDisplayWhenMessageLargerThanKb": { + "type": "integer" + }, + "skipParsingWhenMessageLargerThanKb": { + "type": "integer" + }, + "skipTrafficEndpointsSubscription": { + "type": "boolean" + }, + "stompClientBufferSizeInMb": { + "type": "integer" + }, + "tls": { + "$ref": "#/$defs/TigerTlsConfiguration-nullable" + }, + "trafficDownloadPageSize": { + "type": "integer" + }, + "trafficEndpointConfiguration": { + "$ref": "#/$defs/TrafficEndpointConfiguration-nullable" + }, + "trafficEndpointFilterString": { + "type": [ + "string", + "null" + ] + }, + "trafficEndpoints": { + "type": [ + "array", + "null" + ], + "items": { + "type": "string" + } + }, + "username": { + "type": [ + "string", + "null" + ] + } + } + }, + "TigerProxyNoteCommand": { + "type": "object", + "properties": { + "jexlCriterion": { + "type": [ + "string", + "null" + ] + }, + "message": { + "type": [ + "string", + "null" + ] + } + } + }, + "TigerProxyType-nullable": { + "anyOf": [ + { + "type": "null" + }, + { + "type": "string", + "enum": [ + "http", + "https" + ] + } + ] + }, + "TigerRouteAuthenticationConfiguration-nullable": { + "type": [ + "object", + "null" + ], + "properties": { + "bearerToken": { + "type": [ + "string", + "null" + ] + }, + "password": { + "type": [ + "string", + "null" + ] + }, + "username": { + "type": [ + "string", + "null" + ] + } + } + }, + "TigerTlsConfiguration-nullable": { + "type": [ + "object", + "null" + ], + "properties": { + "allowGenericFallbackIdentity": { + "type": "boolean" + }, + "alternativeNames": { + "type": [ + "array", + "null" + ], + "items": { + "type": "string" + } + }, + "clientSslSuites": { + "type": [ + "array", + "null" + ], + "items": { + "type": "string" + } + }, + "clientSupportedGroups": { + "type": [ + "array", + "null" + ], + "items": { + "type": "string" + } + }, + "domainName": { + "type": [ + "string", + "null" + ] + }, + "forwardMutualTlsIdentity": { + "$ref": "#/$defs/TigerConfigurationPkiIdentity-nullable" + }, + "masterSecretsFile": { + "type": [ + "string", + "null" + ] + }, + "ocspSignerIdentity": { + "$ref": "#/$defs/TigerConfigurationPkiIdentity-nullable" + }, + "serverIdentities": { + "type": [ + "array", + "null" + ], + "items": { + "$ref": "#/$defs/TigerConfigurationPkiIdentity" + } + }, + "serverIdentity": { + "$ref": "#/$defs/TigerConfigurationPkiIdentity-nullable" + }, + "serverRootCa": { + "$ref": "#/$defs/TigerConfigurationPkiIdentity-nullable" + }, + "serverSslSuites": { + "type": [ + "array", + "null" + ], + "items": { + "type": "string" + } + }, + "serverTlsProtocols": { + "type": [ + "array", + "null" + ], + "items": { + "type": "string" + } + } + } + }, + "TrafficEndpointConfiguration-nullable": { + "type": [ + "object", + "null" + ], + "properties": { + "name": { + "type": [ + "string", + "null" + ] + }, + "stompTopic": { + "type": [ + "string", + "null" + ] + }, + "wsEndpoint": { + "type": [ + "string", + "null" + ] + } + } + }, + "X509Certificate": { + "type": "object", + "properties": { + "type": { + "type": [ + "string", + "null" + ] + } + } + }, + "X509Certificate-nullable": { + "anyOf": [ + { + "type": "null" + }, + { + "$ref": "#/$defs/X509Certificate" + } + ] + } + }, + "type": "object", + "properties": { + "localProxyActive": { + "type": "boolean" + }, + "servers": { + "type": "object", + "$ref": "#/$defs/Map(String,CfgServer)-nullable", + "additionalProperties": { + "$ref": "#/$defs/CfgServer" + } + }, + "tigerProxy": { + "$ref": "#/$defs/TigerProxyConfiguration-nullable" + } + } +} diff --git a/src/test/gematik-tiger/tiger.yaml b/src/test/gematik-tiger/tiger.yaml new file mode 100644 index 00000000000..b4814bb3a72 --- /dev/null +++ b/src/test/gematik-tiger/tiger.yaml @@ -0,0 +1,63 @@ +# yaml-language-server: $schema=../../schemas/json/gematik-tiger.json +trueBooleanValue: true +falseBooleanValue: false + +tigerProxy: + skipTrafficEndpointsSubscription: false + proxyPort: 9001 + trafficEndpoints: + - http://localhost:${free.port.2} + keyFolders: + - . + activateRbelParsingFor: + - X509 + +servers: + httpbin: + type: httpbin + serverPort: ${free.port.4} + healthcheckUrl: http://localhost:${free.port.4}/status/200 + remoteTigerProxy: + type: tigerProxy + tigerProxyConfiguration: + adminPort: 9002 + proxyPort: 9003 + proxyRoutes: + - from: http://httpbin + to: + - http://localhost:${free.port.4} + - from: /httpbin + to: + - http://localhost:${free.port.4} + +lib: + rbelPathDebugging: false + activateWorkflowUi: false + trafficVisualization: true + runTestsOnStart: true + enableTestManagementRestApi: true + +additionalConfigurationFiles: + - filename: src/test/resources/testdata/specialEnvironment.yaml + baseKey: external + +editorExamples: + plainTextExample: just some text + xmlExample: | + + This is an example XML + + htmlExample:

This is an example HTML line.

+ jsonExample: | + { + "description": "This is an example JSON", + "items": ["item1", "item2", "item3"] + } + +tigerGlue: + helloTestLocal: "global value for helloTestLocal" + #to make sure that the test works no mather the order in which the + #features are executed, we use two test variables + helloTestFeature1: "global value for helloTestFeature1" + helloTestFeature2: "global value for helloTestFeature2" + From 822205300c150303a5d38e24f79fa1e601e53779 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Thu, 23 Jan 2025 10:04:39 +0000 Subject: [PATCH 2/3] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- src/api/json/catalog.json | 5 +- src/schemas/json/gematik-tiger.json | 476 ++++++---------------------- src/test/gematik-tiger/tiger.yaml | 7 +- 3 files changed, 101 insertions(+), 387 deletions(-) diff --git a/src/api/json/catalog.json b/src/api/json/catalog.json index 5c46ae354b5..7b732578245 100644 --- a/src/api/json/catalog.json +++ b/src/api/json/catalog.json @@ -7423,10 +7423,7 @@ { "name": "gematik tiger test environment configuration", "description": "A configuration file for the test environment of the gematik Tiger test platform", - "fileMatch": [ - "**/tiger.yml", - "**/tiger.yaml" - ], + "fileMatch": ["**/tiger.yml", "**/tiger.yaml"], "url": "https://json.schemastore.org/gematik-tiger.json" } ] diff --git a/src/schemas/json/gematik-tiger.json b/src/schemas/json/gematik-tiger.json index e83d1c478ab..8ca3fb9b006 100644 --- a/src/schemas/json/gematik-tiger.json +++ b/src/schemas/json/gematik-tiger.json @@ -1,15 +1,9 @@ { "$schema": "http://json-schema.org/draft-07/schema#", "$id": "https://json.schemastore.org/gematik-tiger.json", - "title": "Tiger environment configuration", - "description": "A configuration file for the test environment of the gematik Tiger test platform", - "$defs": { "CfgExternalJarOptions-nullable": { - "type": [ - "object", - "null" - ], + "type": ["object", "null"], "properties": { "activateLogs": { "type": "boolean" @@ -18,99 +12,63 @@ "type": "boolean" }, "arguments": { - "type": [ - "array", - "null" - ], + "type": ["array", "null"], "items": { "type": "string" } }, "options": { - "type": [ - "array", - "null" - ], + "type": ["array", "null"], "items": { "type": "string" } }, "workingDir": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] } } }, "CfgHelmChartOptions-nullable": { - "type": [ - "object", - "null" - ], + "type": ["object", "null"], "properties": { "context": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] }, "debug": { "type": "boolean" }, "exposedPorts": { - "type": [ - "array", - "null" - ], + "type": ["array", "null"], "items": { "type": "string" } }, "healthcheckPods": { - "type": [ - "array", - "null" - ], + "type": ["array", "null"], "items": { "type": "string" } }, "logPods": { - "type": [ - "array", - "null" - ], + "type": ["array", "null"], "items": { "type": "string" } }, "nameSpace": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] }, "podName": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] }, "values": { - "type": [ - "array", - "null" - ], + "type": ["array", "null"], "items": { "type": "string" } }, "workingDir": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] } } }, @@ -121,25 +79,16 @@ "type": "boolean" }, "dependsUpon": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] }, "environment": { - "type": [ - "array", - "null" - ], + "type": ["array", "null"], "items": { "type": "string" } }, "exports": { - "type": [ - "array", - "null" - ], + "type": ["array", "null"], "items": { "type": "string" } @@ -148,202 +97,121 @@ "$ref": "#/$defs/CfgExternalJarOptions-nullable" }, "healthcheckReturnCode": { - "type": [ - "integer", - "null" - ] + "type": ["integer", "null"] }, "healthcheckUrl": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] }, "helmChartOptions": { "$ref": "#/$defs/CfgHelmChartOptions-nullable" }, "hostname": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] }, "logFile": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] }, "source": { - "type": [ - "array", - "null" - ], + "type": ["array", "null"], "items": { "type": "string" } }, "startupPollIntervalMs": { - "type": [ - "integer", - "null" - ] + "type": ["integer", "null"] }, "startupTimeoutSec": { - "type": [ - "integer", - "null" - ] + "type": ["integer", "null"] }, "tigerProxyConfiguration": { "$ref": "#/$defs/TigerProxyConfiguration-nullable" }, "type": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] }, "uiRank": { "type": "integer" }, "urlMappings": { - "type": [ - "array", - "null" - ], + "type": ["array", "null"], "items": { "type": "string" } }, "version": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] } } }, "DirectReverseProxyInfo-nullable": { - "type": [ - "object", - "null" - ], + "type": ["object", "null"], "properties": { "hostname": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] }, "ignoreConnectionErrors": { "type": "boolean" }, "port": { - "type": [ - "integer", - "null" - ] + "type": ["integer", "null"] } } }, "ForwardProxyInfo-nullable": { - "type": [ - "object", - "null" - ], + "type": ["object", "null"], "properties": { "hostname": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] }, "noProxyHosts": { - "type": [ - "array", - "null" - ], + "type": ["array", "null"], "items": { "type": "string" } }, "password": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] }, "port": { - "type": [ - "integer", - "null" - ] + "type": ["integer", "null"] }, "type": { "$ref": "#/$defs/TigerProxyType-nullable" }, "username": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] } } }, "Map(String,CfgServer)-nullable": { - "type": [ - "object", - "null" - ], + "type": ["object", "null"], "additionalProperties": { "$ref": "#/$defs/CfgServer" } }, "PrivateKey-nullable": { - "type": [ - "object", - "null" - ] + "type": ["object", "null"] }, "RbelModificationDescription": { "type": "object", "properties": { "condition": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] }, "deleteAfterNExecutions": { - "type": [ - "integer", - "null" - ] + "type": ["integer", "null"] }, "name": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] }, "regexFilter": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] }, "replaceWith": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] }, "targetElement": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] } } }, @@ -354,13 +222,7 @@ }, { "type": "string", - "enum": [ - "PKCS12", - "JKS", - "BKS", - "PKCS8", - "PKCS1" - ] + "enum": ["PKCS12", "JKS", "BKS", "PKCS8", "PKCS1"] } ] }, @@ -371,10 +233,7 @@ "$ref": "#/$defs/X509Certificate-nullable" }, "certificateChain": { - "type": [ - "array", - "null" - ], + "type": ["array", "null"], "items": { "$ref": "#/$defs/X509Certificate" } @@ -383,10 +242,7 @@ "$ref": "#/$defs/TigerPkiIdentityInformation-nullable" }, "keyId": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] }, "privateKey": { "$ref": "#/$defs/PrivateKey-nullable" @@ -410,10 +266,7 @@ "$ref": "#/$defs/TigerRouteAuthenticationConfiguration-nullable" }, "criterions": { - "type": [ - "array", - "null" - ], + "type": ["array", "null"], "items": { "type": "string" } @@ -422,25 +275,16 @@ "type": "boolean" }, "from": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] }, "hosts": { - "type": [ - "array", - "null" - ], + "type": ["array", "null"], "items": { "type": "string" } }, "to": { - "type": [ - "array", - "null" - ], + "type": ["array", "null"], "items": { "type": "string" } @@ -448,31 +292,19 @@ } }, "TigerFileSaveInfo-nullable": { - "type": [ - "object", - "null" - ], + "type": ["object", "null"], "properties": { "clearFileOnBoot": { "type": "boolean" }, "filename": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] }, "readFilter": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] }, "sourceFile": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] }, "writeToFile": { "type": "boolean" @@ -480,25 +312,16 @@ } }, "TigerPkiIdentityInformation-nullable": { - "type": [ - "object", - "null" - ], + "type": ["object", "null"], "properties": { "filenames": { - "type": [ - "array", - "null" - ], + "type": ["array", "null"], "items": { "type": "string" } }, "password": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] }, "storeType": { "$ref": "#/$defs/StoreType-nullable" @@ -506,10 +329,7 @@ } }, "TigerProxyConfiguration-nullable": { - "type": [ - "object", - "null" - ], + "type": ["object", "null"], "properties": { "activateForwardAllLogging": { "type": "boolean" @@ -518,10 +338,7 @@ "type": "boolean" }, "activateRbelParsingFor": { - "type": [ - "array", - "null" - ], + "type": ["array", "null"], "items": { "type": "string" } @@ -554,10 +371,7 @@ "$ref": "#/$defs/ForwardProxyInfo-nullable" }, "keyFolders": { - "type": [ - "array", - "null" - ], + "type": ["array", "null"], "items": { "type": "string" } @@ -572,25 +386,16 @@ "type": "integer" }, "modifications": { - "type": [ - "array", - "null" - ], + "type": ["array", "null"], "items": { "$ref": "#/$defs/RbelModificationDescription" } }, "name": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] }, "notes": { - "type": [ - "array", - "null" - ], + "type": ["array", "null"], "items": { "$ref": "#/$defs/TigerProxyNoteCommand" } @@ -599,43 +404,25 @@ "type": "boolean" }, "password": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] }, "perMessageBufferSizeInMb": { "type": "integer" }, "proxiedServer": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] }, "proxiedServerProtocol": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] }, "proxyLogLevel": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] }, "proxyPort": { - "type": [ - "integer", - "null" - ] + "type": ["integer", "null"] }, "proxyRoutes": { - "type": [ - "array", - "null" - ], + "type": ["array", "null"], "items": { "$ref": "#/$defs/TigerConfigurationRoute" } @@ -671,25 +458,16 @@ "$ref": "#/$defs/TrafficEndpointConfiguration-nullable" }, "trafficEndpointFilterString": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] }, "trafficEndpoints": { - "type": [ - "array", - "null" - ], + "type": ["array", "null"], "items": { "type": "string" } }, "username": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] } } }, @@ -697,16 +475,10 @@ "type": "object", "properties": { "jexlCriterion": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] }, "message": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] } } }, @@ -717,98 +489,62 @@ }, { "type": "string", - "enum": [ - "http", - "https" - ] + "enum": ["http", "https"] } ] }, "TigerRouteAuthenticationConfiguration-nullable": { - "type": [ - "object", - "null" - ], + "type": ["object", "null"], "properties": { "bearerToken": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] }, "password": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] }, "username": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] } } }, "TigerTlsConfiguration-nullable": { - "type": [ - "object", - "null" - ], + "type": ["object", "null"], "properties": { "allowGenericFallbackIdentity": { "type": "boolean" }, "alternativeNames": { - "type": [ - "array", - "null" - ], + "type": ["array", "null"], "items": { "type": "string" } }, "clientSslSuites": { - "type": [ - "array", - "null" - ], + "type": ["array", "null"], "items": { "type": "string" } }, "clientSupportedGroups": { - "type": [ - "array", - "null" - ], + "type": ["array", "null"], "items": { "type": "string" } }, "domainName": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] }, "forwardMutualTlsIdentity": { "$ref": "#/$defs/TigerConfigurationPkiIdentity-nullable" }, "masterSecretsFile": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] }, "ocspSignerIdentity": { "$ref": "#/$defs/TigerConfigurationPkiIdentity-nullable" }, "serverIdentities": { - "type": [ - "array", - "null" - ], + "type": ["array", "null"], "items": { "$ref": "#/$defs/TigerConfigurationPkiIdentity" } @@ -820,19 +556,13 @@ "$ref": "#/$defs/TigerConfigurationPkiIdentity-nullable" }, "serverSslSuites": { - "type": [ - "array", - "null" - ], + "type": ["array", "null"], "items": { "type": "string" } }, "serverTlsProtocols": { - "type": [ - "array", - "null" - ], + "type": ["array", "null"], "items": { "type": "string" } @@ -840,28 +570,16 @@ } }, "TrafficEndpointConfiguration-nullable": { - "type": [ - "object", - "null" - ], + "type": ["object", "null"], "properties": { "name": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] }, "stompTopic": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] }, "wsEndpoint": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] } } }, @@ -869,10 +587,7 @@ "type": "object", "properties": { "type": { - "type": [ - "string", - "null" - ] + "type": ["string", "null"] } } }, @@ -887,14 +602,17 @@ ] } }, + "title": "Tiger environment configuration", + "description": "A configuration file for the test environment of the gematik Tiger test platform", + "type": "object", "properties": { "localProxyActive": { "type": "boolean" }, "servers": { - "type": "object", "$ref": "#/$defs/Map(String,CfgServer)-nullable", + "type": "object", "additionalProperties": { "$ref": "#/$defs/CfgServer" } diff --git a/src/test/gematik-tiger/tiger.yaml b/src/test/gematik-tiger/tiger.yaml index b4814bb3a72..9277fd97554 100644 --- a/src/test/gematik-tiger/tiger.yaml +++ b/src/test/gematik-tiger/tiger.yaml @@ -55,9 +55,8 @@ editorExamples: } tigerGlue: - helloTestLocal: "global value for helloTestLocal" + helloTestLocal: 'global value for helloTestLocal' #to make sure that the test works no mather the order in which the #features are executed, we use two test variables - helloTestFeature1: "global value for helloTestFeature1" - helloTestFeature2: "global value for helloTestFeature2" - + helloTestFeature1: 'global value for helloTestFeature1' + helloTestFeature2: 'global value for helloTestFeature2' From 630e21b66800e396cf2dfeb469604c4cc139ec5b Mon Sep 17 00:00:00 2001 From: "t.eitzenberger" Date: Thu, 23 Jan 2025 12:10:15 +0100 Subject: [PATCH 3/3] TGR-1120: accidentally removed some entries in catalog.json --- src/api/json/catalog.json | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/api/json/catalog.json b/src/api/json/catalog.json index 47c089a734e..c28eb1cca32 100644 --- a/src/api/json/catalog.json +++ b/src/api/json/catalog.json @@ -7386,6 +7386,30 @@ ], "url": "https://json.schemastore.org/gematik-test-patients.json" }, + { + "name": "gematik health care provider list", + "description": "A list of health care providers in german telemedicine", + "fileMatch": ["**/testdata/hcp/hcp.yml", "**/testdata/hcp/hcp.yaml"], + "url": "https://json.schemastore.org/gematik-test-hcps.json" + }, + { + "name": "gematik health care provider institution list", + "description": "A list of health care provider institutions in german telemedicine", + "fileMatch": [ + "**/testdata/institution/hcpi.yml", + "**/testdata/institution/hcpi.yaml" + ], + "url": "https://json.schemastore.org/gematik-test-hcpis.json" + }, + { + "name": "gematik health care insurance list", + "description": "A list of health care insurances in german telemedicine", + "fileMatch": [ + "**/testdata/insurance/insurance.yml", + "**/testdata/insurance/insurance.yaml" + ], + "url": "https://json.schemastore.org/gematik-test-hcpis.json" + }, { "name": "gematik tiger test environment configuration", "description": "A configuration file for the test environment of the gematik Tiger test platform",