wip

internal/module/module.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/hashicorp/hcl/v2"
 	"github.com/hashicorp/hcl/v2/hclwrite"
+	"github.com/leg100/pug/internal/logging"
 	"github.com/leg100/pug/internal/resource"
 	"golang.org/x/exp/maps"
 )
@@ -61,7 +62,7 @@ func (m *Module) LogValue() slog.Value {
 //
 // (a) will only succeed if the module has already been initialized, i.e. terraform
 // init has been run, whereas (b) is necessary if it has not.
-func findModules(parent string) (modules []string, err error) {
+func findModules(logger *logging.Logger, parent string) (modules []string, err error) {
 	found := make(map[string]struct{})
 	walkfn := func(path string, d fs.DirEntry, walkerr error) error {
 		// skip directories that have already been identified as containing a
@@ -91,7 +92,7 @@ func findModules(parent string) (modules []string, err error) {
 		// so this is what is used even though no writing is performed.
 		file, diags := hclwrite.ParseConfig(cfg, path, hcl.Pos{Line: 1, Column: 1})
 		if diags.HasErrors() {
-			slog.Error("reloading modules: parsing hcl", "path", path, "error", diags)
+			logger.Error("reloading modules: parsing hcl", "path", path, "error", diags)
 			return nil
 		}
 		for _, block := range file.Body().Blocks() {

internal/module/module_test.go

@@ -3,12 +3,13 @@ package module
 import (
 	"testing"
 
+	"github.com/leg100/pug/internal/logging"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
 
 func TestFindModules(t *testing.T) {
-	got, err := findModules("../testdata/configs")
+	got, err := findModules(logging.NewLogger("info"), "../testdata/configs")
 	require.NoError(t, err)
 
 	assert.Equal(t, 7, len(got))

internal/module/service.go

@@ -55,7 +55,7 @@ func (s *Service) Reload() error {
 		removed []string
 	)
 
-	found, err := findModules(s.workdir)
+	found, err := findModules(s.logger, s.workdir)
 	if err != nil {
 		return err
 	}