From c0c717801478c7f03bfd0c5c61002568d9e063b2 Mon Sep 17 00:00:00 2001 From: kanywst <45947799+kanywst@users.noreply.github.com> Date: Sun, 8 Nov 2026 12:01:50 +0900 Subject: [PATCH 1/3] docs: mark the repo as merged into 0-draft/aws-connectivity --- README.ja.md | 7 +++++-- README.md | 10 ++++++---- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/README.ja.md b/README.ja.md index 5d919ec..ed1481e 100644 --- a/README.ja.md +++ b/README.ja.md @@ -1,12 +1,15 @@ # cross-connect +> [!WARNING] +> **2026-11-08 に [0-draft/aws-connectivity](https://github.com/0-draft/aws-connectivity) へ統合しました。2026-12-08 以降にアーカイブします。** Direct Connect は AWS への道の 1 本で、その深掘りサイトと道路地図サイトは内容と料金表が重複していました。サイトは に移り (調査ノートは [docs/direct-connect/](https://github.com/0-draft/aws-connectivity/tree/main/docs/direct-connect))、旧 URL からはそちらへ転送します。 + 図解 AWS Direct Connect。コロケーション施設のクロスコネクトから、BGP の経路選択、冗長化モデル、MACsec、月額料金までを、触って動かせる図で解説するバイリンガル (English / 日本語) サイトです。「Direct Connect はなぜわかりにくいのか」を調べた結果 ([調査](docs/13-why-dx-is-hard.md)) をもとに構成し、ファイバーに住む光の粒「ヒカリ」が案内します。 -**サイト:** +**サイト:** [English README](README.md) -Direct Connect は AWS への道のひとつです。それ以外の道 (インターネット、Site-to-Site VPN、SD-WAN、VGW / Transit Gateway / Cloud WAN のハブ、DX と VPN の経路選択、PrivateLink、ハイブリッド DNS) は姉妹サイト [On-ramp](https://0-draft.github.io/on-ramp/?lang=ja) ([リポジトリ](https://github.com/0-draft/on-ramp)) で解説しています。 +Direct Connect は AWS への道のひとつです。それ以外の道 (インターネット、Site-to-Site VPN、SD-WAN、VGW / Transit Gateway / Cloud WAN のハブ、DX と VPN の経路選択、PrivateLink、ハイブリッド DNS) は同じサイトの道路地図 [AWS Connectivity](https://0-draft.github.io/aws-connectivity/?lang=ja) ([リポジトリ](https://github.com/0-draft/aws-connectivity)) で解説しています。 ## 内容 diff --git a/README.md b/README.md index 0aa75d1..a9eb4d1 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,18 @@ # cross-connect +> [!WARNING] +> **Merged into [0-draft/aws-connectivity](https://github.com/0-draft/aws-connectivity) on 2026-11-08, to be archived on or after 2026-12-08.** Direct Connect is one road into AWS, and its deep dive and the road map were two sites with overlapping facts and two price lists. The whole site now lives at (research notes in [docs/direct-connect/](https://github.com/0-draft/aws-connectivity/tree/main/docs/direct-connect)); the old URL redirects there. + [![ci](https://github.com/0-draft/cross-connect/actions/workflows/ci.yml/badge.svg)](https://github.com/0-draft/cross-connect/actions/workflows/ci.yml) [![deploy](https://github.com/0-draft/cross-connect/actions/workflows/deploy.yml/badge.svg)](https://github.com/0-draft/cross-connect/actions/workflows/deploy.yml) AWS Direct Connect, drawn. An illustrated, bilingual (English / 日本語) explainer that walks from the cross connect in a colocation facility to BGP path selection, resiliency models, MACsec and the monthly bill. It is built around the specific reasons people find Direct Connect hard ([research](docs/13-why-dx-is-hard.md)), with a guide character, Hikari, a photon who lives in the fiber. -**Site:** ([日本語](https://0-draft.github.io/cross-connect/?lang=ja)) +**Site:** ([日本語](https://0-draft.github.io/aws-connectivity/direct-connect/?lang=ja)) [日本語の README](README.ja.md) -Direct Connect is one of several roads into AWS. For the others (internet, Site-to-Site VPN, SD-WAN, VGW / Transit Gateway / Cloud WAN hubs, how AWS chooses between DX and VPN, PrivateLink, hybrid DNS) see the sibling site [On-ramp](https://0-draft.github.io/on-ramp/) ([repo](https://github.com/0-draft/on-ramp)). +Direct Connect is one of several roads into AWS. For the others (internet, Site-to-Site VPN, SD-WAN, VGW / Transit Gateway / Cloud WAN hubs, how AWS chooses between DX and VPN, PrivateLink, hybrid DNS) see the road map on the same site, [AWS Connectivity](https://0-draft.github.io/aws-connectivity/) ([repo](https://github.com/0-draft/aws-connectivity)). ## What is in it @@ -51,9 +54,8 @@ The simulators (`src/lib/`) are pure functions with unit tests: BGP path selecti | Workflow | What it does | | --- | --- | | `ci.yml` | typecheck, ESLint, Prettier, markdownlint, build, tests with coverage, Playwright E2E (desktop and phone, EN and JA), actionlint, `npm audit`, dependency review on PRs | -| `freshness.yml` | Opens a monthly issue to re-verify prices, quotas and launches | | `codeql.yml` | CodeQL for JavaScript/TypeScript and GitHub Actions | -| `deploy.yml` | Builds and deploys to GitHub Pages on every push to `main` | +| `deploy.yml` | Since the merge, deploys only `redirect/` to GitHub Pages, which forwards the old URL to the new site | | Dependabot | Weekly grouped updates for npm and GitHub Actions | ## Disclaimer From 3c59e13ef1b30547fc8133c460f67158753d94fa Mon Sep 17 00:00:00 2001 From: kanywst <45947799+kanywst@users.noreply.github.com> Date: Sun, 8 Nov 2026 12:01:50 +0900 Subject: [PATCH 2/3] ci: deploy a redirect to the new site and stop the freshness reminder --- .github/workflows/deploy.yml | 13 ++++------- .github/workflows/freshness.yml | 38 -------------------------------- redirect/404.html | 39 +++++++++++++++++++++++++++++++++ redirect/index.html | 39 +++++++++++++++++++++++++++++++++ 4 files changed, 82 insertions(+), 47 deletions(-) delete mode 100644 .github/workflows/freshness.yml create mode 100644 redirect/404.html create mode 100644 redirect/index.html diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 1ec1290..eeeff2c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -21,18 +21,13 @@ jobs: - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 with: persist-credentials: false - - uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0 - with: - node-version-file: .nvmrc - cache: npm - - run: npm ci - - run: npm run typecheck - - run: npm test - - run: npm run build + # The site moved to 0-draft/aws-connectivity on 2026-11-08. Pages now + # serves only a redirect (redirect/) to its new home, keeping ?lang= + # and the #section of old links. - uses: actions/configure-pages@45bfe0192ca1faeb007ade9deae92b16b8254a0d # v6.0.0 - uses: actions/upload-pages-artifact@fc324d3547104276b827a68afc52ff2a11cc49c9 # v5.0.0 with: - path: dist + path: redirect deploy: needs: build diff --git a/.github/workflows/freshness.yml b/.github/workflows/freshness.yml deleted file mode 100644 index bfc27f4..0000000 --- a/.github/workflows/freshness.yml +++ /dev/null @@ -1,38 +0,0 @@ -name: freshness - -# Prices, quotas and launches on the site are pinned to a date. Once a month, -# open (or reuse) an issue with the checklist for re-verifying them. -on: - schedule: - - cron: "0 0 1 * *" - workflow_dispatch: - -permissions: - contents: read - -jobs: - reminder: - runs-on: ubuntu-latest - permissions: - issues: write - steps: - - name: Open the monthly freshness issue - env: - GH_TOKEN: ${{ github.token }} - REPO: ${{ github.repository }} - run: | - title="Freshness check: $(date -u +%Y-%m)" - if gh issue list --repo "$REPO" --state open --search "\"$title\" in:title" --json number --jq 'length' | grep -qv '^0$'; then - echo "Issue already open: $title" - exit 0 - fi - gh issue create --repo "$REPO" --title "$title" --body-file - <<'BODY' - Re-verify the facts the site pins to a date, then update `UI.asOf`, `PRICES_AS_OF` and the docs. - - - [ ] Pricing: port-hours, DTO matrix, flat-rate tiers — https://aws.amazon.com/directconnect/pricing/ - - [ ] Quotas — https://docs.aws.amazon.com/directconnect/latest/UserGuide/limits.html - - [ ] New launches since the last check — https://aws.amazon.com/about-aws/whats-new/networking_and_content_delivery/ and the DX User Guide document history - - [ ] Locations and speeds (400G, MACsec) — https://aws.amazon.com/directconnect/locations/ - - [ ] SLA — https://aws.amazon.com/directconnect/sla/ - - [ ] Timeline (`src/content/timeline.ts`, `docs/12-timeline.md`) - BODY diff --git a/redirect/404.html b/redirect/404.html new file mode 100644 index 0000000..f78927b --- /dev/null +++ b/redirect/404.html @@ -0,0 +1,39 @@ + + + + + + Moved: Direct Connect, up close — AWS Connectivity + + + + + + +

+ Cross Connect has moved to + AWS Connectivity: Direct Connect, up close. +

+

+ このサイトは + AWS Connectivity の「Direct Connect を深掘り」に移りました。 +

+ + diff --git a/redirect/index.html b/redirect/index.html new file mode 100644 index 0000000..f78927b --- /dev/null +++ b/redirect/index.html @@ -0,0 +1,39 @@ + + + + + + Moved: Direct Connect, up close — AWS Connectivity + + + + + + +

+ Cross Connect has moved to + AWS Connectivity: Direct Connect, up close. +

+

+ このサイトは + AWS Connectivity の「Direct Connect を深掘り」に移りました。 +

+ + From 2d25854876c95986117866b7aee34756454f1b29 Mon Sep 17 00:00:00 2001 From: kanywst <45947799+kanywst@users.noreply.github.com> Date: Sun, 8 Nov 2026 12:03:46 +0900 Subject: [PATCH 3/3] fix(redirect): let the script, not a meta refresh, carry ?lang= and #section --- redirect/404.html | 11 +++++++---- redirect/index.html | 11 +++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/redirect/404.html b/redirect/404.html index f78927b..74fc34f 100644 --- a/redirect/404.html +++ b/redirect/404.html @@ -9,10 +9,6 @@ href="https://0-draft.github.io/aws-connectivity/direct-connect/" /> - + +

diff --git a/redirect/index.html b/redirect/index.html index f78927b..74fc34f 100644 --- a/redirect/index.html +++ b/redirect/index.html @@ -9,10 +9,6 @@ href="https://0-draft.github.io/aws-connectivity/direct-connect/" /> - + +