Fix kiln compilation errors and failing tests

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: ichandrabhatta

.bin/kiln

@@ -924,15 +924,15 @@ func (b *baker) generateRuntimeConfigs() error {
 		registryDataJob.Consumes = consumesMap
 	}
 
-	releases := []string{`$( release "` + b.metadata.Name + `" )`}
+	releases := []string{`$( release "` + b.GetBoshReleaseName() + `" )`}
 	addonJobs := []models.Job{registryDataJob}
 
 	for _, group := range b.hookModeGroups() {
 		for _, hook := range group.hooks {
 			if hook.Name == "" || hook.Command == "" {
 				return fmt.Errorf("%s hook declaration missing name or command", group.mode)
 			}
-			addonJobs = append(addonJobs, models.Job{Name: b.hookJobName(hook.Name), Release: b.metadata.Name})
+			addonJobs = append(addonJobs, models.Job{Name: b.hookJobName(hook.Name), Release: b.GetBoshReleaseName()})
 		}
 	}
 

internal/carvel/baker.go

@@ -812,7 +812,7 @@ consumes:
 			It("synthesizes the hook adapter job into the auto-generated release", func() {
 				// The release tarball should contain the synthesized job.
 				releaseVersion := subject.GetReleaseVersion()
-				tarballPath := filepath.Join(outputPath, "releases", "k8s-tile-test-"+releaseVersion+".tgz")
+				tarballPath := filepath.Join(outputPath, "releases", "k8s-tile-test-pkg-"+releaseVersion+".tgz")
 				Expect(tarballPath).To(BeAnExistingFile())
 
 				// We can check the generated .boshrelease directory.
@@ -846,7 +846,7 @@ consumes:
 				Expect(addon.Jobs).To(HaveLen(2))
 				hookJob := addon.Jobs[1]
 				Expect(hookJob.Name).To(Equal("k8s-tile-test-smoke-tests-post-install-hook"))
-				Expect(hookJob.Release).To(Equal("k8s-tile-test"))
+				Expect(hookJob.Release).To(Equal("k8s-tile-test-pkg"))
 			})
 		})
 
@@ -1081,11 +1081,11 @@ releases:
 				Expect(err).NotTo(HaveOccurred())
 
 				subject := NewBaker()
-				err = subject.Bake(inputPath)
+				err = subject.Bake(inputPath, cargo.Kilnfile{}, cargo.KilnfileLock{}, BakeOptions{})
 				Expect(err).To(HaveOccurred())
 				Expect(err.Error()).To(ContainSubstring("missing required field 'name'"))
 
-				err = subject.BakeFromLockfile(inputPath, cargo.BOSHReleaseTarballLock{}, "/nonexistent/tarball.tgz")
+				err = subject.BakeFromLockfile(inputPath, cargo.Kilnfile{}, cargo.KilnfileLock{}, cargo.BOSHReleaseTarballLock{}, "/nonexistent/tarball.tgz", BakeOptions{})
 				Expect(err).To(HaveOccurred())
 				Expect(err.Error()).To(ContainSubstring("missing required field 'name'"))
 			})
@@ -1114,7 +1114,7 @@ releases:
 				Expect(os.WriteFile(baseYMLPath, updated, 0644)).To(Succeed())
 
 				releaseLock := cargo.BOSHReleaseTarballLock{
-					Name:    "k8s-tile-test",
+					Name:    "k8s-tile-test-pkg",
 					Version: "0.1.1",
 				}
 

internal/carvel/baker_test.go

@@ -91,9 +91,9 @@ func (c CarvelBake) Execute(args []string) error {
 			return fmt.Errorf("failed to parse metadata: %w", err)
 		}
 
-		releaseLock, err := kilnfileLock.FindBOSHReleaseWithName(baker.GetName())
+		releaseLock, err := kilnfileLock.FindBOSHReleaseWithName(baker.GetBoshReleaseName())
 		if err != nil {
-			return fmt.Errorf("release %q not found in Kilnfile.lock", baker.GetName())
+			return fmt.Errorf("release %q not found in Kilnfile.lock", baker.GetBoshReleaseName())
 		}
 
 		tmpDir, tmpErr := os.MkdirTemp("", "carvel-bake-*")
@@ -102,7 +102,7 @@ func (c CarvelBake) Execute(args []string) error {
 		}
 		defer func() { _ = os.RemoveAll(tmpDir) }()
 
-		localTarball, dlErr := downloadCarvelRelease(c.outLogger, kilnfile, kilnfileLock, tmpDir, baker.GetName())
+		localTarball, dlErr := downloadCarvelRelease(c.outLogger, kilnfile, kilnfileLock, tmpDir, baker.GetBoshReleaseName())
 		if dlErr != nil {
 			return fmt.Errorf("failed to download release from Artifactory: %w", dlErr)
 		}

internal/commands/carvel_bake.go

@@ -85,9 +85,9 @@ func (c CarvelPublish) Execute(args []string) error {
 	if len(kilnfileLock.Releases) == 0 {
 		return fmt.Errorf("no releases found in Kilnfile.lock: run 'kiln carvel upload' first")
 	}
-	releaseLock, err := kilnfileLock.FindBOSHReleaseWithName(b.GetName())
+	releaseLock, err := kilnfileLock.FindBOSHReleaseWithName(b.GetBoshReleaseName())
 	if err != nil {
-		return fmt.Errorf("release %q not found in Kilnfile.lock", b.GetName())
+		return fmt.Errorf("release %q not found in Kilnfile.lock", b.GetBoshReleaseName())
 	}
 
 	tmpDir, err := os.MkdirTemp("", "carvel-publish-*")
@@ -97,7 +97,7 @@ func (c CarvelPublish) Execute(args []string) error {
 	defer func() { _ = os.RemoveAll(tmpDir) }()
 
 	c.outLogger.Printf("Publishing Carvel tile from %s", sourcePath)
-	localTarball, err := downloadCarvelRelease(c.outLogger, kilnfile, kilnfileLock, tmpDir, b.GetName())
+	localTarball, err := downloadCarvelRelease(c.outLogger, kilnfile, kilnfileLock, tmpDir, b.GetBoshReleaseName())
 	if err != nil {
 		return fmt.Errorf("failed to download release from Artifactory: %w", err)
 	}

internal/commands/carvel_publish.go

@@ -109,9 +109,9 @@ func (c CarvelReBake) Execute(args []string) error {
 		if len(kilnfileLock.Releases) == 0 {
 			return fmt.Errorf("no releases found in Kilnfile.lock")
 		}
-		releaseLock, err := kilnfileLock.FindBOSHReleaseWithName(b.GetName())
+		releaseLock, err := kilnfileLock.FindBOSHReleaseWithName(b.GetBoshReleaseName())
 		if err != nil {
-			return fmt.Errorf("release %q not found in Kilnfile.lock", b.GetName())
+			return fmt.Errorf("release %q not found in Kilnfile.lock", b.GetBoshReleaseName())
 		}
 
 		tmpDir, tmpErr := os.MkdirTemp("", "carvel-rebake-*")
@@ -121,7 +121,7 @@ func (c CarvelReBake) Execute(args []string) error {
 		defer func() { _ = os.RemoveAll(tmpDir) }()
 
 		c.outLogger.Printf("Re-baking Carvel tile from %s using lockfile", sourcePath)
-		localTarball, dlErr := downloadCarvelRelease(c.outLogger, kilnfile, kilnfileLock, tmpDir, b.GetName())
+		localTarball, dlErr := downloadCarvelRelease(c.outLogger, kilnfile, kilnfileLock, tmpDir, b.GetBoshReleaseName())
 		if dlErr != nil {
 			return fmt.Errorf("failed to download release from Artifactory: %w", dlErr)
 		}