feat(aws-q2-2024): add the package in replacement of aws-q1-2024

tmorin · Sep 28, 2024 · cd6bdb2 · cd6bdb2
1 parent bf3b5e7
commit cd6bdb2
Show file tree

Hide file tree

Showing 13 changed files with 33 additions and 32 deletions.
diff --git a/README.md b/README.md
@@ -42,7 +42,7 @@ It provides a _search engine_ which should improve the discovery process ;).
 
 The available packages:
 
-- [AWS (q1-2024)](distribution/aws-q1-2024/README.md)
+- [AWS (q2-2024)](distribution/aws-q2-2024/README.md)
 - [Azure (v17)](distribution/azure-17/README.md)
 - [C4 Model](distribution/c4model/README.md)
 - [C4 Model + Nord Theme](distribution/c4nord/README.md)

diff --git a/distribution/README.md b/distribution/README.md
@@ -4,7 +4,7 @@
 
 The library provides 13 packages.
 
-- [aws-q1-2024](aws-q1-2024/README.md)
+- [aws-q2-2024](aws-q2-2024/README.md)
 - [azure-17](azure-17/README.md)
 - [c4model](c4model/README.md)
 - [c4nord](c4nord/README.md)

diff --git a/source/generator/website/index.ts b/source/generator/website/index.ts
@@ -40,7 +40,7 @@ const argv = yargs
     default: [
       "**/*.{Local,Remote}.puml",
       /*
-      "aws-q1-2024/!**",
+      "aws-q2-2024/!**",
       "azure-11/!**",
       "gcp/!**",
       "fontawesome-6/!**",

diff --git a/source/library/index.ts b/source/library/index.ts
@@ -1,4 +1,4 @@
-import { AwsQ12024Factory } from "./packages/aws-q1-2024"
+import { AwsQ22024Factory } from "./packages/aws-q2-2024"
 import { AzureV17Factory } from "./packages/azure-17"
 import { C4modelFactory } from "./packages/c4model"
 import { C4nordFactory } from "./packages/c4nord"
@@ -18,7 +18,7 @@ import { Material4Factory } from "./packages/material-4"
 import { Simpleicons8Factory } from "./packages/simpleicons-8"
 
 const PACKAGE_FACTORIES = [
-  new AwsQ12024Factory(),
+  new AwsQ22024Factory(),
   new AzureV17Factory(),
   new C4modelFactory(),
   new C4nordFactory(),

diff --git a/...library/packages/aws-q1-2024/families.csv → ...library/packages/aws-q2-2024/families.csv b/...library/packages/aws-q1-2024/families.csv → ...library/packages/aws-q2-2024/families.csv
diff --git a/...e/library/packages/aws-q1-2024/groups.csv → ...e/library/packages/aws-q2-2024/groups.csv b/...e/library/packages/aws-q1-2024/groups.csv → ...e/library/packages/aws-q2-2024/groups.csv
@@ -1,18 +1,18 @@
 name,front_color,background_color,border_thick,border_style,border_color,icon_reference
-Cloud,$AWS_COLOR_DARK_BLUE,transparent,1,solid,$AWS_COLOR_DARK_BLUE,aws-q1-2024/Resource/GroupIcons/Cloud
-AWS Cloud,$AWS_COLOR_DARK_BLUE,transparent,1,solid,$AWS_COLOR_DARK_BLUE,aws-q1-2024/Resource/GroupIcons/AwsCloud
-Region,$AWS_COLOR_LIGHT_BLUE,transparent,1,dotted,$AWS_COLOR_LIGHT_BLUE,aws-q1-2024/Resource/GroupIcons/Region
+Cloud,$AWS_COLOR_DARK_BLUE,transparent,1,solid,$AWS_COLOR_DARK_BLUE,aws-q2-2024/Resource/GroupIcons/Cloud
+AWS Cloud,$AWS_COLOR_DARK_BLUE,transparent,1,solid,$AWS_COLOR_DARK_BLUE,aws-q2-2024/Resource/GroupIcons/AwsCloud
+Region,$AWS_COLOR_LIGHT_BLUE,transparent,1,dotted,$AWS_COLOR_LIGHT_BLUE,aws-q2-2024/Resource/GroupIcons/Region
 Availability Zone,$AWS_COLOR_LIGHT_BLUE,transparent,1,dashed,$AWS_COLOR_LIGHT_BLUE,
 Security,$AWS_COLOR_RED,transparent,1,solid,$AWS_COLOR_RED,
-Auto Scaling,$AWS_COLOR_ORANGE,transparent,1,dashed,$AWS_COLOR_ORANGE,aws-q1-2024/Resource/GroupIcons/AutoScalingGroup
-VPC,$AWS_COLOR_GREEN,transparent,1,solid,$AWS_COLOR_GREEN,aws-q1-2024/Resource/GroupIcons/VirtualPrivateCloudVpc
-Private Subnet,$AWS_COLOR_LIGHT_BLUE,$AWS_COLOR_LIGHT_BLUE_BG,0,solid,transparent,aws-q1-2024/Resource/GroupIcons/PrivateSubnet
-Public Subnet,$AWS_COLOR_GREEN,$AWS_COLOR_LIGHT_BLUE_BG,0,solid,transparent,aws-q1-2024/Resource/GroupIcons/PublicSubnet
-Server Contents,$AWS_COLOR_GREY,transparent,1,solid,$AWS_COLOR_GREY,aws-q1-2024/Resource/GroupIcons/ServerContents
-Corporate Data Center,$AWS_COLOR_GREY,transparent,1,solid,$AWS_COLOR_GREY,aws-q1-2024/Resource/GroupIcons/CorporateDataCenter
-Elastic Beanstalk Container,$AWS_COLOR_ORANGE,transparent,1,solid,$AWS_COLOR_ORANGE,aws-q1-2024/Resource/GroupIcons/ElasticBeanstalkContainer
-EC2 Instance Contents,$AWS_COLOR_ORANGE,transparent,1,solid,$AWS_COLOR_ORANGE,aws-q1-2024/Resource/GroupIcons/Ec2InstanceContents
-Spot Fleet,$AWS_COLOR_ORANGE,transparent,1,solid,$AWS_COLOR_ORANGE,aws-q1-2024/Resource/GroupIcons/SpotFleet
-AWS Step Functions workflow,$AWS_COLOR_VIOLET,transparent,1,solid,$AWS_COLOR_VIOLET,aws-q1-2024/Architecture/AppIntegration/AwsStepFunctions
+Auto Scaling,$AWS_COLOR_ORANGE,transparent,1,dashed,$AWS_COLOR_ORANGE,aws-q2-2024/Resource/GroupIcons/AutoScalingGroup
+VPC,$AWS_COLOR_GREEN,transparent,1,solid,$AWS_COLOR_GREEN,aws-q2-2024/Resource/GroupIcons/VirtualPrivateCloudVpc
+Private Subnet,$AWS_COLOR_LIGHT_BLUE,$AWS_COLOR_LIGHT_BLUE_BG,0,solid,transparent,aws-q2-2024/Resource/GroupIcons/PrivateSubnet
+Public Subnet,$AWS_COLOR_GREEN,$AWS_COLOR_LIGHT_BLUE_BG,0,solid,transparent,aws-q2-2024/Resource/GroupIcons/PublicSubnet
+Server Contents,$AWS_COLOR_GREY,transparent,1,solid,$AWS_COLOR_GREY,aws-q2-2024/Resource/GroupIcons/ServerContents
+Corporate Data Center,$AWS_COLOR_GREY,transparent,1,solid,$AWS_COLOR_GREY,aws-q2-2024/Resource/GroupIcons/CorporateDataCenter
+Elastic Beanstalk Container,$AWS_COLOR_ORANGE,transparent,1,solid,$AWS_COLOR_ORANGE,aws-q2-2024/Resource/GroupIcons/ElasticBeanstalkContainer
+EC2 Instance Contents,$AWS_COLOR_ORANGE,transparent,1,solid,$AWS_COLOR_ORANGE,aws-q2-2024/Resource/GroupIcons/Ec2InstanceContents
+Spot Fleet,$AWS_COLOR_ORANGE,transparent,1,solid,$AWS_COLOR_ORANGE,aws-q2-2024/Resource/GroupIcons/SpotFleet
+AWS Step Functions workflow,$AWS_COLOR_VIOLET,transparent,1,solid,$AWS_COLOR_VIOLET,aws-q2-2024/Architecture/AppIntegration/AwsStepFunctions
 Dashed,$AWS_COLOR_GREY,transparent,1,dashed,$AWS_COLOR_GREY,
 Plain,$AWS_COLOR_DARK_BLUE,$AWS_COLOR_GREY_BG,0,solid,transparent,
diff --git a/...resource/Res_General-Icons/General_48.svg → ...resource/Res_General-Icons/General_48.svg b/...resource/Res_General-Icons/General_48.svg → ...resource/Res_General-Icons/General_48.svg
diff --git a/...ons/resource/Res_Group-Icons/Cloud_48.svg → ...ons/resource/Res_Group-Icons/Cloud_48.svg b/...ons/resource/Res_Group-Icons/Cloud_48.svg → ...ons/resource/Res_Group-Icons/Cloud_48.svg
diff --git a/...up-Icons/ElasticBeanstalkContainer_48.svg → ...up-Icons/ElasticBeanstalkContainer_48.svg b/...up-Icons/ElasticBeanstalkContainer_48.svg → ...up-Icons/ElasticBeanstalkContainer_48.svg
diff --git a/source/library/packages/aws-q1-2024/index.ts → source/library/packages/aws-q2-2024/index.ts b/source/library/packages/aws-q1-2024/index.ts → source/library/packages/aws-q2-2024/index.ts
@@ -17,16 +17,17 @@ import {
 } from "../../../generator/workdir/discovery"
 
 const FOLDER_DATE = "01312024"
+// https://d1.awsstatic.com/webteam/architecture-icons/q2-2024/Asset-Package_06072024.b5d9f0b1179c4a995a3f1e42042defabb0ba0fd2.zip
 const ICONS_URL = `https://d1.awsstatic.com/webteam/architecture-icons/q1-2024/Asset-Package_02062024.c893ec2a2df5a0b881da3ad9a3213e5f6c8664d4.zip`
 
 type FamiliesCsvRow = {
   name: string
   color: string
 }
 
-export class AwsQ12024Factory implements PackageFactory {
+export class AwsQ22024Factory implements PackageFactory {
   getUrn(): string {
-    return "aws-q1-2024"
+    return "aws-q2-2024"
   }
 
   private getItemUrn(imageSrcPath: string) {

diff --git a/...ages/aws-q1-2024/templates/bootstrap.tera → ...ages/aws-q2-2024/templates/bootstrap.tera b/...ages/aws-q1-2024/templates/bootstrap.tera → ...ages/aws-q2-2024/templates/bootstrap.tera
diff --git a/...es/chef_automate_architecture_on_aws.tera → ...es/chef_automate_architecture_on_aws.tera b/...es/chef_automate_architecture_on_aws.tera → ...es/chef_automate_architecture_on_aws.tera
@@ -1,12 +1,12 @@
 {% extends "package_example.tera" %}
 
 {% block content %}
-include("aws-q1-2024/Group/GroupAwsCloud")
-include("aws-q1-2024/Group/GroupAvailabilityZone")
-include("aws-q1-2024/Group/GroupVpc")
-include("aws-q1-2024/Group/GroupPublicSubnet")
-include("aws-q1-2024/Resource/Compute/AmazonEc2Instance")
-include("aws-q1-2024/Resource/NetworkingContentDelivery/AmazonVpcInternetGateway")
+include("aws-q2-2024/Group/GroupAwsCloud")
+include("aws-q2-2024/Group/GroupAvailabilityZone")
+include("aws-q2-2024/Group/GroupVpc")
+include("aws-q2-2024/Group/GroupPublicSubnet")
+include("aws-q2-2024/Resource/Compute/AmazonEc2Instance")
+include("aws-q2-2024/Resource/NetworkingContentDelivery/AmazonVpcInternetGateway")
 
 GroupAwsCloud('aws') {
     GroupAvailabilityZone('az') {

diff --git a/...q1-2024/examples/git_to_s_3_webhooks.tera → ...6072024/examples/git_to_s_3_webhooks.tera b/...q1-2024/examples/git_to_s_3_webhooks.tera → ...6072024/examples/git_to_s_3_webhooks.tera
@@ -1,12 +1,12 @@
 {% extends "package_example.tera" %}
 
 {% block content %}
-include("aws-q1-2024/Resource/GeneralIcons/User")
-include("aws-q1-2024/Resource/GeneralIcons/Server")
-include("aws-q1-2024/Architecture/Compute/AwsLambda")
-include("aws-q1-2024/Resource/Storage/AmazonSimpleStorageServiceBucketWithObjects")
-include("aws-q1-2024/Resource/SecurityIdentityCompliance/AwsIdentityAccessManagementAddOn")
-include("aws-q1-2024/Group/GroupAwsCloud")
+include("aws-q2-2024/Resource/GeneralIcons/User")
+include("aws-q2-2024/Resource/GeneralIcons/Server")
+include("aws-q2-2024/Architecture/Compute/AwsLambda")
+include("aws-q2-2024/Resource/Storage/AmazonSimpleStorageServiceBucketWithObjects")
+include("aws-q2-2024/Resource/SecurityIdentityCompliance/AwsIdentityAccessManagementAddOn")
+include("aws-q2-2024/Group/GroupAwsCloud")
 
 left to right direction