add support for anystack buildpacks #776
Merged
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
tylerphelan
approved these changes
Jul 19, 2021
tomkennedy513
force-pushed
the
anystack-support
branch
2 times, most recently
from
b12a330
to
59883f2
Compare
Codecov Report
@@ Coverage Diff @@
## main #776 +/- ##
==========================================
+ Coverage 68.54% 69.41% +0.86%
==========================================
Files 93 117 +24
Lines 4130 5074 +944
==========================================
+ Hits 2831 3522 +691
- Misses 951 1185 +234
- Partials 348 367 +19
Continue to review full report at Codecov.
|
pkg/cnb/buildpack_validation.go
Outdated
| @@ -16,7 +17,9 @@ func (bl BuildpackLayerInfo) supports(buildpackApis []string, id string, mixins | |||
| } | |||
|
|
|||
| for _, s := range bl.Stacks { | |||
| if s.ID == id { | |||
| iaAnystack := s.ID == "*" && api.MustParse(bl.API).Compare(api.MustParse("0.5")) >= 0 | |||
There was a problem hiding this comment.
MustParse will panic on a not parseable input which is actually an underlying user input. api.NewVersion is probably safer.
There was a problem hiding this comment.
We already pull in semver to parse buildpack versions. Could we use that instead of adding another dependency on the lifecycle?
There was a problem hiding this comment.
ya good call
tomkennedy513
force-pushed
the
anystack-support
branch
2 times, most recently
from
83504bf
to
ed7e942
Compare
matthewmcnew
approved these changes
Jul 20, 2021
pkg/cnb/buildpack_validation.go
Outdated
| return err | ||
| } | ||
|
|
||
| isAnystack := s.ID == "*" && buildpackVersion.Compare(anyStackMinimumVersion) >= 0 |
There was a problem hiding this comment.
Maybe pull this out to method?
pkg/cnb/buildpack_validation.go
Outdated
| @@ -15,8 +16,19 @@ func (bl BuildpackLayerInfo) supports(buildpackApis []string, id string, mixins | |||
| return errors.Errorf("unsupported buildpack api: %s, expecting: %s", bl.API, strings.Join(buildpackApis, ", ")) | |||
| } | |||
|
|
|||
| anyStackMinimumVersion, err := semver.NewVersion("0.5") | |||
There was a problem hiding this comment.
You could MustParse this.
There was a problem hiding this comment.
And pull it out as var
tomkennedy513
force-pushed
the
anystack-support
branch
from
ed7e942
to
a9c9e0b
Compare
| @@ -46,3 +54,7 @@ func present(haystack []string, needle string) bool { | |||
| } | |||
| return false | |||
| } | |||
|
|
|||
| func isAnystack(stackId string, buildpackVersion *semver.Version) bool { | |||
tomkennedy513
force-pushed
the
anystack-support
branch
from
a9c9e0b
to
1d48b57
Compare
|
Closes #741 |
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.
No description provided.