Merge pull request microfeed#137 from microfeed/d1_migration

Add D1_DATABASE_NAME variable to support d1 migration.
ListenNotes · May 10, 2024 · 0e29382 · 0e29382
2 parents a54a541 + e8b795d
commit 0e29382
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -23,6 +23,7 @@ env:
   R2_ACCESS_KEY_ID: ${{ secrets.R2_ACCESS_KEY_ID }}
   R2_SECRET_ACCESS_KEY: ${{ secrets.R2_SECRET_ACCESS_KEY }}
   R2_PUBLIC_BUCKET: ${{ secrets.R2_PUBLIC_BUCKET || secrets.CLOUDFLARE_PROJECT_NAME }}
+  D1_DATABASE_NAME: ${{ secrets.D1_DATABASE_NAME }}
   DEPLOYMENT_ENVIRONMENT: ${{ inputs.DEPLOYMENT_ENVIRONMENT }}
   PRODUCTION_BRANCH: main
 jobs:

diff --git a/ops/generate_vars_toml.sh b/ops/generate_vars_toml.sh
@@ -13,6 +13,8 @@ cat << EOF > .vars.toml
           R2_SECRET_ACCESS_KEY = "$R2_SECRET_ACCESS_KEY"
           R2_PUBLIC_BUCKET = "$R2_PUBLIC_BUCKET"
 
+          D1_DATABASE_NAME = "$D1_DATABASE_NAME"
+
           PRODUCTION_BRANCH = "$PRODUCTION_BRANCH"
 
           MICROFEED_VERSION = "v1"

diff --git a/ops/lib/utils.js b/ops/lib/utils.js
@@ -48,7 +48,8 @@ class WranglerCmd {
   }
 
   _non_dev_db() {
-    return `${this.v.get('CLOUDFLARE_PROJECT_NAME')}_feed_db_${this.currentEnv}`;
+    return this.v.get('D1_DATABASE_NAME') ||
+      `${this.v.get('CLOUDFLARE_PROJECT_NAME')}_feed_db_${this.currentEnv}`;
   }
 
   createFeedDb() {

diff --git a/ops/sync_project_config.js b/ops/sync_project_config.js
@@ -11,6 +11,8 @@ const ALLOWED_VARS = [
   {name: 'R2_SECRET_ACCESS_KEY', encrypted: true, required: true},
   {name: 'R2_PUBLIC_BUCKET', encrypted: true, required: false},
 
+  {name: 'D1_DATABASE_NAME', encrypted: true, required: false},
+
   {name: 'NODE_VERSION', encrypted: false, required: false},  // Cloudflare Pages CI needs this to use the right Node version.
   {name: 'MICROFEED_VERSION', encrypted: false, required: false},
 ];