Process iconset 17.0 2023.10.23 (#68)

* fix border color

* update code and config to v17

* update examples to v17

* Process iconset 17.0 2023.10.23

* fix structurizr color

Author: hakanson

.vscode/tasks.json

@@ -14,7 +14,7 @@
     {
 			"label": "PlantUML picoweb 8080",
 			"type": "shell",
-			"command": "cd scripts && java -jar plantuml-mit-1.2023.7.jar -picoweb"
+			"command": "cd scripts && java -jar plantuml-mit-1.2023.12.jar -picoweb"
 		}
 	]
 }

AWSSymbols.md

@@ -35,15 +35,15 @@ In order to incorporate and use the _AWS Icons for PlantUML_ resources, `!includ
 
 To get started, include the `AWSCommon.puml` file from the `dist` directory in each `.puml` file or PlantUML diagram. This can be referenced by a URL directly to this repository, or by including the file locally. To use this repository, use the following:
 
-<pre><code>!include https://raw.githubusercontent.com/awslabs/aws-icons-for-plantuml/<b>v16.0</b>/dist/AWSCommon.puml
+<pre><code>!include https://raw.githubusercontent.com/awslabs/aws-icons-for-plantuml/<b>v17.0</b>/dist/AWSCommon.puml
 </code></pre>
 
 or this if defining the URL:
 
-<pre><code>!define AWSPuml https://raw.githubusercontent.com/awslabs/aws-icons-for-plantuml/<b>v16.0</b>/dist
+<pre><code>!define AWSPuml https://raw.githubusercontent.com/awslabs/aws-icons-for-plantuml/<b>v17.0</b>/dist
 </code></pre>
 
-This references the latest _GitHub release_ version of the referenced file from GitHub when an Internet connection is available. It is recommended _not_ to use the `main` branch, but instead a specific release version. The examples below reference the current _v16.0_ release.
+This references the latest _GitHub release_ version of the referenced file from GitHub when an Internet connection is available. It is recommended _not_ to use the `main` branch, but instead a specific release version. The examples below reference the current _v17.0_ release.
 
 All examples reference _main_ and are designed with the most recent files. For consistency of UML diagrams when referencing the files directly via GitHub and not generated locally, it is recommended to use a specific release version.
 
@@ -71,7 +71,7 @@ For example, including these files from the repository (URL), the includes would
 
 ```
 ' Define the main location (URL or local file path)
-!define AWSPuml https://raw.githubusercontent.com/awslabs/aws-icons-for-plantuml/v16.0/dist
+!define AWSPuml https://raw.githubusercontent.com/awslabs/aws-icons-for-plantuml/v17.0/dist
 ' Include main AWSCommon and then resource files
 !include AWSPuml/AWSCommon.puml
 !include AWSPuml/BusinessApplications/all.puml
@@ -91,7 +91,7 @@ This is the [`examples/HelloWorld.puml`](examples/HelloWorld.puml) diagram code:
 ' Uncomment the line below for "dark mode" styling
 '!$AWS_DARK = true
 
-!define AWSPuml https://raw.githubusercontent.com/awslabs/aws-icons-for-plantuml/v16.0/dist
+!define AWSPuml https://raw.githubusercontent.com/awslabs/aws-icons-for-plantuml/v17.0/dist
 !include AWSPuml/AWSCommon.puml
 !include AWSPuml/BusinessApplications/all.puml
 !include AWSPuml/Storage/SimpleStorageService.puml
@@ -108,7 +108,7 @@ desktopAlias --> storageAlias
 
 This code generates the following diagram:
 
-![](http://www.plantuml.com/plantuml/proxy?idx=0&src=https://raw.githubusercontent.com/awslabs/aws-icons-for-plantuml/v16.0/examples/HelloWorld.puml)
+![](http://www.plantuml.com/plantuml/proxy?idx=0&src=https://raw.githubusercontent.com/awslabs/aws-icons-for-plantuml/v17.0/examples/HelloWorld.puml)
 
 ## Examples
 
@@ -127,7 +127,7 @@ This example shows AWS IoT processing of messages via the Rules Engine with an e
 ' Uncomment the line below for "dark mode" styling
 '!$AWS_DARK = true
 
-!define AWSPuml https://raw.githubusercontent.com/awslabs/aws-icons-for-plantuml/v16.0/dist
+!define AWSPuml https://raw.githubusercontent.com/awslabs/aws-icons-for-plantuml/v17.0/dist
 !include AWSPuml/AWSCommon.puml
 !include AWSPuml/InternetOfThings/IoTRule.puml
 !include AWSPuml/Analytics/KinesisDataStreams.puml
@@ -150,7 +150,7 @@ iotRule --> errorQueue : Failed action message
 
 This code generates the following diagram:
 
-![](http://www.plantuml.com/plantuml/proxy?idx=0&src=https%3A%2F%2Fraw.githubusercontent.com%2Fawslabs%2Faws-icons-for-plantuml%2Fv16.0%2Fexamples%2FBasic%2520Usage.puml)
+![](http://www.plantuml.com/plantuml/proxy?idx=0&src=https%3A%2F%2Fraw.githubusercontent.com%2Fawslabs%2Faws-icons-for-plantuml%2Fv17.0%2Fexamples%2FBasic%2520Usage.puml)
 
 ### Raw Images
 
@@ -161,7 +161,7 @@ The individual icon images (complete list [here](AWSSymbols.md)) can be included
 ' Uncomment the line below for "dark mode" styling
 '!$AWS_DARK = true
 
-!define AWSPuml https://raw.githubusercontent.com/awslabs/aws-icons-for-plantuml/v16.0/dist
+!define AWSPuml https://raw.githubusercontent.com/awslabs/aws-icons-for-plantuml/v17.0/dist
 !include AWSPuml/AWSCommon.puml
 !include AWSPuml/MachineLearning/SageMakerModel.puml
 !include AWSPuml/Robotics/RoboMaker.puml
@@ -180,7 +180,7 @@ mySecondFunction --> mySecondML
 
 This code generates the following diagram:
 
-![](http://www.plantuml.com/plantuml/proxy?idx=0&src=https%3A%2F%2Fraw.githubusercontent.com%2Fawslabs%2Faws-icons-for-plantuml%2Fv16.0%2Fexamples%2FRaw%2520Image%2520Usage.puml)
+![](http://www.plantuml.com/plantuml/proxy?idx=0&src=https%3A%2F%2Fraw.githubusercontent.com%2Fawslabs%2Faws-icons-for-plantuml%2Fv17.0%2Fexamples%2FRaw%2520Image%2520Usage.puml)
 
 ### Simplified View
 
@@ -191,7 +191,7 @@ In some cases, PlantUML diagrams may contain too much information, but are still
 ' Uncomment the line below for "dark mode" styling
 '!$AWS_DARK = true
 
-!define AWSPuml https://raw.githubusercontent.com/awslabs/aws-icons-for-plantuml/v16.0/dist
+!define AWSPuml https://raw.githubusercontent.com/awslabs/aws-icons-for-plantuml/v17.0/dist
 !include AWSPuml/AWSCommon.puml
 
 ' Uncomment the following line to create simplified view
@@ -222,11 +222,11 @@ recordVote --> voteDb
 
 This code generates the following diagram:
 
-![](http://www.plantuml.com/plantuml/proxy?idx=0&src=https%3A%2F%2Fraw.githubusercontent.com%2Fawslabs%2Faws-icons-for-plantuml%2Fv16.0%2Fexamples%2FTwo%2520Modes%2520-%2520Technical%2520View.puml)
+![](http://www.plantuml.com/plantuml/proxy?idx=0&src=https%3A%2F%2Fraw.githubusercontent.com%2Fawslabs%2Faws-icons-for-plantuml%2Fv17.0%2Fexamples%2FTwo%2520Modes%2520-%2520Technical%2520View.puml)
 
 And if the `!include AWSPuml/AWSSimplified.puml`is uncommented, this simplified view is created:
 
-![](http://www.plantuml.com/plantuml/proxy?idx=0&src=https%3A%2F%2Fraw.githubusercontent.com%2Fawslabs%2Faws-icons-for-plantuml%2Fv16.0%2Fexamples%2FTwo%2520Modes%2520-%2520Simple%2520View.puml)
+![](http://www.plantuml.com/plantuml/proxy?idx=0&src=https%3A%2F%2Fraw.githubusercontent.com%2Fawslabs%2Faws-icons-for-plantuml%2Fv17.0%2Fexamples%2FTwo%2520Modes%2520-%2520Simple%2520View.puml)
 
 ### Sequence Diagrams
 
@@ -237,7 +237,7 @@ Icons can also be used in UML sequence diagrams, either with Participant macros
 ' Uncomment the line below for "dark mode" styling
 '!$AWS_DARK = true
 
-!define AWSPuml https://raw.githubusercontent.com/awslabs/aws-icons-for-plantuml/v16.0/dist
+!define AWSPuml https://raw.githubusercontent.com/awslabs/aws-icons-for-plantuml/v17.0/dist
 !include AWSPuml/AWSCommon.puml
 !include AWSPuml/Compute/all.puml
 !include AWSPuml/ApplicationIntegration/APIGateway.puml
@@ -263,14 +263,14 @@ api -> user: Returns status code
 
 The code above generates the fully detailed diagram with stereotypes.
 
-![Technical View Sequence Diagram](http://www.plantuml.com/plantuml/proxy?idx=0&src=https%3A%2F%2Fraw.githubusercontent.com%2Fawslabs%2Faws-icons-for-plantuml%2Fv16.0%2Fexamples%2FSequence%2520-%2520Technical.puml)
+![Technical View Sequence Diagram](http://www.plantuml.com/plantuml/proxy?idx=0&src=https%3A%2F%2Fraw.githubusercontent.com%2Fawslabs%2Faws-icons-for-plantuml%2Fv17.0%2Fexamples%2FSequence%2520-%2520Technical.puml)
 
 ```
 @startuml Sequence Diagram - Images
 ' Uncomment the line below for "dark mode" styling
 '!$AWS_DARK = true
 
-!define AWSPuml https://raw.githubusercontent.com/awslabs/aws-icons-for-plantuml/v16.0/dist
+!define AWSPuml https://raw.githubusercontent.com/awslabs/aws-icons-for-plantuml/v17.0/dist
 !include AWSPuml/AWSCommon.puml
 !include AWSPuml/AWSExperimental.puml
 !include AWSPuml/Compute/Lambda.puml
@@ -308,7 +308,7 @@ return status code
 
 The code above generates the same sequence diagram demonstrating how colors, text positioning, and stereotypes can be modified.
 
-![Image View Sequence Diagram](http://www.plantuml.com/plantuml/proxy?idx=0&src=https%3A%2F%2Fraw.githubusercontent.com%2Fawslabs%2Faws-icons-for-plantuml%2Fv16.0%2Fexamples%2FSequence%2520-%2520Images.puml)
+![Image View Sequence Diagram](http://www.plantuml.com/plantuml/proxy?idx=0&src=https%3A%2F%2Fraw.githubusercontent.com%2Fawslabs%2Faws-icons-for-plantuml%2Fv17.0%2Fexamples%2FSequence%2520-%2520Images.puml)
 
 ### Groups
 
@@ -319,7 +319,7 @@ Groups are a system element which shows the connection between multiple services
 ' Uncomment the line below for "dark mode" styling
 '!$AWS_DARK = true
 
-!define AWSPuml https://raw.githubusercontent.com/awslabs/aws-icons-for-plantuml/v16.0/dist
+!define AWSPuml https://raw.githubusercontent.com/awslabs/aws-icons-for-plantuml/v17.0/dist
 !include AWSPuml/AWSCommon.puml
 !include AWSPuml/AWSSimplified.puml
 !include AWSPuml/Compute/EC2.puml
@@ -370,7 +370,7 @@ AWSCloudGroup(cloud) {
 
 This code generates the following diagram:
 
-![VPC Groups Sample](http://www.plantuml.com/plantuml/proxy?idx=0&src=https%3A%2F%2Fraw.githubusercontent.com%2Fawslabs%2Faws-icons-for-plantuml%2Fv16.0%2Fexamples%2FGroups%2520-%2520VPC.puml)
+![VPC Groups Sample](http://www.plantuml.com/plantuml/proxy?idx=0&src=https%3A%2F%2Fraw.githubusercontent.com%2Fawslabs%2Faws-icons-for-plantuml%2Fv17.0%2Fexamples%2FGroups%2520-%2520VPC.puml)
 
 Custom groups can also be constructed using the `$AWSDefineGroup` macro.  Here is an AWS CodePipeline human approval workflow example defining a custom group for AWS CodePipeline.
 
@@ -381,7 +381,7 @@ Custom groups can also be constructed using the `$AWSDefineGroup` macro.  Here i
 ' Uncomment the line below for "dark mode" styling
 '!$AWS_DARK = true
 
-!define AWSPuml https://raw.githubusercontent.com/awslabs/aws-icons-for-plantuml/v16.0/dist
+!define AWSPuml https://raw.githubusercontent.com/awslabs/aws-icons-for-plantuml/v17.0/dist
 !include AWSPuml/AWSCommon.puml
 !include AWSPuml/ApplicationIntegration/SimpleNotificationService.puml
 !include AWSPuml/Compute/EC2.puml
@@ -434,7 +434,7 @@ CodePipelineGroup(pipeline){
 @enduml
 ```
 
-![Amazon S3 Upload Workflow Sample](http://www.plantuml.com/plantuml/proxy?idx=0&src=https%3A%2F%2Fraw.githubusercontent.com%2Fawslabs%2Faws-icons-for-plantuml%2Fv16.0%2Fexamples%2FGroups%2520-%2520CodePipeline.puml)
+![Amazon S3 Upload Workflow Sample](http://www.plantuml.com/plantuml/proxy?idx=0&src=https%3A%2F%2Fraw.githubusercontent.com%2Fawslabs%2Faws-icons-for-plantuml%2Fv17.0%2Fexamples%2FGroups%2520-%2520CodePipeline.puml)
 
 ## Distribution "Dist" Details
 

README.md

@@ -28,8 +28,8 @@
 !$AWS_FG_COLOR = "#000000"
 !$AWS_ARROW_COLOR = "#000000"
 !endif
-!define AWS_BORDER_COLOR #FF9900
-!$AWS_BORDER_COLOR = "#FF9900"
+!define AWS_BORDER_COLOR #7D8998
+!$AWS_BORDER_COLOR = "#7D8998"
 !define AWS_SYMBOL_COLOR AWS_COLOR
 !$AWS_COLOR_GRAY = "#7D8998"
 

dist/AWSCommon.puml

@@ -7,9 +7,10 @@
 !$AWS_COLOR_SQUID = "#232F3E"
 !define AWS_BG_COLOR #FFFFFF
 !$AWS_BG_COLOR = "#000000"
-!define AWS_BORDER_COLOR #FF9900
-!$AWS_BORDER_COLOR = "#FF9900"
+!define AWS_BORDER_COLOR #7D8998
+!$AWS_BORDER_COLOR = "#7D8998"
 !define AWS_SYMBOL_COLOR AWS_COLOR
+!$AWS_COLOR_GRAY = "#7D8998"
 
 ' Styling
 ' ##################################
@@ -19,7 +20,7 @@
 !definelong AWSEntityColoring(e_stereo)
 skinparam rectangle<<e_stereo>> {
     BackgroundColor $AWS_BG_COLOR 
-    BorderColor $AWS_BORDER_COLOR
+    BorderColor $AWS_COLOR_GRAY
 
 }
 !enddefinelong

dist/AWSRaw.puml

@@ -0,0 +1,18 @@
+' Copyright 2019 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+' SPDX-License-Identifier: CC-BY-ND-2.0 (For details, see https://github.com/awslabs/aws-icons-for-plantuml/blob/main/LICENSE)
+sprite $EntityResolution [64x64/16z] {
+xLO5ZWLH2EipcFjVUEKnwGe_ILcNwSeNGakAP8uVXWiNh0FTn4Z6nCQK8Xa6JFS9c1B9wC4_qPL81k2FBuuCHZupFrT9xnaH_0irOZK0z4_fNmC9V4Ok-oVD
+Jpy9V3oohSSYW1tH40JMmPo6nQ18q00CfpDwBWkVppjJsoAQM9TVKJXDfBomj-mNJJp7pfM-BsE_GlQSbu4XxIrx_9o0yiBSir_F2P9ymktj8W7bQ_aauD8L
+zvO4DBHuzzWRyUxUrD-JQChUhbi42-qOW2dttpD1BEx0YQaJK3vCf4Cg0ULpXtG2GqiJKY5ecCLy4l1kwFKpgR-w6rEy_oGOnxDolG6T_IiGT8mGRyOBfHBq
+hUXRV1nL608pnClWHXR5yqKhYwTv-OvyVTxg5useFqdMdsH_A2vSk0S
+}
+
+!function $EntityResolutionIMG($scale=1)
+!return "<img data:image/png;base64,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{scale="+$scale+"}>"
+!endfunction
+
+AWSEntityColoring(EntityResolution)
+!define EntityResolution(e_alias, e_label, e_techn) AWSEntity(e_alias, e_label, e_techn, #8C4FFF, EntityResolution, EntityResolution)
+!define EntityResolution(e_alias, e_label, e_techn, e_descr) AWSEntity(e_alias, e_label, e_techn, e_descr, #8C4FFF, EntityResolution, EntityResolution)
+!define EntityResolutionParticipant(p_alias, p_label, p_techn) AWSParticipant(p_alias, p_label, p_techn, #8C4FFF, EntityResolution, EntityResolution)
+!define EntityResolutionParticipant(p_alias, p_label, p_techn, p_descr) AWSParticipant(p_alias, p_label, p_techn, p_descr, #8C4FFF, EntityResolution, EntityResolution)