fix: pass logger through so it can be discarded in benchmarks

Author: radeksimko

internal/indexer/document_change.go

@@ -82,7 +82,7 @@ func (idx *Indexer) decodeModule(modHandle document.DirHandle, dependsOn job.IDs
 	eSchemaId, err := idx.jobStore.EnqueueJob(job.Job{
 		Dir: modHandle,
 		Func: func(ctx context.Context) error {
-			return module.PreloadEmbeddedSchema(ctx, schemas.FS, idx.modStore, idx.schemaStore, modHandle.Path())
+			return module.PreloadEmbeddedSchema(ctx, idx.logger, schemas.FS, idx.modStore, idx.schemaStore, modHandle.Path())
 		},
 		DependsOn:   job.IDs{metaId},
 		Type:        op.OpTypePreloadEmbeddedSchema.String(),

internal/indexer/module_calls.go

@@ -77,7 +77,7 @@ func (idx *Indexer) decodeInstalledModuleCalls(modHandle document.DirHandle, ign
 			eSchemaId, err := idx.jobStore.EnqueueJob(job.Job{
 				Dir: mcHandle,
 				Func: func(ctx context.Context) error {
-					return module.PreloadEmbeddedSchema(ctx, schemas.FS, idx.modStore, idx.schemaStore, mcPath)
+					return module.PreloadEmbeddedSchema(ctx, idx.logger, schemas.FS, idx.modStore, idx.schemaStore, mcPath)
 				},
 				Type:        op.OpTypePreloadEmbeddedSchema.String(),
 				DependsOn:   job.IDs{metaId},

internal/indexer/walker.go

@@ -149,7 +149,7 @@ func (idx *Indexer) WalkedModule(ctx context.Context, modHandle document.DirHand
 	eSchemaId, err := idx.jobStore.EnqueueJob(job.Job{
 		Dir: modHandle,
 		Func: func(ctx context.Context) error {
-			return module.PreloadEmbeddedSchema(ctx, schemas.FS, idx.modStore, idx.schemaStore, modHandle.Path())
+			return module.PreloadEmbeddedSchema(ctx, idx.logger, schemas.FS, idx.modStore, idx.schemaStore, modHandle.Path())
 		},
 		// This could theoretically also depend on ObtainSchema to avoid
 		// attempt to preload the same schema twice but we avoid that dependency

internal/terraform/module/module_ops.go

@@ -188,7 +188,7 @@ func ObtainSchema(ctx context.Context, modStore *state.ModuleStore, schemaStore
 	return nil
 }
 
-func PreloadEmbeddedSchema(ctx context.Context, fs fs.ReadDirFS, modStore *state.ModuleStore, schemaStore *state.ProviderSchemaStore, modPath string) error {
+func PreloadEmbeddedSchema(ctx context.Context, logger *log.Logger, fs fs.ReadDirFS, modStore *state.ModuleStore, schemaStore *state.ProviderSchemaStore, modPath string) error {
 	mod, err := modStore.ModuleByPath(modPath)
 	if err != nil {
 		return err
@@ -236,14 +236,14 @@ func PreloadEmbeddedSchema(ctx context.Context, fs fs.ReadDirFS, modStore *state
 			// of all recent (0.14+) Terraform versions.
 			originalAddr := pAddr
 			pAddr.Namespace = "hashicorp"
-			log.Printf("preloading schema for %s (implying %s)",
+			logger.Printf("preloading schema for %s (implying %s)",
 				originalAddr.ForDisplay(), pAddr.ForDisplay())
 		}
 
 		pSchemaFile, err := schemas.FindProviderSchemaFile(fs, pAddr)
 		if err != nil {
 			if errors.Is(err, schemas.SchemaNotAvailable{Addr: pAddr}) {
-				log.Printf("preloaded schema not available for %s", pAddr)
+				logger.Printf("preloaded schema not available for %s", pAddr)
 				continue
 			}
 			return err
@@ -273,13 +273,13 @@ func PreloadEmbeddedSchema(ctx context.Context, fs fs.ReadDirFS, modStore *state
 				// This accounts for a possible race condition
 				// where we may be preloading the same schema
 				// for different providers at the same time
-				log.Printf("schema for %s is already loaded", pAddr)
+				logger.Printf("schema for %s is already loaded", pAddr)
 				continue
 			}
 			return err
 		}
 		elapsedTime := time.Now().Sub(startTime)
-		log.Printf("preloaded schema for %s %s in %s", pAddr, pSchemaFile.Version, elapsedTime)
+		logger.Printf("preloaded schema for %s %s in %s", pAddr, pSchemaFile.Version, elapsedTime)
 	}
 
 	return nil

internal/terraform/module/module_ops_test.go

@@ -676,7 +676,7 @@ func TestPreloadEmbeddedSchema_basic(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	err = PreloadEmbeddedSchema(ctx, schemasFS, ss.Modules, ss.ProviderSchemas, modPath)
+	err = PreloadEmbeddedSchema(ctx, log.Default(), schemasFS, ss.Modules, ss.ProviderSchemas, modPath)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -746,7 +746,7 @@ func TestPreloadEmbeddedSchema_unknownProviderOnly(t *testing.T) {
 		t.Fatal(err)
 	}
 
-	err = PreloadEmbeddedSchema(ctx, schemasFS, ss.Modules, ss.ProviderSchemas, modPath)
+	err = PreloadEmbeddedSchema(ctx, log.Default(), schemasFS, ss.Modules, ss.ProviderSchemas, modPath)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -810,13 +810,13 @@ func TestPreloadEmbeddedSchema_idempotency(t *testing.T) {
 	}
 
 	// first
-	err = PreloadEmbeddedSchema(ctx, schemasFS, ss.Modules, ss.ProviderSchemas, modPath)
+	err = PreloadEmbeddedSchema(ctx, log.Default(), schemasFS, ss.Modules, ss.ProviderSchemas, modPath)
 	if err != nil {
 		t.Fatal(err)
 	}
 
 	// second - testing module state
-	err = PreloadEmbeddedSchema(ctx, schemasFS, ss.Modules, ss.ProviderSchemas, modPath)
+	err = PreloadEmbeddedSchema(ctx, log.Default(), schemasFS, ss.Modules, ss.ProviderSchemas, modPath)
 	if err != nil {
 		if !errors.Is(err, job.StateNotChangedErr{Dir: document.DirHandleFromPath(modPath)}) {
 			t.Fatal(err)
@@ -825,7 +825,7 @@ func TestPreloadEmbeddedSchema_idempotency(t *testing.T) {
 
 	ctx = job.WithIgnoreState(ctx, true)
 	// third - testing requirement matching
-	err = PreloadEmbeddedSchema(ctx, schemasFS, ss.Modules, ss.ProviderSchemas, modPath)
+	err = PreloadEmbeddedSchema(ctx, log.Default(), schemasFS, ss.Modules, ss.ProviderSchemas, modPath)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -892,14 +892,14 @@ func TestPreloadEmbeddedSchema_raceCondition(t *testing.T) {
 	wg.Add(2)
 	go func() {
 		defer wg.Done()
-		err := PreloadEmbeddedSchema(ctx, schemasFS, ss.Modules, ss.ProviderSchemas, modPath)
+		err := PreloadEmbeddedSchema(ctx, log.Default(), schemasFS, ss.Modules, ss.ProviderSchemas, modPath)
 		if err != nil && !errors.Is(err, job.StateNotChangedErr{Dir: document.DirHandleFromPath(modPath)}) {
 			t.Error(err)
 		}
 	}()
 	go func() {
 		defer wg.Done()
-		err := PreloadEmbeddedSchema(ctx, schemasFS, ss.Modules, ss.ProviderSchemas, modPath)
+		err := PreloadEmbeddedSchema(ctx, log.Default(), schemasFS, ss.Modules, ss.ProviderSchemas, modPath)
 		if err != nil && !errors.Is(err, job.StateNotChangedErr{Dir: document.DirHandleFromPath(modPath)}) {
 			t.Error(err)
 		}