Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(ps): add larger dyno information to ps:type and ps:scale #2598

Merged
merged 18 commits into from
Jan 30, 2024
Merged

feat(ps): add larger dyno information to ps:type and ps:scale #2598

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
2d2a095
Add additional dyno options
zwhitfield3 Jan 19, 2024
8140553
Add additional price logic for shield dynos
zwhitfield3 Jan 19, 2024
956e354
Update dyno names from feedback
zwhitfield3 Jan 19, 2024
9760847
Update tests
zwhitfield3 Jan 19, 2024
b123c6a
Update case in dyno naming
zwhitfield3 Jan 19, 2024
eaa6964
WIP create larger dyno feature flag
zwhitfield3 Jan 24, 2024
a77e113
Merge branch 'main' into zw/larger-dyno-size-updates
zwhitfield3 Jan 25, 2024
f946e53
Add feature flag and update tests
zwhitfield3 Jan 26, 2024
e66e5f8
Add additional tests for feature flag
zwhitfield3 Jan 26, 2024
2b85cc1
Add feature flag to ps:scale and update tests
zwhitfield3 Jan 26, 2024
0ec6588
Add additional tests for ps:scale using feature flag
zwhitfield3 Jan 26, 2024
0487fb6
Merge branch 'main' into zw/larger-dyno-size-updates
zwhitfield3 Jan 26, 2024
a5baddd
Update feature flag naming & if statements
zwhitfield3 Jan 29, 2024
b9fb004
WIP update ps:type to include available dyno sizes & update tests
zwhitfield3 Jan 29, 2024
22d3dc6
Clean up code & tests
zwhitfield3 Jan 29, 2024
d68688e
Add availableDynoSizes list & update tests
zwhitfield3 Jan 29, 2024
4345641
Update available dyno sizes & tests for ps:type & ps:scale
zwhitfield3 Jan 29, 2024
625c69a
Remove unnecessary returns for clarity
zwhitfield3 Jan 29, 2024
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
11 changes: 8 additions & 3 deletions packages/apps-v5/src/commands/ps/scale.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,15 @@ async function run(context, heroku) {
let isLargerDyno = false
const largerDynoFeatureFlag = await heroku.get('/account/features/frontend-larger-dynos')

function parse(args) {
async function parse(args) {
// checks for larger dyno sizes
// if the feature is not enabled
if (!largerDynoFeatureFlag.enabled) {
let availableDynoSizes = await heroku.get('/dyno-sizes')
availableDynoSizes = availableDynoSizes.map(dyno => {
return ' ' + dyno.name
})

if (args.find(a => a.match(/=/))) {
compact(args.map(arg => {
let match = arg.match(/^([\w-]+)([=+-]\d+)(?::([\w-]+))?$/)
Expand All @@ -30,7 +35,7 @@ async function run(context, heroku) {
isLargerDyno = largerDynoNames.test(size)

if (isLargerDyno) {
throw new Error(`No such size as ${size}.`)
throw new Error(`No such size as ${size}. Use${availableDynoSizes}`)
}

// eslint-disable-next-line no-useless-return
Expand All @@ -48,7 +53,7 @@ async function run(context, heroku) {
}))
}

let changes = parse(context.args)
let changes = await parse(context.args)
if (changes.length === 0) {
let formation = await heroku.get(`/apps/${app}/formation`)

Expand Down
187 changes: 186 additions & 1 deletion packages/apps-v5/test/unit/commands/ps/scale.unit.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,177 @@ const nock = require('nock')
const cmd = commands.find(c => c.topic === 'ps' && c.command === 'scale')
const {expect} = require('chai')

const availableDynoSizes = [
{
id: '03307558-da97-4417-b1b3-e7f23b565422',
compute: 1,
dedicated: false,
memory: 0.5,
name: 'Standard-1X',
cost: {
cents: 2500,
unit: 'monthly',
},
dyno_units: 1,
precise_dyno_units: 1,
private_space_only: false,
},
{
id: '28c44219-0905-4318-8bb7-c2dda860e472',
compute: 2,
dedicated: false,
memory: 1,
name: 'Standard-2X',
cost: {
cents: 5000,
unit: 'monthly',
},
dyno_units: 2,
precise_dyno_units: 2,
private_space_only: false,
},
{
id: '808d31e7-300c-4313-9af3-bc7b69639ef3',
compute: 11,
dedicated: true,
memory: 2.5,
name: 'Performance-M',
cost: {
cents: 25000,
unit: 'monthly',
},
dyno_units: 8,
precise_dyno_units: 8,
private_space_only: false,
},
{
id: 'b711833f-ffa6-478f-82a3-30e071c32485',
compute: 46,
dedicated: true,
memory: 14,
name: 'Performance-L',
cost: {
cents: 50000,
unit: 'monthly',
},
dyno_units: 16,
precise_dyno_units: 16,
private_space_only: false,
},
{
id: 'c5ccc7a9-16ae-4bca-9247-7630c8d00a82',
compute: 2,
dedicated: true,
memory: 1,
name: 'Private-S',
cost: {
cents: null,
unit: null,
},
dyno_units: 5,
precise_dyno_units: 5,
private_space_only: true,
},
{
id: '5d6efb3e-ad8b-4518-ae8d-88540116d92c',
compute: 14,
dedicated: true,
memory: 2.5,
name: 'Private-M',
cost: {
cents: null,
unit: null,
},
dyno_units: 10,
precise_dyno_units: 10,
private_space_only: true,
},
{
id: 'e29ee54f-6988-4810-aaac-d17d55d8a022',
compute: 52,
dedicated: true,
memory: 14,
name: 'Private-L',
cost: {
cents: null,
unit: null,
},
dyno_units: 20,
precise_dyno_units: 20,
private_space_only: true,
},
{
id: 'fabceacc-cdb4-4e3c-ab42-5dd861ea4926',
compute: 14,
dedicated: true,
memory: 2.5,
name: 'Shield-M',
cost: {
cents: null,
unit: null,
},
dyno_units: 12,
precise_dyno_units: 12,
private_space_only: true,
},
{
id: 'a0c5f2c9-6a29-478d-80bd-52f785a9499d',
compute: 52,
dedicated: true,
memory: 14,
name: 'Shield-L',
cost: {
cents: null,
unit: null,
},
dyno_units: 24,
precise_dyno_units: 24,
private_space_only: true,
},
{
id: '7481b4f2-ca73-4faf-9c6d-33cab08ad6e2',
compute: 2,
dedicated: true,
memory: 1,
name: 'Shield-S',
cost: {
cents: null,
unit: null,
},
dyno_units: 6,
precise_dyno_units: 6,
private_space_only: true,
},
{
id: '0f5ec139-ee6b-4de6-a3fe-48d9c3d3e663',
compute: 1,
dedicated: false,
memory: 0.5,
name: 'Eco',
cost: {
cents: 0,
unit: 'monthly',
},
dyno_units: 0,
precise_dyno_units: 0,
private_space_only: false,
},
{
id: '5c93cdee-2bbd-4fc0-9f04-d369d1dbb962',
compute: 1,
dedicated: false,
memory: 0.5,
name: 'Basic',
cost: {
cents: 700,
unit: 'monthly',
},
dyno_units: 0,
precise_dyno_units: 0.28,
private_space_only: false,
},
]

// will remove this flag once we have
// successfully launched larger dyno sizes
function featureFlagPayload(isEnabled = false) {
Expand All @@ -23,6 +194,8 @@ describe('ps:scale', () => {
let api = nock('https://api.heroku.com')
.get('/account/features/frontend-larger-dynos')
.reply(200, featureFlagPayload())
.get('/dyno-sizes')
.reply(200, availableDynoSizes)
.get('/apps/myapp/formation')
.reply(200, [{type: 'web', quantity: 1, size: 'Free'}, {type: 'worker', quantity: 2, size: 'Free'}])
.get('/apps/myapp')
Expand Down Expand Up @@ -53,6 +226,8 @@ describe('ps:scale', () => {
let api = nock('https://api.heroku.com')
.get('/account/features/frontend-larger-dynos')
.reply(200, featureFlagPayload())
.get('/dyno-sizes')
.reply(200, availableDynoSizes)
.get('/apps/myapp/formation')
.reply(200, [{type: 'web', quantity: 1, size: 'Private-L'}, {type: 'worker', quantity: 2, size: 'Private-M'}])
.get('/apps/myapp')
Expand All @@ -68,6 +243,8 @@ describe('ps:scale', () => {
let api = nock('https://api.heroku.com')
.get('/account/features/frontend-larger-dynos')
.reply(200, featureFlagPayload())
.get('/dyno-sizes')
.reply(200, availableDynoSizes)
.get('/apps/myapp/formation')
.reply(200, [])
.get('/apps/myapp')
Expand All @@ -84,6 +261,8 @@ describe('ps:scale', () => {
let api = nock('https://api.heroku.com:443')
.get('/account/features/frontend-larger-dynos')
.reply(200, featureFlagPayload())
.get('/dyno-sizes')
.reply(200, availableDynoSizes)
.patch('/apps/myapp/formation', {updates: [{type: 'web', quantity: '1'}, {type: 'worker', quantity: '2'}]})
.reply(200, [{type: 'web', quantity: 1, size: 'Free'}, {type: 'worker', quantity: 2, size: 'Free'}])
.get('/apps/myapp')
Expand All @@ -99,6 +278,8 @@ describe('ps:scale', () => {
let api = nock('https://api.heroku.com:443')
.get('/account/features/frontend-larger-dynos')
.reply(200, featureFlagPayload())
.get('/dyno-sizes')
.reply(200, availableDynoSizes)
.patch('/apps/myapp/formation', {updates: [{type: 'web', quantity: '1', size: 'Private-L'}]})
.reply(200, [{type: 'web', quantity: 1, size: 'Private-L'}])
.get('/apps/myapp')
Expand All @@ -114,6 +295,8 @@ describe('ps:scale', () => {
let api = nock('https://api.heroku.com:443')
.get('/account/features/frontend-larger-dynos')
.reply(200, featureFlagPayload())
.get('/dyno-sizes')
.reply(200, availableDynoSizes)
.patch('/apps/myapp/formation', {updates: [{type: 'web', quantity: '+1'}]})
.reply(200, [{type: 'web', quantity: 2, size: 'Free'}])
.get('/apps/myapp')
Expand All @@ -130,8 +313,10 @@ it('errors if user attempts to scale up using new larger dyno size and feature f
let api = nock('https://api.heroku.com')
.get('/account/features/frontend-larger-dynos')
.reply(200, featureFlagPayload())
.get('/dyno-sizes')
.reply(200, availableDynoSizes)

return cmd.run({app: 'myapp', args: ['web=1:Performance-L-RAM']})
.catch(error => expect(error.message).to.eq('No such size as Performance-L-RAM.'))
.catch(error => expect(error.message).to.eq('No such size as Performance-L-RAM. Use Standard-1X, Standard-2X, Performance-M, Performance-L, Private-S, Private-M, Private-L, Shield-M, Shield-L, Shield-S, Eco, Basic'))
zwhitfield3 marked this conversation as resolved.
Show resolved Hide resolved
.then(() => api.done())
})
Loading