Use functions for buildscript version requirements instead of formatted strings. #3144
Conversation
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
Contributor
mitchell-as
commented
Feb 26, 2024
•
mitchell-as
commented
 DX-2601 As a user I can expect version requirements to be fully typed
|
mitchell-as
force-pushed
the
mitchell/dx-2601
branch
5 times, most recently
from
19fb393
to
0bddb6f
Compare
mitchell-as
force-pushed
the
mitchell/dx-2601
branch
from
0bddb6f
to
b4f1c54
Compare
MDrakos
requested changes
Mar 4, 2024
Comment on lines
109
to
119
| case eqFuncName: | ||
| fallthrough | ||
| case neFuncName: | ||
| fallthrough | ||
| case gtFuncName: | ||
| fallthrough | ||
| case gteFuncName: | ||
| fallthrough | ||
| case ltFuncName: | ||
| fallthrough | ||
| case lteFuncName: |
There was a problem hiding this comment.
Couldn't we list all of these values for a single case rather than use fallthrough here? So it would be something like:
case eqFuncName, neFuncName, gtFuncName, etc:
...
| } | ||
| err := addRequirement(a.FuncCall) | ||
| if err != nil { | ||
| return err |
There was a problem hiding this comment.
There are a couple errors in this function that need to be wrapped. May be worth skimming the changeset again to ensure we're wrapping everything.
| // {"version_requirements": [{"comparator": "<op>", "version": "<version>"}]} | ||
| case assignment.Key == buildexpression.RequirementVersionKey && assignment.Value.FuncCall != nil: | ||
| var requirements []*Value | ||
| var addRequirement func(*FuncCall) error // recursive function for adding to requirements list |
| @@ -166,7 +169,8 @@ const example = `runtime = solve( | |||
| platforms = ["96b7e6f2-bebf-564c-bc1c-f04482398f38", "96b7e6f2-bebf-564c-bc1c-f04482398f38"], | |||
| requirements = [ | |||
| Req(name = "language/python"), | |||
| Req(name = "language/python/requests", version = "3.10.10") | |||
| Req(name = "language/python/requests", version = Eq("3.10.10")), | |||
| Req(name = "language/python/argparse", version = And(Gt("1.0"), Lt("2.0"))) | |||
There was a problem hiding this comment.
Thank you for adding this to the test.
Comment on lines
297
to
301
| if f.Name == reqFuncName || | ||
| f.Name == eqFuncName || f.Name == neFuncName || | ||
| f.Name == gtFuncName || f.Name == gteFuncName || | ||
| f.Name == ltFuncName || f.Name == lteFuncName || | ||
| f.Name == andFuncName { |
There was a problem hiding this comment.
nit: It might be nice to create a map, slice, or function that can encapsulate this for us. So this line becomes a simple map check, funk.Contains or function call.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.