Use as the canonical subcommand

Author: rizwanreza

internal/carvel/baker_test.go

@@ -477,7 +477,7 @@ var _ = Describe("Carvel Baker", func() {
 
 			publishChecksum := fileChecksum(publishTile)
 
-			// Simulate `kiln carvel rebake`: BakeFromLockfile + KilnBake
+			// Simulate `kiln carvel re-bake`: BakeFromLockfile + KilnBake
 			rebakeBaker := NewBaker()
 			rebakeBaker.SetWriter(GinkgoWriter)
 			err = rebakeBaker.BakeFromLockfile(inputPath, lockfilePath)

internal/commands/carvel.go

@@ -14,20 +14,26 @@ type Carvel struct {
 	outLogger *log.Logger
 	errLogger *log.Logger
 	commands  jhanda.CommandSet
+	aliases   map[string]bool
 }
 
 func NewCarvel(outLogger, errLogger *log.Logger) Carvel {
 	c := Carvel{
 		outLogger: outLogger,
 		errLogger: errLogger,
 		commands:  jhanda.CommandSet{},
+		aliases:   map[string]bool{},
 	}
 
 	// Register subcommands
 	c.commands["bake"] = NewCarvelBake(outLogger, errLogger)
 	c.commands["upload"] = NewCarvelUpload(outLogger, errLogger)
 	c.commands["publish"] = NewCarvelPublish(outLogger, errLogger)
-	c.commands["rebake"] = NewCarvelReBake(outLogger, errLogger)
+	c.commands["re-bake"] = NewCarvelReBake(outLogger, errLogger)
+
+	// Aliases (hidden from help output)
+	c.commands["rebake"] = c.commands["re-bake"]
+	c.aliases["rebake"] = true
 
 	return c
 }
@@ -59,14 +65,16 @@ func (c Carvel) Execute(args []string) error {
 }
 
 func (c Carvel) Usage() jhanda.Usage {
-	// Build subcommand list for the description
 	var subcommandList strings.Builder
 	subcommandList.WriteString("Commands for working with Carvel/Kubernetes tiles.\n\n")
 	subcommandList.WriteString("Subcommands:\n")
 
 	var names []string
 	var length int
 	for name := range c.commands {
+		if c.aliases[name] {
+			continue
+		}
 		names = append(names, name)
 		if len(name) > length {
 			length = len(name)
@@ -95,6 +103,9 @@ func (c Carvel) printHelp() error {
 	)
 
 	for name := range c.commands {
+		if c.aliases[name] {
+			continue
+		}
 		names = append(names, name)
 		if len(name) > length {
 			length = len(name)

internal/commands/carvel_publish.go

@@ -144,7 +144,7 @@ func (c CarvelPublish) Execute(args []string) error {
 
 func (c CarvelPublish) Usage() jhanda.Usage {
 	return jhanda.Usage{
-		Description:      "Publishes a Carvel/Kubernetes tile as a .pivotal file using the cached BOSH release from Kilnfile.lock. Run 'kiln carvel upload' first to build and cache the release. When --final is specified, creates a bake record that can be used with 'kiln carvel rebake' for reproducible builds.",
+		Description:      "Publishes a Carvel/Kubernetes tile as a .pivotal file using the cached BOSH release from Kilnfile.lock. Run 'kiln carvel upload' first to build and cache the release. When --final is specified, creates a bake record that can be used with 'kiln carvel re-bake' for reproducible builds.",
 		ShortDescription: "publishes a Carvel/Kubernetes tile",
 		Flags:            c.Options,
 	}

main.go

@@ -76,6 +76,7 @@ func main() {
 	bakeCommand.KilnVersion = version
 	commandSet["bake"] = bakeCommand
 	commandSet["re-bake"] = commands.NewReBake(bakeCommand)
+	commandSet["rebake"] = commandSet["re-bake"]
 
 	commandSet["test"] = commands.NewTileTest()
 	commandSet["help"] = commands.NewHelp(os.Stdout, globalFlagsUsage, commandSet)