refactor: renamed members of AppContext to remove 'Flag' redundant suffix

Author: s0ders

cmd/release.go

@@ -14,7 +14,6 @@ import (
 	"github.com/s0ders/go-semver-release/v6/internal/branch"
 	"github.com/s0ders/go-semver-release/v6/internal/ci"
 	"github.com/s0ders/go-semver-release/v6/internal/gpg"
-	"github.com/s0ders/go-semver-release/v6/internal/monorepo"
 	"github.com/s0ders/go-semver-release/v6/internal/parser"
 	"github.com/s0ders/go-semver-release/v6/internal/remote"
 	"github.com/s0ders/go-semver-release/v6/internal/rule"
@@ -48,12 +47,7 @@ func NewReleaseCmd(ctx *appcontext.AppContext) *cobra.Command {
 				return fmt.Errorf("loading branches configuration: %w", err)
 			}
 
-			ctx.Projects, err = configureProjects(ctx)
-			if err != nil {
-				return fmt.Errorf("loading projects configuration: %w", err)
-			}
-
-			origin = remote.New(ctx.RemoteNameFlag, ctx.AccessTokenFlag)
+			origin = remote.New(ctx.RemoteName, ctx.AccessToken)
 
 			repository, err = origin.Clone(args[0])
 			if err != nil {
@@ -65,15 +59,15 @@ func NewReleaseCmd(ctx *appcontext.AppContext) *cobra.Command {
 				return fmt.Errorf("computing new semver: %w", err)
 			}
 
-			tagger := tag.NewTagger(ctx.GitNameFlag, ctx.GitEmailFlag, tag.WithTagPrefix(ctx.TagPrefixFlag), tag.WithSignKey(entity))
+			tagger := tag.NewTagger(ctx.GitName, ctx.GitEmail, tag.WithTagPrefix(ctx.TagPrefix), tag.WithSignKey(entity))
 
 			for _, output := range outputs {
 				semver := output.Semver
 				release := output.NewRelease
 				commitHash := output.CommitHash
 				project := output.Project.Name
 
-				err = ci.GenerateGitHubOutput(semver, output.Branch, ci.WithNewRelease(release), ci.WithTagPrefix(ctx.TagPrefixFlag), ci.WithProject(project))
+				err = ci.GenerateGitHubOutput(semver, output.Branch, ci.WithNewRelease(release), ci.WithTagPrefix(ctx.TagPrefix), ci.WithProject(project))
 				if err != nil {
 					return fmt.Errorf("generating github output: %w", err)
 				}
@@ -92,7 +86,7 @@ func NewReleaseCmd(ctx *appcontext.AppContext) *cobra.Command {
 				switch {
 				case !release:
 					logEvent.Msg("no new release")
-				case release && ctx.DryRunFlag:
+				case release && ctx.DryRun:
 					logEvent.Msg("dry-run enabled, next release found")
 				default:
 					logEvent.Msg("new release found")
@@ -146,33 +140,16 @@ func configureBranches(ctx *appcontext.AppContext) ([]branch.Branch, error) {
 	return unmarshalledBranches, nil
 }
 
-func configureProjects(ctx *appcontext.AppContext) ([]monorepo.Project, error) {
-	flag := ctx.MonorepositoryFlag
-
-	if flag.String() == "[]" {
-		return nil, nil
-	}
-
-	monorepoJSON := []map[string]string(flag)
-
-	projects, err := monorepo.Unmarshall(monorepoJSON)
-	if err != nil {
-		return nil, fmt.Errorf("parsing monorepository projects configuration: %w", err)
-	}
-
-	return projects, nil
-}
-
 func configureGPGKey(ctx *appcontext.AppContext) (*openpgp.Entity, error) {
-	flag := ctx.GPGKeyPathFlag
+	flag := ctx.GPGKeyPath
 
 	if flag == "" {
 		return nil, nil
 	}
 
-	ctx.Logger.Debug().Str("path", ctx.GPGKeyPathFlag).Msg("using the following armored key for signing")
+	ctx.Logger.Debug().Str("path", ctx.GPGKeyPath).Msg("using the following armored key for signing")
 
-	armoredKeyFile, err := os.ReadFile(ctx.GPGKeyPathFlag)
+	armoredKeyFile, err := os.ReadFile(ctx.GPGKeyPath)
 	if err != nil {
 		return nil, fmt.Errorf("reading armored key: %w", err)
 	}

cmd/release_test.go

@@ -17,7 +17,6 @@ import (
 	"github.com/s0ders/go-semver-release/v6/internal/appcontext"
 	"github.com/s0ders/go-semver-release/v6/internal/branch"
 	"github.com/s0ders/go-semver-release/v6/internal/gittest"
-	"github.com/s0ders/go-semver-release/v6/internal/monorepo"
 	"github.com/s0ders/go-semver-release/v6/internal/rule"
 	"github.com/s0ders/go-semver-release/v6/internal/tag"
 )
@@ -46,7 +45,7 @@ func TestReleaseCmd_ConfigurationAsEnvironmentVariable(t *testing.T) {
 	_, err = th.ExecuteCommand("release", testRepository.Path)
 	checkErr(t, err, "executing command")
 
-	assert.Equal(accessToken, th.Ctx.AccessTokenFlag, "access token flag value should be equal to environment variable value")
+	assert.Equal(accessToken, th.Ctx.AccessToken, "access token flag value should be equal to environment variable value")
 }
 
 func TestReleaseCmd_ConfigurationAsFile(t *testing.T) {
@@ -874,16 +873,6 @@ func TestReleaseCmd_ConfigureBranches_NoBranches(t *testing.T) {
 	assert.ErrorIs(err, branch.ErrNoBranch)
 }
 
-func TestReleaseCmd_ConfigureProjects_NoProjects(t *testing.T) {
-	assert := assertion.New(t)
-	ctx := appcontext.New()
-
-	projects, err := configureProjects(ctx)
-	checkErr(t, err, "configuring projects")
-
-	assert.Nil(projects, "no monorepo configuration, should have gotten nil")
-}
-
 func TestReleaseCmd_InvalidCustomRules(t *testing.T) {
 	assert := assertion.New(t)
 	ctx := appcontext.New()
@@ -907,21 +896,11 @@ func TestReleaseCmd_InvalidBranch(t *testing.T) {
 	assert.ErrorIs(err, branch.ErrNoName, "should have failed parsing branch with no name")
 }
 
-func TestReleaseCmd_InvalidMonorepoProjects(t *testing.T) {
-	assert := assertion.New(t)
-	ctx := appcontext.New()
-
-	ctx.MonorepositoryFlag = []map[string]string{{"path": "foo"}}
-
-	_, err := configureProjects(ctx)
-	assert.ErrorIs(err, monorepo.ErrNoName, "should have failed parsing project with no name")
-}
-
 func TestReleaseCmd_InvalidArmoredKeyPath(t *testing.T) {
 	assert := assertion.New(t)
 	ctx := appcontext.New()
 
-	ctx.GPGKeyPathFlag = "./does/not/exist"
+	ctx.GPGKeyPath = "./does/not/exist"
 
 	_, err := configureGPGKey(ctx)
 
@@ -958,7 +937,7 @@ func TestReleaseCmd_InvalidArmoredKeyContent(t *testing.T) {
 		}
 	}()
 
-	ctx.GPGKeyPathFlag = keyFilePath
+	ctx.GPGKeyPath = keyFilePath
 
 	_, err = configureGPGKey(ctx)
 	assert.ErrorContains(err, "loading armored key", "should have failed trying to read armored key ring from empty file")

cmd/root.go

@@ -44,7 +44,7 @@ func NewRootCommand(ctx *appcontext.AppContext) *cobra.Command {
 		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
 			ctx.Logger = zerolog.New(cmd.OutOrStdout()).Level(zerolog.InfoLevel)
 
-			if ctx.VerboseFlag {
+			if ctx.Verbose {
 				ctx.Logger = ctx.Logger.Level(zerolog.DebugLevel)
 			}
 
@@ -53,19 +53,19 @@ func NewRootCommand(ctx *appcontext.AppContext) *cobra.Command {
 		TraverseChildren: true,
 	}
 
-	rootCmd.PersistentFlags().StringVar(&ctx.AccessTokenFlag, AccessTokenConfiguration, "", "Access token used to push tag to Git remote")
+	rootCmd.PersistentFlags().StringVar(&ctx.AccessToken, AccessTokenConfiguration, "", "Access token used to push tag to Git remote")
 	rootCmd.PersistentFlags().VarP(&ctx.BranchesFlag, BranchesConfiguration, "b", "An array of branches such as [{\"name\": \"main\"}, {\"name\": \"rc\", \"prerelease\": true}]")
-	rootCmd.PersistentFlags().StringVar(&ctx.BuildMetadataFlag, BuildMetadataConfiguration, "", "Build metadata (e.g. build number) that will be appended to the SemVer")
-	rootCmd.PersistentFlags().StringVar(&ctx.CfgFileFlag, "config", "", "Configuration file path (default \"./"+defaultConfigFile+"."+configFileFormat+"\")")
-	rootCmd.PersistentFlags().BoolVarP(&ctx.DryRunFlag, DryRunConfiguration, "d", false, "Only compute the next SemVer, do not push any tag")
-	rootCmd.PersistentFlags().StringVar(&ctx.GitEmailFlag, GitEmailConfiguration, "go-semver@release.ci", "Email used in semantic version tags")
-	rootCmd.PersistentFlags().StringVar(&ctx.GitNameFlag, GitNameConfiguration, "Go Semver Release", "Name used in semantic version tags")
-	rootCmd.PersistentFlags().StringVar(&ctx.GPGKeyPathFlag, GPGPathConfiguration, "", "Path to an armored GPG key used to sign produced tags")
-	rootCmd.PersistentFlags().Var(&ctx.MonorepositoryFlag, MonorepoConfiguration, "An array of branches such as [{\"name\": \"foo\", \"path\": \"./foo/\"}]")
-	rootCmd.PersistentFlags().StringVar(&ctx.RemoteNameFlag, RemoteNameConfiguration, "origin", "Name of the Git repository remote")
+	rootCmd.PersistentFlags().StringVar(&ctx.BuildMetadata, BuildMetadataConfiguration, "", "Build metadata (e.g. build number) that will be appended to the SemVer")
+	rootCmd.PersistentFlags().StringVar(&ctx.CfgFile, "config", "", "Configuration file path (default \"./"+defaultConfigFile+"."+configFileFormat+"\")")
+	rootCmd.PersistentFlags().BoolVarP(&ctx.DryRun, DryRunConfiguration, "d", false, "Only compute the next SemVer, do not push any tag")
+	rootCmd.PersistentFlags().StringVar(&ctx.GitEmail, GitEmailConfiguration, "go-semver@release.ci", "Email used in semantic version tags")
+	rootCmd.PersistentFlags().StringVar(&ctx.GitName, GitNameConfiguration, "Go Semver Release", "Name used in semantic version tags")
+	rootCmd.PersistentFlags().StringVar(&ctx.GPGKeyPath, GPGPathConfiguration, "", "Path to an armored GPG key used to sign produced tags")
+	rootCmd.PersistentFlags().Var(&ctx.MonorepositoryCfg, MonorepoConfiguration, "An array of branches such as [{\"name\": \"foo\", \"path\": \"./foo/\"}]")
+	rootCmd.PersistentFlags().StringVar(&ctx.RemoteName, RemoteNameConfiguration, "origin", "Name of the Git repository remote")
 	rootCmd.PersistentFlags().Var(&ctx.RulesFlag, RulesConfiguration, "A hashmap of array such as {\"minor\": [\"feat\"], \"patch\": [\"fix\", \"perf\"]} ]")
-	rootCmd.PersistentFlags().StringVar(&ctx.TagPrefixFlag, TagPrefixConfiguration, "v", "Prefix added to the version tag name")
-	rootCmd.PersistentFlags().BoolVarP(&ctx.VerboseFlag, "verbose", "v", false, "Verbose output")
+	rootCmd.PersistentFlags().StringVar(&ctx.TagPrefix, TagPrefixConfiguration, "v", "Prefix added to the version tag name")
+	rootCmd.PersistentFlags().BoolVarP(&ctx.Verbose, "verbose", "v", false, "Verbose output")
 
 	releaseCmd := NewReleaseCmd(ctx)
 	versionCmd := NewVersionCmd()
@@ -77,15 +77,15 @@ func NewRootCommand(ctx *appcontext.AppContext) *cobra.Command {
 }
 
 func initializeConfig(cmd *cobra.Command, ctx *appcontext.AppContext) error {
-	if ctx.CfgFileFlag != "" {
-		ctx.Viper.SetConfigFile(ctx.CfgFileFlag)
+	if ctx.CfgFile != "" {
+		ctx.Viper.SetConfigFile(ctx.CfgFile)
 	} else {
 		ctx.Viper.AddConfigPath(".")
 		ctx.Viper.SetConfigType(configFileFormat)
 		ctx.Viper.SetConfigName(defaultConfigFile)
 	}
 
-	absCfgPath, err := filepath.Abs(ctx.CfgFileFlag)
+	absCfgPath, err := filepath.Abs(ctx.CfgFile)
 	if err != nil {
 		return fmt.Errorf("getting configuration file absolute path: %w", err)
 	}

internal/appcontext/app_context.go

@@ -1,6 +1,6 @@
 // Package appcontext provides a structure to store the current application execution context.
 //
-// The use of this structure allows to avoid the use of global variables to share the states of variables across
+// The use of this structure allows avoiding the use of global variables to share the states of variables across
 // structures and functions.
 package appcontext
 
@@ -14,24 +14,23 @@ import (
 )
 
 type AppContext struct {
-	Viper              *viper.Viper
-	Branches           []branch.Branch
-	Projects           []monorepo.Project
-	Rules              rule.Rules
-	BranchesFlag       branch.Flag
-	MonorepositoryFlag monorepo.Flag
-	RulesFlag          rule.Flag
-	Logger             zerolog.Logger
-	CfgFileFlag        string
-	GitNameFlag        string
-	GitEmailFlag       string
-	TagPrefixFlag      string
-	AccessTokenFlag    string
-	RemoteNameFlag     string
-	GPGKeyPathFlag     string
-	BuildMetadataFlag  string
-	DryRunFlag         bool
-	VerboseFlag        bool
+	Viper             *viper.Viper
+	Branches          []branch.Branch
+	Rules             rule.Rules
+	BranchesFlag      branch.Flag
+	MonorepositoryCfg monorepo.Flag
+	RulesFlag         rule.Flag
+	Logger            zerolog.Logger
+	CfgFile           string
+	GitName           string
+	GitEmail          string
+	TagPrefix         string
+	AccessToken       string
+	RemoteName        string
+	GPGKeyPath        string
+	BuildMetadata     string
+	DryRun            bool
+	Verbose           bool
 }
 
 func New() *AppContext {