Shared Dependencies: the LOGIC #2940

schristoff · 2023-10-09T17:05:11Z

Goal: If I have a parent bundle and a dependency, and that dependency already exists, don't install the dependency again, just wire them up together.

Things to note:

If child dependency exists, and sharing + group match, then on install we will get the arguments from the child dependency and give it to the parent when CNAB.execute is called. Child dependency won't be changed otherwise.
For pre-existing child dependencies, the following occurs:
- Update: Updates to the parent are applied, the pre-existing child is not passed any update information
- Invoke: This is for users to implement they want, but I'm leaving it as a foot gun. If you do an invoke and change the pre-existing child, then all other non-direct parents will need to be invoked as well. As in, we have no reconcile or logic to share these changes, do at your own risk.
- Delete: For a pre-existing child, the parent is delete, the child is left. Users must delete the child manually.

Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

pkg/porter/parameters.go

Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

…version Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

…-y curl did not complete successfully Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

… cleaned up desperately before debugging Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

…ndle manifest Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

build/testdata/bundles/wordpress/porter.yaml

Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

… on install and invoke Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

arschles

This LGTM. I only have documentation nits.

build/testdata/bundles/wordpress/porter.yaml

docs/content/docs/development/authoring-a-bundle/working-with-dependencies.md

pkg/cnab/dependencies/v1/doc.go

pkg/cnab/extended_bundle.go

Co-authored-by: Aaron Schlesinger <70865+arschles@users.noreply.github.com> Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

…dependencies.md Co-authored-by: Aaron Schlesinger <70865+arschles@users.noreply.github.com> Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

Signed-off-by: Sarah Christoff <28318173+schristoff@users.noreply.github.com>

devigned

Mostly documentation feedback. I caught a couple spelling issues. I could have missed others, so might want to run through spellchecker.

Nice work!!

docs/content/docs/development/authoring-a-bundle/working-with-dependencies.md

pkg/cnab/extended_bundle.go

…dependencies.md Co-authored-by: David Justice <devigned@users.noreply.github.com> Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

Signed-off-by: Sarah Christoff <28318173+schristoff@users.noreply.github.com>

devigned

lgtm! 🚀 🦄

Signed-off-by: Sarah Christoff <28318173+schristoff@users.noreply.github.com>

schristoff added 2 commits September 28, 2023 23:24

first pass of moving logic into extendedbundle

da807ac

Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

refried bean candle

7bd5e56

Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

schristoff commented Oct 9, 2023

View reviewed changes

pkg/porter/parameters.go Show resolved Hide resolved

schristoff added 15 commits October 9, 2023 14:44

if installation is found logic

868bc57

Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

basic logic done?

4255504

Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

still need to connect up params and creds, clean up mess, finish tests

e0f95f1

Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

Merge branch 'main' into schristoff_depsresolvelogic

cb0a29c

It was at this point I realized that my implementation is wrong :(

65e18d0

Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

Create executev2, and we're going to have to refactor execute normal …

c1b72d8

…version Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

okay a little bit prettier now

967e3e7

Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

need to get integ working, but executev2 looks... ok?

d6ee7f1

Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

delete bundles-with-shared-deps

337eb29

Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

root wp bundle is failing

b0476d5

Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

oh i was double copying

e3dfbeb

Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

failed to solve process /bin/sh -c apt-get update && apt get install …

14d3d3f

…-y curl did not complete successfully Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

Removed 12 out of the 20 cping of the same dir. This integ test needs…

3dcfca5

… cleaned up desperately before debugging Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

error pulling dependency: unable to pull bundle: failed to resolve bu…

45751c3

…ndle manifest Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

forward progress

1c9d11d

Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

schristoff commented Nov 28, 2023

View reviewed changes

build/testdata/bundles/wordpress/porter.yaml Outdated Show resolved Hide resolved

schristoff added 11 commits November 28, 2023 01:09

and it was all yellow

d8e0768

Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

turn in to something beautiful 🦋

c5fd64b

Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

you know i know you so <3

74be873

Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

coldplay commits is a sign for bed 😑

da90ff0

Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

Look how they shine for you, and all the code that youuu miss ✨

f731b96

Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

Merge branch 'main' into schristoff_depsresolvelogic

0288257

install works, actual magic. bug is in uninstall now :(

3cfb6fb

Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

test didnt error? it just says ok? what does it mean??

2890b66

Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

fix failing unit, we should only do stuff with shared parentless deps…

97764e4

… on install and invoke Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

i think... its solid?

049e220

Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

fix the old deps test

da9ddba

Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

ADOnt work

7e6908a

Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

schristoff marked this pull request as ready for review December 5, 2023 03:07

schristoff requested review from sgettys, bdegeeter and troy0820 as code owners December 5, 2023 03:07

schristoff requested a review from arschles December 5, 2023 03:08

schristoff changed the title ~~[Draft]: Shared Dependencies: the LOGIC~~ Shared Dependencies: the LOGIC Dec 5, 2023

arschles approved these changes Dec 5, 2023

View reviewed changes

schristoff and others added 8 commits December 5, 2023 12:46

Update pkg/cnab/extended_bundle.go

1a352ff

Co-authored-by: Aaron Schlesinger <70865+arschles@users.noreply.github.com> Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

Update docs/content/docs/development/authoring-a-bundle/working-with-…

3a07f9f

…dependencies.md Co-authored-by: Aaron Schlesinger <70865+arschles@users.noreply.github.com> Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

Update docs/content/docs/development/authoring-a-bundle/working-with-…

1c290f6

…dependencies.md Co-authored-by: Aaron Schlesinger <70865+arschles@users.noreply.github.com> Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

Update docs/content/docs/development/authoring-a-bundle/working-with-…

6db3301

…dependencies.md Co-authored-by: Aaron Schlesinger <70865+arschles@users.noreply.github.com> Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

Update docs/content/docs/development/authoring-a-bundle/working-with-…

b0f14b1

…dependencies.md Co-authored-by: Aaron Schlesinger <70865+arschles@users.noreply.github.com> Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

Update docs/content/docs/development/authoring-a-bundle/working-with-…

9b3a652

…dependencies.md Co-authored-by: Aaron Schlesinger <70865+arschles@users.noreply.github.com> Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

Merge branch 'main' into schristoff_depsresolvelogic

542e670

upgrade

d0a8a29

Signed-off-by: Sarah Christoff <28318173+schristoff@users.noreply.github.com>

schristoff requested a review from devigned December 5, 2023 19:50

devigned suggested changes Dec 5, 2023

View reviewed changes

schristoff and others added 6 commits December 5, 2023 15:19

Update docs/content/docs/development/authoring-a-bundle/working-with-…

059d1d4

…dependencies.md Co-authored-by: David Justice <devigned@users.noreply.github.com> Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

Update docs/content/docs/development/authoring-a-bundle/working-with-…

7fa5ca0

…dependencies.md Co-authored-by: David Justice <devigned@users.noreply.github.com> Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

Update docs/content/docs/development/authoring-a-bundle/working-with-…

3e041d6

…dependencies.md Co-authored-by: David Justice <devigned@users.noreply.github.com> Signed-off-by: schristoff <28318173+schristoff@users.noreply.github.com>

better error

c9a5a62

Signed-off-by: Sarah Christoff <28318173+schristoff@users.noreply.github.com>

what is dependening

6685c58

Signed-off-by: Sarah Christoff <28318173+schristoff@users.noreply.github.com>

make doc make sense

95fca4f

Signed-off-by: Sarah Christoff <28318173+schristoff@users.noreply.github.com>

schristoff requested a review from devigned December 5, 2023 22:43

devigned approved these changes Dec 5, 2023

View reviewed changes

update mysql version everywhere

b10deda

Signed-off-by: Sarah Christoff <28318173+schristoff@users.noreply.github.com>

schristoff merged commit 716cd79 into getporter:main Dec 6, 2023
18 checks passed

schristoff deleted the schristoff_depsresolvelogic branch December 6, 2023 02:02

schristoff mentioned this pull request Feb 26, 2024

Share dependencies between bundles #2882

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Shared Dependencies: the LOGIC #2940

Shared Dependencies: the LOGIC #2940

schristoff commented Oct 9, 2023 •

edited

arschles left a comment

devigned left a comment •

edited

devigned left a comment

Shared Dependencies: the LOGIC #2940

Shared Dependencies: the LOGIC #2940

Conversation

schristoff commented Oct 9, 2023 • edited

arschles left a comment

Choose a reason for hiding this comment

devigned left a comment • edited

Choose a reason for hiding this comment

devigned left a comment

Choose a reason for hiding this comment

schristoff commented Oct 9, 2023 •

edited

devigned left a comment •

edited