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

refactor(container): add type to addons in addons:wait #2655

Merged
merged 3 commits into from
Feb 22, 2024
Merged

refactor(container): add type to addons in addons:wait #2655

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2873781
Type the addon for filtering.
eablack Feb 22, 2024
f37ca25
Update to explicitly type addonsToWaitFor
eablack Feb 22, 2024
d5d4ffe
Use temporary type instead of ignoring type error.
eablack Feb 22, 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
Prev Previous commit
Use temporary type instead of ignoring type error.
  • Loading branch information
@eablack
eablack committed Feb 22, 2024
commit d5d4ffeb6dd500c1aacf84478e52b829bda4629f
14 changes: 6 additions & 8 deletions packages/cli/src/commands/addons/wait.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,20 @@ export default class Wait extends Command {

public async run(): Promise<void> {
const {flags, args} = await this.parse(Wait)
let addonsToWaitFor: Heroku.AddOn[]
// TODO: remove this type once the schema is fixed
type AddonWithDeprovisioningState = Heroku.AddOn & {state?: 'deprovisioning'}
let addonsToWaitFor: AddonWithDeprovisioningState[]
if (args.addon) {
addonsToWaitFor = [await resolveAddon(this.heroku, flags.app, args.addon)]
} else if (flags.app) {
const {body: addons} = await this.heroku.get<Heroku.AddOn[]>(`/apps/${flags.app}/addons`)
const {body: addons} = await this.heroku.get<AddonWithDeprovisioningState[]>(`/apps/${flags.app}/addons`)
addonsToWaitFor = addons
} else {
const {body: addons} = await this.heroku.get<Heroku.AddOn[]>('/addons')
const {body: addons} = await this.heroku.get<AddonWithDeprovisioningState[]>('/addons')
addonsToWaitFor = addons
}

// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
addonsToWaitFor = addonsToWaitFor.filter((addon: Heroku.AddOn) => addon.state === 'provisioning' || addon.state === 'deprovisioning')
addonsToWaitFor = addonsToWaitFor.filter((addon: AddonWithDeprovisioningState) => addon.state === 'provisioning' || addon.state === 'deprovisioning')
let interval = Number.parseInt(flags['wait-interval'] || '', 10)
if (!interval || interval < 0) {
interval = 5
Expand Down Expand Up @@ -62,8 +62,6 @@ export default class Wait extends Command {
if (Date.now() - startTime.valueOf() >= 1000 * 5) {
notify(`heroku addons:wait ${addonName}`, 'Add-on successfully provisioned')
}
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
} else if (addon.state === 'deprovisioning') {
// eslint-disable-next-line no-await-in-loop
await waitForAddonDeprovisioning(this.heroku, addon, interval)
Expand Down
Loading