Skip to content

Commit a676780

Browse files
Johennesichderjensgem-awBeff42marlenebuelt
authored
Merge develop (#264)
* Tim epa fdv (#250) * added API for org-admin * Commit from GitHub Actions (GeneratePlantumlImages) * removed FHIR-VZD use-case * Commit from GitHub Actions (GeneratePlantumlImages) * added FHIR-VZD use case * Commit from GitHub Actions (GeneratePlantumlImages) * add doc version * changes in chapter 3.2.2. * change heading at the beginning * new tags in TiMessengerTestTreiber.yaml * Testkonzept TI-Messenger-Dienst version 1.0 * TIM-TS 446: allow FHIR enum state "off" * TIM-TS 446: added correct versions * Updates release version * Marks required properties as required (#233) * Marks required properties as required * Bumps api version * Merges incoming changes * Fix typo * replaced FDV with generic Client * Commit from GitHub Actions (GeneratePlantumlImages) * Speed up image generation workflow * Commit from GitHub Actions (Generate PlantUML & draw.io images) * Split workflow * Commit from GitHub Actions (PlantUML images) * Pull with rebase before committing * Nuke plantuml images * Stash before pulling * Commit from GitHub Actions (PlantUML images) * Commit from GitHub Actions (draw.io images) * Update image paths * Uncomment path filters * Run workflows on change to self * Fix typo Fixes: #230 * Reset images folder * Commit from GitHub Actions (PlantUML images) * Commit from GitHub Actions (draw.io images) * Reset files pulled in from main * Nuke diagrams * Extract individual pages * Commit from GitHub Actions (draw.io images) * Use correct binary name * Commit from GitHub Actions (draw.io images) * Revert "Use correct binary name" This reverts commit cf1b337. * Revert "Extract individual pages" This reverts commit e2d322d. * Split files with more than one diagram * Add lint workflow * Commit from GitHub Actions (draw.io images) * Fix name * Revert "Split files with more than one diagram" This reverts commit 6a735d5. * Commit from GitHub Actions (draw.io images) * Revert "Revert "Split files with more than one diagram"" This reverts commit 4b73179. * Also run on push to main * Commit from GitHub Actions (draw.io images) * Remove spaces * Commit from GitHub Actions (draw.io images) * Fix paths * Add job for verifying image references * Don't pushd/popd per location * Use basename * Output pwd and location * Insert command * Add quotes * Nuke drawio exports * Also run on changes to generated files * Commit from GitHub Actions (draw.io images) * empty * Output tree * Output literal * Remove magic bytes * Move file * Move file back * Commit from GitHub Actions (draw.io images) * Fix case * Try using image macro * Use block image * Try using align attribute * Revert to original version * Use image block * Use image block * Use inline image * Insert back block delimiters * Replace remaining imgs * Nuke puml exports * Commit from GitHub Actions (PlantUML images) * Remove and assert absence of puml output file names * Commit from GitHub Actions (PlantUML images) * empty * Ensure absence of img tags * Run lint as part of export * Merge workflows and add linting * Add shell * Remove empty line * Fix file names * Fix name * Nuke images * Commit from GitHub Actions (Generate images) * Lint on tim-epa-fdv * Add lint badge * Add image gen badge * Remove line break * added org-admin client * Commit from GitHub Actions (Generate images) * added Push-Gateway und Org-Admin Client to TI-Messenger Kontext. * Commit from GitHub Actions (Generate images) * added example for federation list entries * changed Mitarbeiter to Akteur to be more unspecific * Commit from GitHub Actions (Generate images) * Update charts for TIM-1264 * Commit from GitHub Actions (Generate images) * added update of display name * Commit from GitHub Actions (Generate images) * Update further charts for TIM-1264 * Commit from GitHub Actions (Generate images) * removed Vorbedingung and federation tests * Commit from GitHub Actions (Generate images) * removed old Freigabeliste * Commit from GitHub Actions (Generate images) * changed optional to opt * Commit from GitHub Actions (Generate images) * added Basis consumer as alternativ for the connector * Commit from GitHub Actions (Generate images) * removed label at messenger client box * Commit from GitHub Actions (Generate images) * Update chart for TIM-1099 * Commit from GitHub Actions (Generate images) * Add chart for TIM-1060 * Commit from GitHub Actions (Generate images) * Add JSON schema validation into linting workflow * Skip Python setup * Introduce a schema error * Comment RC logic * Add another error * Revert back to RC logic * Add comment * Remove other error * Add example and try to lint it * Announce file being checked * Try fixing paths * Replace env * Add another example * Update diagram for TIM-1307 * Commit from GitHub Actions (Generate images) * Update diagram for TIM-1307 * Commit from GitHub Actions (Generate images) * Update schema for TIM-1307 * Disallow addition properties * Combine images into single folder * Fix image paths * Add empty file to trigger workflow * Commit from GitHub Actions (Generate images) * Review generated ePA images * Commit from GitHub Actions (Generate images) * Rearrange TI-M-Client images * Commit from GitHub Actions (Generate images) * Rearrange TI-M-Dienst images * added optional permission checks * Commit from GitHub Actions (Generate images) * Fix paths * Commit from GitHub Actions (Generate images) * removed client_id checks * Commit from GitHub Actions (Generate images) * Rearrange TI-M-Fachdienst images * Fix paths * Nuke images * Commit from GitHub Actions (Generate images) * Move remaining image * Commit from GitHub Actions (Generate images) * Move test images * Actually move test images * Actually actually move test images * Move pro images * Move further files * Commit from GitHub Actions (Generate images) * removed content in unused folder or shifted content to pro folder * removed all use cases * First checkpoint for uploading images to Polarion * Fix upload * Try to fix this mess * Move readme to correct folder * Join path components instead of replacing characters * Remove attachment uploader * Move lint-asciidoc action out of repo * Change SHA * Commit from GitHub Actions (Generate images) * Move drawio and plantuml actions * Move generate-images workflow out of repo * Update SHA * Update SHA * Update ref * Update ref * Update ref * Update ref * Update ref * Update ref * Update ref * Update ref * Fix typo * Update ref * Update ref * Nuke images * Commit from GitHub Actions (Generate images) * Remove leftover env variables * Pin actions to 0.1.0 * fixed inconsistent token naming * Commit from GitHub Actions (Generate images) * added system overview as draw io picture * Commit from GitHub Actions (Generate images) * resized the organisation * Commit from GitHub Actions (Generate images) * connected Push-Gateway to Proxy * Commit from GitHub Actions (Generate images) * some minor reorgnizations * Commit from GitHub Actions (Generate images) * added client - proxy connection * Commit from GitHub Actions (Generate images) * added connection from vzd auth to Proxy(userinfo Endpoint) * Commit from GitHub Actions (Generate images) * added use cases for hide-versicherte * Commit from GitHub Actions (Generate images) * Updated UI Mockup * Commit from GitHub Actions (Generate images) * Move image for UC-10104 to TI-M Pro * Commit from GitHub Actions (Generate images) * changed message for org-admin * Commit from GitHub Actions (Generate images) * Update image for TIM-1514 * Commit from GitHub Actions (Generate images) * added more detailed ui example for ePA and Pro * Commit from GitHub Actions (Generate images) * added better exception example * Commit from GitHub Actions (Generate images) * added seperate schemas for epa and pro * Update image for TIM-1514 * Commit from GitHub Actions (Generate images) * replaced <> with {} * Commit from GitHub Actions (Generate images) * Remove use cases --------- Co-authored-by: ichderjens <[email protected]> Co-authored-by: andre.wagner <[email protected]> Co-authored-by: stefanie.boxhorn <[email protected]> Co-authored-by: Beff42 <[email protected]> Co-authored-by: marlene.bueltemann <[email protected]> Co-authored-by: Johannes Marbach <[email protected]> Co-authored-by: Johannes Marbach <[email protected]> Co-authored-by: Johennes <[email protected]> Co-authored-by: Oliver Feja <[email protected]> Co-authored-by: ofegem <[email protected]> * Fix broken gemILF_VZD_FHIR_Directory links (#251) * Fix broken gemILF_VZD_FHIR_Directory links * Update to 1.2.2 implementation guide * Lint AsciiDoc links (#252) * Lint AsciiDoc links * Prefix absolute paths with git root * Ignore hashes * Fix typo and check for existence * Eliminate docsdir * Exclude images but include other URLs * Strip fragments * Output path * Fix path substitution bug * Only verify http links * Try GET if HEAD fails * Try OPTIONS before HEAD * Add exceptions * Fix dots and warn * Use globs * Replace welcome package links * Fix dead links * Rearrange actions * Remove references to epa branch * added information api (#253) * added information api * Update src/openapi/TiMessengerInformation.yaml Co-authored-by: Johannes Marbach <[email protected]> * Update src/openapi/TiMessengerInformation.yaml Co-authored-by: Johannes Marbach <[email protected]> * Update src/openapi/TiMessengerInformation.yaml Co-authored-by: Johannes Marbach <[email protected]> * removed version from server url and added versioning for domain search --------- Co-authored-by: Johannes Marbach <[email protected]> * Clarify /owner-authenticate flow for Org-Admin (#255) Fixes: #203 * Updated page for registration service (#256) * aligned page for registration service with specification * aligned specification and github page (#257) * aligned specification and github page * removed UC pictures * Commit from GitHub Actions (Generate images) * Domain -> Servername (#259) * Replace domain with server in images * Rename domain to server in new schemas * Update image for TIM-1556 (#260) * Update image for TIM-1556 * removed QR Code part * changed references to fhir-vzd documenation & removed our page * corrected links * Update README.adoc * Update README.adoc * Update docs/Foederationsliste/Foederationsliste.adoc * Update docs/Foederationsliste/Foederationsliste.adoc * Update image for TIM-1561 * Commit from GitHub Actions (Generate images) * Add isInsurance endpoint (#263) * Add isInsurance endpoint * Remove DefaultResponse * Reset src/openapi/TiMessengerTestTreiber.yaml (#265) * Add release notes (#266) * merge main into develop (#267) * fix links from idp.adoc to internal requirements documents * Adds better documentation of where the mxid is required in its url fo… (#228) * Adds better documentation of where the mxid is required in its url format --------- Co-authored-by: TVRiddle <[email protected]> * Fixes issue with code generation * new tags in TiMessengerTestTreiber.yaml * TIM-TS 446: allow FHIR enum state "off" * TIM-TS 446: added correct versions * Updates release version * Marks required properties as required (#233) * Marks required properties as required * Bumps api version * Merges incoming changes * Fix typo * Removes test driver api and adds fachportal links to welcome package (#237) * added new permissionConfig and examples * Update FHIR-Directory.adoc * Document previously unspecified but already implemented MXID header * Mention second endpoint --------- Co-authored-by: gem-jn <[email protected]> Co-authored-by: ichderjens <[email protected]> Co-authored-by: andre.wagner <[email protected]> Co-authored-by: stefanie.boxhorn <[email protected]> Co-authored-by: Beff42 <[email protected]> Co-authored-by: marlene.bueltemann <[email protected]> Co-authored-by: Johennes <[email protected]> Co-authored-by: Oliver Feja <[email protected]> Co-authored-by: ofegem <[email protected]>
1 parent 9f74bf2 commit a676780

File tree

247 files changed

+6508
-2767
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

247 files changed

+6508
-2767
lines changed

‎.github/actions/lint-jsonschema/action.yml‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
name: Lint JSON Schema
2+
3+
runs:
4+
using: "composite"
5+
steps:
6+
- name: Set up check-jsonschema
7+
shell: bash
8+
run: |
9+
pip install check-jsonschema
10+
11+
- name: Set up environment
12+
shell: bash
13+
run: |
14+
# Sadly, composite actions currently don't support environment variables so we freestyle a replacement
15+
echo 'SCHEMAS_ROOT=src/schema' >> .gha-env
16+
echo 'EXAMPLES_ROOT=src/schema/examples' >> .gha-env
17+
18+
- name: Verify schemas
19+
shell: bash
20+
run: |
21+
source .gha-env
22+
23+
# We handle the return code ourselves to prevent the action from exiting on the first error
24+
rc=0
25+
26+
while read -r file; do
27+
echo "Validating $file"
28+
if ! check-jsonschema --check-metaschema "$file"; then
29+
rc=1
30+
fi
31+
done < <(find "$SCHEMAS_ROOT" -name "*.json" -maxdepth 1)
32+
33+
exit $rc
34+
35+
- name: Verify examples
36+
shell: bash
37+
run: |
38+
source .gha-env
39+
40+
# We handle the return code ourselves to prevent the action from exiting on the first error
41+
rc=0
42+
43+
while read -r file; do
44+
schema=$(basename "$file")
45+
schema=$SCHEMAS_ROOT/${schema%%.*}.json
46+
echo "Validating $file against $schema"
47+
if ! check-jsonschema --schemafile "$schema" "$file"; then
48+
rc=1
49+
fi
50+
done < <(find "$EXAMPLES_ROOT" -name "*.json")
51+
52+
exit $rc

‎.github/actions/lint-links/action.yml‎

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
name: Lint Links
2+
3+
runs:
4+
using: "composite"
5+
steps:
6+
- name: Verify links
7+
shell: bash
8+
run: |
9+
function warn {
10+
>&2 echo -e "\033[0;33m$@\033[0m"
11+
}
12+
13+
function err {
14+
>&2 echo -e "\033[0;31m$@\033[0m"
15+
}
16+
17+
rc=0
18+
19+
while read -r file; do
20+
echo "Checking $file"
21+
22+
pushd "$(dirname "$file")" > /dev/null
23+
24+
while read -r location; do
25+
echo "Checking location $location"
26+
27+
if [[ "$location" == http* ]]; then
28+
if ! curl -X OPTIONS --silent --fail "$location" 2>&1 > /dev/null; then
29+
if ! curl --head --silent --fail "$location" 2>&1 > /dev/null; then
30+
if ! curl --silent --fail "$location" 2>&1 > /dev/null; then
31+
# Some URLs are examples or the endpoints helpfully support neither OPTIONS nor HEAD
32+
if [[ "$location" = *example* ]] || \
33+
[[ "$location" = https://idp-ref.app.ti-dienste.de/auth* ]] || \
34+
[[ "$location" = https://idp.app.ti-dienste.de/auth* ]] || \
35+
[[ "$location" = https://idp-ref.app.ti-dienste.de/token* ]] || \
36+
[[ "$location" = https://idp.app.ti-dienste.de/token* ]] || \
37+
[[ "$location" = https://idp-ref.app.ti-dienste.de ]];
38+
then
39+
warn "$file references non-verifiable location $location"
40+
else
41+
err "$file references non-existent location $location"
42+
rc=1
43+
fi
44+
fi
45+
fi
46+
fi
47+
else
48+
# Strip fragments and prefix absolute paths with repo root
49+
path=${location/\#*/}
50+
if [[ "$path" == /* ]]; then
51+
path=$(git rev-parse --show-toplevel)/$path
52+
fi
53+
54+
if [[ ! -e "$path" ]]; then
55+
err "$file references non-existent location $location"
56+
rc=1
57+
fi
58+
fi
59+
done < <(grep -hoE 'link:[^\[]*|image::?[^\[]*|https?://[^\["[:space:]]*' "$(basename "$file")" | grep -v '^image:' | sed -E "s/^link:+//g")
60+
61+
popd > /dev/null
62+
done < <(find . -type f -name "*.adoc")
63+
64+
exit $rc

‎.github/workflows/GeneratePlantumlImages.yml‎

Lines changed: 0 additions & 105 deletions
This file was deleted.

‎.github/workflows/generate-images.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: Generate images
2+
3+
on:
4+
push:
5+
branches:
6+
- '**'
7+
paths:
8+
- '.github/workflows/generate-images.yml'
9+
- 'images/generated/**'
10+
- '**.drawio'
11+
- '**.puml'
12+
workflow_dispatch:
13+
14+
jobs:
15+
generate:
16+
uses: gematik/github-image-actions/.github/workflows/[email protected]
17+
with:
18+
srcdir: src/images
19+
outdir: images/generated
20+
ref: 0.1.0

‎.github/workflows/lint.yml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
name: Lint
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches:
7+
- main
8+
workflow_dispatch:
9+
10+
jobs:
11+
asciidoc-images:
12+
runs-on: ubuntu-latest
13+
14+
steps:
15+
- name: Check out repository
16+
uses: actions/checkout@v4
17+
18+
- name: Lint
19+
uses: gematik/github-image-actions/.github/actions/[email protected]
20+
21+
asciidoc-links:
22+
runs-on: ubuntu-latest
23+
24+
steps:
25+
- name: Check out repository
26+
uses: actions/checkout@v4
27+
28+
- name: Lint
29+
uses: ./.github/actions/lint-links
30+
31+
drawio:
32+
runs-on: ubuntu-latest
33+
34+
steps:
35+
- name: Check out repository
36+
uses: actions/checkout@v4
37+
38+
- name: Lint
39+
uses: gematik/github-image-actions/.github/actions/[email protected]
40+
41+
jsonschema:
42+
runs-on: ubuntu-latest
43+
44+
steps:
45+
- name: Check out repository
46+
uses: actions/checkout@v4
47+
48+
- name: Lint
49+
uses: ./.github/actions/lint-jsonschema
50+
51+
plantuml:
52+
runs-on: ubuntu-latest
53+
54+
steps:
55+
- name: Check out repository
56+
uses: actions/checkout@v4
57+
58+
- name: Lint
59+
uses: gematik/github-image-actions/.github/actions/[email protected]

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
*.dtmp
22
src/fhir/input-cache
3-
.idea
3+
.idea
4+
target/
5+
.DS_Store

0 commit comments

Comments
 (0)