Skip to content

Reorganize the code into pkg and internal directories, this moves the oci directory out of stacker binary's way#335

Merged
rchincha merged 1 commit intoproject-stacker:mainfrom
ariel-miculas:rename-oci-dir
Dec 15, 2022
Merged

Reorganize the code into pkg and internal directories, this moves the oci directory out of stacker binary's way#335
rchincha merged 1 commit intoproject-stacker:mainfrom
ariel-miculas:rename-oci-dir

Conversation

@ariel-miculas
Copy link
Contributor

Fixes #296
Fixes #332

Signed-off-by: Ariel Miculas ariel.miculas@cisco.com

@hallyn
Copy link
Contributor

hallyn commented Dec 1, 2022

I don't know that we can do this. At least it'll be painful for all the users of that path. Definitely major version change sort of thing.

@rchincha
Copy link
Contributor

rchincha commented Dec 7, 2022

Would organize code under pkg/ and internal/ if need be. That is the golang way to do this.

@ariel-miculas ariel-miculas force-pushed the rename-oci-dir branch 4 times, most recently from 64b34dd to 557d407 Compare December 8, 2022 18:21
@ariel-miculas ariel-miculas changed the title Rename oci to oci-utils to avoid conflict with stacker's oci Reorganize the code into pkg and internal directories, this moves the oci directory out of stacker binary's way Dec 8, 2022
@ariel-miculas
Copy link
Contributor Author

@rchincha what do you think?

@ariel-miculas ariel-miculas force-pushed the rename-oci-dir branch 2 times, most recently from 2ca5d76 to 5e775ca Compare December 12, 2022 19:34
@rchincha rchincha added this to the v0.40.1 milestone Dec 13, 2022
@rchincha
Copy link
Contributor

@ariel-miculas can you resolve the conflict? you may just have to move that file again.

Copy link
Contributor

@hallyn hallyn left a comment

Choose a reason for hiding this comment

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

Thank you. I like it. Much cleaner layout.

It'll still hurt for anyone using the pkg/ stuff right now, but it's worth it.

And, by switching to cmd/stacker/ you've made room for cmd/atomfs :)

@ariel-miculas
Copy link
Contributor Author

This will need to be updated: https://stackerbuild.io/developer_guide/code_structure/

@rchincha
Copy link
Contributor

@ariel-miculas can this wait until after #345, this being mostly a re-org PR.

@ariel-miculas
Copy link
Contributor Author

sure

@ariel-miculas ariel-miculas force-pushed the rename-oci-dir branch 3 times, most recently from 1a871ae to 15e3b72 Compare December 15, 2022 18:21
This is done by reorganizing the code into the pkg directory. Files from
cmd/ were also moved to cmd/stacker, according to the go guidelines.

Fixes project-stacker#296
Fixes project-stacker#332

Signed-off-by: Ariel Miculas <amiculas@cisco.com>
Copy link
Contributor

@rchincha rchincha left a comment

Choose a reason for hiding this comment

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

lgtm

@rchincha rchincha merged commit c303bf9 into project-stacker:main Dec 15, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Cannot run basic example: Invalid image detected stacker clean deletes oci/oci.go

3 participants

Comments