feat: Updated based on review comments

- Also noticed that kiln version is not currently added to kiln carvel
  baked record. Fixed that

ai-assisted=yes
JIRA-ID: TNZ-119962

Authored-by: Ramkumar Vengadakrishnan <ramkumar.vengadakrishnan@broadcom.com>

Author: ram-pivot

internal/carvel/baker.go

@@ -91,6 +91,9 @@ func (b *baker) Bake(source string) error {
 	if err != nil {
 		return err
 	}
+	if b.metadata.Name == "" {
+		return errors.New("missing required field 'name' in tile metadata (base.yml)")
+	}
 	if err := validateVariables(b.metadata.Variables); err != nil {
 		return err
 	}
@@ -142,6 +145,9 @@ func (b *baker) BakeFromLockfile(source string, releaseLock cargo.BOSHReleaseTar
 	if err != nil {
 		return err
 	}
+	if b.metadata.Name == "" {
+		return errors.New("missing required field 'name' in tile metadata (base.yml)")
+	}
 	if err := validateVariables(b.metadata.Variables); err != nil {
 		return err
 	}
@@ -153,7 +159,7 @@ func (b *baker) BakeFromLockfile(source string, releaseLock cargo.BOSHReleaseTar
 	b.progress(fmt.Sprintf("Tile: %s version %s (metadata_version %s)", b.metadata.Name, ver, b.metadata.MetadataVersion))
 
 	if releaseLock.Name != b.GetBoshReleaseName() {
-		return fmt.Errorf("lockfile release name %q does not match tile name %q", releaseLock.Name, b.GetBoshReleaseName())
+		return fmt.Errorf("lockfile release name %q does not match tile-derived name %q", releaseLock.Name, b.GetBoshReleaseName())
 	}
 
 	b.releaseVersion = releaseLock.Version

internal/carvel/baker_test.go

@@ -311,6 +311,7 @@ consumes:
 				}
 				for _, cmd := range commands {
 					cmd.Dir = inputPath
+					cmd.Env = append(os.Environ(), "GIT_AUTHOR_NAME=test", "GIT_AUTHOR_EMAIL=test@test.com", "GIT_COMMITTER_NAME=test", "GIT_COMMITTER_EMAIL=test@test.com")
 					out, err := cmd.CombinedOutput()
 					Expect(err).NotTo(HaveOccurred(), "error invoking git: "+string(out))
 				}
@@ -524,6 +525,7 @@ consumes:
 				}
 				for _, cmd := range commands {
 					cmd.Dir = inputPath
+					cmd.Env = append(os.Environ(), "GIT_AUTHOR_NAME=test", "GIT_AUTHOR_EMAIL=test@test.com", "GIT_COMMITTER_NAME=test", "GIT_COMMITTER_EMAIL=test@test.com")
 					out, err := cmd.CombinedOutput()
 					Expect(err).NotTo(HaveOccurred(), "error invoking git: "+string(out))
 				}
@@ -578,7 +580,27 @@ consumes:
 				subject := NewBaker()
 				err = subject.BakeFromLockfile(inputPath, releaseLock, "/nonexistent/tarball.tgz")
 				Expect(err).To(HaveOccurred())
-				Expect(err.Error()).To(ContainSubstring("does not match tile name"))
+				Expect(err.Error()).To(ContainSubstring("does not match tile-derived name"))
+			})
+		})
+
+		When("the tile metadata name is missing", func() {
+			It("returns an error early", func() {
+				inputPath, err := os.MkdirTemp("", "missing-name-*")
+				Expect(err).NotTo(HaveOccurred())
+				defer func() { _ = os.RemoveAll(inputPath) }()
+
+				err = os.WriteFile(filepath.Join(inputPath, "base.yml"), []byte("label: no-name-tile"), 0644)
+				Expect(err).NotTo(HaveOccurred())
+
+				subject := NewBaker()
+				err = subject.Bake(inputPath)
+				Expect(err).To(HaveOccurred())
+				Expect(err.Error()).To(ContainSubstring("missing required field 'name'"))
+
+				err = subject.BakeFromLockfile(inputPath, cargo.BOSHReleaseTarballLock{}, "/nonexistent/tarball.tgz")
+				Expect(err).To(HaveOccurred())
+				Expect(err.Error()).To(ContainSubstring("missing required field 'name'"))
 			})
 		})
 	})

internal/commands/carvel.go

@@ -18,7 +18,7 @@ type Carvel struct {
 	synopses  map[string]string
 }
 
-func NewCarvel(outLogger, errLogger *log.Logger) Carvel {
+func NewCarvel(outLogger, errLogger *log.Logger, kilnVersion string) Carvel {
 	c := Carvel{
 		outLogger: outLogger,
 		errLogger: errLogger,
@@ -27,11 +27,17 @@ func NewCarvel(outLogger, errLogger *log.Logger) Carvel {
 		synopses:  map[string]string{},
 	}
 
+	publishCmd := NewCarvelPublish(outLogger, errLogger)
+	publishCmd.KilnVersion = kilnVersion
+
+	rebakeCmd := NewCarvelReBake(outLogger, errLogger)
+	rebakeCmd.KilnVersion = kilnVersion
+
 	// Register subcommands
 	c.commands["bake"] = NewCarvelBake(outLogger, errLogger)
 	c.commands["upload"] = NewCarvelUpload(outLogger, errLogger)
-	c.commands["publish"] = NewCarvelPublish(outLogger, errLogger)
-	c.commands["re-bake"] = NewCarvelReBake(outLogger, errLogger)
+	c.commands["publish"] = publishCmd
+	c.commands["re-bake"] = rebakeCmd
 
 	// Positional argument synopses for usage lines
 	c.synopses["re-bake"] = "<bake-record>"

internal/commands/carvel_rebake.go

@@ -18,9 +18,10 @@ import (
 )
 
 type CarvelReBake struct {
-	outLogger *log.Logger
-	errLogger *log.Logger
-	Options   CarvelReBakeOptions
+	outLogger   *log.Logger
+	errLogger   *log.Logger
+	KilnVersion string
+	Options     CarvelReBakeOptions
 }
 
 type CarvelReBakeOptions struct {
@@ -56,6 +57,10 @@ func (c CarvelReBake) Execute(args []string) error {
 		return fmt.Errorf("failed to parse bake record: %w", err)
 	}
 
+	if record.KilnVersion != "" && c.KilnVersion != "" && record.KilnVersion != c.KilnVersion {
+		return fmt.Errorf("kiln version mismatch: bake record was created with kiln %s, but running kiln is %s", record.KilnVersion, c.KilnVersion)
+	}
+
 	tileDir := filepath.FromSlash(record.TileDirectory)
 	if tileDir == "" {
 		tileDir = "."

internal/commands/carvel_rebake_test.go

@@ -70,6 +70,34 @@ var _ = Describe("CarvelReBake", func() {
 			})
 		})
 
+		When("the bake record has a mismatched kiln version", func() {
+			It("returns an error", func() {
+				record := bake.Record{
+					KilnVersion: "0.14.0",
+				}
+				buf, err := json.Marshal(record)
+				Expect(err).NotTo(HaveOccurred())
+
+				tmpDir, err := os.MkdirTemp("", "version-mismatch-*")
+				Expect(err).NotTo(HaveOccurred())
+				defer func() { _ = os.RemoveAll(tmpDir) }()
+
+				recPath := filepath.Join(tmpDir, "record.json")
+				err = os.WriteFile(recPath, buf, 0644)
+				Expect(err).NotTo(HaveOccurred())
+
+				cmd := commands.NewCarvelReBake(outLogger, errLogger)
+				cmd.KilnVersion = "0.15.0"
+
+				err = cmd.Execute([]string{
+					"--output-file", "/tmp/out.pivotal",
+					recPath,
+				})
+				Expect(err).To(HaveOccurred())
+				Expect(err.Error()).To(ContainSubstring("kiln version mismatch: bake record was created with kiln 0.14.0, but running kiln is 0.15.0"))
+			})
+		})
+
 		When("the bake record has a mismatched source revision", func() {
 			var (
 				inputPath  string

main.go

@@ -106,7 +106,7 @@ func main() {
 		log.Fatal(err)
 	}
 
-	carvelCommand := commands.NewCarvel(outLogger, errLogger)
+	carvelCommand := commands.NewCarvel(outLogger, errLogger, version)
 	commandSet["carvel"] = carvelCommand
 
 	if command == "carvel" {