-
Notifications
You must be signed in to change notification settings - Fork 12
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.
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
chore(cli): show warning when using deprecated version #102
Open
tttol
wants to merge
3
commits into
aws:main
Choose a base branch
from
tttol:show-deprecation-msg
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+99
−11
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
import { checkIfDeprecated } from '../../../lib/cli/util/npm'; | ||
|
||
jest.mock('util', () => { | ||
const mockExec = jest.fn(); | ||
const format = jest.fn((fmt, ...args) => { | ||
return [fmt, ...args].join(' '); | ||
}); | ||
return { | ||
promisify: jest.fn(() => mockExec), | ||
__mockExec: mockExec, | ||
format, | ||
}; | ||
}); | ||
|
||
const { __mockExec: mockedExec } = jest.requireMock('util'); | ||
|
||
describe('npm.ts', () => { | ||
beforeEach(() => { | ||
jest.resetAllMocks(); | ||
}); | ||
|
||
describe('checkIfDeprecated', () => { | ||
test('returns null for non-deprecated version', async () => { | ||
mockedExec.mockResolvedValue({ | ||
stdout: '', | ||
stderr: '', | ||
}); | ||
|
||
const result = await checkIfDeprecated('2.1.0'); | ||
|
||
expect(result).toBeNull(); | ||
expect(mockedExec).toHaveBeenCalledWith('npm view aws-cdk@2.1.0 deprecated --silent', { timeout: 3000 }); | ||
}); | ||
|
||
test('returns deprecation message for deprecated version', async () => { | ||
const deprecationMessage = 'This version has been deprecated'; | ||
mockedExec.mockImplementation(() => Promise.resolve({ | ||
stdout: deprecationMessage, | ||
stderr: '', | ||
})); | ||
|
||
const result = await checkIfDeprecated('1.0.0'); | ||
|
||
expect(result).toBe(deprecationMessage); | ||
}); | ||
|
||
test('returns null when error occurs', async () => { | ||
mockedExec.mockImplementation(() => Promise.reject(new Error('npm error'))); | ||
|
||
const result = await checkIfDeprecated('2.1.0'); | ||
|
||
expect(result).toBeNull(); | ||
}); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you work this into the existing version check in some way? (it may be that you will need to change that existing check to return information about more than 1 version at a time).
I'd like to avoid doing unnecessary calls to NPM.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@rix0rrr
It's true that my implementation results in unnecessary NPM calls. But I couldn't find the logic of version check in existing source code. Which logic/file are you referring when you said
work this into the existing version check
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We're doing upgrade notice work here already: https://github.com/aws/aws-cdk-cli/blob/huijbers/install-deps/packages/aws-cdk/lib/cli/version.ts/#L86
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@rix0rrr
Do you mean that calling
checkIfDeprecated
out ofif (laterVersion)
block is better?Ref: https://github.com/aws/aws-cdk-cli/blob/main/packages/aws-cdk/lib/cli/version.ts#L125