fix(all): worker environments (#2538)

proofzero · Jul 24, 2023 · ace2b32 · ace2b32
1 parent eae2f7a
commit ace2b32
Show file tree

Hide file tree

Showing 42 changed files with 207 additions and 144 deletions.
diff --git 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
@@ -39,13 +39,23 @@ 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:
           apiToken: ${{ secrets.TOKEN_CLOUDFLARE_API }}
           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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -2,8 +2,8 @@ name: Core
 
 on:
   push:
-    branches:
-      - main
+    tags:
+      - '*'
 
 defaults:
   run:
@@ -39,13 +39,23 @@ 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:
           apiToken: ${{ secrets.TOKEN_CLOUDFLARE_API }}
           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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,9 +1,8 @@
 name: Core
 
 on:
-  push:
-    branches:
-      - main
+  release:
+    types: [published]
 
 defaults:
   run:
@@ -39,13 +38,23 @@ 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:
           apiToken: ${{ secrets.TOKEN_CLOUDFLARE_API }}
           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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,11 +1,18 @@
-name = "console-current"
+name = "console"
 
 workers_dev = false
 main = "./build/index.js"
 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
@@ -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
@@ -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
@@ -1,11 +1,18 @@
-name = "passport-current"
+name = "passport"
 main = "./build/index.js"
 compatibility_date = "2022-04-05"
 compatibility_flags = ["streams_enable_constructors"]
 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"