refactor!: cobra migrate

cli/recipe/release.go

@@ -1,7 +1,6 @@
 package recipe
 
 import (
-	"context"
 	"errors"
 	"fmt"
 	"os"
@@ -19,15 +18,14 @@ import (
 	"github.com/AlecAivazis/survey/v2"
 	"github.com/distribution/reference"
 	"github.com/go-git/go-git/v5"
-	"github.com/urfave/cli/v3"
+	"github.com/spf13/cobra"
 )
 
-var recipeReleaseCommand = cli.Command{
-	Name:      "release",
-	Aliases:   []string{"rl"},
-	Usage:     "Release a new recipe version",
-	UsageText: "abra recipe release <recipe> [<version>] [options]",
-	Description: `Create a new version of a recipe.
+var RecipeReleaseCommand = &cobra.Command{
+	Use:     "release <recipe> [version] [flags]",
+	Aliases: []string{"rl"},
+	Short:   "Release a new recipe version",
+	Long: `Create a new version of a recipe.
 
 These versions are then published on the Co-op Cloud recipe catalogue. These
 versions take the following form:
@@ -44,21 +42,25 @@ recipe updates are properly communicated. I.e. developers of an app might
 publish a minor version but that might lead to changes in the recipe which are
 major and therefore require intervention while doing the upgrade work.
 
-Publish your new release to git.coopcloud.tech with "-p/--publish". This
+Publish your new release to git.coopcloud.tech with "--publish/-p". This
 requires that you have permission to git push to these repositories and have
 your SSH keys configured on your account.`,
-	Flags: []cli.Flag{
-		internal.DryFlag,
-		internal.MajorFlag,
-		internal.MinorFlag,
-		internal.PatchFlag,
-		internal.PublishFlag,
+	Args: cobra.RangeArgs(1, 2),
+	ValidArgsFunction: func(
+		cmd *cobra.Command,
+		args []string,
+		toComplete string) ([]string, cobra.ShellCompDirective) {
+		switch l := len(args); l {
+		case 0:
+			return autocomplete.RecipeNameComplete()
+		case 1:
+			return autocomplete.RecipeVersionComplete(args[0])
+		default:
+			return nil, cobra.ShellCompDirectiveDefault
+		}
 	},
-	Before:        internal.SubCommandBefore,
-	ShellComplete: autocomplete.RecipeNameComplete,
-	HideHelp:      true,
-	Action: func(ctx context.Context, cmd *cli.Command) error {
-		recipe := internal.ValidateRecipe(cmd)
+	Run: func(cmd *cobra.Command, args []string) {
+		recipe := internal.ValidateRecipe(args, cmd.Name())
 
 		imagesTmp, err := getImageVersions(recipe)
 		if err != nil {
@@ -75,7 +77,11 @@ your SSH keys configured on your account.`,
 			log.Fatalf("main app service version for %s is empty?", recipe.Name)
 		}
 
-		tagString := cmd.Args().Get(1)
+		var tagString string
+		if len(args) == 2 {
+			tagString = args[1]
+		}
+
 		if tagString != "" {
 			if _, err := tagcmp.Parse(tagString); err != nil {
 				log.Fatalf("cannot parse %s, invalid tag specified?", tagString)
@@ -133,7 +139,7 @@ your SSH keys configured on your account.`,
 			}
 		}
 
-		return nil
+		return
 	},
 }
 
@@ -261,6 +267,7 @@ func addReleaseNotes(recipe recipe.Recipe, tag string) error {
 			log.Debugf("dry run: move release note from 'next' to %s", tag)
 			return nil
 		}
+
 		if !internal.NoInput {
 			prompt := &survey.Input{
 				Message: "Use release note in release/next?",
@@ -273,14 +280,17 @@ func addReleaseNotes(recipe recipe.Recipe, tag string) error {
 				return nil
 			}
 		}
+
 		err := os.Rename(nextReleaseNotePath, tagReleaseNotePath)
 		if err != nil {
 			return err
 		}
+
 		err = gitPkg.Add(recipe.Dir, path.Join("release", "next"), internal.Dry)
 		if err != nil {
 			return err
 		}
+
 		err = gitPkg.Add(recipe.Dir, path.Join("release", tag), internal.Dry)
 		if err != nil {
 			return err
@@ -297,6 +307,7 @@ func addReleaseNotes(recipe recipe.Recipe, tag string) error {
 	prompt := &survey.Input{
 		Message: "Release Note (leave empty for no release note)",
 	}
+
 	var releaseNote string
 	if err := survey.AskOne(prompt, &releaseNote); err != nil {
 		return err
@@ -306,12 +317,11 @@ func addReleaseNotes(recipe recipe.Recipe, tag string) error {
 		return nil
 	}
 
-	err := os.WriteFile(tagReleaseNotePath, []byte(releaseNote), 0o644)
-	if err != nil {
+	if err := os.WriteFile(tagReleaseNotePath, []byte(releaseNote), 0o644); err != nil {
 		return err
 	}
-	err = gitPkg.Add(recipe.Dir, path.Join("release", tag), internal.Dry)
-	if err != nil {
+
+	if err := gitPkg.Add(recipe.Dir, path.Join("release", tag), internal.Dry); err != nil {
 		return err
 	}
 
@@ -376,17 +386,17 @@ func pushRelease(recipe recipe.Recipe, tagString string) error {
 		return nil
 	}
 
-	if !internal.Publish && !internal.NoInput {
+	if !publish && !internal.NoInput {
 		prompt := &survey.Confirm{
 			Message: "publish new release?",
 		}
 
-		if err := survey.AskOne(prompt, &internal.Publish); err != nil {
+		if err := survey.AskOne(prompt, &publish); err != nil {
 			return err
 		}
 	}
 
-	if internal.Publish {
+	if publish {
 		if err := recipe.Push(internal.Dry); err != nil {
 			return err
 		}
@@ -546,3 +556,50 @@ func getLabelVersion(recipe recipe.Recipe, prompt bool) (string, error) {
 
 	return initTag, nil
 }
+
+var (
+	publish bool
+)
+
+func init() {
+	RecipeReleaseCommand.Flags().BoolVarP(
+		&internal.Dry,
+		"dry-run",
+		"r",
+		false,
+		"report changes that would be made",
+	)
+
+	RecipeReleaseCommand.Flags().BoolVarP(
+		&internal.Major,
+		"major",
+		"x",
+		false,
+		"increase the major part of the version",
+	)
+
+	RecipeReleaseCommand.Flags().BoolVarP(
+		&internal.Minor,
+		"minor",
+		"y",
+		false,
+		"increase the minor part of the version",
+	)
+
+	RecipeReleaseCommand.Flags().BoolVarP(
+		&internal.Patch,
+		"patch",
+		"z",
+		false,
+		"increase the patch part of the version",
+	)
+
+	RecipeReleaseCommand.Flags().BoolVarP(
+		&publish,
+		"publish",
+		"p",
+		false,
+		"publish changes to git.coopcloud.tech",
+	)
+
+}