Skip to content

Commit

Permalink
Merge develop (#264)
Browse files Browse the repository at this point in the history
* 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 <ichderjens@users.noreply.github.com>
Co-authored-by: andre.wagner <andre.wagner@gematik.de>
Co-authored-by: stefanie.boxhorn <stefanie.boxhorn@gematik.de>
Co-authored-by: Beff42 <83531917+Beff42@users.noreply.github.com>
Co-authored-by: marlene.bueltemann <marlene.bueltemann@gematik.de>
Co-authored-by: Johannes Marbach <n0-0ne+github@mailbox.org>
Co-authored-by: Johannes Marbach <johannes.marbach@gematik.de>
Co-authored-by: Johennes <Johennes@users.noreply.github.com>
Co-authored-by: Oliver Feja <oliver.feja@gematik.de>
Co-authored-by: ofegem <ofegem@users.noreply.github.com>

* 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 <johannes.marbach@gematik.de>

* Update src/openapi/TiMessengerInformation.yaml

Co-authored-by: Johannes Marbach <johannes.marbach@gematik.de>

* Update src/openapi/TiMessengerInformation.yaml

Co-authored-by: Johannes Marbach <johannes.marbach@gematik.de>

* removed version from server url and added versioning for domain search

---------

Co-authored-by: Johannes Marbach <johannes.marbach@gematik.de>

* 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 <44850999+TVRiddle@users.noreply.github.com>

* 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 <jens.neubert@gematik.de>
Co-authored-by: ichderjens <ichderjens@users.noreply.github.com>
Co-authored-by: andre.wagner <andre.wagner@gematik.de>
Co-authored-by: stefanie.boxhorn <stefanie.boxhorn@gematik.de>
Co-authored-by: Beff42 <83531917+Beff42@users.noreply.github.com>
Co-authored-by: marlene.bueltemann <marlene.bueltemann@gematik.de>
Co-authored-by: Johennes <Johennes@users.noreply.github.com>
Co-authored-by: Oliver Feja <oliver.feja@gematik.de>
Co-authored-by: ofegem <ofegem@users.noreply.github.com>
  • Loading branch information
10 people authored Sep 26, 2024
1 parent 9f74bf2 commit a676780
Show file tree
Hide file tree
Showing 247 changed files with 6,508 additions and 2,767 deletions.
52 changes: 52 additions & 0 deletions .github/actions/lint-jsonschema/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: Lint JSON Schema

runs:
using: "composite"
steps:
- name: Set up check-jsonschema
shell: bash
run: |
pip install check-jsonschema
- name: Set up environment
shell: bash
run: |
# Sadly, composite actions currently don't support environment variables so we freestyle a replacement
echo 'SCHEMAS_ROOT=src/schema' >> .gha-env
echo 'EXAMPLES_ROOT=src/schema/examples' >> .gha-env
- name: Verify schemas
shell: bash
run: |
source .gha-env
# We handle the return code ourselves to prevent the action from exiting on the first error
rc=0
while read -r file; do
echo "Validating $file"
if ! check-jsonschema --check-metaschema "$file"; then
rc=1
fi
done < <(find "$SCHEMAS_ROOT" -name "*.json" -maxdepth 1)
exit $rc
- name: Verify examples
shell: bash
run: |
source .gha-env
# We handle the return code ourselves to prevent the action from exiting on the first error
rc=0
while read -r file; do
schema=$(basename "$file")
schema=$SCHEMAS_ROOT/${schema%%.*}.json
echo "Validating $file against $schema"
if ! check-jsonschema --schemafile "$schema" "$file"; then
rc=1
fi
done < <(find "$EXAMPLES_ROOT" -name "*.json")
exit $rc
64 changes: 64 additions & 0 deletions .github/actions/lint-links/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
name: Lint Links

runs:
using: "composite"
steps:
- name: Verify links
shell: bash
run: |
function warn {
>&2 echo -e "\033[0;33m$@\033[0m"
}
function err {
>&2 echo -e "\033[0;31m$@\033[0m"
}
rc=0
while read -r file; do
echo "Checking $file"
pushd "$(dirname "$file")" > /dev/null
while read -r location; do
echo "Checking location $location"
if [[ "$location" == http* ]]; then
if ! curl -X OPTIONS --silent --fail "$location" 2>&1 > /dev/null; then
if ! curl --head --silent --fail "$location" 2>&1 > /dev/null; then
if ! curl --silent --fail "$location" 2>&1 > /dev/null; then
# Some URLs are examples or the endpoints helpfully support neither OPTIONS nor HEAD
if [[ "$location" = *example* ]] || \
[[ "$location" = https://idp-ref.app.ti-dienste.de/auth* ]] || \
[[ "$location" = https://idp.app.ti-dienste.de/auth* ]] || \
[[ "$location" = https://idp-ref.app.ti-dienste.de/token* ]] || \
[[ "$location" = https://idp.app.ti-dienste.de/token* ]] || \
[[ "$location" = https://idp-ref.app.ti-dienste.de ]];
then
warn "$file references non-verifiable location $location"
else
err "$file references non-existent location $location"
rc=1
fi
fi
fi
fi
else
# Strip fragments and prefix absolute paths with repo root
path=${location/\#*/}
if [[ "$path" == /* ]]; then
path=$(git rev-parse --show-toplevel)/$path
fi
if [[ ! -e "$path" ]]; then
err "$file references non-existent location $location"
rc=1
fi
fi
done < <(grep -hoE 'link:[^\[]*|image::?[^\[]*|https?://[^\["[:space:]]*' "$(basename "$file")" | grep -v '^image:' | sed -E "s/^link:+//g")
popd > /dev/null
done < <(find . -type f -name "*.adoc")
exit $rc
105 changes: 0 additions & 105 deletions .github/workflows/GeneratePlantumlImages.yml

This file was deleted.

20 changes: 20 additions & 0 deletions .github/workflows/generate-images.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Generate images

on:
push:
branches:
- '**'
paths:
- '.github/workflows/generate-images.yml'
- 'images/generated/**'
- '**.drawio'
- '**.puml'
workflow_dispatch:

jobs:
generate:
uses: gematik/github-image-actions/.github/workflows/generate-images.yml@0.1.0
with:
srcdir: src/images
outdir: images/generated
ref: 0.1.0
59 changes: 59 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
name: Lint

on:
pull_request:
push:
branches:
- main
workflow_dispatch:

jobs:
asciidoc-images:
runs-on: ubuntu-latest

steps:
- name: Check out repository
uses: actions/checkout@v4

- name: Lint
uses: gematik/github-image-actions/.github/actions/lint-asciidoc@0.1.0

asciidoc-links:
runs-on: ubuntu-latest

steps:
- name: Check out repository
uses: actions/checkout@v4

- name: Lint
uses: ./.github/actions/lint-links

drawio:
runs-on: ubuntu-latest

steps:
- name: Check out repository
uses: actions/checkout@v4

- name: Lint
uses: gematik/github-image-actions/.github/actions/lint-drawio@0.1.0

jsonschema:
runs-on: ubuntu-latest

steps:
- name: Check out repository
uses: actions/checkout@v4

- name: Lint
uses: ./.github/actions/lint-jsonschema

plantuml:
runs-on: ubuntu-latest

steps:
- name: Check out repository
uses: actions/checkout@v4

- name: Lint
uses: gematik/github-image-actions/.github/actions/lint-plantuml@0.1.0
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
*.dtmp
src/fhir/input-cache
.idea
.idea
target/
.DS_Store
Loading

0 comments on commit a676780

Please sign in to comment.