New command to list the custom packages by cmoulliard · Pull Request #466 · cnoe-io/idpbuilder

cmoulliard · 2024-12-24T14:35:55Z

New command to list the custom packages
See: Add list package(s) command #465

cmoulliard · 2024-12-24T14:38:12Z

Example of what the code produce now

Custom packages added

❯ idp create --color --recreate --name dummy --port 9443 \
   -p https://github.com/cnoe-io/stacks//basic/package1 \
   -p https://github.com/cnoe-io/stacks//basic/package2

What the command idp get packages prints

// A custom package
❯ ./idpbuilder get packages -p app-my-app
CUSTOM PACKAGE NAME   IDP NAMESPACE      GIT REPOSITORY                                                                      STATUS
app-my-app            idpbuilder-dummy   https://gitea.cnoe.localtest.me:9443/giteaAdmin/idpbuilder-dummy-my-app-manifests   true

// All the custom packages
~/code/cnoe/fork-idpbuilder on list-packages •
❯ ./idpbuilder get packages
CUSTOM PACKAGE NAME   IDP NAMESPACE      GIT REPOSITORY                                                                      STATUS
app-guestbook         idpbuilder-dummy   https://github.com/cnoe-io/stacks/tree/main/basic/package2                          true
app-my-app            idpbuilder-dummy   https://gitea.cnoe.localtest.me:9443/giteaAdmin/idpbuilder-dummy-my-app-manifests   true
app2-guestbook2       idpbuilder-dummy   https://github.com/cnoe-io/stacks/tree/main/basic/package2                          true

~/code/cnoe/fork-idpbuilder on list-packages •

nabuskey

Can we add additional printer columns for the package type?

https://book.kubebuilder.io/reference/generating-crd#additional-printer-columns

https://github.com/cnoe-io/idpbuilder/blob/main/api/v1alpha1/custom_package_types.go

nabuskey · 2024-12-27T17:11:30Z

pkg/entity/package.go

Can we merge all structs in separate files into one file? Is the entity package for types? If so, we should name the package as types instead of entity.

If so, we should name the package as types instead of entity.

types is a better name. I will rename. Fixed: 6415f7b

Can we merge all structs in separate files into one file?

Why do you want to merge them into one file ? This is easier to figure out what it exists if you have one file/type under the folder name types

pkg/cmd/get/packages.go

cmoulliard · 2025-01-02T09:49:39Z

Can we add additional printer columns for the package type?

Yes but what do you want to print under this new column ?

cmoulliard · 2025-01-02T11:25:11Z

Question: Should we also add the column of the Argocd repo as we also have those for git or gitea repo ?
See: 0cd0d7d

❯ ./idpbuilder get packages
CUSTOM PACKAGE NAME   IDP NAMESPACE      GIT REPOSITORY                                                                      ARGOCD REPOSITORY                                                      STATUS
app-guestbook         idpbuilder-dummy   https://github.com/cnoe-io/stacks/tree/main/basic/package2                          https://argocd.cnoe.localtest.me:9443/applications/argocd/guestbook    true
app-my-app            idpbuilder-dummy   https://gitea.cnoe.localtest.me:9443/giteaAdmin/idpbuilder-dummy-my-app-manifests   https://argocd.cnoe.localtest.me:9443/applications/argocd/my-app       true
app2-guestbook2       idpbuilder-dummy   https://github.com/cnoe-io/stacks/tree/main/basic/package2                          https://argocd.cnoe.localtest.me:9443/applications/argocd/guestbook2   true

Signed-off-by: cmoulliard <cmoulliard@redhat.com>

…mPackages Signed-off-by: cmoulliard <cmoulliard@redhat.com>

Signed-off-by: cmoulliard <cmoulliard@redhat.com>

Co-authored-by: Manabu McCloskey <manabu.mccloskey@gmail.com> Signed-off-by: cmoulliard <cmoulliard@redhat.com>

Signed-off-by: cmoulliard <cmoulliard@redhat.com>

nabuskey

Let's merge all files under the types directory. I don't think we should have a file for each struct. It's very Java like right now.😅

nabuskey · 2025-01-02T21:51:44Z

pkg/printer/package.go

+func generatePackageTable(packagesTable []types.Package) metav1.Table {
+	table := &metav1.Table{}
+	table.ColumnDefinitions = []metav1.TableColumnDefinition{
+		{Name: "Custom package name", Type: "string"},


I liked "name" more. Custom package is already implied when you run the command.

Fixed: 9bbd4d5

nabuskey · 2025-01-02T21:56:18Z

Question: Should we also add the column of the Argocd repo as we also have those for git or gitea repo ?

See: 0cd0d7d


❯ ./idpbuilder get packages

CUSTOM PACKAGE NAME   IDP NAMESPACE      GIT REPOSITORY                                                                      ARGOCD REPOSITORY                                                      STATUS

app-guestbook         idpbuilder-dummy   https://github.com/cnoe-io/stacks/tree/main/basic/package2                          https://argocd.cnoe.localtest.me:9443/applications/argocd/guestbook    true

app-my-app            idpbuilder-dummy   https://gitea.cnoe.localtest.me:9443/giteaAdmin/idpbuilder-dummy-my-app-manifests   https://argocd.cnoe.localtest.me:9443/applications/argocd/my-app       true

app2-guestbook2       idpbuilder-dummy   https://github.com/cnoe-io/stacks/tree/main/basic/package2                          https://argocd.cnoe.localtest.me:9443/applications/argocd/guestbook2   true

You mean ArgoCD application URL or git repositories used by ArgoCD applications?

cmoulliard · 2025-01-03T08:24:02Z

Let's merge all files under the types directory. I don't think we should have a file for each struct. It's very Java like right now.😅

Indeed but that simplify the readability of the code and Java language rocks from this point of view :-)

cmoulliard · 2025-01-03T08:24:55Z

You mean ArgoCD application URL or git repositories used by ArgoCD applications?

Argocd URL on our IDP to access the application straight from the Argocd UI

Signed-off-by: cmoulliard <cmoulliard@redhat.com>

nabuskey · 2025-01-03T16:59:32Z

Let's merge all files under the types directory. I don't think we should have a file for each struct. It's very Java like right now.😅

Indeed but that simplify the readability of the code and Java language rocks from this point of view :-)

Yeah I'd rather keep it uniform within this project. If you look at how we define related types for this project, we do that in a single file like here: https://github.com/cnoe-io/idpbuilder/blob/main/api/v1alpha1/custom_package_types.go

So let's merge them into a single file.

nabuskey · 2025-01-03T17:00:47Z

You mean ArgoCD application URL or git repositories used by ArgoCD applications?

Argocd URL on our IDP to access the application straight from the Argocd UI

I see, then we should change the name of the column. It's currently named ARGOCD REPOSITORY. It should be ARGOCD URL yea?

Signed-off-by: cmoulliard <cmoulliard@redhat.com>

cmoulliard · 2025-01-06T09:55:30Z

So let's merge them into a single file.

Done: 593b727

Signed-off-by: cmoulliard <cmoulliard@redhat.com>

cmoulliard · 2025-01-06T09:56:51Z

I see, then we should change the name of the column. It's currently named ARGOCD REPOSITORY. It should be ARGOCD URL yea?

Fixed: da6e72b

Signed-off-by: cmoulliard <cmoulliard@redhat.com>

pkg/cmd/get/packages.go

pkg/types/internal_types.go

…and port Signed-off-by: cmoulliard <cmoulliard@redhat.com>

Signed-off-by: cmoulliard <cmoulliard@redhat.com>

nabuskey · 2025-01-14T23:25:31Z

globals/project.go

+var (
+	ClusterProtocol string // http or https scheme
+	ClusterPort     string // 8443 or user's port defined when the cluster is created
+)
+


Can we get away without using these? How come we can't use GiteaBaseUrl and ArgocdBaseUrl as-is?

No as we need such global vars to generate the proper URLs of ArgoCD or Gitea. Such variables are collected when the cluster is created. Without such vars it will be needed to fetch them using the kubernetes CR.

k get localbuilds.idpbuilder.cnoe.io/dummy -oyaml apiVersion: idpbuilder.cnoe.io/v1alpha1 kind: Localbuild metadata: name: dummy spec: buildCustomization: host: cnoe.localtest.me ingressHost: cnoe.localtest.me port: "9443" protocol: https selfSignedCert: | -----BEGIN CERTIFICATE----- MIIBsDCCA...EVSNlep0EtTdKee Sg0OoQ== -----END CERTIFICATE----- packageConfigs: argoPackageConfigs: enabled: true embeddedArgoApplicationsPackageConfigs: enabled: true

I see. Can we not get it from the CR then? If custom packages exist, then the localbuild object must also exist correct?

Can we not get it from the CR then? If custom packages exist, then the localbuild object must also exist correct?

We can get it using go code doing this "kubectl get cr/localbuilds.idpbuilder.cnoe.io" but this is a bit boiler plate as we got such values when we execute the command "idp create" ....

It's one call to the API server yea? i think that's fine. In Go, there's a lot of boilerplate like this 😆

Fixed and did some reorg to avoid cycling import issue: 01a0b22
@nabuskey

pkg/cmd/get/packages.go

Signed-off-by: cmoulliard <cmoulliard@redhat.com>

…LocalBuild Signed-off-by: cmoulliard <cmoulliard@redhat.com>

Signed-off-by: cmoulliard <cmoulliard@redhat.com>

punkwalker

LGTM 🚀

punkwalker · 2025-01-22T23:53:36Z

/e2e

cmoulliard requested review from nabuskey and punkwalker December 24, 2024 14:53

falconcr approved these changes Dec 24, 2024

View reviewed changes

nabuskey reviewed Dec 27, 2024

View reviewed changes

cmoulliard and others added 8 commits January 2, 2025 12:26

WIP. Create the command able to list the custom packages. cnoe-io#465

0b1047d

Signed-off-by: cmoulliard <cmoulliard@redhat.com>

WIP. Add comment

5257268

Signed-off-by: cmoulliard <cmoulliard@redhat.com>

WIP. Rename the column names and avoid to reassign the variable custo…

d4a55bb

…mPackages Signed-off-by: cmoulliard <cmoulliard@redhat.com>

Print also the status of the CustomPackage

ad92328

Signed-off-by: cmoulliard <cmoulliard@redhat.com>

Update pkg/cmd/get/packages.go

f1aa060

Co-authored-by: Manabu McCloskey <manabu.mccloskey@gmail.com> Signed-off-by: cmoulliard <cmoulliard@redhat.com>

Update pkg/cmd/get/packages.go

1618273

Co-authored-by: Manabu McCloskey <manabu.mccloskey@gmail.com> Signed-off-by: cmoulliard <cmoulliard@redhat.com>

Rename package entity to types

66c3262

Signed-off-by: cmoulliard <cmoulliard@redhat.com>

Add argocd repository column

cdb89b7

Signed-off-by: cmoulliard <cmoulliard@redhat.com>

cmoulliard force-pushed the list-packages branch from 0cd0d7d to cdb89b7 Compare January 2, 2025 11:26

Remove non used function

00d5fbc

Signed-off-by: cmoulliard <cmoulliard@redhat.com>

nabuskey reviewed Jan 2, 2025

View reviewed changes

Rename the column custom package name to simply: name

9bbd4d5

Signed-off-by: cmoulliard <cmoulliard@redhat.com>

cmoulliard added 3 commits January 6, 2025 10:23

Merge branch 'main' into list-packages

6a4c349

Remove non used packages

a87a5cd

Signed-off-by: cmoulliard <cmoulliard@redhat.com>

Merged into one file the types

593b727

Signed-off-by: cmoulliard <cmoulliard@redhat.com>

Argocd Re^pository to Argocd Url as column name

da6e72b

Signed-off-by: cmoulliard <cmoulliard@redhat.com>

cmoulliard added 2 commits January 8, 2025 08:21

Merge branch 'main' into list-packages

7aab462

Removed non used packages

09eb8e5

Signed-off-by: cmoulliard <cmoulliard@redhat.com>

cmoulliard requested a review from nabuskey January 8, 2025 08:01

blakeromano reviewed Jan 8, 2025

View reviewed changes

pkg/cmd/get/packages.go Outdated Show resolved Hide resolved

nabuskey reviewed Jan 8, 2025

View reviewed changes

pkg/types/internal_types.go Show resolved Hide resolved

cmoulliard added 2 commits January 9, 2025 08:45

Remove duplicate code and create global variables to handle protocol …

4f3eca7

…and port Signed-off-by: cmoulliard <cmoulliard@redhat.com>

Moving types under printer package

99eaf67

Signed-off-by: cmoulliard <cmoulliard@redhat.com>

cmoulliard requested review from blakeromano, falconcr and nabuskey January 9, 2025 09:09

nabuskey reviewed Jan 14, 2025

View reviewed changes

cmoulliard added 3 commits January 15, 2025 11:02

Remove declaration of the customPackages as already done

fb6248d

Signed-off-by: cmoulliard <cmoulliard@redhat.com>

Refactor the code to get the IDP config: port and protocol using the …

1115087

…LocalBuild Signed-off-by: cmoulliard <cmoulliard@redhat.com>

Reorg the packages to avoid cycling issue

01a0b22

Signed-off-by: cmoulliard <cmoulliard@redhat.com>

cmoulliard requested a review from nabuskey January 16, 2025 14:59

punkwalker approved these changes Jan 22, 2025

View reviewed changes

cmoulliard merged commit 3b21af9 into cnoe-io:main Jan 23, 2025

squidboylan mentioned this pull request Jan 25, 2025

Add list package(s) command #465

Closed

Conversation

cmoulliard commented Dec 24, 2024

Uh oh!

cmoulliard commented Dec 24, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

nabuskey left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cmoulliard Jan 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

cmoulliard commented Jan 2, 2025

Uh oh!

cmoulliard commented Jan 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

nabuskey left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

nabuskey commented Jan 2, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cmoulliard commented Jan 3, 2025

Uh oh!

cmoulliard commented Jan 3, 2025

Uh oh!

nabuskey commented Jan 3, 2025

Uh oh!

nabuskey commented Jan 3, 2025

Uh oh!

cmoulliard commented Jan 6, 2025

Uh oh!

cmoulliard commented Jan 6, 2025

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cmoulliard Jan 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

punkwalker left a comment

Choose a reason for hiding this comment

Uh oh!

punkwalker commented Jan 22, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

cmoulliard commented Dec 24, 2024 •

edited

Loading

cmoulliard Jan 2, 2025 •

edited

Loading

cmoulliard commented Jan 2, 2025 •

edited

Loading

nabuskey commented Jan 2, 2025 •

edited

Loading

cmoulliard Jan 16, 2025 •

edited

Loading