Merge branch 'main' into kft/add_acceptance_test_ci_jobs

Energinet-DataHub · Mar 28, 2023 · 2cb1765 · 2cb1765
2 parents 6bce287 + 5477be7
commit 2cb1765
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/detect-changes.yml b/.github/workflows/detect-changes.yml
@@ -54,6 +54,6 @@ jobs:
               - '.github/actions/dotnet-*/**'
               - 'source/!((IntegrationEvents|RequestResponse)/**)/**'
             render_diagrams:
-              - 'docs/c4-model-edi-component-level.dsl'
+              - 'docs/diagrams/c4-model-edi-component-level.dsl'
               - '.github/workflows/render-diagrams.yml'
               - '.github/workflows/detect-changes.yml'
diff --git a/.github/workflows/render-diagrams.yml b/.github/workflows/render-diagrams.yml
@@ -7,5 +7,5 @@ jobs:
   render_c4:
     uses: Energinet-DataHub/.github/.github/workflows/structurizr.yml@v10
     with:
-      dsl: source/datahub3-model/model.dsl
+      dsl: docs/diagrams/edi.dsl
     secrets: inherit
diff --git a/diagrams/c4-model-edi-component-level/Container-001.png b/diagrams/c4-model-edi-component-level/Container-001.png
diff --git a/diagrams/c4-model-edi-component-level/SystemContext.png b/diagrams/c4-model-edi-component-level/SystemContext.png
diff --git a/diagrams/c4-model-edi-component-level/SystemLandscape.png b/diagrams/c4-model-edi-component-level/SystemLandscape.png
diff --git a/docs/c4-model-edi-component-level.dsl → docs/diagrams/edi.dsl b/docs/c4-model-edi-component-level.dsl → docs/diagrams/edi.dsl
@@ -6,11 +6,11 @@ workspace extends https://raw.githubusercontent.com/Energinet-DataHub/opengeh-ar
 
             edi = group "EDI" {
                 peekComponent = container "Peek component" "Handles peek requests from actors" "C#, Azure function" {
-                    actor -> this "Peek messages"
+                    extSoftSystem -> this "Peek messages"
                     tags "Microsoft Azure - Function Apps"
                 }
                 dequeueComponent = container "Dequeue component" "Handles dequeue requests from actors" "C#, Azure function" {
-                    actor -> this "Dequeue messages"
+                    extSoftSystem -> this "Dequeue messages"
                     tags "Microsoft Azure - Function Apps"
                 }
                 timeSeriesListener = container "TimeSeries listener" "Listens for integration events indicating time series data is ready" "C#, Azure function" {
@@ -30,7 +30,7 @@ workspace extends https://raw.githubusercontent.com/Energinet-DataHub/opengeh-ar
             }
             performanceTest = group "PerformanceTest" {
                 testApi = container "API component" "Exposes performance test helper functions" "ASP.NET web API" {
-                }                
+                }
                 simulationComponent = container "Simulation" "Simulates actors" "Grafana K6" {
                     this -> testApi "Fecth actor numbers and tokens"
                     this -> peekComponent "Peek messages"

diff --git a/docs/diagrams/edi/Container-001.png b/docs/diagrams/edi/Container-001.png
diff --git a/...rams/c4-model-edi-component-level/EDI.png → docs/diagrams/edi/EDI.png b/...rams/c4-model-edi-component-level/EDI.png → docs/diagrams/edi/EDI.png
diff --git a/...l-edi-component-level/Performancetest.png → docs/diagrams/edi/Performancetest.png b/...l-edi-component-level/Performancetest.png → docs/diagrams/edi/Performancetest.png
diff --git a/docs/diagrams/edi/SystemContext.png b/docs/diagrams/edi/SystemContext.png