fix(pg-v5): add an environment variable for which addon service to re…

…solve
heroku · Jul 12, 2021 · 40d212d · 40d212d
1 parent 7f28cc4
commit 40d212d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/packages/pg-v5/lib/fetcher.js b/packages/pg-v5/lib/fetcher.js
@@ -15,7 +15,9 @@ module.exports = heroku => {
 
       debug(`fetching ${db} on ${app}`)
 
-      return resolve.appAttachment(heroku, app, db, { addon_service: 'heroku-postgresql', namespace: namespace })
+      let addonService = process.env.HEROKU_POSTGRESQL_ADDON_NAME || 'heroku-postgresql'
+      debug(`addon service: ${addonService}`)
+      return resolve.appAttachment(heroku, app, db, { addon_service: addonService, namespace: namespace })
         .then(attached => ({ matches: [attached] }))
         .catch(function (err) {
           if (err.statusCode === 422 && err.body && err.body.id === 'multiple_matches' && err.matches) {

diff --git a/packages/pg-v5/test/lib/fetcher.js b/packages/pg-v5/test/lib/fetcher.js
@@ -31,6 +31,7 @@ describe('fetcher', () => {
 
   afterEach(() => {
     api.done()
+    delete process.env.HEROKU_POSTGRESQL_ADDON_NAME
   })
 
   describe('addon', () => {
@@ -41,6 +42,15 @@ describe('fetcher', () => {
           expect(addon.name).to.equal('postgres-1')
         })
     })
+
+    it('returns addon attached to app in another shogun', () => {
+      stub.withArgs(sinon.match.any, 'myapp', 'DATABASE_URL', { addon_service: 'heroku-postgresql-meta', namespace: null }).returns(Promise.resolve({ addon: { name: 'postgres-1' } }))
+      process.env.HEROKU_POSTGRESQL_ADDON_NAME = 'heroku-postgresql-meta'
+      return fetcher(new Heroku()).addon('myapp', 'DATABASE_URL')
+        .then(addon => {
+          expect(addon.name).to.equal('postgres-1')
+        })
+    })
   })
 
   describe('database', () => {