diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 34661352..fdcec4db 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -10,10 +10,10 @@ RUN apk update && apk add --no-cache \ RUN go install github.com/mingrammer/round@latest # install fonts -RUN curl -O https://noto-website-2.storage.googleapis.com/pkgs/NotoSansCJKjp-hinted.zip \ +RUN curl -L -O https://github.com/notofonts/noto-cjk/releases/download/Sans2.004/06_NotoSansCJKjp.zip \ && mkdir -p /usr/share/fonts/NotoSansCJKjp \ -&& unzip NotoSansCJKjp-hinted.zip -d /usr/share/fonts/NotoSansCJKjp/ \ -&& rm NotoSansCJKjp-hinted.zip \ +&& unzip 06_NotoSansCJKjp.zip -d /usr/share/fonts/NotoSansCJKjp/ \ +&& rm 06_NotoSansCJKjp.zip \ && fc-cache -fv # add go bin to path. diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 7b56e730..3da9ecda 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -32,7 +32,7 @@ jobs: - name: Setup Graphviz uses: ts-graphviz/setup-graphviz@v2 - name: Install poetry - run: curl -sSL https://install.python-poetry.org | python3 - + run: curl -sSL https://install.python-poetry.org | python3 - --version 2.2.1 - name: Run all tests run: | poetry install diff --git a/diagrams/__init__.py b/diagrams/__init__.py index db3203c8..062ecae2 100644 --- a/diagrams/__init__.py +++ b/diagrams/__init__.py @@ -92,7 +92,7 @@ class Diagram: # imagepos attribute is not backward compatible # TODO: check graphviz version to see if "imagepos" is available >= 2.40 # https://github.com/xflr6/graphviz/blob/master/graphviz/backend.py#L248 - # "imagepos": "tc", + "imagepos": "tc", "imagescale": "true", "fontname": "Sans-Serif", "fontsize": "13", diff --git a/diagrams/aws/network.py b/diagrams/aws/network.py index 4f072756..fe8d946e 100644 --- a/diagrams/aws/network.py +++ b/diagrams/aws/network.py @@ -128,6 +128,10 @@ class TransitGateway(_Network): _icon = "transit-gateway.png" +class VerifiedAccess(_Network): + _icon = "verified-access.png" + + class VPCCustomerGateway(_Network): _icon = "vpc-customer-gateway.png" diff --git a/docker/dev/Dockerfile b/docker/dev/Dockerfile index ab653077..d266630e 100644 --- a/docker/dev/Dockerfile +++ b/docker/dev/Dockerfile @@ -9,10 +9,10 @@ RUN apk update && apk add --no-cache \ RUN go install github.com/mingrammer/round@latest # install fonts -RUN curl -O https://noto-website-2.storage.googleapis.com/pkgs/NotoSansCJKjp-hinted.zip \ +RUN curl -L -O https://github.com/notofonts/noto-cjk/releases/download/Sans2.004/06_NotoSansCJKjp.zip \ && mkdir -p /usr/share/fonts/NotoSansCJKjp \ -&& unzip NotoSansCJKjp-hinted.zip -d /usr/share/fonts/NotoSansCJKjp/ \ -&& rm NotoSansCJKjp-hinted.zip \ +&& unzip 06_NotoSansCJKjp.zip -d /usr/share/fonts/NotoSansCJKjp/ \ +&& rm 06_NotoSansCJKjp.zip \ && fc-cache -fv # add go bin to path. diff --git a/docs/nodes/aws.md b/docs/nodes/aws.md index ad51cbc2..0d5cf59d 100644 --- a/docs/nodes/aws.md +++ b/docs/nodes/aws.md @@ -1304,6 +1304,9 @@ Node classes list of the aws provider. TransitGateway **diagrams.aws.network.TransitGateway**, **TGW** (alias) +VerifiedAccess +**diagrams.aws.network.VerifiedAccess** + VPCCustomerGateway **diagrams.aws.network.VPCCustomerGateway** diff --git a/resources/aws/network/verified-access.png b/resources/aws/network/verified-access.png new file mode 100644 index 00000000..856c2d34 Binary files /dev/null and b/resources/aws/network/verified-access.png differ diff --git a/website/package-lock.json b/website/package-lock.json index bcea7129..8146900d 100644 --- a/website/package-lock.json +++ b/website/package-lock.json @@ -1,11 +1,11 @@ { - "name": "dependabot_20260408-1084-wpz4hx", + "name": "dependabot_20260413-1084-dnhlcu", "lockfileVersion": 3, "requires": true, "packages": { "": { "dependencies": { - "minimist": "^1.2.7" + "minimist": "^1.2.8" }, "devDependencies": { "docusaurus": "^1.14.7" @@ -7530,9 +7530,10 @@ } }, "node_modules/minimist": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.7.tgz", - "integrity": "sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==", + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -8263,11 +8264,10 @@ "dev": true }, "node_modules/picomatch": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.2.tgz", - "integrity": "sha512-V7+vQEJ06Z+c5tSye8S+nHUfI51xoXIXjHQ99cQtKUkQqqO1kO/KCJUfZXuB47h/YBlDhah2H3hdUGXn8ie0oA==", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", + "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", "dev": true, - "license": "MIT", "engines": { "node": ">=8.6" }, diff --git a/website/package.json b/website/package.json index a36ccea9..1c931e25 100644 --- a/website/package.json +++ b/website/package.json @@ -12,6 +12,6 @@ "docusaurus": "^1.14.7" }, "dependencies": { - "minimist": "^1.2.7" + "minimist": "^1.2.8" } } diff --git a/website/static/img/resources/aws/network/verified-access.png b/website/static/img/resources/aws/network/verified-access.png new file mode 100644 index 00000000..856c2d34 Binary files /dev/null and b/website/static/img/resources/aws/network/verified-access.png differ diff --git a/website/yarn.lock b/website/yarn.lock index 71d5b5a5..661c07d2 100644 --- a/website/yarn.lock +++ b/website/yarn.lock @@ -3963,9 +3963,9 @@ minimatch@3.0.4, minimatch@^3.0.4, minimatch@~3.0.2: dependencies: brace-expansion "^1.1.7" -minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.7: - version "1.2.7" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18" +minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5, minimist@^1.2.8: + version "1.2.8" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" mixin-deep@^1.1.3, mixin-deep@^1.2.0: version "1.3.2"