update logs

Author: iignatevich

Makefile

@@ -24,7 +24,7 @@ LOCAL_BIN:=$(CURDIR)/bin
 
 # Linter config.
 GOLANGCI_BIN:=$(LOCAL_BIN)/golangci-lint
-GOLANGCI_TAG:=1.61.0
+GOLANGCI_TAG:=1.64.5
 
 .PHONY: all
 all: deps test build

compose/builder.go

@@ -11,9 +11,8 @@ import (
 
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing/object"
-	"github.com/stevenle/topsort"
-
 	"github.com/launchrctl/launchr/pkg/action"
+	"github.com/stevenle/topsort"
 )
 
 const (
@@ -123,8 +122,8 @@ func identifyStrategy(name string) (mergeStrategyType, mergeStrategyTarget) {
 
 // Builder struct, provides methods to merge packages into build
 type Builder struct {
-	withLogger action.WithLogger
-	withTerm   action.WithTerm
+	action.WithLogger
+	action.WithTerm
 
 	platformDir      string
 	targetDir        string
@@ -144,8 +143,8 @@ type fsEntry struct {
 
 func createBuilder(c *Composer, targetDir, sourceDir string, packages []*Package) *Builder {
 	return &Builder{
-		c.withLogger,
-		c.withTerm,
+		c.WithLogger,
+		c.WithTerm,
 		c.pwd,
 		targetDir,
 		sourceDir,
@@ -182,7 +181,7 @@ func getVersionedMap(gitDir string) (map[string]bool, error) {
 }
 
 func (b *Builder) build(ctx context.Context) error {
-	b.withTerm.Term().Println("Creating composition...")
+	b.Term().Println("Creating composition...")
 	err := EnsureDirExists(b.targetDir)
 	if err != nil {
 		return err
@@ -258,7 +257,7 @@ func (b *Builder) build(ctx context.Context) error {
 	targetsMap := getTargetsMap(b.packages)
 
 	if b.logConflicts {
-		b.withTerm.Term().Info().Printf("Conflicting files:\n")
+		b.Term().Info().Printf("Conflicting files:\n")
 	}
 
 	for i := 0; i < len(items); i++ {
@@ -350,7 +349,7 @@ func (b *Builder) logConflictResolve(resolveto mergeConflictResolve, path, pkgNa
 		return
 	}
 
-	b.withTerm.Term().Info().Printfln("[%s] - %s > Selected from %s", pkgName, path, entry.From)
+	b.Term().Info().Printfln("[%s] - %s > Selected from %s", pkgName, path, entry.From)
 }
 
 func getTargetsMap(packages []*Package) map[string]string {

compose/compose.go

@@ -10,14 +10,14 @@ import (
 	"syscall"
 
 	"github.com/launchrctl/keyring"
-
-	"github.com/launchrctl/launchr"
 	"github.com/launchrctl/launchr/pkg/action"
 )
 
 const (
-	MainDir        = ".compose"         // MainDir is a compose directory.
-	BuildDir       = MainDir + "/build" // BuildDir is a result directory of compose action.
+	// MainDir is a compose directory.
+	MainDir = ".compose"
+	// BuildDir is a result directory of compose action.
+	BuildDir       = MainDir + "/build"
 	composeFile    = "plasma-compose.yaml"
 	dirPermissions = 0755
 )
@@ -42,7 +42,7 @@ func (kw *keyringWrapper) getForURL(url string) (keyring.CredentialsItem, error)
 		if errors.Is(errGet, keyring.ErrEmptyPass) {
 			return ci, errGet
 		} else if !errors.Is(errGet, keyring.ErrNotFound) {
-			kw.WithLogger.Log().Debug(errGet.Error())
+			kw.Log().Debug(errGet.Error())
 			return ci, errors.New("the keyring is malformed or wrong passphrase provided")
 		}
 
@@ -70,7 +70,7 @@ func (kw *keyringWrapper) getForURL(url string) (keyring.CredentialsItem, error)
 
 func (kw *keyringWrapper) fillCredentials(ci keyring.CredentialsItem) (keyring.CredentialsItem, error) {
 	if ci.URL != "" {
-		kw.WithTerm.Term().Printfln("Please add login and password for URL - %s", ci.URL)
+		kw.Term().Printfln("Please add login and password for URL - %s", ci.URL)
 	}
 	err := keyring.RequestCredentialsFromTty(&ci)
 	if err != nil {
@@ -82,8 +82,8 @@ func (kw *keyringWrapper) fillCredentials(ci keyring.CredentialsItem) (keyring.C
 
 // Composer stores compose definition
 type Composer struct {
-	withLogger action.WithLogger
-	withTerm   action.WithTerm
+	action.WithLogger
+	action.WithTerm
 
 	pwd     string
 	options *ComposerOptions
@@ -110,16 +110,6 @@ func CreateComposer(pwd string, opts ComposerOptions, k keyring.Keyring) (*Compo
 	return &Composer{pwd: pwd, options: &opts, compose: config, k: k}, nil
 }
 
-// SetLogger sets logger for composer.
-func (c *Composer) SetLogger(logger *launchr.Logger) {
-	c.withLogger.SetLogger(logger)
-}
-
-// SetTerm sets terminal for composer.
-func (c *Composer) SetTerm(term *launchr.Terminal) {
-	c.withTerm.SetTerm(term)
-}
-
 // RunInstall on Composer
 func (c *Composer) RunInstall() error {
 	ctx, cancel := context.WithCancel(context.Background())
@@ -129,7 +119,7 @@ func (c *Composer) RunInstall() error {
 
 	go func() {
 		<-signalChan
-		c.withTerm.Term().Printfln("\nTermination signal received. Cleaning up...")
+		c.Term().Printfln("\nTermination signal received. Cleaning up...")
 		// cleanup dir
 		_, _, _ = c.prepareInstall(false)
 
@@ -150,8 +140,8 @@ func (c *Composer) RunInstall() error {
 			shouldUpdate:   false,
 			interactive:    c.options.Interactive,
 		}
-		kw.WithLogger = c.withLogger
-		kw.WithTerm = c.withTerm
+		kw.SetLogger(c.Log())
+		kw.SetTerm(c.Term())
 		dm := CreateDownloadManager(kw)
 		packages, err := dm.Download(ctx, c.getCompose(), packagesDir)
 		if err != nil {
@@ -171,21 +161,21 @@ func (c *Composer) RunInstall() error {
 func (c *Composer) prepareInstall(clean bool) (string, string, error) {
 	for _, dep := range c.compose.Dependencies {
 		if dep.Source.Tag != "" {
-			c.withTerm.Term().Warning().Printfln("found deprecated field `tag` in `%s` dependency. Use `ref` field for tags or branches.", dep.Name)
+			c.Term().Warning().Printfln("found deprecated field `tag` in `%s` dependency. Use `ref` field for tags or branches.", dep.Name)
 		}
 	}
 
 	buildPath := c.getPath(BuildDir)
 	packagesPath := c.getPath(c.options.WorkingDir)
 
-	c.withTerm.Term().Printfln("Cleaning build dir: %s", BuildDir)
+	c.Term().Printfln("Cleaning build dir: %s", BuildDir)
 	err := os.RemoveAll(buildPath)
 	if err != nil {
 		return "", "", err
 	}
 
 	if clean {
-		c.withTerm.Term().Printfln("Cleaning packages dir: %s", packagesPath)
+		c.Term().Printfln("Cleaning packages dir: %s", packagesPath)
 		err = os.RemoveAll(packagesPath)
 		if err != nil {
 			return "", "", err

compose/downloadManager.go

@@ -140,7 +140,7 @@ func (m DownloadManager) downloadPackage(ctx context.Context, pkg *Package, targ
 	if err != nil {
 		errRemove := os.RemoveAll(downloadPath)
 		if errRemove != nil {
-			m.kw.WithLogger.Log().Debug("error cleaning package folder", "path", downloadPath, "err", err)
+			m.kw.Log().Debug("error cleaning package folder", "path", downloadPath, "err", err)
 		}
 	}
 

compose/forms.go

@@ -9,7 +9,6 @@ import (
 
 	"dario.cat/mergo"
 	"github.com/charmbracelet/huh"
-
 	"github.com/launchrctl/launchr/pkg/action"
 )
 
@@ -80,7 +79,7 @@ func (f *FormsAction) AddPackage(doCreate bool, newDependency *Dependency, rawSt
 
 	sanitizeDependency(newDependency)
 	config.Dependencies = append(config.Dependencies, *newDependency)
-	f.WithTerm.Term().Println("Saving plasma-compose...")
+	f.Term().Println("Saving plasma-compose...")
 	sortPackages(config)
 	err = writeComposeYaml(config)
 
@@ -121,7 +120,7 @@ func (f *FormsAction) UpdatePackage(dependency *Dependency, rawStrategies *RawSt
 	}
 
 	sanitizeDependency(toUpdate)
-	f.WithTerm.Term().Println("Saving plasma-compose...")
+	f.Term().Println("Saving plasma-compose...")
 	sortPackages(config)
 	err = writeComposeYaml(config)
 
@@ -185,7 +184,7 @@ func (f *FormsAction) UpdatePackages(dir string) error {
 		}
 	}
 
-	f.WithTerm.Term().Println("Saving plasma-compose...")
+	f.Term().Println("Saving plasma-compose...")
 	var newDeps []Dependency
 	for _, dep := range packagesMap {
 		newDeps = append(newDeps, *dep)
@@ -245,12 +244,12 @@ OUTER:
 	}
 
 	if saveRequired {
-		f.WithTerm.Term().Println("Updating plasma-compose...")
+		f.Term().Println("Updating plasma-compose...")
 		config.Dependencies = dependencies
 		sortPackages(config)
 		err = writeComposeYaml(config)
 	} else {
-		f.WithTerm.Term().Println("Nothing to update, quiting")
+		f.Term().Println("Nothing to update, quiting")
 	}
 
 	return err

compose/git.go

@@ -29,7 +29,7 @@ func (g *gitDownloader) fetchRemotes(r *git.Repository, url string, refSpec []co
 		return errR
 	}
 
-	g.k.WithTerm.Term().Printfln("Fetching remote %s", url)
+	g.k.Term().Printfln("Fetching remote %s", url)
 	for _, rem := range remotes {
 		options := git.FetchOptions{
 			//RefSpecs: []config.RefSpec{"refs/*:refs/*", "HEAD:refs/heads/HEAD"},
@@ -69,7 +69,7 @@ func (g *gitDownloader) fetchRemotes(r *git.Repository, url string, refSpec []co
 				if err != nil {
 					if errors.Is(err, transport.ErrAuthorizationFailed) || errors.Is(err, transport.ErrAuthenticationRequired) {
 						if g.k.interactive {
-							g.k.WithTerm.Term().Println("invalid auth, trying manual authorisation")
+							g.k.Term().Println("invalid auth, trying manual authorisation")
 							continue
 						}
 					}
@@ -129,13 +129,13 @@ func (g *gitDownloader) EnsureLatest(pkg *Package, downloadPath string) (bool, e
 
 	r, err := git.PlainOpen(downloadPath)
 	if err != nil {
-		g.k.WithLogger.Log().Debug("git init error", "err", err)
+		g.k.Log().Debug("git init error", "err", err)
 		return false, nil
 	}
 
 	head, err := r.Head()
 	if err != nil {
-		g.k.WithLogger.Log().Debug("get head error", "err", err)
+		g.k.Log().Debug("get head error", "err", err)
 		return false, fmt.Errorf("can't get HEAD of '%s', ensure package is valid", pkg.GetName())
 	}
 
@@ -154,22 +154,22 @@ func (g *gitDownloader) EnsureLatest(pkg *Package, downloadPath string) (bool, e
 		pullTarget = "branch"
 		isLatest, err = g.ensureLatestBranch(r, pkg.GetURL(), pkgRefName, remoteRefName)
 		if err != nil {
-			g.k.WithTerm.Term().Warning().Printfln("Couldn't check local branch, marking package %s(%s) as outdated, see debug for detailed error.", pkg.GetName(), pkgRefName)
-			g.k.WithLogger.Log().Debug("ensure branch error", "err", err)
+			g.k.Term().Warning().Printfln("Couldn't check local branch, marking package %s(%s) as outdated, see debug for detailed error.", pkg.GetName(), pkgRefName)
+			g.k.Log().Debug("ensure branch error", "err", err)
 			return isLatest, nil
 		}
 	} else {
 		pullTarget = "tag"
 		isLatest, err = g.ensureLatestTag(r, pkg.GetURL(), pkgRefName)
 		if err != nil {
-			g.k.WithTerm.Term().Warning().Printfln("Couldn't check local tag, marking package %s(%s) as outdated, see debug for detailed error.", pkg.GetName(), pkgRefName)
-			g.k.WithLogger.Log().Debug("ensure tag error", "err", err)
+			g.k.Term().Warning().Printfln("Couldn't check local tag, marking package %s(%s) as outdated, see debug for detailed error.", pkg.GetName(), pkgRefName)
+			g.k.Log().Debug("ensure tag error", "err", err)
 			return isLatest, nil
 		}
 	}
 
 	if !isLatest {
-		g.k.WithTerm.Term().Info().Printfln("Pulling new changes from %s '%s' of %s package", pullTarget, pkgRefName, pkg.GetName())
+		g.k.Term().Info().Printfln("Pulling new changes from %s '%s' of %s package", pullTarget, pkgRefName, pkg.GetName())
 	}
 
 	return isLatest, nil
@@ -242,7 +242,7 @@ func (g *gitDownloader) ensureLatestTag(r *git.Repository, fetchURL, refName str
 
 // Download implements Downloader.Download interface
 func (g *gitDownloader) Download(ctx context.Context, pkg *Package, targetDir string) error {
-	g.k.WithTerm.Term().Printfln("git fetch: %s", pkg.GetURL())
+	g.k.Term().Printfln("git fetch: %s", pkg.GetURL())
 
 	url := pkg.GetURL()
 	if url == "" {
@@ -303,10 +303,10 @@ func (g *gitDownloader) tryDownload(ctx context.Context, targetDir string, optio
 	for _, authType := range auths {
 		if authType == authorisationNone {
 			_, err := git.PlainCloneContext(ctx, targetDir, false, options)
-			g.k.WithTerm.Term().Println("")
+			g.k.Term().Println("")
 			if err != nil {
 				if errors.Is(err, transport.ErrAuthenticationRequired) {
-					g.k.WithTerm.Term().Println("auth required, trying keyring authorisation")
+					g.k.Term().Println("auth required, trying keyring authorisation")
 					continue
 				}
 
@@ -329,7 +329,7 @@ func (g *gitDownloader) tryDownload(ctx context.Context, targetDir string, optio
 			if err != nil {
 				if errors.Is(err, transport.ErrAuthorizationFailed) || errors.Is(err, transport.ErrAuthenticationRequired) {
 					if g.k.interactive {
-						g.k.WithTerm.Term().Println("invalid auth, trying manual authorisation")
+						g.k.Term().Println("invalid auth, trying manual authorisation")
 						continue
 					}
 				}

compose/http.go

@@ -58,7 +58,7 @@ func (h *httpDownloader) Download(_ context.Context, pkg *Package, targetDir str
 		return errNoURL
 	}
 
-	h.k.WithTerm.Term().Printfln("http download: %s", name)
+	h.k.Term().Printfln("http download: %s", name)
 	fpath := filepath.Clean(filepath.Join(targetDir, name))
 
 	err := os.MkdirAll(targetDir, dirPermissions)
@@ -73,7 +73,7 @@ func (h *httpDownloader) Download(_ context.Context, pkg *Package, targetDir str
 
 	defer func() {
 		if err = out.Close(); err != nil {
-			h.k.WithLogger.Log().Debug(errFailedClose.Error())
+			h.k.Log().Debug(errFailedClose.Error())
 		}
 	}()
 
@@ -93,11 +93,11 @@ func (h *httpDownloader) Download(_ context.Context, pkg *Package, targetDir str
 			resp, err = doRequest(client, req)
 			if err != nil {
 				if errors.Is(err, errAuthenticationRequired) {
-					h.k.WithTerm.Term().Println("auth required, trying keyring authorisation")
+					h.k.Term().Println("auth required, trying keyring authorisation")
 					continue
 				}
 
-				h.k.WithLogger.Log().Debug(err.Error())
+				h.k.Log().Debug(err.Error())
 				return errDownloadFailed
 			}
 		}
@@ -113,12 +113,12 @@ func (h *httpDownloader) Download(_ context.Context, pkg *Package, targetDir str
 			if err != nil {
 				if errors.Is(err, errAuthorizationFailed) {
 					if h.k.interactive {
-						h.k.WithTerm.Term().Println("invalid auth, trying manual authorisation")
+						h.k.Term().Println("invalid auth, trying manual authorisation")
 						continue
 					}
 				}
 
-				h.k.WithLogger.Log().Debug(err.Error())
+				h.k.Log().Debug(err.Error())
 				return errDownloadFailed
 			}
 		}
@@ -134,7 +134,7 @@ func (h *httpDownloader) Download(_ context.Context, pkg *Package, targetDir str
 			req.SetBasicAuth(ci.Username, ci.Password)
 			resp, err = doRequest(client, req)
 			if err != nil {
-				h.k.WithLogger.Log().Debug(err.Error())
+				h.k.Log().Debug(err.Error())
 				return errDownloadFailed
 			}
 		}
@@ -144,7 +144,7 @@ func (h *httpDownloader) Download(_ context.Context, pkg *Package, targetDir str
 
 	defer func() {
 		if err = resp.Body.Close(); err != nil {
-			h.k.WithLogger.Log().Debug(errFailedClose.Error())
+			h.k.Log().Debug(errFailedClose.Error())
 		}
 	}()