fix: update '@heroku/heroku-cli-util' dependency version (W-21546520) (#3595)

sbosio · web-flow · commit 03d53a689a49 · 2026-03-17T09:31:58.000-03:00
Update heroku-cli-util dependency and fix tests.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -10,7 +10,7 @@
     "@heroku-cli/notifications": "^1.2.6",
     "@heroku-cli/schema": "^1.0.25",
     "@heroku/buildpack-registry": "^1.0.1",
-    "@heroku/heroku-cli-util": "^10.6.0",
+    "@heroku/heroku-cli-util": "^10.6.1",
     "@heroku/http-call": "^5.5.1",
     "@heroku/mcp-server": "^1.2.0",
     "@heroku/socksv5": "^0.0.9",
diff --git a/src/commands/data/pg/destroy.ts b/src/commands/data/pg/destroy.ts
@@ -32,10 +32,6 @@ export default class DataPgDestroy extends BaseCommand {
     const addonResolver = new utils.AddonResolver(this.heroku)
     const addon = await addonResolver.resolve(databaseName, app, utils.pg.addonService())
 
-    if (!utils.pg.isPostgresAddon(addon)) {
-      ux.error(`You can only use this command to delete Heroku Postgres databases. Run ${color.code(`heroku addons:destroy ${addon.name}`)} instead.`)
-    }
-
     // prevent deletion of add-on when context.app is set but the addon is
     // attached to a different app
     const addonApp = addon.app!.name!
diff --git a/test/unit/commands/data/pg/destroy.unit.test.ts b/test/unit/commands/data/pg/destroy.unit.test.ts
@@ -45,17 +45,17 @@ describe('data:pg:destroy', function () {
     }
   })
 
-  it('prevents destruction of add-ons other than Heroku Postgres', async function () {
+  it('doesn\'t destroy non-Postgres addons', async function () {
     const resolveApi = nock('https://api.heroku.com')
       .post('/actions/addons/resolve')
       .reply(200, [nonPostgresAddon])
 
     try {
-      await runCommand(DataPgDestroy, [addon.name!, '--app=myapp', '--confirm=myapp'])
+      await runCommand(DataPgDestroy, [nonPostgresAddon.name!, '--app=myapp', '--confirm=myapp'])
     } catch (error: unknown) {
       resolveApi.done()
       expect(ansis.strip((error as Error).message)).to.equal(
-        'You can only use this command to delete Heroku Postgres databases. Run heroku addons:destroy redis-database instead.',
+        'Couldn\'t find that addon.',
       )
     }
   })
diff --git a/test/unit/commands/pg/backups/capture.unit.test.ts b/test/unit/commands/pg/backups/capture.unit.test.ts
@@ -34,7 +34,7 @@ describe('pg:backups:capture', function () {
     }
     api
       .post('/actions/addon-attachments/resolve', {
-        addon_attachment: 'DATABASE_URL', addon_service: 'heroku-postgresql', app: 'myapp',
+        addon_attachment: 'DATABASE_URL', app: 'myapp',
       })
       .reply(200, [{addon}])
     pgApi
@@ -76,7 +76,7 @@ describe('pg:backups:capture', function () {
     }
     api
       .post('/actions/addon-attachments/resolve', {
-        addon_attachment: 'DATABASE_URL', addon_service: 'heroku-postgresql', app: 'myapp',
+        addon_attachment: 'DATABASE_URL', app: 'myapp',
       })
       .reply(200, [{addon}])
     pgApi
@@ -122,7 +122,7 @@ describe('pg:backups:capture', function () {
     }
     api
       .post('/actions/addon-attachments/resolve', {
-        addon_attachment: 'DATABASE_URL', addon_service: 'heroku-postgresql', app: 'myapp',
+        addon_attachment: 'DATABASE_URL', app: 'myapp',
       })
       .reply(200, [{addon}])
     pgApi
diff --git a/test/unit/commands/pg/backups/restore.unit.test.ts b/test/unit/commands/pg/backups/restore.unit.test.ts
@@ -20,7 +20,7 @@ describe('pg:backups:restore', function () {
   beforeEach(async function () {
     api = nock('https://api.heroku.com')
     api.post('/actions/addon-attachments/resolve', {
-      addon_attachment: 'DATABASE_URL', addon_service: 'heroku-postgresql', app: 'myapp',
+      addon_attachment: 'DATABASE_URL', app: 'myapp',
     }).reply(200, [{addon}])
     pg = nock('https://api.data.heroku.com')
   })
diff --git a/test/unit/commands/pg/backups/schedule.unit.test.ts b/test/unit/commands/pg/backups/schedule.unit.test.ts
@@ -29,7 +29,6 @@ describe('pg:backups:schedule', function () {
       api
         .post('/actions/addon-attachments/resolve', {
           addon_attachment: 'DATABASE_URL',
-          addon_service: 'heroku-postgresql',
           app: 'myapp',
         })
         .reply(200, [
@@ -136,7 +135,6 @@ describe('pg:backups:schedule', function () {
     api
       .post('/actions/addon-attachments/resolve', {
         addon_attachment: 'DATABASE_URL',
-        addon_service: 'heroku-postgresql',
         app: 'myapp',
       })
       .reply(200, [
diff --git a/test/unit/commands/pg/backups/unschedule.unit.test.ts b/test/unit/commands/pg/backups/unschedule.unit.test.ts
@@ -24,7 +24,6 @@ describe('pg:backups:unschedule', function () {
         .reply(200, [addon])
         .post('/actions/addon-attachments/resolve', {
           addon_attachment: 'DATABASE_URL',
-          addon_service: 'heroku-postgresql',
           app: appName,
         })
         .reply(200, [attachment])
@@ -66,7 +65,6 @@ describe('pg:backups:unschedule error state', function () {
       .reply(200, [addon])
       .post('/actions/addon-attachments/resolve', {
         addon_attachment: 'DATABASE_URL',
-        addon_service: 'heroku-postgresql',
         app: appName,
       })
       .reply(200, [attachment])
diff --git a/test/unit/commands/pg/connection-pooling/attach.unit.test.ts b/test/unit/commands/pg/connection-pooling/attach.unit.test.ts
@@ -17,7 +17,7 @@ describe('pg:connection-pooling:attach', function () {
 
   beforeEach(function () {
     api = nock('https://api.heroku.com')
-      .post('/actions/addon-attachments/resolve', {addon_attachment: 'postgres-1', addon_service: 'heroku-postgresql', app: 'myapp'})
+      .post('/actions/addon-attachments/resolve', {addon_attachment: 'postgres-1', app: 'myapp'})
       .reply(200, [resolvedAttachments['myapp::postgres-1']])
       .get('/addons/postgres-1')
       .reply(200, addon)
diff --git a/test/unit/commands/pg/copy.unit.test.ts b/test/unit/commands/pg/copy.unit.test.ts
@@ -58,7 +58,7 @@ describe('pg:copy', function () {
       api.get('/addons/postgres-1')
         .reply(200, addon)
       api.post('/actions/addon-attachments/resolve', {
-        app: 'myapp', addon_attachment: 'HEROKU_POSTGRESQL_RED_URL', addon_service: 'heroku-postgresql',
+        app: 'myapp', addon_attachment: 'HEROKU_POSTGRESQL_RED_URL',
       })
         .reply(200, [attachment])
       api.get('/apps/myapp/config-vars')
@@ -108,11 +108,11 @@ describe('pg:copy', function () {
       api.get('/addons/postgres-2')
         .reply(200, otherAddon)
       api.post('/actions/addon-attachments/resolve', {
-        app: 'myapp', addon_attachment: 'HEROKU_POSTGRESQL_RED_URL', addon_service: 'heroku-postgresql',
+        app: 'myapp', addon_attachment: 'HEROKU_POSTGRESQL_RED_URL',
       })
         .reply(200, [attachment])
       api.post('/actions/addon-attachments/resolve', {
-        app: 'myotherapp', addon_attachment: 'DATABASE_URL', addon_service: 'heroku-postgresql',
+        app: 'myotherapp', addon_attachment: 'DATABASE_URL',
       })
         .reply(200, [otherAttachment])
       api.get('/apps/myapp/config-vars')
@@ -152,11 +152,11 @@ describe('pg:copy', function () {
       api.get('/addons/postgres-2')
         .reply(200, otherAddon)
       api.post('/actions/addon-attachments/resolve', {
-        app: 'myapp', addon_attachment: 'HEROKU_POSTGRESQL_RED_URL', addon_service: 'heroku-postgresql',
+        app: 'myapp', addon_attachment: 'HEROKU_POSTGRESQL_RED_URL',
       })
         .reply(200, [attachment])
       api.post('/actions/addon-attachments/resolve', {
-        app: 'myapp', addon_attachment: 'ATTACHED_BLUE', addon_service: 'heroku-postgresql',
+        app: 'myapp', addon_attachment: 'ATTACHED_BLUE',
       })
         .reply(200, [attachedBlueAttachment])
       api.get('/apps/myapp/config-vars')
@@ -192,11 +192,11 @@ describe('pg:copy', function () {
       api.get('/addons/postgres-2')
         .reply(200, otherAddon)
       api.post('/actions/addon-attachments/resolve', {
-        app: 'mylowercaseapp', addon_attachment: 'lowercase_database_URL', addon_service: 'heroku-postgresql',
+        app: 'mylowercaseapp', addon_attachment: 'lowercase_database_URL',
       })
         .reply(200, [lowercaseAttachment])
       api.post('/actions/addon-attachments/resolve', {
-        app: 'myotherapp', addon_attachment: 'DATABASE_URL', addon_service: 'heroku-postgresql',
+        app: 'myotherapp', addon_attachment: 'DATABASE_URL',
       })
         .reply(200, [otherAttachment])
       api.get('/apps/mylowercaseapp/config-vars')
@@ -231,7 +231,7 @@ describe('pg:copy', function () {
       api.get('/addons/postgres-1')
         .reply(200, addon)
       api.post('/actions/addon-attachments/resolve', {
-        app: 'myapp', addon_attachment: 'HEROKU_POSTGRESQL_RED_URL', addon_service: 'heroku-postgresql',
+        app: 'myapp', addon_attachment: 'HEROKU_POSTGRESQL_RED_URL',
       })
         .reply(200, [attachment])
       api.get('/apps/myapp/config-vars')
diff --git a/test/unit/commands/pg/credentials.unit.test.ts b/test/unit/commands/pg/credentials.unit.test.ts
@@ -91,7 +91,7 @@ describe('pg:credentials', function () {
       },
     ]
 
-    api.post('/actions/addon-attachments/resolve', {addon_attachment: 'DATABASE_URL', addon_service: 'heroku-postgresql', app: 'myapp'})
+    api.post('/actions/addon-attachments/resolve', {addon_attachment: 'DATABASE_URL', app: 'myapp'})
       .reply(200, [{addon}])
       .get('/addons/1/addon-attachments')
       .reply(200, attachments)
@@ -175,7 +175,7 @@ describe('pg:credentials', function () {
       },
     ]
 
-    api.post('/actions/addon-attachments/resolve', {addon_attachment: 'DATABASE_URL', addon_service: 'heroku-postgresql', app: 'myapp'})
+    api.post('/actions/addon-attachments/resolve', {addon_attachment: 'DATABASE_URL', app: 'myapp'})
       .reply(200, [{addon}])
       .get('/addons/1/addon-attachments')
       .reply(200, attachments)
diff --git a/test/unit/commands/pg/credentials/create.unit.test.ts b/test/unit/commands/pg/credentials/create.unit.test.ts
@@ -26,7 +26,6 @@ describe('pg:credentials:create', function () {
     api.post('/actions/addon-attachments/resolve', {
       app: 'myapp',
       addon_attachment: 'DATABASE_URL',
-      addon_service: 'heroku-postgresql',
     }).reply(200, [{addon}])
 
     pg.post('/postgres/v0/databases/postgres-1/credentials')
@@ -50,7 +49,6 @@ describe('pg:credentials:create', function () {
     api.post('/actions/addon-attachments/resolve', {
       app: 'myapp',
       addon_attachment: 'DATABASE_URL',
-      addon_service: 'heroku-postgresql',
     }).reply(200, [{addon: essentialAddon}])
 
     const err = "You can't create a custom credential on Essential-tier databases."
@@ -69,7 +67,6 @@ describe('pg:credentials:create', function () {
     api.post('/actions/addon-attachments/resolve', {
       app: 'myapp',
       addon_attachment: 'DATABASE_URL',
-      addon_service: 'heroku-postgresql',
     }).reply(200, [{addon: hobbyAddon}])
 
     const err = "You can't create a custom credential on Essential-tier databases."
diff --git a/test/unit/commands/pg/credentials/rotate.unit.test.ts b/test/unit/commands/pg/credentials/rotate.unit.test.ts
@@ -60,7 +60,6 @@ describe('pg:credentials:rotate', function () {
       api.post('/actions/addon-attachments/resolve', {
         app: 'myapp',
         addon_attachment: 'DATABASE_URL',
-        addon_service: 'heroku-postgresql',
       }).reply(200, [{addon}])
     })
 
@@ -215,7 +214,6 @@ describe('pg:credentials:rotate', function () {
     api.post('/actions/addon-attachments/resolve', {
       app: 'myapp',
       addon_attachment: 'DATABASE_URL',
-      addon_service: 'heroku-postgresql',
     }).reply(200, [{addon: hobbyAddon}])
 
     const err = 'Legacy Essential-tier databases do not support named credentials.'
@@ -235,7 +233,6 @@ describe('pg:credentials:rotate', function () {
     api.post('/actions/addon-attachments/resolve', {
       app: 'myapp',
       addon_attachment: 'DATABASE_URL',
-      addon_service: 'heroku-postgresql',
     }).reply(200, [{addon: essentialAddon}])
 
     pg.post('/postgres/v0/databases/postgres-1/credentials/lucy/credentials_rotation')
@@ -263,7 +260,6 @@ describe('pg:credentials:rotate', function () {
     api.post('/actions/addon-attachments/resolve', {
       app: 'myapp',
       addon_attachment: 'DATABASE_URL',
-      addon_service: 'heroku-postgresql',
     }).reply(200, [{addon: hobbyAddon}])
 
     pg.post('/postgres/v0/databases/postgres-1/credentials/default/credentials_rotation')
@@ -288,7 +284,6 @@ describe('pg:credentials:rotate', function () {
     api.post('/actions/addon-attachments/resolve', {
       app: 'myapp',
       addon_attachment: 'DATABASE_URL',
-      addon_service: 'heroku-postgresql',
     }).reply(200, [{addon: hobbyAddon}])
 
     pg.post('/postgres/v0/databases/postgres-1/credentials_rotation')
diff --git a/test/unit/commands/pg/info.unit.test.ts b/test/unit/commands/pg/info.unit.test.ts
@@ -98,7 +98,7 @@ describe('pg:info', function () {
       const addon = addons[1]
       api.get('/apps/myapp/config-vars')
         .reply(200, config)
-        .post('/actions/addon-attachments/resolve', {addon_attachment: 'postgres-2', addon_service: 'heroku-postgresql', app: 'myapp'})
+        .post('/actions/addon-attachments/resolve', {addon_attachment: 'postgres-2', app: 'myapp'})
         .reply(200, [{addon}])
       pg.get('/client/v11/databases/2')
         .reply(200, dbB)
diff --git a/test/unit/commands/pg/killall.unit.test.ts b/test/unit/commands/pg/killall.unit.test.ts
@@ -23,7 +23,7 @@ describe('pg:killall', function () {
   })
 
   it('waits for all databases to be available', async function () {
-    api.post('/actions/addon-attachments/resolve', {addon_attachment: 'DATABASE_URL', addon_service: 'heroku-postgresql', app: 'myapp'})
+    api.post('/actions/addon-attachments/resolve', {addon_attachment: 'DATABASE_URL', app: 'myapp'})
       .reply(200, [{addon: db}])
     pg.post('/client/v11/databases/1/connection_reset')
       .reply(200)
diff --git a/test/unit/commands/pg/links/create.unit.test.ts b/test/unit/commands/pg/links/create.unit.test.ts
@@ -29,7 +29,7 @@ describe('pg:links:create', function () {
 
     it('errors when attempting to create a link', async function () {
       api.post('/actions/addon-attachments/resolve', {
-        addon_attachment: 'heroku-postgres', addon_service: 'heroku-postgresql', app: 'myapp',
+        addon_attachment: 'heroku-postgres', app: 'myapp',
       }).reply(200, [{addon}])
 
       api.post('/actions/addons/resolve', {
@@ -61,7 +61,6 @@ describe('pg:links:create', function () {
     it('errors when attempting to create a link', async function () {
       api.post('/actions/addon-attachments/resolve', {
         addon_attachment: 'heroku-postgres',
-        addon_service: 'heroku-postgresql',
         app: 'myapp',
       }).reply(200, [{addon}])
 
diff --git a/test/unit/commands/pg/promote.unit.test.ts b/test/unit/commands/pg/promote.unit.test.ts
@@ -295,7 +295,6 @@ describe('pg:promote when argument is a credential attachment', function () {
       .post('/actions/addon-attachments/resolve', {
         app: 'myapp',
         addon_attachment: 'DATABASE',
-        addon_service: 'heroku-postgresql',
       })
       .reply(200, [{addon, name: 'PURPLE', namespace: 'credential:hello'}])
       .get('/apps/myapp/formation')
@@ -565,10 +564,10 @@ describe('pg:promote when release phase is present', function () {
       })
       .reply(201)
       .post('/actions/addon-attachments/resolve', {
-        app: 'myapp', addon_attachment: 'DATABASE', addon_service: 'heroku-postgresql',
+        app: 'myapp', addon_attachment: 'DATABASE',
       })
       .reply(201, [{
-        name: 'PURPLE', addon: {name: addon.name, id: addon.id}, namespace: 'credential:hello',
+        name: 'PURPLE', addon: {name: addon.name, id: addon.id, plan: {id: addon.plan!.id, name: addon.plan!.name}}, namespace: 'credential:hello',
       }])
     nock('https://api.data.heroku.com')
       .get(`/client/v11/databases/${addon.id}/wait_status`)
diff --git a/test/unit/commands/pg/settings/auto-explain.unit.test.ts b/test/unit/commands/pg/settings/auto-explain.unit.test.ts
@@ -23,7 +23,6 @@ describe('pg:settings:auto-explain', function () {
     api.post('/actions/addon-attachments/resolve', {
       app: 'myapp',
       addon_attachment: 'test-database',
-      addon_service: 'heroku-postgresql',
     }).reply(200, [{addon}])
 
     pg = nock('https://api.data.heroku.com')
diff --git a/test/unit/commands/pg/settings/auto-explain/log-analyze.unit.test.ts b/test/unit/commands/pg/settings/auto-explain/log-analyze.unit.test.ts
@@ -16,7 +16,6 @@ describe('pg:settings:auto-explain:log-analyze', function () {
       .post('/actions/addon-attachments/resolve', {
         app: 'myapp',
         addon_attachment: 'test-database',
-        addon_service: 'heroku-postgresql',
       }).reply(200, [{addon}])
   })
 
diff --git a/test/unit/commands/pg/settings/auto-explain/log-buffers.unit.test.ts b/test/unit/commands/pg/settings/auto-explain/log-buffers.unit.test.ts
@@ -15,7 +15,6 @@ describe('pg:settings:auto-explain:log-buffers', function () {
       .post('/actions/addon-attachments/resolve', {
         app: 'myapp',
         addon_attachment: 'test-database',
-        addon_service: 'heroku-postgresql',
       }).reply(200, [{addon}])
   })
 
diff --git a/test/unit/commands/pg/settings/auto-explain/log-format.unit.test.ts b/test/unit/commands/pg/settings/auto-explain/log-format.unit.test.ts
@@ -16,7 +16,6 @@ describe('pg:settings:auto-explain:log-format', function () {
       .post('/actions/addon-attachments/resolve', {
         app: 'myapp',
         addon_attachment: 'test-database',
-        addon_service: 'heroku-postgresql',
       }).reply(200, [{addon}])
   })
 
diff --git a/test/unit/commands/pg/settings/auto-explain/log-min-duration.unit.test.ts b/test/unit/commands/pg/settings/auto-explain/log-min-duration.unit.test.ts
@@ -15,7 +15,6 @@ describe('pg:settings:auto-explain:log-min-duration', function () {
       .post('/actions/addon-attachments/resolve', {
         app: 'myapp',
         addon_attachment: 'test-database',
-        addon_service: 'heroku-postgresql',
       }).reply(200, [{addon}])
   })
 
diff --git a/test/unit/commands/pg/settings/auto-explain/log-nested-statements.unit.test.ts b/test/unit/commands/pg/settings/auto-explain/log-nested-statements.unit.test.ts
@@ -15,7 +15,6 @@ describe('pg:settings:auto-explain:log-nested-statements', function () {
       .post('/actions/addon-attachments/resolve', {
         app: 'myapp',
         addon_attachment: 'test-database',
-        addon_service: 'heroku-postgresql',
       }).reply(200, [{addon}])
   })
 
diff --git a/test/unit/commands/pg/settings/auto-explain/log-triggers.unit.test.ts b/test/unit/commands/pg/settings/auto-explain/log-triggers.unit.test.ts
@@ -16,7 +16,6 @@ describe('pg:settings:auto-explain:log-triggers', function () {
       .post('/actions/addon-attachments/resolve', {
         app: 'myapp',
         addon_attachment: 'test-database',
-        addon_service: 'heroku-postgresql',
       }).reply(200, [{addon}])
   })
 
diff --git a/test/unit/commands/pg/settings/auto-explain/log-verbose.unit.test.ts b/test/unit/commands/pg/settings/auto-explain/log-verbose.unit.test.ts
diff --git a/test/unit/commands/pg/settings/data-connector-details-logs.unit.test.ts b/test/unit/commands/pg/settings/data-connector-details-logs.unit.test.ts
diff --git a/test/unit/commands/pg/settings/index.unit.test.ts b/test/unit/commands/pg/settings/index.unit.test.ts
diff --git a/test/unit/commands/pg/settings/log-connections.unit.test.ts b/test/unit/commands/pg/settings/log-connections.unit.test.ts
diff --git a/test/unit/commands/pg/settings/log-lock-waits.unit.test.ts b/test/unit/commands/pg/settings/log-lock-waits.unit.test.ts
diff --git a/test/unit/commands/pg/settings/log-min-duration-statement.unit.test.ts b/test/unit/commands/pg/settings/log-min-duration-statement.unit.test.ts
diff --git a/test/unit/commands/pg/settings/log-min-error-statement.unit.test.ts b/test/unit/commands/pg/settings/log-min-error-statement.unit.test.ts
diff --git a/test/unit/commands/pg/settings/log-statement.unit.test.ts b/test/unit/commands/pg/settings/log-statement.unit.test.ts
diff --git a/test/unit/commands/pg/settings/track-functions.unit.test.ts b/test/unit/commands/pg/settings/track-functions.unit.test.ts

Original file line number	Diff line number	Diff line change
`@@ -45,17 +45,17 @@ describe('data:pg:destroy', function () {`
`45`	`45`	`}`
`46`	`46`	`})`
`47`	`47`
`48`		`- it('prevents destruction of add-ons other than Heroku Postgres', async function () {`
	`48`	`+ it('doesn\'t destroy non-Postgres addons', async function () {`
`49`	`49`	`const resolveApi = nock('https://api.heroku.com')`
`50`	`50`	`.post('/actions/addons/resolve')`
`51`	`51`	`.reply(200, [nonPostgresAddon])`
`52`	`52`
`53`	`53`	`try {`
`54`		`- await runCommand(DataPgDestroy, [addon.name!, '--app=myapp', '--confirm=myapp'])`
	`54`	`+ await runCommand(DataPgDestroy, [nonPostgresAddon.name!, '--app=myapp', '--confirm=myapp'])`
`55`	`55`	`} catch (error: unknown) {`
`56`	`56`	`resolveApi.done()`
`57`	`57`	`expect(ansis.strip((error as Error).message)).to.equal(`
`58`		`- 'You can only use this command to delete Heroku Postgres databases. Run heroku addons:destroy redis-database instead.',`
	`58`	`+ 'Couldn\'t find that addon.',`
`59`	`59`	`)`
`60`	`60`	`}`
`61`	`61`	`})`