From abe3ffde59d6a0d942a9ac2d1b657287f75efa67 Mon Sep 17 00:00:00 2001
From: penard-cb <135390596+penard-cb@users.noreply.github.com>
Date: Mon, 24 Jul 2023 14:47:32 -0400
Subject: [PATCH] Don't set the package variable for the new Resolver Template
 (#2725)

---
 plugin/resolvergen/resolver.go | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/plugin/resolvergen/resolver.go b/plugin/resolvergen/resolver.go
index 215bc469df..d5515da35a 100644
--- a/plugin/resolvergen/resolver.go
+++ b/plugin/resolvergen/resolver.go
@@ -81,8 +81,9 @@ func (m *Plugin) generateSingleFile(data *codegen.Data) error {
 		OmitTemplateComment: data.Config.Resolver.OmitTemplateComment,
 	}
 
+	newResolverTemplate := resolverTemplate
 	if data.Config.Resolver.ResolverTemplate != "" {
-		resolverTemplate = readResolverTemplate(data.Config.Resolver.ResolverTemplate)
+		newResolverTemplate = readResolverTemplate(data.Config.Resolver.ResolverTemplate)
 	}
 
 	return templates.Render(templates.Options{
@@ -91,7 +92,7 @@ func (m *Plugin) generateSingleFile(data *codegen.Data) error {
 		Filename:    data.Config.Resolver.Filename,
 		Data:        resolverBuild,
 		Packages:    data.Config.Packages,
-		Template:    resolverTemplate,
+		Template:    newResolverTemplate,
 	})
 }
 
@@ -162,9 +163,9 @@ func (m *Plugin) generatePerSchema(data *codegen.Data) error {
 		file.imports = rewriter.ExistingImports(filename)
 		file.RemainingSource = rewriter.RemainingSource(filename)
 	}
-
+	newResolverTemplate := resolverTemplate
 	if data.Config.Resolver.ResolverTemplate != "" {
-		resolverTemplate = readResolverTemplate(data.Config.Resolver.ResolverTemplate)
+		newResolverTemplate = readResolverTemplate(data.Config.Resolver.ResolverTemplate)
 	}
 
 	for filename, file := range files {
@@ -194,7 +195,7 @@ func (m *Plugin) generatePerSchema(data *codegen.Data) error {
 			Filename:    filename,
 			Data:        resolverBuild,
 			Packages:    data.Config.Packages,
-			Template:    resolverTemplate,
+			Template:    newResolverTemplate,
 		})
 		if err != nil {
 			return err