Merge branch 'main' into adding-pg-upgrade-prepare

nilamuthu · web-flow · commit 7f5aa8bf4ca8 · 2025-04-01T10:04:28.000-07:00
diff --git a/packages/cli/src/lib/pg/host.ts b/packages/cli/src/lib/pg/host.ts
@@ -1,4 +1,3 @@
 export default function () {
-  const host = process.env.HEROKU_DATA_HOST || process.env.HEROKU_POSTGRESQL_HOST
-  return host ? host : 'api.data.heroku.com'
+  return process.env.HEROKU_DATA_HOST || 'api.data.heroku.com'
 }
diff --git a/packages/cli/src/lib/redis/api.ts b/packages/cli/src/lib/redis/api.ts
@@ -66,7 +66,7 @@ export type RedisFormationWaitResponse = {
 type HttpVerb = 'GET' | 'POST' | 'PATCH' | 'DELETE' | 'PUT'
 
 export default (app: string, database: string | undefined, json: boolean, heroku: APIClient) => {
-  const HOST = process.env.HEROKU_REDIS_HOST || 'api.data.heroku.com'
+  const HOST = process.env.HEROKU_DATA_HOST || process.env.HEROKU_REDIS_HOST || 'api.data.heroku.com'
   const ADDON = process.env.HEROKU_REDIS_ADDON_NAME || 'heroku-redis'
 
   return {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`	`1`	`export default function () {`
`2`		`- const host = process.env.HEROKU_DATA_HOST \|\| process.env.HEROKU_POSTGRESQL_HOST`
`3`		`- return host ? host : 'api.data.heroku.com'`
	`2`	`+ return process.env.HEROKU_DATA_HOST \|\| 'api.data.heroku.com'`
`4`	`3`	`}`