Remove logger keys

blackstork-io · Jun 23, 2024 · 184cf4f · 184cf4f
1 parent 39d6f93
commit 184cf4f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 28 deletions.
diff --git a/cmd/render.go b/cmd/render.go
@@ -1,7 +1,6 @@
 package cmd
 
 import (
-	"context"
 	"fmt"
 	"log/slog"
 	"os"
@@ -51,9 +50,6 @@ var renderCmd = &cobra.Command{
 		ctx := cmd.Context()
 		logger := slog.Default()
 
-		ctx = context.WithValue(ctx, "logger", *logger)
-		ctx = context.WithValue(ctx, "document", target)
-
 		var diags diagnostics.Diag
 		eng := engine.New(
 			engine.WithLogger(logger),

diff --git a/eval/document.go b/eval/document.go
@@ -22,14 +22,8 @@ type Document struct {
 }
 
 func (doc *Document) FetchData(ctx context.Context) (plugin.Data, diagnostics.Diag) {
-	var logger slog.Logger
-	loggerVal := ctx.Value("logger")
-	if loggerVal != nil {
-		logger = loggerVal.(slog.Logger)
-	} else {
-		logger = *slog.Default()
-	}
-	logger.DebugContext(ctx, "Fetching data for the document template", "document", ctx.Value("document"))
+	logger := *slog.Default()
+	logger.DebugContext(ctx, "Fetching data for the document template")
 	result := make(plugin.MapData)
 	diags := diagnostics.Diag{}
 	for _, block := range doc.DataBlocks {
@@ -58,14 +52,8 @@ func (doc *Document) FetchData(ctx context.Context) (plugin.Data, diagnostics.Di
 }
 
 func (doc *Document) RenderContent(ctx context.Context, docDataCtx plugin.MapData) (plugin.Content, plugin.Data, diagnostics.Diag) {
-	var logger slog.Logger
-	loggerVal := ctx.Value("logger")
-	if loggerVal != nil {
-		logger = loggerVal.(slog.Logger)
-	} else {
-		logger = *slog.Default()
-	}
-	logger.DebugContext(ctx, "Rendering content for the document template", "document", ctx.Value("document"))
+	logger := *slog.Default()
+	logger.DebugContext(ctx, "Fetching data for the document template")
 	data, diags := doc.FetchData(ctx)
 	if diags.HasErrors() {
 		return nil, nil, diags
@@ -123,14 +111,8 @@ func (doc *Document) RenderContent(ctx context.Context, docDataCtx plugin.MapDat
 }
 
 func (doc *Document) Publish(ctx context.Context, content plugin.Content, data plugin.Data) diagnostics.Diag {
-	var logger slog.Logger
-	loggerVal := ctx.Value("logger")
-	if loggerVal != nil {
-		logger = loggerVal.(slog.Logger)
-	} else {
-		logger = *slog.Default()
-	}
-	logger.DebugContext(ctx, "Publishing the document content", "document", ctx.Value("document"))
+	logger := *slog.Default()
+	logger.DebugContext(ctx, "Fetching data for the document template")
 	docData := plugin.MapData{
 		definitions.BlockKindContent: content.AsData(),
 	}