From ace2b322a92b949286e16c912f8ecb23e003ea2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nmez=20Kartal?= Date: Mon, 24 Jul 2023 19:52:54 +0300 Subject: [PATCH] fix(all): worker environments (#2538) --- .github/workflows/main-console.yaml | 1 + .github/workflows/main-core.yaml | 10 +++++++++ .github/workflows/main-email.yaml | 1 + .github/workflows/main-galaxy.yaml | 1 + .github/workflows/main-images.yaml | 1 + .github/workflows/main-passport.yaml | 1 + .github/workflows/main-profile.yaml | 1 + .github/workflows/next-console.yaml | 1 + .github/workflows/next-core.yaml | 14 ++++++++++-- .github/workflows/next-email.yaml | 1 + .github/workflows/next-galaxy.yaml | 1 + .github/workflows/next-images.yaml | 1 + .github/workflows/next-passport.yaml | 1 + .github/workflows/next-profile.yaml | 1 + .github/workflows/release-console.yaml | 1 + .github/workflows/release-core.yaml | 15 ++++++++++--- .github/workflows/release-email.yaml | 1 + .github/workflows/release-galaxy.yaml | 1 + .github/workflows/release-images.yaml | 1 + .github/workflows/release-passport.yaml | 1 + .github/workflows/release-profile.yaml | 1 + apps/console/wrangler.current.toml | 17 ++++++++------- apps/console/wrangler.dev.toml | 20 ++++++++--------- apps/console/wrangler.next.toml | 20 ++++++++--------- apps/passport/wrangler.current.toml | 17 ++++++++------- apps/passport/wrangler.dev.toml | 17 ++++++++------- apps/passport/wrangler.next.toml | 17 ++++++++------- apps/profile/wrangler.current.toml | 17 ++++++++------- apps/profile/wrangler.dev.toml | 17 ++++++++------- apps/profile/wrangler.next.toml | 17 ++++++++------- platform/core/wrangler.current.toml | 29 +++++++++++++------------ platform/core/wrangler.dev.toml | 29 +++++++++++++------------ platform/core/wrangler.next.toml | 29 +++++++++++++------------ platform/email/wrangler.current.toml | 4 ++-- platform/email/wrangler.dev.toml | 4 ++-- platform/email/wrangler.next.toml | 4 ++-- platform/galaxy/wrangler.current.toml | 3 ++- platform/galaxy/wrangler.dev.toml | 3 ++- platform/galaxy/wrangler.next.toml | 3 ++- platform/images/wrangler.current.toml | 9 ++++---- platform/images/wrangler.dev.toml | 9 ++++---- platform/images/wrangler.next.toml | 9 ++++---- 42 files changed, 207 insertions(+), 144 deletions(-) diff --git a/.github/workflows/main-console.yaml b/.github/workflows/main-console.yaml index 06df4e946a..d9f7fc101b 100644 --- a/.github/workflows/main-console.yaml +++ b/.github/workflows/main-console.yaml @@ -49,6 +49,7 @@ jobs: accountId: ${{ secrets.INTERNAL_CLOUDFLARE_ACCOUNT_ID }} workingDirectory: 'apps/console' command: publish --config wrangler.dev.toml + environment: 'dev' secrets: | SECRET_SESSION_KEY SECRET_SESSION_SALT diff --git a/.github/workflows/main-core.yaml b/.github/workflows/main-core.yaml index eb5b138ad6..32b25d2a6e 100644 --- a/.github/workflows/main-core.yaml +++ b/.github/workflows/main-core.yaml @@ -39,6 +39,15 @@ jobs: - name: Test run: yarn run test + - name: Deploy edges D1 Database + uses: cloudflare/wrangler-action@2.0.0 + with: + apiToken: ${{ secrets.TOKEN_CLOUDFLARE_API }} + accountId: ${{ secrets.INTERNAL_CLOUDFLARE_ACCOUNT_ID }} + workingDirectory: 'platform/core' + command: d1 migrations apply edges-v2-dev --config wrangler.dev.toml --env dev + environment: 'dev' + - name: Deploy uses: cloudflare/wrangler-action@2.0.0 with: @@ -46,6 +55,7 @@ jobs: accountId: ${{ secrets.INTERNAL_CLOUDFLARE_ACCOUNT_ID }} workingDirectory: platform/core command: publish --config wrangler.dev.toml + environment: 'dev' secrets: | SECRET_JWK_CURRENT_KID SECRET_JWKS diff --git a/.github/workflows/main-email.yaml b/.github/workflows/main-email.yaml index 2b343f17aa..634904edaf 100644 --- a/.github/workflows/main-email.yaml +++ b/.github/workflows/main-email.yaml @@ -46,6 +46,7 @@ jobs: accountId: ${{ secrets.INTERNAL_CLOUDFLARE_ACCOUNT_ID }} workingDirectory: platform/email command: publish --config wrangler.dev.toml + environment: 'dev' secrets: | INTERNAL_DKIM_DOMAIN INTERNAL_DKIM_SELECTOR diff --git a/.github/workflows/main-galaxy.yaml b/.github/workflows/main-galaxy.yaml index 798b7e3296..31790dc956 100644 --- a/.github/workflows/main-galaxy.yaml +++ b/.github/workflows/main-galaxy.yaml @@ -51,5 +51,6 @@ jobs: accountId: ${{ secrets.INTERNAL_CLOUDFLARE_ACCOUNT_ID }} workingDirectory: 'platform/galaxy' command: publish --config wrangler.dev.toml + environment: 'dev' env: NODE_ENV: 'development' diff --git a/.github/workflows/main-images.yaml b/.github/workflows/main-images.yaml index be5bf8e370..c1ced1f42d 100644 --- a/.github/workflows/main-images.yaml +++ b/.github/workflows/main-images.yaml @@ -48,6 +48,7 @@ jobs: accountId: ${{ secrets.INTERNAL_CLOUDFLARE_ACCOUNT_ID }} workingDirectory: 'platform/images' command: publish --config wrangler.dev.toml + environment: 'dev' # This causes secrets to be set as if by: $ wrangler secret put. # Each supplied name must be defined in the env: config stanza. secrets: | diff --git a/.github/workflows/main-passport.yaml b/.github/workflows/main-passport.yaml index 79b5af5ada..9b639f6c47 100644 --- a/.github/workflows/main-passport.yaml +++ b/.github/workflows/main-passport.yaml @@ -48,6 +48,7 @@ jobs: accountId: ${{ secrets.INTERNAL_CLOUDFLARE_ACCOUNT_ID }} workingDirectory: 'apps/passport' command: publish --config wrangler.dev.toml + environment: 'dev' secrets: | SECRET_SESSION_KEY SECRET_SESSION_SALT diff --git a/.github/workflows/main-profile.yaml b/.github/workflows/main-profile.yaml index 7b23e2ea37..d242295792 100644 --- a/.github/workflows/main-profile.yaml +++ b/.github/workflows/main-profile.yaml @@ -48,6 +48,7 @@ jobs: accountId: ${{ secrets.INTERNAL_CLOUDFLARE_ACCOUNT_ID }} workingDirectory: 'apps/profile' command: publish --config wrangler.dev.toml + environment: 'dev' secrets: | SECRET_SESSION_KEY SECRET_SESSION_SALT diff --git a/.github/workflows/next-console.yaml b/.github/workflows/next-console.yaml index 7c0d25ef7c..35066c0fd0 100644 --- a/.github/workflows/next-console.yaml +++ b/.github/workflows/next-console.yaml @@ -49,6 +49,7 @@ jobs: accountId: ${{ secrets.INTERNAL_CLOUDFLARE_ACCOUNT_ID }} workingDirectory: 'apps/console' command: publish --config wrangler.next.toml + environment: 'next' secrets: | SECRET_SESSION_KEY SECRET_SESSION_SALT diff --git a/.github/workflows/next-core.yaml b/.github/workflows/next-core.yaml index 3ac5cb717e..c58570646e 100644 --- a/.github/workflows/next-core.yaml +++ b/.github/workflows/next-core.yaml @@ -2,8 +2,8 @@ name: Core on: push: - branches: - - main + tags: + - '*' defaults: run: @@ -39,6 +39,15 @@ jobs: - name: Test run: yarn run test + - name: Deploy edges D1 Database + uses: cloudflare/wrangler-action@2.0.0 + with: + apiToken: ${{ secrets.TOKEN_CLOUDFLARE_API }} + accountId: ${{ secrets.INTERNAL_CLOUDFLARE_ACCOUNT_ID }} + workingDirectory: 'platform/core' + command: d1 migrations apply edges-v2-next --config wrangler.next.toml --env next + environment: 'next' + - name: Deploy uses: cloudflare/wrangler-action@2.0.0 with: @@ -46,6 +55,7 @@ jobs: accountId: ${{ secrets.INTERNAL_CLOUDFLARE_ACCOUNT_ID }} workingDirectory: platform/core command: publish --config wrangler.next.toml + environment: 'next' secrets: | SECRET_JWK_CURRENT_KID SECRET_JWKS diff --git a/.github/workflows/next-email.yaml b/.github/workflows/next-email.yaml index 199d606d30..1f39319fa8 100644 --- a/.github/workflows/next-email.yaml +++ b/.github/workflows/next-email.yaml @@ -46,6 +46,7 @@ jobs: accountId: ${{ secrets.INTERNAL_CLOUDFLARE_ACCOUNT_ID }} workingDirectory: platform/email command: publish --config wrangler.next.toml + environment: 'next' secrets: | INTERNAL_DKIM_DOMAIN INTERNAL_DKIM_SELECTOR diff --git a/.github/workflows/next-galaxy.yaml b/.github/workflows/next-galaxy.yaml index d447f97b2c..79000cdbd2 100644 --- a/.github/workflows/next-galaxy.yaml +++ b/.github/workflows/next-galaxy.yaml @@ -50,3 +50,4 @@ jobs: accountId: ${{ secrets.INTERNAL_CLOUDFLARE_ACCOUNT_ID }} workingDirectory: 'platform/galaxy' command: publish --config wrangler.next.toml + environment: 'next' diff --git a/.github/workflows/next-images.yaml b/.github/workflows/next-images.yaml index dd42654635..c691ece4e2 100644 --- a/.github/workflows/next-images.yaml +++ b/.github/workflows/next-images.yaml @@ -48,6 +48,7 @@ jobs: accountId: ${{ secrets.INTERNAL_CLOUDFLARE_ACCOUNT_ID }} workingDirectory: 'platform/images' command: publish --config wrangler.next.toml + environment: 'next' # This causes secrets to be set as if by: $ wrangler secret put. # Each supplied name must be defined in the env: config stanza. secrets: | diff --git a/.github/workflows/next-passport.yaml b/.github/workflows/next-passport.yaml index 8e17491f0f..3993e113dd 100644 --- a/.github/workflows/next-passport.yaml +++ b/.github/workflows/next-passport.yaml @@ -46,6 +46,7 @@ jobs: accountId: ${{ secrets.INTERNAL_CLOUDFLARE_ACCOUNT_ID }} workingDirectory: 'apps/passport' command: publish --config wrangler.next.toml + environment: 'next' secrets: | SECRET_SESSION_KEY SECRET_SESSION_SALT diff --git a/.github/workflows/next-profile.yaml b/.github/workflows/next-profile.yaml index a59bb5e75a..4e97395f0d 100644 --- a/.github/workflows/next-profile.yaml +++ b/.github/workflows/next-profile.yaml @@ -46,6 +46,7 @@ jobs: accountId: ${{ secrets.INTERNAL_CLOUDFLARE_ACCOUNT_ID }} workingDirectory: 'apps/profile' command: publish --config wrangler.next.toml + environment: 'next' secrets: | SECRET_SESSION_KEY SECRET_SESSION_SALT diff --git a/.github/workflows/release-console.yaml b/.github/workflows/release-console.yaml index 7bb3b993e2..2166af8a58 100644 --- a/.github/workflows/release-console.yaml +++ b/.github/workflows/release-console.yaml @@ -44,6 +44,7 @@ jobs: accountId: ${{ secrets.INTERNAL_CLOUDFLARE_ACCOUNT_ID }} workingDirectory: 'apps/console' command: publish --config wrangler.current.toml + environment: 'current' secrets: | SECRET_SESSION_KEY SECRET_SESSION_SALT diff --git a/.github/workflows/release-core.yaml b/.github/workflows/release-core.yaml index 93b0232f13..9ea39cd375 100644 --- a/.github/workflows/release-core.yaml +++ b/.github/workflows/release-core.yaml @@ -1,9 +1,8 @@ name: Core on: - push: - branches: - - main + release: + types: [published] defaults: run: @@ -39,6 +38,15 @@ jobs: - name: Test run: yarn run test + - name: Deploy edges D1 Database + uses: cloudflare/wrangler-action@2.0.0 + with: + apiToken: ${{ secrets.TOKEN_CLOUDFLARE_API }} + accountId: ${{ secrets.INTERNAL_CLOUDFLARE_ACCOUNT_ID }} + workingDirectory: 'platform/core' + command: d1 migrations apply edges-v2-current --config wrangler.current.toml --env current + environment: 'current' + - name: Deploy uses: cloudflare/wrangler-action@2.0.0 with: @@ -46,6 +54,7 @@ jobs: accountId: ${{ secrets.INTERNAL_CLOUDFLARE_ACCOUNT_ID }} workingDirectory: platform/core command: publish --config wrangler.current.toml + environment: 'current' secrets: | SECRET_JWK_CURRENT_KID SECRET_JWKS diff --git a/.github/workflows/release-email.yaml b/.github/workflows/release-email.yaml index 19481978ae..40b5ed23f2 100644 --- a/.github/workflows/release-email.yaml +++ b/.github/workflows/release-email.yaml @@ -45,6 +45,7 @@ jobs: accountId: ${{ secrets.INTERNAL_CLOUDFLARE_ACCOUNT_ID }} workingDirectory: platform/email command: publish --config wrangler.current.toml + environment: 'current' secrets: | INTERNAL_DKIM_DOMAIN INTERNAL_DKIM_SELECTOR diff --git a/.github/workflows/release-galaxy.yaml b/.github/workflows/release-galaxy.yaml index bbbd0f950b..8752e26b7c 100644 --- a/.github/workflows/release-galaxy.yaml +++ b/.github/workflows/release-galaxy.yaml @@ -45,3 +45,4 @@ jobs: accountId: ${{ secrets.INTERNAL_CLOUDFLARE_ACCOUNT_ID }} workingDirectory: 'platform/galaxy' command: publish --config wrangler.current.toml + environment: 'current' diff --git a/.github/workflows/release-images.yaml b/.github/workflows/release-images.yaml index 53af04c651..3f8bf9144a 100644 --- a/.github/workflows/release-images.yaml +++ b/.github/workflows/release-images.yaml @@ -44,6 +44,7 @@ jobs: accountId: ${{ secrets.INTERNAL_CLOUDFLARE_ACCOUNT_ID }} workingDirectory: 'platform/images' command: publish --config wrangler.current.toml + environment: 'current' # This causes secrets to be set as if by: $ wrangler secret put. # Each supplied name must be defined in the env: config stanza. secrets: | diff --git a/.github/workflows/release-passport.yaml b/.github/workflows/release-passport.yaml index 039eaec01f..a71cf0f2dd 100644 --- a/.github/workflows/release-passport.yaml +++ b/.github/workflows/release-passport.yaml @@ -42,6 +42,7 @@ jobs: accountId: ${{ secrets.INTERNAL_CLOUDFLARE_ACCOUNT_ID }} workingDirectory: 'apps/passport' command: publish --config wrangler.current.toml + environment: 'current' secrets: | SECRET_SESSION_KEY SECRET_SESSION_SALT diff --git a/.github/workflows/release-profile.yaml b/.github/workflows/release-profile.yaml index 7ad456590a..fb6d17ef00 100644 --- a/.github/workflows/release-profile.yaml +++ b/.github/workflows/release-profile.yaml @@ -42,6 +42,7 @@ jobs: accountId: ${{ secrets.INTERNAL_CLOUDFLARE_ACCOUNT_ID }} workingDirectory: 'apps/profile' command: publish --config wrangler.current.toml + environment: 'current' secrets: | SECRET_SESSION_KEY SECRET_SESSION_SALT diff --git a/apps/console/wrangler.current.toml b/apps/console/wrangler.current.toml index 539d12e274..b11fa3845a 100644 --- a/apps/console/wrangler.current.toml +++ b/apps/console/wrangler.current.toml @@ -1,4 +1,4 @@ -name = "console-current" +name = "console" workers_dev = false main = "./build/index.js" @@ -6,6 +6,13 @@ compatibility_date = "2022-04-05" compatibility_flags = ["streams_enable_constructors"] logpush = true +[build] +command = "yarn build" + +[site] +bucket = "./public" + +[env.current] routes = [ { pattern = "console.rollup.id", custom_domain = true, zone_name = "rollup.id" }, ] @@ -15,13 +22,7 @@ services = [ { binding = "Images", service = "images-current" }, ] -[build] -command = "yarn build" - -[site] -bucket = "./public" - -[vars] +[env.current.vars] PASSPORT_URL = "https://passport.rollup.id" COOKIE_DOMAIN = "rollup.id" STORAGE_NAMESPACE = "console" diff --git a/apps/console/wrangler.dev.toml b/apps/console/wrangler.dev.toml index 7231f16d77..1091edb7dd 100644 --- a/apps/console/wrangler.dev.toml +++ b/apps/console/wrangler.dev.toml @@ -1,11 +1,17 @@ -name = "console-dev" - -workers_dev = false +name = "console" main = "./build/index.js" compatibility_date = "2022-04-05" compatibility_flags = ["streams_enable_constructors"] logpush = true +workers_dev = false + +[build] +command = "yarn build" +[site] +bucket = "./public" + +[env.dev] routes = [ { pattern = "console-dev.rollup.id", custom_domain = true, zone_name = "rollup.id" }, ] @@ -15,13 +21,7 @@ services = [ { binding = "Images", service = "images-dev" }, ] -[build] -command = "yarn build" - -[site] -bucket = "./public" - -[vars] +[env.dev.vars] PASSPORT_URL = "https://passport-dev.rollup.id" COOKIE_DOMAIN = "rollup.id" STORAGE_NAMESPACE = "console" diff --git a/apps/console/wrangler.next.toml b/apps/console/wrangler.next.toml index dbddd4e744..6783909f5b 100644 --- a/apps/console/wrangler.next.toml +++ b/apps/console/wrangler.next.toml @@ -1,11 +1,17 @@ -name = "console-next" - -workers_next = false +name = "console" main = "./build/index.js" compatibility_date = "2022-04-05" compatibility_flags = ["streams_enable_constructors"] logpush = true +workers_dev = false + +[build] +command = "yarn build" + +[site] +bucket = "./public" +[env.next] routes = [ { pattern = "console-next.rollup.id", custom_domain = true, zone_name = "rollup.id" }, ] @@ -15,13 +21,7 @@ services = [ { binding = "Images", service = "images-next" }, ] -[build] -command = "yarn build" - -[site] -bucket = "./public" - -[vars] +[env.next.vars] PASSPORT_URL = "https://passport-next.rollup.id" COOKIE_DOMAIN = "rollup.id" STORAGE_NAMESPACE = "console" diff --git a/apps/passport/wrangler.current.toml b/apps/passport/wrangler.current.toml index a81a208e6e..db90f3cf9f 100644 --- a/apps/passport/wrangler.current.toml +++ b/apps/passport/wrangler.current.toml @@ -1,4 +1,4 @@ -name = "passport-current" +name = "passport" main = "./build/index.js" compatibility_date = "2022-04-05" compatibility_flags = ["streams_enable_constructors"] @@ -6,6 +6,13 @@ node_compat = true workers_dev = false logpush = true +[build] +command = "yarn build" + +[site] +bucket = "./public" + +[env.current] routes = [ { pattern = "passport.rollup.id", custom_domain = true, zone_name = "rollup.id" }, { pattern = "passport.pz3r0.com", custom_domain = true, zone_name = "pz3r0.com" }, @@ -16,13 +23,7 @@ services = [ { binding = "Images", service = "images-current" }, ] -[build] -command = "yarn build" - -[site] -bucket = "./public" - -[vars] +[env.current.vars] DEFAULT_HOSTS = ["passport.rollup.id", "passport.pz3r0.com"] COOKIE_DOMAIN = "rollup.id" PROFILE_APP_URL = "https://my.rollup.id" diff --git a/apps/passport/wrangler.dev.toml b/apps/passport/wrangler.dev.toml index 0e61bd774e..4d0929b3e6 100644 --- a/apps/passport/wrangler.dev.toml +++ b/apps/passport/wrangler.dev.toml @@ -1,4 +1,4 @@ -name = "passport-dev" +name = "passport" main = "./build/index.js" compatibility_date = "2022-04-05" compatibility_flags = ["streams_enable_constructors"] @@ -6,6 +6,13 @@ node_compat = true workers_dev = false logpush = true +[build] +command = "yarn build" + +[site] +bucket = "./public" + +[env.dev] routes = [ { pattern = "passport-dev.rollup.id", custom_domain = true, zone_name = "rollup.id" }, { pattern = "passport-dev.pz3r0.com", custom_domain = true, zone_name = "pz3r0.com" }, @@ -16,13 +23,7 @@ services = [ { binding = "Images", service = "images-dev" }, ] -[build] -command = "yarn build" - -[site] -bucket = "./public" - -[vars] +[env.dev.vars] DEFAULT_HOSTS = ["passport-dev.rollup.id", "passport-dev.pz3r0.com"] COOKIE_DOMAIN = "rollup.id" PROFILE_APP_URL = "https://my-dev.rollup.id" diff --git a/apps/passport/wrangler.next.toml b/apps/passport/wrangler.next.toml index 6125799a0f..03eca8fd20 100644 --- a/apps/passport/wrangler.next.toml +++ b/apps/passport/wrangler.next.toml @@ -1,4 +1,4 @@ -name = "passport-next" +name = "passport" main = "./build/index.js" compatibility_date = "2022-04-05" compatibility_flags = ["streams_enable_constructors"] @@ -6,6 +6,13 @@ node_compat = true workers_dev = false logpush = true +[build] +command = "yarn build" + +[site] +bucket = "./public" + +[env.next] routes = [ { pattern = "passport-next.rollup.id", custom_domain = true, zone_name = "rollup.id" }, { pattern = "passport-next.pz3r0.com", custom_domain = true, zone_name = "pz3r0.com" }, @@ -16,13 +23,7 @@ services = [ { binding = "Images", service = "images-next" }, ] -[build] -command = "yarn build" - -[site] -bucket = "./public" - -[vars] +[env.next.vars] DEFAULT_HOSTS = ["passport-next.rollup.id", "passport-next.pz3r0.com"] COOKIE_DOMAIN = "rollup.id" PROFILE_APP_URL = "https://my-next.rollup.id" diff --git a/apps/profile/wrangler.current.toml b/apps/profile/wrangler.current.toml index 65127c61a9..a3ee8d003c 100644 --- a/apps/profile/wrangler.current.toml +++ b/apps/profile/wrangler.current.toml @@ -1,10 +1,17 @@ -name = "profile-current" +name = "profile" main = "./build/index.js" compatibility_date = "2022-04-05" compatibility_flags = ["no_minimal_subrequests"] workers_dev = false logpush = true +[build] +command = "yarn build" + +[site] +bucket = "./public" + +[env.current] kv_namespaces = [ { binding = "ProfileKV", id = "3a5214b7dab24414a1cb65733a6143b2" }, ] @@ -18,13 +25,7 @@ services = [ { binding = "Images", service = "images-current" }, ] -[build] -command = "yarn build" - -[site] -bucket = "./public" - -[vars] +[env.current.vars] PASSPORT_URL = "https://passport.rollup.id" PASSPORT_AUTH_URL = "https://passport.rollup.id/authorize" IMAGES_URL = "https://images.rollup.id/trpc" diff --git a/apps/profile/wrangler.dev.toml b/apps/profile/wrangler.dev.toml index 612e1b47f1..6a957f431a 100644 --- a/apps/profile/wrangler.dev.toml +++ b/apps/profile/wrangler.dev.toml @@ -1,10 +1,17 @@ -name = "profile-dev" +name = "profile" main = "./build/index.js" compatibility_date = "2022-04-05" compatibility_flags = ["no_minimal_subrequests"] workers_dev = false logpush = true +[build] +command = "yarn build" + +[site] +bucket = "./public" + +[env.dev] kv_namespaces = [ { binding = "ProfileKV", id = "6510b0e703694f0388ced3de37df869d" }, ] @@ -18,13 +25,7 @@ services = [ { binding = "Images", service = "images-dev" }, ] -[build] -command = "yarn build" - -[site] -bucket = "./public" - -[vars] +[env.dev.vars] PASSPORT_URL = "https://passport-dev.rollup.id" PASSPORT_AUTH_URL = "https://passport-dev.rollup.id/authorize" IMAGES_URL = "https://images-dev.rollup.id/trpc" diff --git a/apps/profile/wrangler.next.toml b/apps/profile/wrangler.next.toml index 938a3f3abb..6a23bb26ec 100644 --- a/apps/profile/wrangler.next.toml +++ b/apps/profile/wrangler.next.toml @@ -1,10 +1,17 @@ -name = "profile-next" +name = "profile" main = "./build/index.js" compatibility_date = "2022-04-05" compatibility_flags = ["no_minimal_subrequests"] workers_dev = false logpush = true +[build] +command = "yarn build" + +[site] +bucket = "./public" + +[env.next] kv_namespaces = [ { binding = "ProfileKV", id = "451e189131d74dca87b41701555a839d" }, ] @@ -18,13 +25,7 @@ services = [ { binding = "Images", service = "images-next" }, ] -[build] -command = "yarn build" - -[site] -bucket = "./public" - -[vars] +[env.next.vars] PASSPORT_URL = "https://passport-next.rollup.id" PASSPORT_AUTH_URL = "https://passport-next.rollup.id/authorize" IMAGES_URL = "https://images-next.rollup.id/trpc" diff --git a/platform/core/wrangler.current.toml b/platform/core/wrangler.current.toml index 5f084cde05..657e555801 100644 --- a/platform/core/wrangler.current.toml +++ b/platform/core/wrangler.current.toml @@ -1,4 +1,4 @@ -name = "core-current" +name = "core" main = "src/index.ts" compatibility_date = "2023-03-14" compatibility_flags = ["no_minimal_subrequests"] @@ -6,6 +6,7 @@ logpush = true node_compat = true workers_dev = false +[env.current] durable_objects.bindings = [ { name = "Access", class_name = "Authorization" }, { name = "Account", class_name = "Identity" }, @@ -27,24 +28,13 @@ analytics_engine_datasets = [ unsafe.bindings = [{ type = "metadata", name = "ServiceDeploymentMetadata" }] -[[d1_databases]] +[[env.current.d1_databases]] binding = "EDGES" database_name = "edges-v2-current" database_id = "825ee9f1-8de8-4f73-a0e0-1998feea3d7f" migrations_dir = "../edges/migrations" -[[migrations]] -tag = "v0" -new_classes = ["IdentityGroup"] -transferred_classes = [ - { from = "Access", from_script = "access-current", to = "Authorization" }, - { from = "Account", from_script = "account-current", to = "Identity" }, - { from = "Address", from_script = "address-current", to = "Account" }, - { from = "Authorization", from_script = "access-current", to = "ExchangeCode" }, - { from = "StarbaseApplication", from_script = "starbase-current", to = "StarbaseApplication" }, -] - -[vars] +[env.current.vars] ENVIRONMENT = "current" INTERNAL_PASSPORT_SERVICE_NAME = "passport-current" @@ -58,3 +48,14 @@ REGENERATION_COOLDOWN_PERIOD_IN_MS = 600_000 MAX_ATTEMPTS_TIME_PERIOD_IN_MS = 300_000 POSTHOG_API_KEY = "phc_QGmYrKfXcyIAUBBTX3NBDJjNg2MX24ijFemeUuykzWr" + +[[migrations]] +tag = "v0" +new_classes = ["IdentityGroup"] +transferred_classes = [ + { from = "Access", from_script = "access-current", to = "Authorization" }, + { from = "Account", from_script = "account-current", to = "Identity" }, + { from = "Address", from_script = "address-current", to = "Account" }, + { from = "Authorization", from_script = "access-current", to = "ExchangeCode" }, + { from = "StarbaseApplication", from_script = "starbase-current", to = "StarbaseApplication" }, +] diff --git a/platform/core/wrangler.dev.toml b/platform/core/wrangler.dev.toml index be1192231d..6675b3f329 100644 --- a/platform/core/wrangler.dev.toml +++ b/platform/core/wrangler.dev.toml @@ -1,4 +1,4 @@ -name = "core-dev" +name = "core" main = "src/index.ts" compatibility_date = "2023-03-14" compatibility_flags = ["no_minimal_subrequests"] @@ -6,6 +6,7 @@ logpush = true node_compat = true workers_dev = false +[env.dev] durable_objects.bindings = [ { name = "Access", class_name = "Authorization" }, { name = "Account", class_name = "Identity" }, @@ -27,24 +28,13 @@ analytics_engine_datasets = [ unsafe.bindings = [{ type = "metadata", name = "ServiceDeploymentMetadata" }] -[[d1_databases]] +[[env.dev.d1_databases]] binding = "EDGES" database_name = "edges-v2-dev" database_id = "bd11ba92-bfcf-4d37-8224-d57467cced48" migrations_dir = "../edges/migrations" -[[migrations]] -tag = "v0" -new_classes = ["IdentityGroup"] -transferred_classes = [ - { from = "Access", from_script = "access-dev", to = "Authorization" }, - { from = "Account", from_script = "account-dev", to = "Identity" }, - { from = "Address", from_script = "address-dev", to = "Account" }, - { from = "Authorization", from_script = "access-dev", to = "ExchangeCode" }, - { from = "StarbaseApplication", from_script = "starbase-dev", to = "StarbaseApplication" }, -] - -[vars] +[env.dev.vars] ENVIRONMENT = "dev" INTERNAL_PASSPORT_SERVICE_NAME = "passport-dev" @@ -58,3 +48,14 @@ REGENERATION_COOLDOWN_PERIOD_IN_MS = 30_000 MAX_ATTEMPTS_TIME_PERIOD_IN_MS = 300_000 POSTHOG_API_KEY = "phc_f7q7V62YWsS0FKyIRxO36xyUMFYJ8oahurHPBAXkGe5" + +[[migrations]] +tag = "v0" +new_classes = ["IdentityGroup"] +transferred_classes = [ + { from = "Access", from_script = "access-dev", to = "Authorization" }, + { from = "Account", from_script = "account-dev", to = "Identity" }, + { from = "Address", from_script = "address-dev", to = "Account" }, + { from = "Authorization", from_script = "access-dev", to = "ExchangeCode" }, + { from = "StarbaseApplication", from_script = "starbase-dev", to = "StarbaseApplication" }, +] diff --git a/platform/core/wrangler.next.toml b/platform/core/wrangler.next.toml index 56e76c64ca..17a0cae84f 100644 --- a/platform/core/wrangler.next.toml +++ b/platform/core/wrangler.next.toml @@ -1,4 +1,4 @@ -name = "core-next" +name = "core" main = "src/index.ts" compatibility_date = "2023-03-14" compatibility_flags = ["no_minimal_subrequests"] @@ -6,6 +6,7 @@ logpush = true node_compat = true workers_dev = false +[env.next] durable_objects.bindings = [ { name = "Access", class_name = "Authorization" }, { name = "Account", class_name = "Identity" }, @@ -27,24 +28,13 @@ analytics_engine_datasets = [ unsafe.bindings = [{ type = "metadata", name = "ServiceDeploymentMetadata" }] -[[d1_databases]] +[[env.next.vars.d1_databases]] binding = "EDGES" database_name = "edges-v2-next" database_id = "058ddc84-7734-47ca-a84b-7f325c5336f7" migrations_dir = "../edges/migrations" -[[migrations]] -tag = "v0" -new_classes = ["IdentityGroup"] -transferred_classes = [ - { from = "Access", from_script = "access-next", to = "Authorization" }, - { from = "Account", from_script = "account-next", to = "Identity" }, - { from = "Address", from_script = "address-next", to = "Account" }, - { from = "Authorization", from_script = "access-next", to = "ExchangeCode" }, - { from = "StarbaseApplication", from_script = "starbase-next", to = "StarbaseApplication" }, -] - -[vars] +[env.next.vars] ENVIRONMENT = "next" INTERNAL_PASSPORT_SERVICE_NAME = "passport-next" @@ -58,3 +48,14 @@ REGENERATION_COOLDOWN_PERIOD_IN_MS = 600_000 MAX_ATTEMPTS_TIME_PERIOD_IN_MS = 300_000 POSTHOG_API_KEY = "phc_JsZaA3PKO8jNF6gJ7HusRN3C7yzp56JakJJZfNRI9n7" + +[[migrations]] +tag = "v0" +new_classes = ["IdentityGroup"] +transferred_classes = [ + { from = "Access", from_script = "access-next", to = "Authorization" }, + { from = "Account", from_script = "account-next", to = "Identity" }, + { from = "Address", from_script = "address-next", to = "Account" }, + { from = "Authorization", from_script = "access-next", to = "ExchangeCode" }, + { from = "StarbaseApplication", from_script = "starbase-next", to = "StarbaseApplication" }, +] diff --git a/platform/email/wrangler.current.toml b/platform/email/wrangler.current.toml index 7ed4cf3a64..592c560ccc 100644 --- a/platform/email/wrangler.current.toml +++ b/platform/email/wrangler.current.toml @@ -1,9 +1,9 @@ -name = "email-current" +name = "email" main = "src/index.ts" compatibility_date = "2022-10-05" logpush = true workers_dev = false -[vars] +[env.current.vars] NotificationFromName = "Rollup - Notification" NotificationFromUser = 'noreply' diff --git a/platform/email/wrangler.dev.toml b/platform/email/wrangler.dev.toml index 36fe6a5a9d..4b71506b26 100644 --- a/platform/email/wrangler.dev.toml +++ b/platform/email/wrangler.dev.toml @@ -1,9 +1,9 @@ -name = "email-dev" +name = "email" main = "src/index.ts" compatibility_date = "2022-10-05" logpush = true workers_dev = false -[vars] +[env.dev.vars] NotificationFromName = "Rollup Dev - Notification" NotificationFromUser = 'noreply-dev' diff --git a/platform/email/wrangler.next.toml b/platform/email/wrangler.next.toml index 250dc5bfb8..92e8cc4da5 100644 --- a/platform/email/wrangler.next.toml +++ b/platform/email/wrangler.next.toml @@ -1,9 +1,9 @@ -name = "email-next" +name = "email" main = "src/index.ts" compatibility_date = "2022-10-05" logpush = true workers_dev = false -[vars] +[env.next.vars] NotificationFromName = "Rollup Next - Notification" NotificationFromUser = 'noreply-next' diff --git a/platform/galaxy/wrangler.current.toml b/platform/galaxy/wrangler.current.toml index c120705193..d771b971a7 100644 --- a/platform/galaxy/wrangler.current.toml +++ b/platform/galaxy/wrangler.current.toml @@ -1,10 +1,11 @@ -name = "galaxy-current" +name = "galaxy" main = "src/index.ts" compatibility_date = "2022-10-19" logpush = true node_compat = true wrangler_dev = false +[env.current] route = { pattern = "galaxy.rollup.id", custom_domain = true, zone_name = "rollup.id" } services = [ diff --git a/platform/galaxy/wrangler.dev.toml b/platform/galaxy/wrangler.dev.toml index e7034187ab..396a6bf138 100644 --- a/platform/galaxy/wrangler.dev.toml +++ b/platform/galaxy/wrangler.dev.toml @@ -1,10 +1,11 @@ -name = "galaxy-dev" +name = "galaxy" main = "src/index.ts" compatibility_date = "2022-10-19" logpush = true node_compat = true wrangler_dev = false +[env.dev] route = { pattern = "galaxy-dev.rollup.id", custom_domain = true, zone_name = "rollup.id" } services = [ diff --git a/platform/galaxy/wrangler.next.toml b/platform/galaxy/wrangler.next.toml index 8b461c5feb..e117f6ee07 100644 --- a/platform/galaxy/wrangler.next.toml +++ b/platform/galaxy/wrangler.next.toml @@ -1,10 +1,11 @@ -name = "galaxy-next" +name = "galaxy" main = "src/index.ts" compatibility_date = "2022-10-19" logpush = true node_compat = true wrangler_dev = false +[env.next] route = { pattern = "galaxy-next.rollup.id", custom_domain = true, zone_name = "rollup.id" } services = [ diff --git a/platform/images/wrangler.current.toml b/platform/images/wrangler.current.toml index 3726139c30..d0f27ede56 100644 --- a/platform/images/wrangler.current.toml +++ b/platform/images/wrangler.current.toml @@ -1,11 +1,9 @@ -name = "images-current" +name = "images" main = "src/index.ts" compatibility_date = "2022-10-05" logpush = true workers_dev = false -route = { pattern = "images.rollup.id", custom_domain = true, zone_name = "rollup.id" } - [[rules]] globs = ["**/*.wasm"] type = "CompiledWasm" @@ -14,6 +12,9 @@ type = "CompiledWasm" globs = ["**/*.png"] type = "Data" -[vars] +[env.current] +route = { pattern = "images.rollup.id", custom_domain = true, zone_name = "rollup.id" } + +[env.current.vars] UPLOAD_WINDOW_SECONDS = 200 HASH_INTERNAL_CLOUDFLARE_ACCOUNT_ID = "VqQy1abBMHYDZwVsTbsSMw" diff --git a/platform/images/wrangler.dev.toml b/platform/images/wrangler.dev.toml index de437bc717..e43bb6d569 100644 --- a/platform/images/wrangler.dev.toml +++ b/platform/images/wrangler.dev.toml @@ -1,11 +1,9 @@ -name = "images-dev" +name = "images" main = "src/index.ts" compatibility_date = "2022-10-05" logpush = true workers_dev = false -route = { pattern = "images-dev.rollup.id", custom_domain = true, zone_name = "rollup.id" } - [[rules]] globs = ["**/*.wasm"] type = "CompiledWasm" @@ -14,6 +12,9 @@ type = "CompiledWasm" globs = ["**/*.png"] type = "Data" -[vars] +[env.dev] +route = { pattern = "images-dev.rollup.id", custom_domain = true, zone_name = "rollup.id" } + +[env.dev.vars] UPLOAD_WINDOW_SECONDS = 200 HASH_INTERNAL_CLOUDFLARE_ACCOUNT_ID = "VqQy1abBMHYDZwVsTbsSMw" diff --git a/platform/images/wrangler.next.toml b/platform/images/wrangler.next.toml index ac453e69ee..0b9b941ab3 100644 --- a/platform/images/wrangler.next.toml +++ b/platform/images/wrangler.next.toml @@ -1,11 +1,9 @@ -name = "images-next" +name = "images" main = "src/index.ts" compatibility_date = "2022-10-05" logpush = true workers_dev = false -route = { pattern = "images-next.rollup.id", custom_domain = true, zone_name = "rollup.id" } - [[rules]] globs = ["**/*.wasm"] type = "CompiledWasm" @@ -14,6 +12,9 @@ type = "CompiledWasm" globs = ["**/*.png"] type = "Data" -[vars] +[env.next] +route = { pattern = "images-next.rollup.id", custom_domain = true, zone_name = "rollup.id" } + +[env.next.vars] UPLOAD_WINDOW_SECONDS = 200 HASH_INTERNAL_CLOUDFLARE_ACCOUNT_ID = "VqQy1abBMHYDZwVsTbsSMw"