A lot of thigs are going on

Signed-off-by: Nikolai Rodionov <allanger@badhouseplants.net>

internal/helpers/email/email.go

@@ -1,22 +0,0 @@
-package email
-
-import (
-	"net/smtp"
-)
-
-type EmailConf struct {
-	From     string
-	Password string
-	SmtpHost string
-	SmtpPort string
-}
-
-func (e *EmailConf) SendEmail(to string, message string) error {
-	messageByte := []byte(message)
-	auth := smtp.PlainAuth("", e.From, e.Password, e.SmtpHost)
-
-	if err := smtp.SendMail(e.SmtpHost+":"+e.SmtpPort, auth, e.From, []string{to}, messageByte); err != nil {
-		return err
-	}
-	return nil
-}

internal/helpers/helm/helm.go

@@ -1,178 +0,0 @@
-package helm
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/sirupsen/logrus"
-	"gopkg.in/yaml.v2"
-	"helm.sh/helm/v3/pkg/action"
-	"helm.sh/helm/v3/pkg/chart/loader"
-	"helm.sh/helm/v3/pkg/chartutil"
-	"helm.sh/helm/v3/pkg/cli"
-	"helm.sh/helm/v3/pkg/engine"
-	"helm.sh/helm/v3/pkg/getter"
-	"helm.sh/helm/v3/pkg/registry"
-	"helm.sh/helm/v3/pkg/repo"
-)
-
-type Helm struct{}
-
-func NewHelm() Helmhelper {
-	return &Helm{}
-}
-
-func getDownloadDirPath(workdirPath string) string {
-	return fmt.Sprintf("%s/.charts", workdirPath)
-}
-
-func getChartDirPath(downloadDirPath string, release *ReleaseData) string {
-	return fmt.Sprintf("%s/%s-%s-%s", downloadDirPath, release.RepositoryName, release.Chart, release.Version)
-
-}
-
-func (h *Helm) PullChart(workdirPath string, release *ReleaseData) (path string, err error) {
-	downloadDirPath := getDownloadDirPath(workdirPath)
-	if err := os.MkdirAll(downloadDirPath, 0777); err != nil {
-		return "", err
-	}
-
-	config := new(action.Configuration)
-	cl := cli.New()
-	chartDir := getChartDirPath(downloadDirPath, release)
-	_, err = os.Stat(chartDir)
-
-	if err != nil && !os.IsNotExist(err) {
-		return "", nil
-	} else if os.IsNotExist(err) {
-		if err := os.Mkdir(chartDir, 0777); err != nil {
-			return "", err
-		}
-		registry, err := registry.NewClient()
-		if err != nil {
-			return "", err
-		}
-
-		var path string
-		// Download the chart to the workdir
-		if release.RepositoryKind != "oci" {
-			r, err := repo.NewChartRepository(&repo.Entry{
-				Name: release.RepositoryName,
-				URL:  release.RepositoryURL,
-			}, getter.All(cl))
-			if err != nil {
-				return "", err
-			}
-			path = r.Config.Name
-
-		} else {
-			path = release.RepositoryURL
-		}
-
-		client := action.NewPullWithOpts(action.WithConfig(config))
-
-		client.Untar = true
-		client.UntarDir = workdirPath
-		client.SetRegistryClient(registry)
-		client.DestDir = workdirPath
-		client.Settings = cl
-
-		chartRemote := fmt.Sprintf("%s/%s", path, release.Chart)
-		logrus.Infof("trying to pull: %s", chartRemote)
-		if _, err = client.Run(chartRemote); err != nil {
-			return "", err
-		}
-	}
-	return release.Chart, nil
-}
-
-func (h *Helm) FindLatestVersion(workdirPath string, release *ReleaseData) (version string, err error) {
-	downloadDirPath := getDownloadDirPath(workdirPath)
-	if err := os.MkdirAll(downloadDirPath, 0777); err != nil {
-		return "", err
-	}
-
-	config := new(action.Configuration)
-	cl := cli.New()
-	chartDir := getChartDirPath(downloadDirPath, release)
-	chartPath, err := h.PullChart(workdirPath, release)
-	if err != nil {
-		return "", err
-	}
-
-	showAction := action.NewShowWithConfig(action.ShowChart, config)
-
-	res, err := showAction.LocateChart(fmt.Sprintf("%s/%s", chartDir, chartPath), cl)
-	if err != nil {
-		return "", err
-	}
-	res, err = showAction.Run(res)
-	if err != nil {
-		return "", nil
-	}
-
-	chartData, err := chartFromString(res)
-	if err != nil {
-		return "", err
-	}
-	logrus.Infof("the latest version of %s is %s", release.Chart, chartData.Version)
-	versionedChartDir := getChartDirPath(downloadDirPath, release)
-	os.Rename(chartDir, versionedChartDir)
-	return chartData.Version, err
-}
-
-func (h *Helm) RenderChart(workdirPath string, release *ReleaseData) error {
-	downloadDirPath := getDownloadDirPath(workdirPath)
-	chartDirPath := getChartDirPath(downloadDirPath, release)
-	chartPath, err := getChartPathFromDir(chartDirPath)
-	if err != nil {
-		return err
-	}
-	logrus.Info(fmt.Sprintf("%s/%s", chartDirPath, chartPath))
-	chartObj, err := loader.Load(fmt.Sprintf("%s/%s", chartDirPath, chartPath))
-	if err != nil {
-		return err
-	}
-	values := chartutil.Values{}
-	values["Values"] = chartObj.Values
-	values["Release"] = map[string]string{
-		"Name":      release.Name,
-		"Namespace": release.Namespace,
-	}
-	values["Capabilities"] = map[string]map[string]string{
-		"KubeVersion": {
-			"Version":    "v1.27.9",
-			"GitVersion": "v1.27.9",
-		},
-	}
-	files, err := engine.Engine{Strict: false}.Render(chartObj, values)
-	if err != nil {
-		return err
-	}
-	logrus.Info(files)
-	for file, data := range files {
-		logrus.Infof("%s - %s", file, data)
-	}
-	logrus.Info("I'm here")
-	return nil
-}
-
-func getChartPathFromDir(downloadDir string) (file string, err error) {
-	files, err := os.ReadDir(downloadDir)
-	if err != nil {
-		return "", err
-	} else if len(files) == 0 {
-		return "", fmt.Errorf("expected to have one file, got zero in a dir %s", downloadDir)
-	} else if len(files) > 1 {
-		return "", fmt.Errorf("expected to have only one file in a dir %s", downloadDir)
-	}
-	return files[0].Name(), nil
-}
-
-func chartFromString(info string) (*ReleaseData, error) {
-	releaseData := new(ReleaseData)
-	if err := yaml.Unmarshal([]byte(info), &releaseData); err != nil {
-		return nil, err
-	}
-	return releaseData, nil
-}

internal/helpers/helm/types.go

@@ -1,18 +0,0 @@
-package helm
-
-type Helmhelper interface {
-	FindLatestVersion(workdirPath string, release *ReleaseData) (string, error)
-	PullChart(workdirPath string, release *ReleaseData) (string, error)
-	RenderChart(workdirPath string, release *ReleaseData) error
-}
-
-type ReleaseData struct {
-	Name           string
-	Chart          string
-	Namespace      string
-	Version        string
-	RepositoryName string
-	RepositoryURL  string
-	RepositoryKind string
-	ValuesData     string
-}

internal/helpers/kube/kube.go

@@ -1,68 +0,0 @@
-package kube
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/types"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-)
-
-func Create(ctx context.Context, client client.Client, obj client.Object, wait bool) error {
-	if err := client.Create(ctx, obj); err != nil {
-		return err
-	}
-	if wait {
-		if err := WaitUntilCreated(ctx, client, obj, 10, time.Millisecond*50); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func Update(ctx context.Context, client client.Client, obj client.Object) error {
-	if err := client.Update(ctx, obj); err != nil {
-		return err
-	}
-	return nil
-}
-
-func SetOwnerRef(ctx context.Context, client client.Client, obj client.Object, owner client.Object) client.Object {
-	apiVersion := fmt.Sprintf("%s/%s", owner.GetObjectKind().GroupVersionKind().Group, owner.GetObjectKind().GroupVersionKind().Version)
-	ownerReference := []metav1.OwnerReference{
-		{
-			APIVersion: apiVersion,
-			Kind:       owner.GetObjectKind().GroupVersionKind().GroupKind().Kind,
-			Name:       owner.GetName(),
-			UID:        owner.GetUID(),
-		},
-	}
-	obj.SetOwnerReferences(ownerReference)
-	return obj
-}
-
-func WaitUntilCreated(ctx context.Context, client client.Client, obj client.Object, attemps int, timeout time.Duration) error {
-	if err := client.Get(ctx, types.NamespacedName{
-		Namespace: obj.GetNamespace(),
-		Name:      obj.GetName(),
-	}, obj); err != nil {
-		if attemps > 0 {
-			time.Sleep(timeout)
-			if err := WaitUntilCreated(ctx, client, obj, attemps-1, timeout); err != nil {
-				return err
-			}
-		} else {
-			return err
-		}
-	}
-	return nil
-}
-
-func Delete(ctx context.Context, client client.Client, obj client.Object, wait bool) error {
-	if err := client.Delete(ctx, obj); err != nil {
-		return err
-	}
-	return nil
-}

internal/helpers/kube/kube_test.go

@@ -1 +0,0 @@
-package kube_test

internal/helpers/logger/logger.go

@@ -0,0 +1,45 @@
+package logger
+
+import (
+	"context"
+
+	"github.com/go-logr/logr"
+	"github.com/go-logr/zapr"
+	"github.com/mattn/go-colorable"
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
+)
+
+func SetupLogger(levelTxt string) *zap.Logger {
+	level, err := zapcore.ParseLevel(levelTxt)
+	if err != nil {
+		level = zapcore.ErrorLevel
+	}
+	aa := zap.NewDevelopmentEncoderConfig()
+	aa.EncodeLevel = zapcore.CapitalColorLevelEncoder
+	aa.TimeKey = ""
+	bb := zap.New(zapcore.NewCore(
+		zapcore.NewConsoleEncoder(aa),
+		zapcore.AddSync(colorable.NewColorableStdout()),
+		level,
+	))
+	return bb
+}
+
+func NewLogger(ctx context.Context, levelTxt string) context.Context {
+	log := zapr.NewLogger(SetupLogger(levelTxt))
+	ctx = logr.NewContext(ctx, log)
+	return ctx
+}
+
+func FromContext(ctx context.Context) logr.Logger {
+	log, err := logr.FromContext(ctx)
+	if err == nil {
+		return log
+	}
+	return zapr.NewLogger(zap.NewExample())
+}
+
+func ToContext(ctx context.Context, logger logr.Logger) context.Context {
+	return logr.NewContext(ctx, logger)
+}