From 9951b9a1f35ecfd712c0fa0ead144f6323895335 Mon Sep 17 00:00:00 2001
From: "David J. Allen" <davidallendj@gmail.com>
Date: Thu, 12 Dec 2024 14:29:41 -0700
Subject: [PATCH] refactor: added more logging info

---
 pkg/generator/generator.go |  4 ++--
 pkg/server/server.go       | 21 +++++++++------------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/pkg/generator/generator.go b/pkg/generator/generator.go
index b7d5fa8..34333b0 100644
--- a/pkg/generator/generator.go
+++ b/pkg/generator/generator.go
@@ -212,7 +212,7 @@ func GenerateWithTarget(config *config.Config, target string) (FileMap, error) {
 	// load target information from config
 	targetInfo, ok = config.Targets[target]
 	if !ok {
-		log.Warn().Msg("target not found in config")
+		log.Warn().Str("target", target).Msg("target not found in config")
 	}
 
 	// if no plugin supplied in config target, then using the target supplied
@@ -224,7 +224,7 @@ func GenerateWithTarget(config *config.Config, target string) (FileMap, error) {
 	generator, ok = DefaultGenerators[target]
 	if !ok {
 		// only load the plugin needed for this target if we don't find default
-		log.Error().Msg("could not find target in default generators")
+		log.Warn().Str("target", target).Msg("could not find target in default generators")
 		generator, err = LoadPlugin(targetInfo.Plugin)
 		if err != nil {
 			return nil, fmt.Errorf("failed to load plugin: %v", err)
diff --git a/pkg/server/server.go b/pkg/server/server.go
index 24822ed..f8b57c5 100644
--- a/pkg/server/server.go
+++ b/pkg/server/server.go
@@ -58,7 +58,7 @@ func New(conf *config.Config) *Server {
 	// return based on config values
 	return &Server{
 		Config: conf,
-		Server: &http.Server{Addr: fmt.Sprintf("%s", conf.Server.Host)},
+		Server: &http.Server{Addr: conf.Server.Host},
 		Jwks: Jwks{
 			Uri:     conf.Server.Jwks.Uri,
 			Retries: conf.Server.Jwks.Retries,
@@ -138,29 +138,26 @@ func (s *Server) Generate(opts ...client.Option) func(w http.ResponseWriter, r *
 	return func(w http.ResponseWriter, r *http.Request) {
 		// get all of the expect query URL params and validate
 		var (
-			target string = r.URL.Query().Get("target")
+			targetParam string  = r.URL.Query().Get("target")
+			target      *Target = s.getTarget(targetParam)
+			outputs     generator.FileMap
+			err         error
 		)
 		s.GeneratorParams = parseGeneratorParams(r, opts...)
-		if target == "" {
+		if targetParam == "" {
 			writeErrorResponse(w, "must specify a target")
 			return
 		}
 
 		// try to generate with target supplied by client first
-		var (
-			t       *Target = s.getTarget(target)
-			outputs generator.FileMap
-			err     error
-		)
-
-		if t != nil {
-			outputs, err = generator.Generate(t.PluginPath, s.GeneratorParams)
+		if target != nil {
+			outputs, err = generator.Generate(target.PluginPath, s.GeneratorParams)
 			if err != nil {
 
 			}
 		} else {
 			// try and generate a new config file from supplied params
-			outputs, err = generator.GenerateWithTarget(s.Config, target)
+			outputs, err = generator.GenerateWithTarget(s.Config, targetParam)
 			if err != nil {
 				writeErrorResponse(w, "failed to generate file: %v", err)
 				return