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

Jump to bottom

Jh/migrate webhooks oclif core #2197

Merged
merged 16 commits into from
Jan 11, 2023
Merged

Jh/migrate webhooks oclif core #2197

merged 16 commits into from
Jan 11, 2023

Conversation

jheikes515
Copy link
Contributor

GUS Ticket: W-11999458

@jheikes515 jheikes515 temporarily deployed to AcceptanceTests December 27, 2022 21:37 — with GitHub Actions Inactive
@jheikes515 jheikes515 temporarily deployed to AcceptanceTests December 27, 2022 21:37 — with GitHub Actions Inactive
@jheikes515 jheikes515 temporarily deployed to AcceptanceTests December 27, 2022 21:37 — with GitHub Actions Inactive
@jheikes515 jheikes515 temporarily deployed to AcceptanceTests December 27, 2022 21:37 — with GitHub Actions Inactive
@jheikes515 jheikes515 temporarily deployed to AcceptanceTests December 27, 2022 21:37 — with GitHub Actions Inactive
@jheikes515 jheikes515 temporarily deployed to AcceptanceTests December 27, 2022 21:37 — with GitHub Actions Inactive
jheikes515
jheikes515 commented Dec 27, 2022
View reviewed changes
packages/webhooks/test/commands/webhooks/add.test.ts
expect(ctx.stdout).to.equal('=== Webhooks Signing Secret\n1234\n')
expect(ctx.stderr).to.contain('Adding webhook to example-pipeline... done\n')
expect(ctx.stdout).to.contain('=== Webhooks Signing Secret')
expect(ctx.stdout).to.contain('1234')
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Split these lines up because the tests don't handle \n correctly with the oclif upgrade

jheikes515
jheikes515 commented Dec 27, 2022
View reviewed changes
packages/webhooks/test/commands/webhooks/deliveries/index.test.ts
expect(ctx.stdout).to.contain('Status Include Level Attempts Code Error Next Attempt')
expect(ctx.stdout).to.contain(' 99999999-9999-9999-9999-999999999999 2017-08-17T20:22:37Z retrying api:build notify 4')
expect(ctx.stdout).to.contain('401 Foobar 2017-08-17T20:22:39Z')
expect(ctx.stdout).to.contain(' 66666666-6666-6666-6666-666666666666 2017-08-17T20:22:38Z pending api:build notify 4')
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Like above, Split these lines up because the tests don't handle \n correctly with the oclif upgrade. Changed ` to ' because linting complained about it (even though I did not change eslint version)

jheikes515
jheikes515 commented Dec 27, 2022
View reviewed changes
packages/webhooks/test/commands/webhooks/deliveries/index.test.ts
@@ -115,17 +118,19 @@ describe('webhooks:deliveries', () => {
.command(['webhooks:deliveries', '--app', 'example-app'])
.it('only shows 1000 webhook deliveries', ctx => {
const expectedHeader = 'Delivery ID Created Status Include Level Attempts Code Error Next Attempt'
const expectedUnderline = '──────────────────────────────────── ──────────────────── ─────── ───────── ────── ──────── ──── ───── ────────────'
Copy link
Contributor Author

@jheikes515 jheikes515 Dec 27, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added, because this is now being added to the table beneath the header row, since the oclif/core update.

jheikes515
jheikes515 commented Dec 27, 2022
View reviewed changes
packages/webhooks/test/commands/webhooks/deliveries/index.test.ts
const expectedRow = '66666666-6666-6666-6666-666666666666 2017-08-17T20:22:38Z pending api:build notify 4'
const angleBrackets = process.platform === 'win32' ? '»' : '›'
const rows = ctx.stdout.split('\n')

const headerRowCount = 1
const headerRowCount = 2
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also a change resulting from the oclif/core update

jheikes515
jheikes515 commented Dec 27, 2022
View reviewed changes
packages/webhooks/test/commands/webhooks/events/index.test.ts
@@ -82,7 +80,7 @@ describe('webhooks:events', () => {
})
})

describe('by default the table is sorted by `created_at`', () => {
describe('by default the table is sorted by "created_at"', () => {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

eslint complained about the quotes so I changed them

@jheikes515 jheikes515 temporarily deployed to AcceptanceTests December 27, 2022 21:59 — with GitHub Actions Inactive
@jheikes515 jheikes515 temporarily deployed to AcceptanceTests December 27, 2022 21:59 — with GitHub Actions Inactive
@jheikes515 jheikes515 temporarily deployed to AcceptanceTests December 27, 2022 21:59 — with GitHub Actions Inactive
@jheikes515 jheikes515 temporarily deployed to AcceptanceTests January 11, 2023 15:55 — with GitHub Actions Inactive
@jheikes515 jheikes515 temporarily deployed to AcceptanceTests January 11, 2023 15:55 — with GitHub Actions Inactive
@jheikes515 jheikes515 temporarily deployed to AcceptanceTests January 11, 2023 15:55 — with GitHub Actions Inactive
@jheikes515 jheikes515 temporarily deployed to AcceptanceTests January 11, 2023 15:55 — with GitHub Actions Inactive
@jheikes515 jheikes515 temporarily deployed to AcceptanceTests January 11, 2023 16:30 — with GitHub Actions Inactive
@jheikes515 jheikes515 temporarily deployed to AcceptanceTests January 11, 2023 16:30 — with GitHub Actions Inactive
@jheikes515 jheikes515 temporarily deployed to AcceptanceTests January 11, 2023 16:30 — with GitHub Actions Inactive
@jheikes515 jheikes515 temporarily deployed to AcceptanceTests January 11, 2023 16:30 — with GitHub Actions Inactive
@jheikes515 jheikes515 temporarily deployed to AcceptanceTests January 11, 2023 16:30 — with GitHub Actions Inactive
@jheikes515 jheikes515 temporarily deployed to AcceptanceTests January 11, 2023 16:53 — with GitHub Actions Inactive
@jheikes515 jheikes515 temporarily deployed to AcceptanceTests January 11, 2023 16:53 — with GitHub Actions Inactive
@jheikes515 jheikes515 temporarily deployed to AcceptanceTests January 11, 2023 16:53 — with GitHub Actions Inactive
@jheikes515 jheikes515 temporarily deployed to AcceptanceTests January 11, 2023 16:53 — with GitHub Actions Inactive
@jheikes515 jheikes515 temporarily deployed to AcceptanceTests January 11, 2023 16:53 — with GitHub Actions Inactive
@jheikes515 jheikes515 temporarily deployed to AcceptanceTests January 11, 2023 17:02 — with GitHub Actions Inactive
@jheikes515 jheikes515 temporarily deployed to AcceptanceTests January 11, 2023 17:02 — with GitHub Actions Inactive
@jheikes515 jheikes515 temporarily deployed to AcceptanceTests January 11, 2023 17:02 — with GitHub Actions Inactive
@jheikes515 jheikes515 temporarily deployed to AcceptanceTests January 11, 2023 17:02 — with GitHub Actions Inactive
@jheikes515 jheikes515 temporarily deployed to AcceptanceTests January 11, 2023 17:02 — with GitHub Actions Inactive
@jheikes515 jheikes515 temporarily deployed to AcceptanceTests January 11, 2023 17:02 — with GitHub Actions Inactive
@jheikes515 jheikes515 marked this pull request as ready for review January 11, 2023 19:16
@jheikes515 jheikes515 requested a review from a team as a code owner January 11, 2023 19:16
@jheikes515 jheikes515 merged commit 7cfeafb into oclif-core-migration Jan 11, 2023
@jheikes515 jheikes515 deleted the jh/migrate-webhooks-oclif-core branch January 11, 2023 19:25
k80bowman pushed a commit that referenced this pull request Jan 27, 2023
@jheikes515 @k80bowman
Jh/migrate webhooks oclif core (#2197)
7fe0a0a 
* refactor(webhooks): upgrade webhooks to oclif/core

* refactor(webhooks): migrate to oclif/core

* chore: fix failing tests & linting

* fix: tests handle \n differently

* fix: failing tests

* fix: failing tests

* fix: update node version in ci

* fix: removed Node 18

* fix: lint error, ci experiment

* fix: revert ci

* chore: troubleshooting

* fix: error in add.test

* chore: added message to action.stop
ryandagg added a commit that referenced this pull request Jan 31, 2023
@k80bowman @ryandagg
@zwhitfield3 @jheikes515
Oclif core migration (#2144)
a1f4604 
* fix(ps): migrate ps packages to oclif core (#2115)

* Attempt to move ps to oclif/core. Most difficulty with upgrading @oclif/test. Questionable tsconfig change.

* Upgraded TS to latest and skip running in node_modules. Tests passing.

* Move skipLibCheck from test level tsconfig to package level so build command succeeds.
Make import of run file readable

* revert tslint setting that should break things, but doesn't.

* fix(addons-v5): migrate addons-v5 package to OCLIF/core (#2116)

* fix(addons-v5): migrate addons-v5 package to OCLIF/core
- add oclif/core dependency
- remove oclif/dev-cli and oclif/plugin-legacy dependencies
- replace oclif/config with oclif/core in create.js test file

* fix yarn.lock file

Co-authored-by: Katy Bowman <katybowman@salesforce.com>

* fix(apps-v5): migrate to oclif core (#2121)

* chore: remove unused dependencies.

* fix: Add oclif/core to dependencies. Was counting on other packages to install it prior. Update imports.

* fix(addons-v5): migrate addons-v5 package to OCLIF/core (#2116)

* fix(addons-v5): migrate addons-v5 package to OCLIF/core
- add oclif/core dependency
- remove oclif/dev-cli and oclif/plugin-legacy dependencies
- replace oclif/config with oclif/core in create.js test file

* fix yarn.lock file

Co-authored-by: Katy Bowman <katybowman@salesforce.com>

* chore(ps-v5): update heroku ps plans pre nov 28 (#2118)

* chore(addons-v5): update free in heroku addons (#2041)

* Update free logic & wip tests

* Update & fix tests

* Include free formatting for cents

* Update from standard-0 to hobby-basic plan

* Update from hobby-basic to mini plan (#2069)

* chore(ps-v5): update heroku ps plans (#2077)

* Update docs & quota output

* Update tests

* Include basic plan

* Update tests

* Update eco plan messaging

* Remove post nov 28 changes. Move to post nov branch

* Update free and eco quota message

* Fix conditional

Co-authored-by: Katy Bowman <katy.bowman@salesforce.com>
Co-authored-by: Katy Bowman <katybowman@salesforce.com>
Co-authored-by: Zane Whitfield <zwhitfield@salesforce.com>

* refactor(status): migrate status package to oclif/core (#2134)

* refactor: add oclif/core to status package

* refactor(status): migrate to oclif/core and fix test

* remove unneeded oclif dependencies

* upgrade typescript and set to skipLibCheck

Co-authored-by: Katy Bowman <katybowman@salesforce.com>

* refactor: migrate pg-v5 certs-v5 redis-v5 to oclif/core (#2150)

* refactor(certs-v5): migrate to oclif/core

* refactor(pg-v5): migrate to oclif/core

* refactor(redis-v5): migrate to oclif/core

Co-authored-by: Katy Bowman <katybowman@salesforce.com>

* refactor(container-registry-v5): migrate to oclif/core (#2148)

* refactor(container-registry-v5): migrate to oclif/core

* move oclif/core to dev dependencies

Co-authored-by: Katy Bowman <katybowman@salesforce.com>

* refactor(oauth-v5): migrate to oclif/core (#2149)

* refactor(oauth-v5): migrate to oclif/core

* move oclif/core to dev dependencies

Co-authored-by: Katy Bowman <katybowman@salesforce.com>

* refactor (ci-v5): migrate ci-v5 to oclif/core (#2153)

* feat(autocomplete) upgrade to core and integrate with updated herokucli command (#2160)

* wip

* refactor: upgrade autocomplete to oclif/core and local linked @heroku-cli/command.

* chore: Remove random semi

* chore: update command

* feat(local): upgrade local package to core (#2169)

* feat: upgrade to core & command & required packages

* chore: work around incorrect type in @oclif/test stub method.

* fix: upgrade to oclif/core. (#2122)

Update oclif/test and typescript to handle oclif/test.
Remove unused @heroku-cli/command dependency.
Update tslint.json to extend a package that actually exists in the repo.

* refactor(run-v5): migrate run-v5 to oclif core (#2154)

* refactor (ci-v5): migrate ci-v5 to oclif/core

* refactor (run-v5): migrate run-v5 to oclif/core

* refactor: updated to use oclif/core

* Update packages/run-v5/lib/colorize.js

Co-authored-by: RyanDagg <ryandagg@users.noreply.github.com>

Co-authored-by: RyanDagg <ryandagg@users.noreply.github.com>

* chore(config): upgrade config package to core (#2174)

* chore: upgrade config package to oclif core, updated heroku/command and oclif/test.

* chore: upgrade from cli-ux to oclif/core. Update a test to handle extra newlines from CliUX

* refactor(git): update the git package to use oclif/core (#2175)

* refactor(git): update the git package to use oclif/core

* refactor(git): remove cli-ux package

* refactor(run): upgrade run package to oclif/core (#2180)

* refactor(run): upgrade run package to oclif/core

* fix: eslint error

* chore: yarn.lock

* fix: error in tests

* chore: yarn.lock

* fix: eslint errors

* fix: ci script

* Jh/migrate orgsv5 oclif core (#2192)

* refactor(run): upgrade run package to oclif/core

* fix: eslint error

* chore: yarn.lock

* fix: error in tests

* chore: yarn.lock

* fix: eslint errors

* fix: ci script

* refactor(orgs-v5): migrate orgs-v5 to oclif/core

* refactor(buildpacks): migrate to oclif/core (#2193)

* refactor(buildpacks): initial upgrade to oclif/core

* refactor(buildpacks): initial conversion to core CliUx

* refactor(buildpacks): remove fancynock from tests

* refactor(buildpacks): update table functions to use oclif/core instead of cli-ux

* fix(buildpacks): fix tests

* chore(buildpacks): removing unneeded dependencies

* refactor(spaces): upgrade spaces to oclif/core (#2194)

* refactor(pipelines) oclif core migration (#2198)

* refactor(pipelines): initial oclif/core migration

* fix(pipelines): add types for repo object

* refactor(pipelines): fix typescript in tests

* fix: adjust failing test. add eslint ignore file for */lib build artifacts.

* fix: update package.json for -h/-v flags and remove cli-ux

* fix: remove unused packages. Fix a test that was failing due to white space changes in CliUX.

* fix: test to handle CliUX whitespace changes.

Co-authored-by: Katy Bowman <katy.bowman@salesforce.com>

* Jh/migrate oauth oclif core (#2195)

* refactor(oauth): update oauth to oclif/core

* fix: failing tests

* fix: reverted comment removal

* Update packages/oauth/package.json

Co-authored-by: RyanDagg <ryandagg@users.noreply.github.com>

* fix: reverted tsconfig.json

Co-authored-by: RyanDagg <ryandagg@users.noreply.github.com>

* chore(ci): migrate to oclif core (#2183)

* chore: upgrade to oclif/core.

* fix: revert index.test format. Add comment for ts-disable

* fix: correctly add help and version flags.

* fix(pipelines) cli-ux migration (#2199)

* refactor(pipelines): initial oclif/core migration

* fix(pipelines): add types for repo object

* refactor(pipelines): fix typescript in tests

* fix: adjust failing test. add eslint ignore file for */lib build artifacts.

* fix: update package.json for -h/-v flags and remove cli-ux

* fix: remove unused packages. Fix a test that was failing due to white space changes in CliUX.

* fix: test to handle CliUX whitespace changes.

* fix: finish removing cli-ux package from pipelines.

Co-authored-by: Katy Bowman <katy.bowman@salesforce.com>

* Jh/migrate webhooks oclif core (#2197)

* refactor(webhooks): upgrade webhooks to oclif/core

* refactor(webhooks): migrate to oclif/core

* chore: fix failing tests & linting

* fix: tests handle \n differently

* fix: failing tests

* fix: failing tests

* fix: update node version in ci

* fix: removed Node 18

* fix: lint error, ci experiment

* fix: revert ci

* chore: troubleshooting

* fix: error in add.test

* chore: added message to action.stop

* refactor: build release packages from oclif  (#2204)

* chore: intitial exploration of what happens when trying to package debian build

* chore: enable downstream deb builds

* refactor: Add "oclif" cli, not core to all packages. Update all commands to use new location of .bin file.

* chore: pin oclif version across all packages

* chore: remove unused  @heroku-cli/dev-cli dependencies.

* chore: revert verification changes to ci.yml

* Attempt to retry on timeout

* fix: add retry to correct location

* chore: add comment to new retry approach

* might as well bump timeout in new plugin and drop yarn from 1000 minutes

* plugin would not get approved. Increasing timeout via yarn.

* Refactor(auth & cli): migrate auth and cli packages to oclif/core (#2173)

* refactor(auth): refactor the auth package to use oclif/core

* chore(auth): update typescript and oclif/test versions

* refactor(cli): migrate cli package to oclif/core, update typescript and oclif/test

* chore(auth & cli): yarn.lock updates

* A few fixes for oclif auth (#2176)

* wip: lint issue due to eslint plugin updated somewhere in chain.

* wip lock package numbers

* fix: revert yarn.lock from oclif-core-migration branch.

* chore(auth): align dependency versions with cli package

* chore: confirm TS error mirrors functionality. It does not.

* Revert "chore: confirm TS error mirrors functionality. It does not."

This reverts commit 4566880.

* chore: update yarn.lock

* fix: fix cli analytics tests

* chore(auth & cli): remove unneccessary dependencies

* chore: update yarn.lock

Co-authored-by: RyanDagg <ryandagg@users.noreply.github.com>
Co-authored-by: RyanDagg <rdagg@salesforce.com>

* refactor(apps): update to oclif core and merge in yarn 3 (#2214)

* refactor(pipelines): initial oclif/core migration

* fix(pipelines): add types for repo object

* refactor(pipelines): fix typescript in tests

* fix: adjust failing test. add eslint ignore file for */lib build artifacts.

* fix: update package.json for -h/-v flags and remove cli-ux

* fix: remove unused packages. Fix a test that was failing due to white space changes in CliUX.

* fix: test to handle CliUX whitespace changes.

* refactor: upgrade to oclif core in apps package

* fix: finish removing cli-ux package from pipelines.

* fix: migrate from cli-ux to core

* fix: finish removing cli-ux from autocomplete
fix a test issue in autocomplete due to some eslint module resolution issues.

* Re-add ts package

* fix(apps): test fix

* refactor: upgrade to yarn 3. Attempting to determine version in CI.

* chore: revert ci.yml changes. uneeded.

* fix: see if the Snyk security issue is do to rm -rf

* fix: type in JSON

* ci experiment

* chore: make import versions consistent

* add script to delete ALL node_modules

* fix: finish ps upgrade. tests passing.

* fix: get status command working again.

* revert to minimum needed change.

* remove yarn files.

* fix: finish ps upgrade. tests passing. (#2210)

* fix: finish ps upgrade. tests passing.

* fix: get status command working again.

* revert to minimum needed change.

* fix: correct core version in apps. Fix remaining tests outside of apps.

* Fix some missed dependencies in autocomplete

* chore: Removed all references to @oclif/command

* fix: No longer getting errors in pipelines lint.

* Fix all of the eslint problems.

* Revert "fix: No longer getting errors in pipelines lint."

This reverts commit 8adac9e.

* Revert "Revert "fix: No longer getting errors in pipelines lint.""

This reverts commit 6aca06b.

* fix: type issue in config

* Reverting to @oclif/command until we can figure out why core breaks everything.

* Merge in branch with master merged into oclif-core-migration

* Remove unnecessary "camelcase: off". Lint passing.

* chore: remove unneeded script

* Update packages/apps/package.json

* chore: remove unused plugin in auth

Co-authored-by: Katy Bowman <katy.bowman@salesforce.com>
Co-authored-by: Jennette <jheikes@salesforce.com>

* refactor(cli) finish upgrading cli package (#2215)

* refactor(pipelines): initial oclif/core migration

* fix(pipelines): add types for repo object

* refactor(pipelines): fix typescript in tests

* fix: adjust failing test. add eslint ignore file for */lib build artifacts.

* fix: update package.json for -h/-v flags and remove cli-ux

* fix: remove unused packages. Fix a test that was failing due to white space changes in CliUX.

* fix: test to handle CliUX whitespace changes.

* refactor: upgrade to oclif core in apps package

* fix: finish removing cli-ux package from pipelines.

* fix: migrate from cli-ux to core

* fix: finish removing cli-ux from autocomplete
fix a test issue in autocomplete due to some eslint module resolution issues.

* Re-add ts package

* fix(apps): test fix

* refactor: upgrade to yarn 3. Attempting to determine version in CI.

* chore: revert ci.yml changes. uneeded.

* fix: see if the Snyk security issue is do to rm -rf

* fix: type in JSON

* ci experiment

* chore: make import versions consistent

* add script to delete ALL node_modules

* fix: finish ps upgrade. tests passing.

* fix: get status command working again.

* revert to minimum needed change.

* remove yarn files.

* fix: finish ps upgrade. tests passing. (#2210)

* fix: finish ps upgrade. tests passing.

* fix: get status command working again.

* revert to minimum needed change.

* fix: correct core version in apps. Fix remaining tests outside of apps.

* Fix some missed dependencies in autocomplete

* chore: Removed all references to @oclif/command

* fix: No longer getting errors in pipelines lint.

* Fix all of the eslint problems.

* Revert "fix: No longer getting errors in pipelines lint."

This reverts commit 8adac9e.

* Revert "Revert "fix: No longer getting errors in pipelines lint.""

This reverts commit 6aca06b.

* fix: type issue in config

* Reverting to @oclif/command until we can figure out why core breaks everything.

* Merge in branch with master merged into oclif-core-migration

* Remove unnecessary "camelcase: off". Lint passing.

* chore standardize **/bin/run files. Add them where missing.

* chore: remove unneeded script

Co-authored-by: Katy Bowman <katy.bowman@salesforce.com>
Co-authored-by: Jennette <jheikes@salesforce.com>

* fix: use the spinner function from CliUx directly (#2222)

* fix(apps): use spinner function directly in several files

* fix(webhooks): use spinner function directly in several files

* chore(oclif) remove all old oclif dependencies (#2223)

* wip: first step to remove all dependencies importing pre core.

* chore: remove all imports of @oclif/core@2

* chore: remove @oclif/plugin-legacy and it's pre-core dependencies.

* chore: remove confusing yarn version. Remove boostrap line from readme.

---------

Co-authored-by: RyanDagg <ryandagg@users.noreply.github.com>
Co-authored-by: Katy Bowman <katybowman@salesforce.com>
Co-authored-by: Zane Whitfield <zwhitfield@salesforce.com>
Co-authored-by: jheikes515 <87785368+jheikes515@users.noreply.github.com>
Co-authored-by: RyanDagg <rdagg@salesforce.com>
Co-authored-by: Jennette <jheikes@salesforce.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@k80bowman k80bowman k80bowman approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@jheikes515 @k80bowman