Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/commands/data/pg/create.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,7 @@ export default class DataPgCreate extends BaseCommand {
const {followers, 'high-availability': highAvailability, level} = flags
const service = utils.pg.addonService()

const useProd = process.env.HEROKU_PROD_NGPG === 'true'
const planSuffix = useProd ? '' : '-beta'
const plan = `advanced${network ? `-${network}` : ''}${planSuffix}`
const plan = `advanced${network ? `-${network}` : ''}`
const servicePlan = `${service}:${plan}`

// Parse provision options
Expand Down
65 changes: 1 addition & 64 deletions test/fixtures/data/pg/fixtures.ts
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export const addon: DeepRequired<Heroku.AddOn> = {
id: 'ab0490b3-b7cd-4bf6-b840-9db509f3d075',
installable_inside_private_network: false,
installable_outside_private_network: true,
name: 'heroku-postgresql:advanced-beta',
name: 'heroku-postgresql:advanced',
price: {
cents: 0,
contract: false,
Expand Down Expand Up @@ -135,27 +135,6 @@ export const pricingResponse: PricingInfoResponse = {
rate: 20,
},
},
'advanced-beta': {
'instance-4G': {
billing_period: 'month',
billing_unit: 'compute',
product_description: '4G-Performance',
rate: 6000,
},
'instance-8G': {
billing_period: 'month',
billing_unit: 'compute',
product_description: '8G-Performance',
rate: 20000,
},
'storage-optimized': {
billing_period: 'month',
billing_unit: 'gigabyte',
included_units: 100,
product_description: 'Optimized Storage',
rate: 20,
},
},
'advanced-private': {
'instance-4G': {
billing_period: 'month',
Expand All @@ -177,27 +156,6 @@ export const pricingResponse: PricingInfoResponse = {
rate: 24,
},
},
'advanced-private-beta': {
'instance-4G': {
billing_period: 'month',
billing_unit: 'compute',
product_description: '4G-Performance',
rate: 7200,
},
'instance-8G': {
billing_period: 'month',
billing_unit: 'compute',
product_description: '8G-Performance',
rate: 24000,
},
'storage-optimized': {
billing_period: 'month',
billing_unit: 'gigabyte',
included_units: 100,
product_description: 'Optimized Storage',
rate: 24,
},
},
'advanced-shield': {
'instance-4G': {
billing_period: 'month',
Expand All @@ -219,27 +177,6 @@ export const pricingResponse: PricingInfoResponse = {
rate: 28,
},
},
'advanced-shield-beta': {
'instance-4G': {
billing_period: 'month',
billing_unit: 'compute',
product_description: '4G-Performance',
rate: 8400,
},
'instance-8G': {
billing_period: 'month',
billing_unit: 'compute',
product_description: '8G-Performance',
rate: 28000,
},
'storage-optimized': {
billing_period: 'month',
billing_unit: 'gigabyte',
included_units: 100,
product_description: 'Optimized Storage',
rate: 28,
},
},
}

export const scaleResponse: ScaleResponse = {
Expand Down
115 changes: 11 additions & 104 deletions test/unit/commands/data/pg/create.unit.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ describe('data:pg:create', function () {
.post('/apps/myapp/addons', {
attachment: {},
config: {level: '4G-Performance'},
plan: {name: 'heroku-postgresql:advanced-beta'},
plan: {name: 'heroku-postgresql:advanced'},
})
.reply(200, createAddonResponse)
const dataApi = nock('https://api.data.heroku.com')
Expand Down Expand Up @@ -107,7 +107,7 @@ describe('data:pg:create', function () {
.post('/apps/myapp/addons', {
attachment: {},
config: {level: '4G-Performance'},
plan: {name: 'heroku-postgresql:advanced-private-beta'},
plan: {name: 'heroku-postgresql:advanced-private'},
})
.reply(200, createAddonResponse)

Expand Down Expand Up @@ -135,7 +135,7 @@ describe('data:pg:create', function () {
.post('/apps/myapp/addons', {
attachment: {},
config: {level: '4G-Performance'},
plan: {name: 'heroku-postgresql:advanced-shield-beta'},
plan: {name: 'heroku-postgresql:advanced-shield'},
})
.reply(200, createAddonResponse)

Expand All @@ -158,99 +158,6 @@ describe('data:pg:create', function () {
`)
})

describe('with HEROKU_PROD_NGPG env var set', function () {
let originalEnv: NodeJS.ProcessEnv

beforeEach(function () {
originalEnv = {...process.env}
process.env.HEROKU_PROD_NGPG = 'true'
})

afterEach(function () {
process.env = originalEnv
})

it('creates database with non-beta plan', async function () {
const herokuApi = nock('https://api.heroku.com')
.post('/apps/myapp/addons', {
attachment: {},
config: {level: '4G-Performance'},
plan: {name: 'heroku-postgresql:advanced'},
})
.reply(200, createAddonResponse)

await runCommand(DataPgCreate, ['--app=myapp', '--level=4G-Performance'])

herokuApi.done()
})

it('creates database in private network with non-beta plan', async function () {
const herokuApi = nock('https://api.heroku.com')
.post('/apps/myapp/addons', {
attachment: {},
config: {level: '4G-Performance'},
plan: {name: 'heroku-postgresql:advanced-private'},
})
.reply(200, createAddonResponse)

await runCommand(DataPgCreate, [
'--app=myapp',
'--network=private',
'--level=4G-Performance',
])

herokuApi.done()
})

it('creates database in shield network with non-beta plan', async function () {
const herokuApi = nock('https://api.heroku.com')
.post('/apps/myapp/addons', {
attachment: {},
config: {level: '4G-Performance'},
plan: {name: 'heroku-postgresql:advanced-shield'},
})
.reply(200, createAddonResponse)

await runCommand(DataPgCreate, [
'--app=myapp',
'--network=shield',
'--level=4G-Performance',
])

herokuApi.done()
})

it('uses non-beta pricing in interactive mode', async function () {
const herokuApi = nock('https://api.heroku.com')
.post('/apps/myapp/addons', {
attachment: {},
config: {
'high-availability': true,
level: levelsResponse.items[0].name,
},
plan: {name: 'heroku-postgresql:advanced'},
})
.reply(200, createAddonResponse)

const dataApi = nock('https://api.data.heroku.com')
.get('/data/postgres/v1/levels/advanced')
.reply(200, levelsResponse)
.get('/data/postgres/v1/pricing')
.reply(200, pricingResponse)

poolConfigStubs.levelStep.resolves(levelsResponse.items[0].name) // Level selection
promptStub
.onCall(0).resolves({action: 'keep'}) // High availability selection
.onCall(1).resolves({action: 'confirm'}) // Confirmation
.onCall(2).resolves({action: 'exit'}) // Exit at follower pool configuration

await runCommand(DataPgCreate, ['--app=myapp'])

herokuApi.done()
dataApi.done()
})
})

it('creates database with provision options', async function () {
const herokuApi = nock('https://api.heroku.com')
// eslint-disable-next-line @typescript-eslint/no-explicit-any
Expand Down Expand Up @@ -286,7 +193,7 @@ describe('data:pg:create', function () {
level: '4G-Performance',
},
confirm: 'myapp',
plan: {name: 'heroku-postgresql:advanced-beta'},
plan: {name: 'heroku-postgresql:advanced'},
})
.reply(200, createAddonResponse)

Expand All @@ -313,7 +220,7 @@ describe('data:pg:create', function () {
'high-availability': true,
level: levelsResponse.items[0].name,
},
plan: {name: 'heroku-postgresql:advanced-beta'},
plan: {name: 'heroku-postgresql:advanced'},
})
.reply(200, createAddonResponse)

Expand Down Expand Up @@ -387,7 +294,7 @@ describe('data:pg:create', function () {
'high-availability': false,
level: levelsResponse.items[0].name,
},
plan: {name: 'heroku-postgresql:advanced-beta'},
plan: {name: 'heroku-postgresql:advanced'},
})
.reply(200, createAddonResponse)

Expand Down Expand Up @@ -428,7 +335,7 @@ describe('data:pg:create', function () {
'high-availability': true,
level: levelsResponse.items[1].name,
},
plan: {name: 'heroku-postgresql:advanced-beta'},
plan: {name: 'heroku-postgresql:advanced'},
})
.reply(200, createAddonResponse)

Expand Down Expand Up @@ -472,7 +379,7 @@ describe('data:pg:create', function () {
'high-availability': false,
level: levelsResponse.items[0].name,
},
plan: {name: 'heroku-postgresql:advanced-beta'},
plan: {name: 'heroku-postgresql:advanced'},
})
.reply(200, createAddonResponse)

Expand Down Expand Up @@ -515,7 +422,7 @@ describe('data:pg:create', function () {
'high-availability': true,
level: levelsResponse.items[0].name,
},
plan: {name: 'heroku-postgresql:advanced-beta'},
plan: {name: 'heroku-postgresql:advanced'},
})
.reply(200, createAddonResponse)

Expand Down Expand Up @@ -571,7 +478,7 @@ describe('data:pg:create', function () {
'high-availability': true,
level: levelsResponse.items[0].name,
},
plan: {name: 'heroku-postgresql:advanced-beta'},
plan: {name: 'heroku-postgresql:advanced'},
})
.reply(200, createAddonResponse)

Expand Down Expand Up @@ -649,7 +556,7 @@ describe('data:pg:create', function () {
'high-availability': true,
level: levelsResponse.items[0].name,
},
plan: {name: 'heroku-postgresql:advanced-beta'},
plan: {name: 'heroku-postgresql:advanced'},
})
.reply(200, createAddonResponse)

Expand Down
10 changes: 5 additions & 5 deletions test/unit/commands/data/pg/fork.unit.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ describe('data:pg:fork', function () {
fork: 'advanced-horizontal-01234',
level: '4G-Performance',
},
plan: {name: 'heroku-postgresql:advanced-beta'},
plan: {name: 'heroku-postgresql:advanced'},
})
.reply(200, createForkResponse)

Expand Down Expand Up @@ -83,7 +83,7 @@ describe('data:pg:fork', function () {
level: '4G-Performance',
},
name: 'my-forked-db',
plan: {name: 'heroku-postgresql:advanced-beta'},
plan: {name: 'heroku-postgresql:advanced'},
})
.reply(200, createForkResponse)

Expand Down Expand Up @@ -122,7 +122,7 @@ describe('data:pg:fork', function () {
fork: 'advanced-horizontal-01234',
level: '8G-Performance',
},
plan: {name: 'heroku-postgresql:advanced-beta'},
plan: {name: 'heroku-postgresql:advanced'},
})
.reply(200, createForkResponse)

Expand Down Expand Up @@ -189,7 +189,7 @@ describe('data:pg:fork', function () {
'recovery-time': '2025-01-11T12:35:00',
rollback: 'advanced-horizontal-01234',
},
plan: {name: 'heroku-postgresql:advanced-beta'},
plan: {name: 'heroku-postgresql:advanced'},
})
.reply(200, createForkResponse)

Expand Down Expand Up @@ -234,7 +234,7 @@ describe('data:pg:fork', function () {
'recovery-time': '2025-01-30T00:00:00',
rollback: 'advanced-horizontal-01234',
},
plan: {name: 'heroku-postgresql:advanced-beta'},
plan: {name: 'heroku-postgresql:advanced'},
})
.reply(200, createForkResponse)

Expand Down
Loading