Skip to content
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.

Sign up for GitHub

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

Jump to bottom

chore: refactor Zarf Component composition #2058

Merged
merged 79 commits into from
Nov 1, 2023
Merged

chore: refactor Zarf Component composition #2058

merged 79 commits into from
Nov 1, 2023

Conversation

Noxsios
Copy link
Contributor

@Noxsios Noxsios commented Oct 7, 2023 •
edited
Loading

Description

chain, err := composer.NewImportChain(pkg.Components[0], "amd64")
if err != nil {
    panic(err)
}

fmt.Println(chain.String())

results in:

component "k3s" imports "k3s" in packages/distros/k3s, which imports "k3s" in common

Related Issue

Fixes #2037
Fixes #1827
Fixes #1845

Type of change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Other (security config, docs update, etc)

Checklist before merging

@Noxsios Noxsios linked an issue Oct 7, 2023 that may be closed by this pull request
Refactor component composability and skeletons to address bugs and update to newer patterns #2037
Closed
@netlify
Copy link

netlify bot commented Oct 7, 2023 •
edited
Loading

✅ Deploy Preview for zarf-docs canceled.

Name Link
🔨 Latest commit ae8ba09
🔍 Latest deploy log https://app.netlify.com/sites/zarf-docs/deploys/6541c1609bdfcb00080eb47b

Noxsios added 3 commits October 7, 2023 21:03
@Noxsios
naming
d1f9046 
Signed-off-by: razzle <[email protected]>
@Noxsios
revive
3342ad2 
Signed-off-by: razzle <[email protected]>
@Noxsios
slightly better
d17a6e7 
Signed-off-by: razzle <[email protected]>
Racer159
Racer159 requested changes Oct 8, 2023
View reviewed changes
src/pkg/packager/composer/list.go Outdated Show resolved Hide resolved
src/pkg/packager/composer/list.go Outdated Show resolved Hide resolved
src/pkg/packager/composer/list.go Outdated Show resolved Hide resolved
@Noxsios
progress
d47874a 
Signed-off-by: razzle <[email protected]>
@Racer159 Racer159 changed the title Refactor Component Composition chore: refactor Zarf Component composition Oct 11, 2023
Noxsios added 21 commits October 12, 2023 12:14
@Noxsios
progress
bedc0e2 
Signed-off-by: razzle <[email protected]>
@Noxsios
merging vars and consts
f035195 
Signed-off-by: razzle <[email protected]>
@Noxsios
start using for real
c2cb820 
Signed-off-by: razzle <[email protected]>
@Noxsios
runtime validation of import definitions
f7cd2b1 
Signed-off-by: razzle <[email protected]>
@Noxsios
more progress
b32bfa2 
Signed-off-by: razzle <[email protected]>
@Noxsios
progress on oci compose
cb4f324 
Signed-off-by: razzle <[email protected]>
@Noxsios
progress on oci compose
70fc996 
Signed-off-by: razzle <[email protected]>
@Noxsios
fix tb:dir relationship
762356d 
Signed-off-by: razzle <[email protected]>
@Noxsios
derp
96d59c0 
Signed-off-by: razzle <[email protected]>
@Noxsios
cleanup
5439285 
Signed-off-by: razzle <[email protected]>
@Noxsios
Merge branch 'main' into refactor-composition
7e1afcc
@Noxsios
fix doubling
a49aec6 
Signed-off-by: razzle <[email protected]>
@Noxsios
string instead of history
707fb30 
Signed-off-by: razzle <[email protected]>
@Noxsios
fix merge vars and consts
9b5942a 
Signed-off-by: razzle <[email protected]>
@Noxsios
fix single component compose
8da6550 
Signed-off-by: razzle <[email protected]>
@Noxsios
Merge branch 'main' into refactor-composition
bbbfa6f
@Noxsios
derp
95c997c 
Signed-off-by: razzle <[email protected]>
@Noxsios
lets try this
b072230 
Signed-off-by: razzle <[email protected]>
@Noxsios
mutate tail, kinda ugly ngl
6c16f7e 
Signed-off-by: razzle <[email protected]>
@Noxsios
better string
2c3969f 
Signed-off-by: razzle <[email protected]>
@Noxsios
better string
a1466b2 
Signed-off-by: razzle <[email protected]>
@Racer159 Racer159 removed the needs-tests PR Label - Tests required to merge label Oct 31, 2023
@Racer159 Racer159 self-requested a review October 31, 2023 15:29
lucasrod16
lucasrod16 previously approved these changes Oct 31, 2023
View reviewed changes
Copy link
Contributor

@lucasrod16 lucasrod16 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@Racer159 Racer159 dismissed their stale review October 31, 2023 23:19

I have modified this PR significantly and the review is no longer valid

jeff-mccoy
jeff-mccoy approved these changes Nov 1, 2023
View reviewed changes
Copy link
Contributor

@jeff-mccoy jeff-mccoy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

way more sane way to manage composition, lgtm

@Racer159 Racer159 merged commit ff70c6a into main Nov 1, 2023
26 checks passed
@Racer159 Racer159 deleted the refactor-composition branch November 1, 2023 04:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jeff-mccoy jeff-mccoy jeff-mccoy approved these changes

@lucasrod16 lucasrod16 lucasrod16 left review comments

@Madeline-UX Madeline-UX Awaiting requested review from Madeline-UX

@Racer159 Racer159 Awaiting requested review from Racer159

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@Noxsios @jeff-mccoy @Racer159 @lucasrod16