Reorg the packages to avoid cycling issue

Signed-off-by: cmoulliard <[email protected]>
cnoe-io · Jan 16, 2025 · 01a0b22 · 01a0b22
1 parent 1115087
commit 01a0b22
Show file tree

Hide file tree

Showing 13 changed files with 56 additions and 44 deletions.
diff --git a/pkg/controllers/crd.go b/pkg/controllers/crd.go
@@ -4,10 +4,10 @@ import (
 	"context"
 	"embed"
 	"fmt"
+	"github.com/cnoe-io/idpbuilder/pkg/util/fs"
 	"time"
 
 	"github.com/cnoe-io/idpbuilder/pkg/k8s"
-	"github.com/cnoe-io/idpbuilder/pkg/util"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -20,7 +20,7 @@ import (
 var crdFS embed.FS
 
 func getK8sResources(scheme *runtime.Scheme, templateData any) ([]client.Object, error) {
-	rawResources, err := util.ConvertFSToBytes(crdFS, "resources", templateData)
+	rawResources, err := fs.ConvertFSToBytes(crdFS, "resources", templateData)
 	if err != nil {
 		return nil, err
 	}

diff --git a/pkg/controllers/gitrepository/gitea.go b/pkg/controllers/gitrepository/gitea.go
@@ -3,6 +3,7 @@ package gitrepository
 import (
 	"context"
 	"fmt"
+	"github.com/cnoe-io/idpbuilder/pkg/util/files"
 	"os"
 	"path/filepath"
 
@@ -136,7 +137,7 @@ func writeRepoContents(repo *v1alpha1.GitRepository, dstPath string, config v1al
 		return nil
 	}
 
-	err := util.CopyDirectory(repo.Spec.Source.Path, dstPath)
+	err := files.CopyDirectory(repo.Spec.Source.Path, dstPath)
 	if err != nil {
 		return fmt.Errorf("copying files: %w", err)
 	}

diff --git a/pkg/controllers/localbuild/argo_test.go b/pkg/controllers/localbuild/argo_test.go
@@ -2,13 +2,13 @@ package localbuild
 
 import (
 	"context"
+	"github.com/cnoe-io/idpbuilder/pkg/util/fs"
 	"testing"
 
 	argov1alpha1 "github.com/cnoe-io/argocd-api/api/argo/application/v1alpha1"
 	"github.com/cnoe-io/idpbuilder/api/v1alpha1"
 	"github.com/cnoe-io/idpbuilder/globals"
 	"github.com/cnoe-io/idpbuilder/pkg/k8s"
-	"github.com/cnoe-io/idpbuilder/pkg/util"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -43,7 +43,7 @@ func TestGetRawInstallResources(t *testing.T) {
 		resourceFS:   installArgoFS,
 		resourcePath: "resources/argo",
 	}
-	resources, err := util.ConvertFSToBytes(e.resourceFS, e.resourcePath,
+	resources, err := fs.ConvertFSToBytes(e.resourceFS, e.resourcePath,
 		v1alpha1.BuildCustomizationSpec{
 			Protocol:       "",
 			Host:           "",

diff --git a/pkg/k8s/client.go b/pkg/k8s/client.go
@@ -3,15 +3,14 @@ package k8s
 import (
 	"context"
 	"fmt"
-	"k8s.io/client-go/tools/clientcmd"
-	"k8s.io/client-go/util/homedir"
-	"path/filepath"
-
 	corev1 "k8s.io/api/core/v1"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/client-go/tools/clientcmd"
+	"k8s.io/client-go/util/homedir"
+	"path/filepath"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 

diff --git a/pkg/k8s/util.go b/pkg/k8s/util.go
@@ -2,14 +2,15 @@ package k8s
 
 import (
 	"embed"
-	"github.com/cnoe-io/idpbuilder/pkg/util"
+	"github.com/cnoe-io/idpbuilder/pkg/util/files"
+	"github.com/cnoe-io/idpbuilder/pkg/util/fs"
 	"k8s.io/apimachinery/pkg/runtime"
 	"os"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 func BuildCustomizedManifests(filePath, fsPath string, resourceFS embed.FS, scheme *runtime.Scheme, templateData any) ([][]byte, error) {
-	rawResources, err := util.ConvertFSToBytes(resourceFS, fsPath, templateData)
+	rawResources, err := fs.ConvertFSToBytes(resourceFS, fsPath, templateData)
 	if err != nil {
 		return nil, err
 	}
@@ -27,7 +28,7 @@ func BuildCustomizedManifests(filePath, fsPath string, resourceFS embed.FS, sche
 }
 
 func BuildCustomizedObjects(filePath, fsPath string, resourceFS embed.FS, scheme *runtime.Scheme, templateData any) ([]client.Object, error) {
-	rawResources, err := util.ConvertFSToBytes(resourceFS, fsPath, templateData)
+	rawResources, err := fs.ConvertFSToBytes(resourceFS, fsPath, templateData)
 	if err != nil {
 		return nil, err
 	}
@@ -50,7 +51,7 @@ func applyOverrides(filePath string, originalFiles [][]byte, scheme *runtime.Sch
 		return nil, nil, err
 	}
 
-	rendered, err := util.ApplyTemplate(customBS, templateData)
+	rendered, err := files.ApplyTemplate(customBS, templateData)
 	if err != nil {
 		return nil, nil, err
 	}

diff --git a/pkg/kind/cluster.go b/pkg/kind/cluster.go
@@ -5,13 +5,14 @@ import (
 	"embed"
 	"errors"
 	"fmt"
+	"github.com/cnoe-io/idpbuilder/pkg/util"
+	"github.com/cnoe-io/idpbuilder/pkg/util/files"
 	"io/fs"
 	"os"
 	"strconv"
 	"strings"
 
 	"github.com/cnoe-io/idpbuilder/api/v1alpha1"
-	"github.com/cnoe-io/idpbuilder/pkg/util"
 	"github.com/go-logr/logr"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	kindv1alpha4 "sigs.k8s.io/kind/pkg/apis/config/v1alpha4"
@@ -94,7 +95,7 @@ func (c *Cluster) getConfig() ([]byte, error) {
 	}
 
 	var retBuff []byte
-	if retBuff, err = util.ApplyTemplate(rawConfigTempl, TemplateConfig{
+	if retBuff, err = files.ApplyTemplate(rawConfigTempl, TemplateConfig{
 		BuildCustomizationSpec: c.cfg,
 		KubernetesVersion:      c.kubeVersion,
 		ExtraPortsMapping:      portMappingPairs,

diff --git a/pkg/util/argocd.go b/pkg/util/argocd.go
@@ -3,6 +3,7 @@ package util
 import (
 	"context"
 	"fmt"
+	"github.com/cnoe-io/idpbuilder/pkg/util/idp"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
@@ -15,7 +16,7 @@ const (
 )
 
 func ArgocdBaseUrl(ctx context.Context) (string, error) {
-	idpConfig, err := GetIDPConfig(ctx)
+	idpConfig, err := idp.GetConfig(ctx)
 	if err != nil {
 		return "", fmt.Errorf("error fetching idp config: %s", err)
 	}

diff --git a/pkg/util/files.go → pkg/util/files/files.go b/pkg/util/files.go → pkg/util/files/files.go
@@ -1,4 +1,4 @@
-package util
+package files
 
 import (
 	"bytes"

diff --git a/pkg/util/fs.go → pkg/util/fs/fs.go b/pkg/util/fs.go → pkg/util/fs/fs.go
@@ -1,8 +1,9 @@
-package util
+package fs
 
 import (
 	"errors"
 	"fmt"
+	"github.com/cnoe-io/idpbuilder/pkg/util/files"
 	"io"
 	"io/fs"
 	"os"
@@ -29,7 +30,7 @@ func ConvertFSToBytes(inFS FS, name string, templateData any) ([][]byte, error)
 			return nil, err
 		}
 
-		if returnedRawResource, err := ApplyTemplate(rawResource, templateData); err == nil {
+		if returnedRawResource, err := files.ApplyTemplate(rawResource, templateData); err == nil {
 			rawResources = append(rawResources, returnedRawResource)
 		} else {
 			return nil, err

diff --git a/pkg/util/fs_test.go → pkg/util/fs/fs_test.go b/pkg/util/fs_test.go → pkg/util/fs/fs_test.go
@@ -1,4 +1,4 @@
-package util
+package fs
 
 import (
 	"fmt"

diff --git a/pkg/util/gitea.go b/pkg/util/gitea.go
@@ -6,6 +6,7 @@ import (
 	"encoding/base64"
 	"fmt"
 	"github.com/cnoe-io/idpbuilder/api/v1alpha1"
+	"github.com/cnoe-io/idpbuilder/pkg/util/idp"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -113,7 +114,7 @@ func GetGiteaToken(ctx context.Context, baseUrl, username, password string) (str
 }
 
 func GiteaBaseUrl(ctx context.Context) (string, error) {
-	idpConfig, err := GetIDPConfig(ctx)
+	idpConfig, err := idp.GetConfig(ctx)
 	if err != nil {
 		return "", fmt.Errorf("error fetching idp config: %s", err)
 	}

diff --git a/pkg/util/idp/idp.go b/pkg/util/idp/idp.go
@@ -0,0 +1,30 @@
+package idp
+
+import (
+	"context"
+	"github.com/cnoe-io/idpbuilder/api/v1alpha1"
+	"github.com/cnoe-io/idpbuilder/pkg/k8s"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+)
+
+func GetConfig(ctx context.Context) (v1alpha1.BuildCustomizationSpec, error) {
+	b := v1alpha1.BuildCustomizationSpec{}
+
+	kubeClient, err := k8s.GetKubeClient()
+	if err != nil {
+		return b, err
+	}
+
+	list, err := getLocalBuild(ctx, kubeClient)
+	if err != nil {
+		return b, err
+	}
+
+	// TODO: We assume that only one LocalBuild exists !
+	return list.Items[0].Spec.BuildCustomization, nil
+}
+
+func getLocalBuild(ctx context.Context, kubeClient client.Client) (v1alpha1.LocalbuildList, error) {
+	localBuildList := v1alpha1.LocalbuildList{}
+	return localBuildList, kubeClient.List(ctx, &localBuildList)
+}
diff --git a/pkg/util/util.go b/pkg/util/util.go
@@ -5,7 +5,6 @@ import (
 	"crypto/rand"
 	"crypto/tls"
 	"fmt"
-	"github.com/cnoe-io/idpbuilder/pkg/k8s"
 	"math"
 	"math/big"
 	mathrand "math/rand"
@@ -32,28 +31,6 @@ const (
 	StaticPassword  = "developer"
 )
 
-func GetIDPConfig(ctx context.Context) (v1alpha1.BuildCustomizationSpec, error) {
-	b := v1alpha1.BuildCustomizationSpec{}
-
-	kubeClient, err := k8s.GetKubeClient()
-	if err != nil {
-		return b, err
-	}
-
-	list, err := getLocalBuild(ctx, kubeClient)
-	if err != nil {
-		return b, err
-	}
-
-	// TODO: We assume that only one LocalBuild exists !
-	return list.Items[0].Spec.BuildCustomization, nil
-}
-
-func getLocalBuild(ctx context.Context, kubeClient client.Client) (v1alpha1.LocalbuildList, error) {
-	localBuildList := v1alpha1.LocalbuildList{}
-	return localBuildList, kubeClient.List(ctx, &localBuildList)
-}
-
 func GetCLIStartTimeAnnotationValue(annotations map[string]string) (string, error) {
 	if annotations == nil {
 		return "", fmt.Errorf("this object's annotation is nil")