-
Notifications
You must be signed in to change notification settings - Fork 0
Model draft architecture using Structurizr #11
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
mpbrown
wants to merge
8
commits into
main
Choose a base branch
from
mike/5-structurizr-draft
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
a6c2e63
Model draft architecture using Structurizr
mpbrown ef808c3
Add structurizr to just scripts
mpbrown 14d298b
Add diagram export commands
mpbrown 2649348
Update architecture to show only iteration 1
mpbrown 09aadba
Fix typo for arch help command
mpbrown eb38f83
Remove no longer supported dot format export
mpbrown 96b36ae
Use docker compose for structurizr
mpbrown 00a7db6
Use printf instead of echo to show browser link
mpbrown File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -45,4 +45,7 @@ coverage.xml | |
| .exrc | ||
|
|
||
| # macOS | ||
| **/.DS_Store | ||
| **/.DS_Store | ||
|
|
||
| # Structurizr | ||
| .structurizr/ | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| set working-directory := "../docs" | ||
|
|
||
| alias h := _default | ||
| alias help := _default | ||
|
|
||
| # List commands for structurizr | ||
| @_default: | ||
| just --list arch | ||
|
|
||
| alias start := view | ||
| alias open := view | ||
|
|
||
| [doc('Sets up the Structurizr instance locally on port 7268.')] | ||
| view: | ||
| @printf "%b\n" "*******************\n\n🌐 View Structurizr in your browser at http://localhost:7268\n\n*******************\n" | ||
| docker compose -f compose.structurizr.yml up structurizr | ||
|
|
||
| [doc('Exports diagrams in puml format (C4 PlantUML) into a `diagrams/` directory.')] | ||
| render-c4plantuml: | ||
| docker compose -f compose.structurizr.yml run --rm structurizr \ | ||
| export \ | ||
| -workspace workspace.json \ | ||
| -format plantuml/c4plantuml \ | ||
| -output diagrams | ||
|
|
||
| [doc('Exports diagrams in mmd format (Mermaid) into a `diagrams/` directory. Useful for quickly including diagrams into GitHub-rendered Markdown.')] | ||
| render-mermaid: | ||
| docker compose -f compose.structurizr.yml run --rm structurizr \ | ||
| export \ | ||
| -workspace workspace.json \ | ||
| -format mermaid \ | ||
| -output diagrams |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| services: | ||
| structurizr: | ||
| image: structurizr/structurizr:latest | ||
| volumes: | ||
| - ./:/usr/local/structurizr | ||
| ports: | ||
| - "7268:8080" | ||
| command: local |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,155 @@ | ||
| workspace "Name" "Description" { | ||
|
|
||
| !identifiers hierarchical | ||
|
|
||
| model { | ||
| aims = softwareSystem "AIMS Platform" { | ||
| description "Handles incoming eCRs and decides whether to send to PHAs. Includes eCR Refiner." | ||
| tags "AIMS" | ||
| } | ||
| did = softwareSystem "Difference in Docs" { | ||
| description "Determines differences between eCRs based on configuration" | ||
| tags "DiffInDocs" | ||
|
|
||
| db = container "Database" { | ||
| description "Stores previously seen eCR metadata" | ||
| tags "Database" | ||
| technology "AWS DynamoDB" | ||
| } | ||
| s3 = container "Storage Account" { | ||
| description "Stores eCR data with input and output buckets" | ||
| tags "S3" | ||
| technology "AWS S3" | ||
| } | ||
| sqs = container "Message Queue" { | ||
| description "Holds incoming eCR data" | ||
| tags "Queue" | ||
| technology "AWS SQS" | ||
| } | ||
| lambda = container "Lambda" { | ||
| description "Runs function to determine differences between eCR versions" | ||
| tags "Lambda" | ||
| technology "AWS Lambda, Python" | ||
| } | ||
| } | ||
|
|
||
| aims -> did.s3 "Sends eCR input to" | ||
| did.s3 -> did.sqs "Publishes notification events to" "SNS" | ||
| did.sqs -> did.lambda "Invokes with event as input" "SNS" | ||
| did.lambda -> did.db "Reads from and writes to" "HTTPS" | ||
| did.lambda -> did.s3 "Reads from and writes to" "HTTPS" | ||
| did.s3 -> aims "Sends diff output to" | ||
| } | ||
|
|
||
| views { | ||
| systemContext did "Diagram1" { | ||
| include * | ||
| title "System Context View: Difference in Docs, Iteration 1 DRAFT" | ||
| } | ||
| container did "Diagram2" { | ||
| include * | ||
| title "Container View: Difference in Docs, Iteration 1 DRAFT" | ||
| } | ||
|
|
||
| dynamic did "Sequence1" { | ||
| title "Sequence Diagram: Difference in Docs, Iteration 1 DRAFT" | ||
|
|
||
| aims -> did.s3 "Adds eCR to an input bucket on" | ||
| did.s3 -> did.sqs "Publishes event with eCR metadata to" | ||
| did.sqs -> did.lambda "Triggers with eCR metadata as input" | ||
| did.lambda -> did.db "Persists eCR metadata with bucket URL to" | ||
| did.lambda -> did.db "Queries for previous eCR version with matching Set ID" | ||
| did.db -> did.lambda "Returns previous eCR version metadata with bucket URL if it exists" | ||
| did.lambda -> did.s3 "Fetches eCR files of current and previous version using saved bucket URLs" | ||
| did.s3 -> did.lambda "Returns eCR files of current and previous version to compare" | ||
| did.lambda -> did.s3 "Adds diff output to" | ||
| did.s3 -> aims "Triggers remaining AIMS processing" | ||
| } | ||
|
|
||
| styles { | ||
| element "Element" { | ||
| color #0773af | ||
| stroke #0773af | ||
| strokeWidth 7 | ||
| shape roundedbox | ||
| } | ||
| element "Boundary" { | ||
| strokeWidth 5 | ||
| } | ||
| element "Person" { | ||
| background "#6e99b2" | ||
| stroke "#afcadb" | ||
| color "#ffffff" | ||
| shape person | ||
| } | ||
| element "DiffInDocs" { | ||
| background "#ffffff" | ||
| stroke "#6499af" | ||
| color "#6499af" | ||
| icon "./icons/dibbs-logo.png" | ||
| } | ||
| element "AIMS" { | ||
| background "#ffffff" | ||
| stroke "#009ca7" | ||
| color "#009ca7" | ||
| icon "./icons/aphl-aims.png" | ||
| } | ||
| element "Database" { | ||
| background "#ed2bf7" | ||
| stroke "#971b9e" | ||
| color "#ffffff" | ||
| shape cylinder | ||
| icon "./icons/aws-dynamodb.png" | ||
| } | ||
| element "Lambda" { | ||
| background "#e48125" | ||
| stroke "#cc5717" | ||
| color "#ffffff" | ||
| shape shell | ||
| icon "./icons/aws-lambda.png" | ||
| } | ||
| element "S3" { | ||
| background "#8caf31" | ||
| stroke "#7aa116" | ||
| color "#ffffff" | ||
| shape bucket | ||
| icon "./icons/aws-s3.png" | ||
| } | ||
| element "Queue" { | ||
| background "#d72b6c" | ||
| stroke "#af2359" | ||
| color "#ffffff" | ||
| shape pipe | ||
| icon "./icons/aws-simple-queue-service.png" | ||
| } | ||
| element "UI" { | ||
| background "#dbf6ff" | ||
| stroke "#3b7082" | ||
| color "#3b7082" | ||
| icon "./icons/react-logo.png" | ||
| shape webbrowser | ||
| } | ||
| element "Backend" { | ||
| background "#06bdaa" | ||
| stroke "#049789" | ||
| color "#ffffff" | ||
| shape component | ||
| icon "./icons/fastapi-logo.png" | ||
| } | ||
| element "Keycloak" { | ||
| background "#737373" | ||
| stroke "#191919" | ||
| color "#ffffff" | ||
| icon "./icons/keycloak-logo.png" | ||
| shape hexagon | ||
| } | ||
| relationship "Relationship" { | ||
| thickness 4 | ||
| } | ||
| } | ||
| } | ||
|
|
||
| configuration { | ||
| scope softwareSystem | ||
| } | ||
| } |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This file gets generated automatically based on
workspace.dsl