Detector changes for run image extension #1011
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
- The logic to update the default path for TOML files was repeated across phases - In general it is safe to provide default values for inputs that might not be relevant to the current phase, as these will be ignored when constructing a new service for the phase; e.g., platform.LifecycleInputs.OrderPath will be ignored when constructing a lifecycle.Exporter - As more inputs are shared across phases (e.g., analyzed.toml is now an input to the detect phase), duplicating the logic for providing default values is becoming more cumbersome Signed-off-by: Natalie Arellano <[email protected]>
Signed-off-by: Natalie Arellano <[email protected]>
…= 0.10 Signed-off-by: Natalie Arellano <[email protected]>
Signed-off-by: Natalie Arellano <[email protected]>
…kage Signed-off-by: Natalie Arellano <[email protected]>
Signed-off-by: Natalie Arellano <[email protected]>
… the platform spec Signed-off-by: Natalie Arellano <[email protected]>
…mage.extend = <true or false, default false> Signed-off-by: Natalie Arellano <[email protected]>
Signed-off-by: Natalie Arellano <[email protected]>
… should fail if the selected base image is not found in run.toml. Signed-off-by: Natalie Arellano <[email protected]>
Signed-off-by: Natalie Arellano <[email protected]>
Signed-off-by: Natalie Arellano <[email protected]>
natalieparellano
changed the base branch from
main
to
refactor/lifecycle-inputs
|
This is ready for feedback but we can block merging on #994 |
Signed-off-by: Natalie Arellano <[email protected]>
Signed-off-by: Natalie Arellano <[email protected]>
|
The exporter acceptance failure is mystifying me... |
natalieparellano
commented
Mar 7, 2023
| cli.FlagLayersDir(&d.LayersDir) | ||
| cli.FlagPlanPath(&d.PlanPath) | ||
| cli.FlagPlatformDir(&d.PlatformDir) | ||
| cli.FlagBuildConfigDir(&d.BuildConfigDir) |
There was a problem hiding this comment.
Unrelated bug, this should only be valid for newer platforms
We pluralize all other list elements Signed-off-by: Natalie Arellano <[email protected]>
natalieparellano
commented
Mar 7, 2023
Comment on lines
+58
to
+87
| type TargetMetadata struct { | ||
| buildpack.TargetPartial | ||
| Distribution *buildpack.DistributionMetadata `json:"distribution,omitempty" toml:"distribution,omitempty"` | ||
| } | ||
|
|
||
| // Satisfies treats optional fields (ArchVariant and Distributions) as wildcards if empty, returns true if | ||
| func (t *TargetMetadata) IsSatisfiedBy(o *buildpack.TargetMetadata) bool { | ||
| if t.Arch != o.Arch || t.OS != o.OS { | ||
| return false | ||
| } | ||
| if t.ArchVariant != "" && o.ArchVariant != "" && t.ArchVariant != o.ArchVariant { | ||
| return false | ||
| } | ||
|
|
||
| // if either of the lengths of Distributions are zero, treat it as a wildcard. | ||
| if t.Distribution != nil && len(o.Distributions) > 0 { | ||
| // this could be more efficient but the lists are probably short... | ||
| found := false | ||
| for _, odist := range o.Distributions { | ||
| if t.Distribution.Name == odist.Name && t.Distribution.Version == odist.Version { | ||
| found = true | ||
| continue | ||
| } | ||
| } | ||
| if !found { | ||
| return false | ||
| } | ||
| } | ||
| return true | ||
| } |
There was a problem hiding this comment.
Copied from further down in the file
jabrown85
approved these changes
Mar 8, 2023
Signed-off-by: Natalie Arellano <[email protected]>
Signed-off-by: Natalie Arellano <[email protected]>
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.
Fixes #996