Clean up options handling, fix warnings

Author: holzensp

cmd/pkl-gen-go/pkl-gen-go.go

@@ -127,7 +127,7 @@ var (
 	printVersion     bool
 )
 
-// The version of pkl-gen-go.
+// The Version of pkl-gen-go.
 //
 // This gets replaced by ldflags when built through CI,
 // or by init when installed via go install.
@@ -230,21 +230,26 @@ func (args *cliArgs) parse(arguments []string) error {
 	return nil
 }
 
+// Translates the cli arguments to an configuration closure for the evaluator evaluating `generator-settings.pkl`.
+func (args *cliArgs) loadGeneratorSettingsOptions() func(opts *pkl.EvaluatorOptions) {
+	return func(opts *pkl.EvaluatorOptions) {
+		if args.cacheDir != "" {
+			opts.CacheDir = args.cacheDir
+		}
+	}
+}
+
 // Loads the settings for controlling codegen.
 // Uses a Pkl evaluator that is separate from what's used for actually running codegen.
 func (args *cliArgs) loadGeneratorSettings() (*generatorsettings.GeneratorSettings, error) {
 	projectDir := findProjectDir(args.projectDir)
 	var evaluator pkl.Evaluator
 	var err error
-	opts := func(opts *pkl.EvaluatorOptions) {
-		if args.cacheDir != "" {
-			opts.CacheDir = args.cacheDir
-		}
-	}
+
 	if projectDir != "" {
-		evaluator, err = pkl.NewProjectEvaluator(context.Background(), projectDir, pkl.PreconfiguredOptions, opts)
+		evaluator, err = pkl.NewProjectEvaluator(context.Background(), projectDir, pkl.PreconfiguredOptions, args.loadGeneratorSettingsOptions())
 	} else {
-		evaluator, err = pkl.NewEvaluator(context.Background(), pkl.PreconfiguredOptions, opts)
+		evaluator, err = pkl.NewEvaluator(context.Background(), pkl.PreconfiguredOptions, args.loadGeneratorSettingsOptions())
 	}
 	if err != nil {
 		panic(err)
@@ -296,11 +301,8 @@ func (args *cliArgs) resolvePrecedence(settings *generatorsettings.GeneratorSett
 		*settings.ProjectDir = args.projectDir
 	}
 	if args.cacheDir != "" {
-		normalized, err := filepath.Abs(args.cacheDir)
-		if err != nil {
-			return err
-		}
-		settings.CacheDir = &normalized
+		// Not normalized to absolute path, for hermetic build systems
+		settings.CacheDir = &args.cacheDir
 	}
 	settings.DryRun = args.dryRun
 	return nil