Merge pull request #793 from monstermunchkin/misc/logging

Fix small logging issues

Author: stgraber

distrobuilder/main_incus.go

@@ -233,7 +233,7 @@ func (c *cmdIncus) runPack(cmd *cobra.Command, args []string, overlayDir string)
 		return fmt.Errorf("Failed to manage packages: %w", err)
 	}
 
-	c.global.logger.Info("Running hooks", "trigger", "post-packages")
+	c.global.logger.WithField("trigger", "post-packages").Info("Running hooks")
 
 	// Run post packages hook
 	for _, hook := range c.global.definition.GetRunnableActions("post-packages", imageTargets) {

image/incus_test.go

@@ -35,7 +35,7 @@ var incusDef = shared.Definition{
 }
 
 func setupIncus(t *testing.T) *IncusImage {
-	cacheDir := filepath.Join(os.TempDir(), "distrobuilder-test")
+	cacheDir := filepath.Join(os.TempDir(), "distrobuilder-test-incus")
 
 	err := os.MkdirAll(filepath.Join(cacheDir, "rootfs"), 0755)
 	require.NoError(t, err)
@@ -66,7 +66,7 @@ func setupIncus(t *testing.T) *IncusImage {
 }
 
 func teardownIncus(t *testing.T) {
-	os.RemoveAll(filepath.Join(os.TempDir(), "distrobuilder-test"))
+	os.RemoveAll(filepath.Join(os.TempDir(), "distrobuilder-test-incus"))
 }
 
 func TestIncusBuild(t *testing.T) {

image/lxc_test.go

@@ -83,7 +83,7 @@ var lxcDef = shared.Definition{
 
 func lxcCacheDir() string {
 	wd, _ := os.Getwd()
-	return filepath.Join(wd, "distrobuilder-test")
+	return filepath.Join(wd, "distrobuilder-test-lxc")
 }
 
 func setupLXC() *LXCImage {

managers/manager.go

@@ -41,9 +41,10 @@ type managerCommands struct {
 
 // Manager represents a package manager.
 type Manager struct {
-	mgr manager
-	def shared.Definition
-	ctx context.Context
+	mgr    manager
+	def    shared.Definition
+	ctx    context.Context
+	logger *logrus.Logger
 }
 
 type manager interface {
@@ -90,7 +91,7 @@ func Load(ctx context.Context, managerName string, logger *logrus.Logger, defini
 		return nil, fmt.Errorf("Failed to load manager %q: %w", managerName, err)
 	}
 
-	return &Manager{def: definition, mgr: d, ctx: ctx}, nil
+	return &Manager{def: definition, mgr: d, ctx: ctx, logger: logger}, nil
 }
 
 // ManagePackages manages packages.
@@ -122,6 +123,8 @@ func (m *Manager) ManagePackages(imageTarget shared.ImageTarget) error {
 			return fmt.Errorf("Failed to update: %w", err)
 		}
 
+		m.logger.WithField("trigger", "post-update").Info("Running hooks")
+
 		// Run post update hook
 		for _, action := range m.def.GetRunnableActions("post-update", imageTarget) {
 			if action.Pongo {