Skip to content

Restructure (2): Consolidate packages and move to microcluster#552

Merged
roosterfish merged 25 commits intocanonical:v3from
roosterfish:consolidate_all_packages
Dec 2, 2025
Merged

Restructure (2): Consolidate packages and move to microcluster#552
roosterfish merged 25 commits intocanonical:v3from
roosterfish:consolidate_all_packages

Conversation

@roosterfish
Copy link
Contributor

This is the second PR taken from a single commit in #534.
The final package layout will be different but to allow reviewing the changes in smaller chunks I will split this PR by its commits.

In this PR types which might end up on the user's end through the various channels (client funcs, app funcs, API handlers) are now moved to the central microcluster/* package which is the regular entry point for Microcluster users to derive an app construct.

Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
…l package

Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
@roosterfish roosterfish changed the title Restructure (2): Consolidate all packages and move to microcluster Restructure (2): Consolidate packages and move to microcluster Dec 2, 2025
@roosterfish roosterfish marked this pull request as ready for review December 2, 2025 14:22
Copy link
Member

@kadinsayani kadinsayani left a comment

Choose a reason for hiding this comment

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

The new package structure LGTM overall. Shall we also update the Makefile update-schema target in this PR?

❯ make update-schema
go generate ./cluster/...
pattern ./cluster/...: lstat ./cluster/: no such file or directory
make: *** [Makefile:66: update-schema] Error 1

Apologies, I initially posted this comment on #534 by accident.

@roosterfish
Copy link
Contributor Author

Apologies, I initially posted this comment on #534 by accident.

Left a comment there, let me add another commit to this PR which drops this.

Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
kadinsayani
kadinsayani previously approved these changes Dec 2, 2025
@roosterfish
Copy link
Contributor Author

@kadinsayani missed two more lines in code comments.

Copy link
Member

@kadinsayani kadinsayani left a comment

Choose a reason for hiding this comment

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

Shall we also drop the generation directives from internal/cluster?

Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
Signed-off-by: Julian Pelizäus <julian.pelizaeus@canonical.com>
@roosterfish roosterfish force-pushed the consolidate_all_packages branch from 3d1d548 to 668bf40 Compare December 2, 2025 16:43
Copy link
Member

@kadinsayani kadinsayani left a comment

Choose a reason for hiding this comment

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

LGTM, thanks!

@roosterfish roosterfish merged commit 4cb1129 into canonical:v3 Dec 2, 2025
5 checks passed
@roosterfish roosterfish deleted the consolidate_all_packages branch December 2, 2025 16:48
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.

2 participants