chore: fix some sonar warnings (#4391)

* Remove the 'Get' prefix from this function name.

Signed-off-by: Thomas Poignant <[email protected]>

* Handle this error explicitly or document why it can be safely ignored.

Signed-off-by: Thomas Poignant <[email protected]>

* Handle this error explicitly

Signed-off-by: Thomas Poignant <[email protected]>

* Remove this 'else' clause; the code should continue after the error check.

Signed-off-by: Thomas Poignant <[email protected]>

* fix some sonar issues

Signed-off-by: Thomas Poignant <[email protected]>

* Handle this error explicitly

Signed-off-by: Thomas Poignant <[email protected]>

* remove unused func

Signed-off-by: Thomas Poignant <[email protected]>

* sonar feedback fix

Signed-off-by: Thomas Poignant <[email protected]>

* remove function starting with Get

Signed-off-by: Thomas Poignant <[email protected]>

* fix proptypes issues

Signed-off-by: Thomas Poignant <[email protected]>

* fix sonar

Signed-off-by: Thomas Poignant <[email protected]>

* fix lint issue

Signed-off-by: Thomas Poignant <[email protected]>

* remove unused proptype

Signed-off-by: Thomas Poignant <[email protected]>

---------

Signed-off-by: Thomas Poignant <[email protected]>
Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>

Author: thomaspoignant

cmd/cli/evaluate/evaluate.go

@@ -51,14 +51,20 @@ func (e evaluate) Evaluate() (map[string]model.RawVarResult, error) {
 		if e.flag != "" {
 			listFlags = append(listFlags, e.flag)
 		} else {
-			flags, _ := goff.GetFlagsFromCache()
+			flags, err := goff.GetFlagsFromCache()
+			if err != nil {
+				return nil, err
+			}
 			for key := range flags {
 				listFlags = append(listFlags, key)
 			}
 		}
 
 		for _, flag := range listFlags {
-			res, _ := goff.RawVariation(flag, convertedEvaluationCtx, nil)
+			res, err := goff.RawVariation(flag, convertedEvaluationCtx, nil)
+			if err != nil {
+				return nil, err
+			}
 			result[flag] = res
 		}
 		return result, nil

cmd/cli/evaluate/evaluate_cmd.go

@@ -153,9 +153,8 @@ evaluate --kind postgres --table my-table --column my-column:my-column-type --fl
 
 			if checkMode {
 				return runCheck(cmd, retrieverConf)
-			} else {
-				return runEvaluate(cmd, args, evalFlagFormat, retrieverConf, evalFlag, evalCtx)
 			}
+			return runEvaluate(cmd, args, evalFlagFormat, retrieverConf, evalFlag, evalCtx)
 		},
 		SilenceUsage:  true,
 		SilenceErrors: true,

cmd/cli/evaluate/evaluate_test.go

@@ -171,7 +171,8 @@ func Test_evaluate_Evaluate(t *testing.T) {
 					return evaluate{}, err
 				}
 
-				gitHubRetriever, _ := r.(*githubretriever.Retriever)
+				gitHubRetriever, ok := r.(*githubretriever.Retriever)
+				assert.True(t, ok, "failed to assert retriever to *githubretriever.Retriever")
 				gitHubRetriever.SetHTTPClient(&mock.HTTP{})
 
 				return evaluate{
@@ -211,7 +212,8 @@ func Test_evaluate_Evaluate(t *testing.T) {
 					return evaluate{}, err
 				}
 
-				gitLabRetriever, _ := r.(*gitlabretriever.Retriever)
+				gitLabRetriever, ok := r.(*gitlabretriever.Retriever)
+				assert.True(t, ok, "failed to assert retriever to *gitlabretriever.Retriever")
 				gitLabRetriever.SetHTTPClient(&mock.HTTP{})
 
 				return evaluate{
@@ -251,7 +253,8 @@ func Test_evaluate_Evaluate(t *testing.T) {
 					return evaluate{}, err
 				}
 
-				bitBucketRetriever, _ := r.(*bitbucketretriever.Retriever)
+				bitBucketRetriever, ok := r.(*bitbucketretriever.Retriever)
+				assert.True(t, ok, "failed to assert retriever to *bitbucketretriever.Retriever")
 				bitBucketRetriever.SetHTTPClient(&mock.HTTP{})
 
 				return evaluate{
@@ -295,7 +298,8 @@ func Test_evaluate_Evaluate(t *testing.T) {
 					return evaluate{}, err
 				}
 
-				s3Retriever, _ := r.(*s3retrieverv2.Retriever)
+				s3Retriever, ok := r.(*s3retrieverv2.Retriever)
+				assert.True(t, ok, "failed to assert retriever to *s3retrieverv2.Retriever")
 				s3Retriever.SetDownloader(downloader)
 
 				_ = s3Retriever.Init(context.Background(), nil)
@@ -340,7 +344,8 @@ func Test_evaluate_Evaluate(t *testing.T) {
 					return evaluate{}, err
 				}
 
-				httpRetriever, _ := r.(*httpretriever.Retriever)
+				httpRetriever, ok := r.(*httpretriever.Retriever)
+				assert.True(t, ok, "failed to assert retriever to *httpretriever.Retriever")
 				httpRetriever.SetHTTPClient(&mock.HTTP{})
 
 				return evaluate{
@@ -383,7 +388,8 @@ func Test_evaluate_Evaluate(t *testing.T) {
 					return evaluate{}, err
 				}
 
-				gcsRetriever, _ := r.(*gcstorageretriever.Retriever)
+				gcsRetriever, ok := r.(*gcstorageretriever.Retriever)
+				assert.True(t, ok, "failed to assert retriever to *gcstorageretriever.Retriever")
 				gcsRetriever.SetOptions([]option.ClientOption{
 					option.WithCredentials(&google.Credentials{}),
 					option.WithHTTPClient(mockedStorage.Server.HTTPClient()),

cmd/cli/generate/manifest/manifest.go

@@ -11,11 +11,7 @@ import (
 	dtoCore "github.com/thomaspoignant/go-feature-flag/modules/core/dto"
 )
 
-func NewManifest(
-	configFile string,
-	configFormat string,
-	flagManifestDestination string,
-) (Manifest, error) {
+func NewManifest(configFile, configFormat, flagManifestDestination string) (Manifest, error) {
 	if flagManifestDestination == "" {
 		return Manifest{}, fmt.Errorf("--flag_manifest_destination is mandatory")
 	}
@@ -63,7 +59,7 @@ func (m *Manifest) generateDefinitions(flagDTOs map[string]dto.DTO) (
 	output := helper.Output{}
 	for flagKey, flagDTO := range flagDTOs {
 		flag := dtoCore.ConvertDtoToInternalFlag(flagDTO)
-		flagType, err := helper.GetFlagTypeFromVariations(flag.GetVariations())
+		flagType, err := helper.FlagTypeFromVariations(flag.GetVariations())
 		if err != nil {
 			return model.FlagManifest{}, output,
 				fmt.Errorf("invalid configuration for flag %s: %s", flagKey, err.Error())

cmd/cli/generate/manifest/manifest_cmd.go

@@ -18,7 +18,10 @@ func NewManifestCmd() *cobra.Command {
 			"⚠️ note that this is an experimental feature and we may change this command line without warning.",
 
 		RunE: func(cmd *cobra.Command, _ []string) error {
-			m, _ := NewManifest(manifestConfigFile, manifestFlagFormat, flagManifestDestination)
+			m, err := NewManifest(manifestConfigFile, manifestFlagFormat, flagManifestDestination)
+			if err != nil {
+				return err
+			}
 			output, err := m.Generate()
 			if err != nil {
 				cmd.SilenceUsage = true

cmd/cli/helper/number_type.go

@@ -7,7 +7,7 @@ import (
 	"github.com/thomaspoignant/go-feature-flag/cmd/cli/generate/manifest/model"
 )
 
-func GetFlagTypeFromVariations(variations map[string]*interface{}) (model.FlagType, error) {
+func FlagTypeFromVariations(variations map[string]*interface{}) (model.FlagType, error) {
 	if variations == nil {
 		return "", fmt.Errorf("impossible to find type, no variations found")
 	}

cmd/cli/helper/number_type_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/thomaspoignant/go-feature-flag/modules/core/testutils/testconvert"
 )
 
-func TestGetFlagTypeFromVariations(t *testing.T) {
+func TestFlagTypeFromVariations(t *testing.T) {
 	tests := []struct {
 		name       string
 		variations map[string]*interface{}
@@ -101,7 +101,7 @@ func TestGetFlagTypeFromVariations(t *testing.T) {
 
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			result, err := helper.GetFlagTypeFromVariations(tt.variations)
+			result, err := helper.FlagTypeFromVariations(tt.variations)
 			if tt.expectErr {
 				assert.Error(t, err)
 			} else {

cmd/cli/helper/print_output.go

@@ -48,7 +48,10 @@ func (o *Output) PrintLines(cmd *cobra.Command) {
 		default:
 			outputText = pterm.Sprint(line.Text)
 		}
-		_, _ = fmt.Fprintln(writer, outputText)
+		_, err := fmt.Fprintln(writer, outputText)
+		if err != nil {
+			PrintFatalAndExit(err)
+		}
 	}
 }
 

cmd/cli/helper/read_config_file.go

@@ -42,9 +42,10 @@ func LoadConfigFile(
 	for _, location := range defaultLocations {
 		for _, ext := range supportedExtensions {
 			configFile := fmt.Sprintf("%s%s.%s", location, filename, ext)
-			if _, err := os.Stat(configFile); err == nil {
-				return readConfigFile(configFile, ext)
+			if _, err := os.Stat(configFile); err != nil {
+				continue
 			}
+			return readConfigFile(configFile, ext)
 		}
 	}
 	return nil, fmt.Errorf(
@@ -53,7 +54,7 @@ func LoadConfigFile(
 	)
 }
 
-func readConfigFile(configFile string, configFormat string) (map[string]dto.DTO, error) {
+func readConfigFile(configFile, configFormat string) (map[string]dto.DTO, error) {
 	dat, err := os.ReadFile(configFile)
 	if err != nil {
 		return nil, err

cmd/cli/linter/lint_cmd.go

@@ -28,7 +28,7 @@ func NewLintCmd() *cobra.Command {
 func runLint(cmd *cobra.Command, args []string, lintFlagFormat string) error {
 	output := helper.Output{}
 	l := Linter{
-		InputFile:   getFilePath(args),
+		InputFile:   extractFilePathFromArgs(args),
 		InputFormat: lintFlagFormat,
 	}
 	if errs := l.Lint(); len(errs) > 0 {
@@ -44,7 +44,7 @@ func runLint(cmd *cobra.Command, args []string, lintFlagFormat string) error {
 	return nil
 }
 
-func getFilePath(args []string) string {
+func extractFilePathFromArgs(args []string) string {
 	if len(args) == 0 {
 		return ""
 	}