Stack removal: detect phase and analyze.toml support Targets #994

joe-kimmel-vmw · 2023-01-31T17:49:21Z

fixes: #743

removes stacks from buildpack descriptors and detection logic,
shims from stack to target where relevant.
changes and simplifies some pointer-struct to just strings, which does change the analyze.toml spec. As far as I can tell this is victimless change, but probably there's a corresponding PR in the specs repo I haven't made yet?

codecov · 2023-02-08T00:30:41Z

Codecov Report

Merging #994 (7b5e9f3) into main (014cceb) will increase coverage by 0.15%.
The diff coverage is 22.59%.

❗ Current head 7b5e9f3 differs from pull request most recent head daa0182. Consider uploading reports for the commit daa0182 to get more accurate results

Additional details and impacted files

@@            Coverage Diff             @@
##             main     #994      +/-   ##
==========================================
+ Coverage   64.48%   64.62%   +0.15%     
==========================================
  Files          82       86       +4     
  Lines        6181     6231      +50     
==========================================
+ Hits         3985     4026      +41     
- Misses       1810     1824      +14     
+ Partials      386      381       -5

Flag	Coverage Δ
os_linux	`64.08% <22.59%> (-0.39%)`	⬇️
os_windows	`59.00% <22.59%> (?)`
unit	`64.08% <22.59%> (-0.39%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

natalieparellano

@joe-kimmel-vmw it's awesome to see this taking shape. I left a few comments for now

buildpack/testdata/buildpack/by-id/B/v1/bin/build

platform/files.go

buildpack/bp_descriptor.go

cmd/lifecycle/creator.go

buildpack/bp_descriptor.go

detector.go

platform/files.go

platform/export_inputs.go

platform/files.go

detector.go

cmd/lifecycle/restorer.go

detector.go

platform/files.go

BpDescriptor reads and populates Targets data Signed-off-by: Joe Kimmel <[email protected]>

Signed-off-by: Joe Kimmel <[email protected]>

minor cleanup nix mixins mixup Signed-off-by: Joe Kimmel <[email protected]>

- RunImage has: - Reference - Target While i was in there, some of the other *ImageReference types were inconvient so I changed them to just be strings instead of structs containing strings. This does have the effect of collapsing a table, But as a newer contributor to this project I have the blessing and curse of not feeling all that constrained by (nor aware of) past decisions. Signed-off-by: Joe Kimmel <[email protected]>

Signed-off-by: Joe Kimmel <[email protected]>

small cleanups / removal of unneeded check Signed-off-by: Joe Kimmel <[email protected]>

Signed-off-by: Joe Kimmel <[email protected]>

…pack fixtures Signed-off-by: Joe Kimmel <[email protected]>

Signed-off-by: Joe Kimmel <[email protected]>

natalieparellano

Adding a few comments for now, still reviewing

env/build.go

buildpack/bp_descriptor_test.go

buildpack/bp_descriptor.go

handlers.go

platform/files.go

platform/files_test.go

cmd/lifecycle/creator.go

buildpack/bp_descriptor_test.go

…consequences Signed-off-by: Joe Kimmel <[email protected]>

Signed-off-by: Joe Kimmel <[email protected]>

Update env/build.go Update buildpack/bp_descriptor.go Update default arch to amd64 use OS instead of Os fixing mocks and fn calls after small change Co-authored-by: Natalie Arellano <[email protected]> Signed-off-by: Joe Kimmel <[email protected]>

fix descriptor test bc we decided that we _do_ want that behavior for old versions Signed-off-by: Joe Kimmel <[email protected]>

Signed-off-by: Joe Kimmel <[email protected]>

buildpack/bp_descriptor.go

platform/files.go

This allows us to remove our custom writer, while keeping the file schema unchanged in Platform API 0.12 Signed-off-by: Natalie Arellano <[email protected]>

Signed-off-by: Joe Kimmel <[email protected]>

Signed-off-by: Natalie Arellano <[email protected]>

natalieparellano

Looks good to me! Thanks for all your hard work @joe-kimmel-vmw

joe-kimmel-vmw force-pushed the 743-probably branch 4 times, most recently from ac9fb02 to 986d801 Compare February 6, 2023 22:28

joe-kimmel-vmw force-pushed the 743-probably branch from e4723a2 to 60a1d17 Compare February 8, 2023 00:29

joe-kimmel-vmw changed the title ~~very wip, incomplete changes~~ still wip but getting somewheres probably Feb 8, 2023

natalieparellano reviewed Feb 8, 2023

View reviewed changes

natalieparellano mentioned this pull request Feb 9, 2023

Adds -run as an input to the analyzer #1005

Merged

joe-kimmel-vmw force-pushed the 743-probably branch 4 times, most recently from edb21ff to 357fc37 Compare February 15, 2023 00:14

natalieparellano mentioned this pull request Feb 15, 2023

Detector changes for run image extension #1011

Merged

joe-kimmel-vmw changed the title ~~still wip but getting somewheres probably~~ Stack removal: little ol detect phase and the big bad analyzed.toml Feb 16, 2023

joe-kimmel-vmw force-pushed the 743-probably branch from dfbb652 to daa0182 Compare February 17, 2023 00:13

joe-kimmel-vmw marked this pull request as ready for review February 17, 2023 00:15

joe-kimmel-vmw requested a review from a team as a code owner February 17, 2023 00:15

natalieparellano mentioned this pull request Feb 17, 2023

Restorer changes for run image extension #1014

Merged

natalieparellano reviewed Feb 17, 2023

View reviewed changes

platform/files.go Outdated Show resolved Hide resolved

platform/export_inputs.go Outdated Show resolved Hide resolved

platform/files.go Outdated Show resolved Hide resolved

joe-kimmel-vmw force-pushed the 743-probably branch from 62bf6bf to 09fb151 Compare February 28, 2023 23:51

jabrown85 reviewed Mar 1, 2023

View reviewed changes

detector.go Outdated Show resolved Hide resolved

cmd/lifecycle/restorer.go Outdated Show resolved Hide resolved

detector.go Outdated Show resolved Hide resolved

detector.go Outdated Show resolved Hide resolved

platform/files.go Outdated Show resolved Hide resolved

joe-kimmel-vmw changed the title ~~Stack removal: little ol detect phase and the big bad analyzed.toml~~ Stack removal: detect phase and analyze.toml support Targets Mar 2, 2023

joe-kimmel-vmw force-pushed the 743-probably branch 3 times, most recently from c260907 to f30221d Compare March 2, 2023 03:31

joe-kimmel-vmw added 4 commits March 3, 2023 10:37

initial setup for toml file schemas and structs

c44fae5

BpDescriptor reads and populates Targets data Signed-off-by: Joe Kimmel <[email protected]>

correct-er detector for target selector

1727470

Signed-off-by: Joe Kimmel <[email protected]>

TargetMetadata.Equals: tests and impl nailed down

05059ad

minor cleanup nix mixins mixup Signed-off-by: Joe Kimmel <[email protected]>

joe-kimmel-vmw added 8 commits March 3, 2023 10:37

NewDetector respects the alphabet

43961f9

Signed-off-by: Joe Kimmel <[email protected]>

only replace stack with target for newer api versions

221d03d

small cleanups / removal of unneeded check Signed-off-by: Joe Kimmel <[email protected]>

Equals->Satisfied and other cleanups

7ec4aac

Signed-off-by: Joe Kimmel <[email protected]>

detector logic is probably all the way working

b1895f5

Signed-off-by: Joe Kimmel <[email protected]>

turns out the unit tests pass without the bin folders for these build…

afc4181

…pack fixtures Signed-off-by: Joe Kimmel <[email protected]>

analyzed.toml backwards compat shims

65ad03e

Signed-off-by: Joe Kimmel <[email protected]>

change detector to take analyzedMD struct rather than file

8197098

Signed-off-by: Joe Kimmel <[email protected]>

small cleanups

1a52632

Signed-off-by: Joe Kimmel <[email protected]>

joe-kimmel-vmw force-pushed the 743-probably branch 2 times, most recently from bc6c9de to 81ff6ca Compare March 3, 2023 20:26

natalieparellano reviewed Mar 6, 2023

View reviewed changes

platform/files_test.go Show resolved Hide resolved

natalieparellano reviewed Mar 6, 2023

View reviewed changes

cmd/lifecycle/creator.go Outdated Show resolved Hide resolved

natalieparellano reviewed Mar 6, 2023

View reviewed changes

buildpack/bp_descriptor_test.go Show resolved Hide resolved

joe-kimmel-vmw force-pushed the 743-probably branch from 22e3fc0 to a723199 Compare March 7, 2023 00:12

joe-kimmel-vmw and others added 6 commits March 6, 2023 20:29

runImage only has one distribution and that small adjustment has some…

9b27d1b

…consequences Signed-off-by: Joe Kimmel <[email protected]>

move isWildcard to private method of detector

84564d7

Signed-off-by: Joe Kimmel <[email protected]>

analyzed acceptance tests use ReadAnalyzed fn

6d82a73

Signed-off-by: Joe Kimmel <[email protected]>

Updates

a22df73

Update env/build.go Update buildpack/bp_descriptor.go Update default arch to amd64 use OS instead of Os fixing mocks and fn calls after small change Co-authored-by: Natalie Arellano <[email protected]> Signed-off-by: Joe Kimmel <[email protected]>

couple more easy fixes

6b6af94

fix descriptor test bc we decided that we _do_ want that behavior for old versions Signed-off-by: Joe Kimmel <[email protected]>

Targets are auto-detected based on contents of buildpack/bin

f699e34

Signed-off-by: Joe Kimmel <[email protected]>

joe-kimmel-vmw force-pushed the 743-probably branch from 64543ae to f699e34 Compare March 7, 2023 03:31

natalieparellano reviewed Mar 7, 2023

View reviewed changes

buildpack/bp_descriptor.go Outdated Show resolved Hide resolved

natalieparellano reviewed Mar 7, 2023

View reviewed changes

platform/files.go Outdated Show resolved Hide resolved

Joe Kimmel and others added 3 commits March 7, 2023 13:40

Change AnalyzedMetadata struct to use pointers again

c376a76

This allows us to remove our custom writer, while keeping the file schema unchanged in Platform API 0.12 Signed-off-by: Natalie Arellano <[email protected]>

Fix lint

47f53e6

Signed-off-by: Joe Kimmel <[email protected]>

Fix nil pointer

fcc4674

Signed-off-by: Natalie Arellano <[email protected]>

natalieparellano approved these changes Mar 7, 2023

View reviewed changes

natalieparellano merged commit 6d6b469 into buildpacks:main Mar 7, 2023

natalieparellano deleted the 743-probably branch March 7, 2023 20:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Stack removal: detect phase and analyze.toml support Targets #994

Stack removal: detect phase and analyze.toml support Targets #994

joe-kimmel-vmw commented Jan 31, 2023 •

edited

Loading

codecov bot commented Feb 8, 2023 •

edited

Loading

natalieparellano left a comment

natalieparellano left a comment

natalieparellano left a comment

Stack removal: detect phase and analyze.toml support Targets #994

Stack removal: detect phase and analyze.toml support Targets #994

Conversation

joe-kimmel-vmw commented Jan 31, 2023 • edited Loading

codecov bot commented Feb 8, 2023 • edited Loading

Codecov Report

natalieparellano left a comment

Choose a reason for hiding this comment

natalieparellano left a comment

Choose a reason for hiding this comment

natalieparellano left a comment

Choose a reason for hiding this comment

joe-kimmel-vmw commented Jan 31, 2023 •

edited

Loading

codecov bot commented Feb 8, 2023 •

edited

Loading