Validation moved to languagecontainer

Author: suztomo

internal/librariangen/generate/generator.go

@@ -41,9 +41,6 @@ var (
 // Generate is the main entrypoint for the `generate` command. It orchestrates
 // the entire generation process.
 func Generate(ctx context.Context, cfg *generate.Config) error {
-	if err := cfg.Context.Validate(); err != nil {
-		return fmt.Errorf("librariangen: invalid configuration: %w", err)
-	}
 	slog.Debug("librariangen: generate command started")
 	defer cleanupIntermediateFiles(cfg.Context.OutputDir)
 

internal/librariangen/languagecontainer/generate/generate.go

@@ -17,6 +17,7 @@ package generate
 
 import (
 	"errors"
+	"fmt"
 	"log/slog"
 	"path/filepath"
 
@@ -68,6 +69,9 @@ type Config struct {
 // NewConfig creates a new Config, parsing the generate-request.json file
 // from the LibrarianDir in the given Context.
 func NewConfig(ctx *Context) (*Config, error) {
+	if err := ctx.Validate(); err != nil {
+		return nil, fmt.Errorf("invalid context: %w", err)
+	}
 	reqPath := filepath.Join(ctx.LibrarianDir, "generate-request.json")
 	slog.Debug("languagecontainer: reading generate request", "path", reqPath)
 

internal/librariangen/languagecontainer/generate/generate_test.go

@@ -28,6 +28,9 @@ func TestNewConfig(t *testing.T) {
 	want := &Config{
 		Context: &Context{
 			LibrarianDir: librarianDir,
+			InputDir:     "in",
+			OutputDir:    "out",
+			SourceDir:    "source",
 		},
 		Request: &message.Library{
 			ID:      "chronicle",
@@ -55,6 +58,9 @@ func TestNewConfig(t *testing.T) {
 
 	ctx := &Context{
 		LibrarianDir: librarianDir,
+		InputDir:     "in",
+		OutputDir:    "out",
+		SourceDir:    "source",
 	}
 	got, err := NewConfig(ctx)
 	if err != nil {
@@ -65,3 +71,43 @@ func TestNewConfig(t *testing.T) {
 		t.Errorf("NewConfig() mismatch (-want +got):\n%s", diff)
 	}
 }
+
+func TestNewConfig_validate(t *testing.T) {
+	tests := []struct {
+		name    string
+		context *Context
+	}{
+		{
+			name:    "empty librarian dir",
+			context: &Context{},
+		},
+		{
+			name: "empty input dir",
+			context: &Context{
+				LibrarianDir: "librarian",
+			},
+		},
+		{
+			name: "empty output dir",
+			context: &Context{
+				LibrarianDir: "librarian",
+				InputDir:     "in",
+			},
+		},
+		{
+			name: "empty source dir",
+			context: &Context{
+				LibrarianDir: "librarian",
+				InputDir:     "in",
+				OutputDir:    "out",
+			},
+		},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if _, err := NewConfig(tt.context); err == nil {
+				t.Error("NewConfig() error = nil, want not nil")
+			}
+		})
+	}
+}

internal/librariangen/languagecontainer/languagecontainer_test.go

@@ -2,7 +2,6 @@
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
-// You may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0

internal/librariangen/main.go

@@ -52,13 +52,7 @@ func runCLI(args []string) int {
 		Generate:    generate.Generate,
 		ReleaseInit: release.Init,
 	}
-	if exitCode := languagecontainer.Run(args[1:], &container); exitCode != 0 {
-		slog.Error("command failed", "command", args[1])
-		return 1
-	}
-
-	slog.Info("librariangen: finished successfully")
-	return 0
+	return languagecontainer.Run(args, &container)
 }
 
 func parseLogLevel(logLevelEnv string) slog.Level {