upd NewGenerator to use ctx instead of logger

Author: gertd

internal/certs/certs.go

@@ -2,6 +2,7 @@ package certs
 
 import (
 	"bytes"
+	"context"
 	"crypto/rand"
 	"crypto/rsa"
 	"crypto/x509"
@@ -34,9 +35,9 @@ type CertGenConfig struct {
 	DNSNames         []string
 }
 
-// NewGenerator creates a new cert generator.
-func NewGenerator(logger *zerolog.Logger) *Generator {
-	log := logger.With().Str("component", "cert-generator").Logger()
+// NewGenerator creates a new cert generator using the logger from the context.
+func NewGenerator(ctx context.Context) *Generator {
+	log := zerolog.Ctx(ctx).With().Str("component", "cert-generator").Logger()
 
 	return &Generator{
 		logger: &log,

topaz/certs/generator.go

@@ -1,6 +1,7 @@
 package certs
 
 import (
+	"context"
 	"os"
 	"path/filepath"
 
@@ -60,7 +61,8 @@ func GenerateCerts(force bool, dnsNames []string, certPaths ...*CertPaths) error
 
 func generate(dnsNames []string, certPaths ...*CertPaths) error {
 	logger := zerolog.Nop()
-	generator := certs.NewGenerator(&logger)
+	ctx := logger.WithContext(context.Background())
+	generator := certs.NewGenerator(ctx)
 
 	tab := table.New(os.Stderr)
 	defer tab.Close()

topazd/cc/factory.go

@@ -32,7 +32,9 @@ func buildCC(
 		return nil, nil, err
 	}
 
-	generator := certs.NewGenerator(zerologLogger)
+	ctx := zerologLogger.WithContext(errGroupAndContext.Ctx)
+
+	generator := certs.NewGenerator(ctx)
 
 	configConfig, err := config.NewConfig(configPath, zerologLogger, overrides, generator)
 	if err != nil {