Skip to content

Commit fad894e

Browse files
thomaspoignantkodiakhq[bot]
thomaspoignant
and
kodiakhq[bot]
authored
chore: fix some sonar warnings (#4391)
* Remove the 'Get' prefix from this function name. Signed-off-by: Thomas Poignant <thomas.poignant@gofeatureflag.org> * Handle this error explicitly or document why it can be safely ignored. Signed-off-by: Thomas Poignant <thomas.poignant@gofeatureflag.org> * Handle this error explicitly Signed-off-by: Thomas Poignant <thomas.poignant@gofeatureflag.org> * Remove this 'else' clause; the code should continue after the error check. Signed-off-by: Thomas Poignant <thomas.poignant@gofeatureflag.org> * fix some sonar issues Signed-off-by: Thomas Poignant <thomas.poignant@gofeatureflag.org> * Handle this error explicitly Signed-off-by: Thomas Poignant <thomas.poignant@gofeatureflag.org> * remove unused func Signed-off-by: Thomas Poignant <thomas.poignant@gofeatureflag.org> * sonar feedback fix Signed-off-by: Thomas Poignant <thomas.poignant@gofeatureflag.org> * remove function starting with Get Signed-off-by: Thomas Poignant <thomas.poignant@gofeatureflag.org> * fix proptypes issues Signed-off-by: Thomas Poignant <thomas.poignant@gofeatureflag.org> * fix sonar Signed-off-by: Thomas Poignant <thomas.poignant@gofeatureflag.org> * fix lint issue Signed-off-by: Thomas Poignant <thomas.poignant@gofeatureflag.org> * remove unused proptype Signed-off-by: Thomas Poignant <thomas.poignant@gofeatureflag.org> --------- Signed-off-by: Thomas Poignant <thomas.poignant@gofeatureflag.org> Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
1 parent 3a7ca53 commit fad894e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+368
-267
lines changed

‎cmd/cli/evaluate/evaluate.go‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,14 +51,20 @@ func (e evaluate) Evaluate() (map[string]model.RawVarResult, error) {
5151
if e.flag != "" {
5252
listFlags = append(listFlags, e.flag)
5353
} else {
54-
flags, _ := goff.GetFlagsFromCache()
54+
flags, err := goff.GetFlagsFromCache()
55+
if err != nil {
56+
return nil, err
57+
}
5558
for key := range flags {
5659
listFlags = append(listFlags, key)
5760
}
5861
}
5962

6063
for _, flag := range listFlags {
61-
res, _ := goff.RawVariation(flag, convertedEvaluationCtx, nil)
64+
res, err := goff.RawVariation(flag, convertedEvaluationCtx, nil)
65+
if err != nil {
66+
return nil, err
67+
}
6268
result[flag] = res
6369
}
6470
return result, nil

‎cmd/cli/evaluate/evaluate_cmd.go‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,8 @@ evaluate --kind postgres --table my-table --column my-column:my-column-type --fl
153153

154154
if checkMode {
155155
return runCheck(cmd, retrieverConf)
156-
} else {
157-
return runEvaluate(cmd, args, evalFlagFormat, retrieverConf, evalFlag, evalCtx)
158156
}
157+
return runEvaluate(cmd, args, evalFlagFormat, retrieverConf, evalFlag, evalCtx)
159158
},
160159
SilenceUsage: true,
161160
SilenceErrors: true,

‎cmd/cli/evaluate/evaluate_test.go‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,8 @@ func Test_evaluate_Evaluate(t *testing.T) {
171171
return evaluate{}, err
172172
}
173173

174-
gitHubRetriever, _ := r.(*githubretriever.Retriever)
174+
gitHubRetriever, ok := r.(*githubretriever.Retriever)
175+
assert.True(t, ok, "failed to assert retriever to *githubretriever.Retriever")
175176
gitHubRetriever.SetHTTPClient(&mock.HTTP{})
176177

177178
return evaluate{
@@ -211,7 +212,8 @@ func Test_evaluate_Evaluate(t *testing.T) {
211212
return evaluate{}, err
212213
}
213214

214-
gitLabRetriever, _ := r.(*gitlabretriever.Retriever)
215+
gitLabRetriever, ok := r.(*gitlabretriever.Retriever)
216+
assert.True(t, ok, "failed to assert retriever to *gitlabretriever.Retriever")
215217
gitLabRetriever.SetHTTPClient(&mock.HTTP{})
216218

217219
return evaluate{
@@ -251,7 +253,8 @@ func Test_evaluate_Evaluate(t *testing.T) {
251253
return evaluate{}, err
252254
}
253255

254-
bitBucketRetriever, _ := r.(*bitbucketretriever.Retriever)
256+
bitBucketRetriever, ok := r.(*bitbucketretriever.Retriever)
257+
assert.True(t, ok, "failed to assert retriever to *bitbucketretriever.Retriever")
255258
bitBucketRetriever.SetHTTPClient(&mock.HTTP{})
256259

257260
return evaluate{
@@ -295,7 +298,8 @@ func Test_evaluate_Evaluate(t *testing.T) {
295298
return evaluate{}, err
296299
}
297300

298-
s3Retriever, _ := r.(*s3retrieverv2.Retriever)
301+
s3Retriever, ok := r.(*s3retrieverv2.Retriever)
302+
assert.True(t, ok, "failed to assert retriever to *s3retrieverv2.Retriever")
299303
s3Retriever.SetDownloader(downloader)
300304

301305
_ = s3Retriever.Init(context.Background(), nil)
@@ -340,7 +344,8 @@ func Test_evaluate_Evaluate(t *testing.T) {
340344
return evaluate{}, err
341345
}
342346

343-
httpRetriever, _ := r.(*httpretriever.Retriever)
347+
httpRetriever, ok := r.(*httpretriever.Retriever)
348+
assert.True(t, ok, "failed to assert retriever to *httpretriever.Retriever")
344349
httpRetriever.SetHTTPClient(&mock.HTTP{})
345350

346351
return evaluate{
@@ -383,7 +388,8 @@ func Test_evaluate_Evaluate(t *testing.T) {
383388
return evaluate{}, err
384389
}
385390

386-
gcsRetriever, _ := r.(*gcstorageretriever.Retriever)
391+
gcsRetriever, ok := r.(*gcstorageretriever.Retriever)
392+
assert.True(t, ok, "failed to assert retriever to *gcstorageretriever.Retriever")
387393
gcsRetriever.SetOptions([]option.ClientOption{
388394
option.WithCredentials(&google.Credentials{}),
389395
option.WithHTTPClient(mockedStorage.Server.HTTPClient()),

‎cmd/cli/generate/manifest/manifest.go‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,7 @@ import (
1111
dtoCore "github.com/thomaspoignant/go-feature-flag/modules/core/dto"
1212
)
1313

14-
func NewManifest(
15-
configFile string,
16-
configFormat string,
17-
flagManifestDestination string,
18-
) (Manifest, error) {
14+
func NewManifest(configFile, configFormat, flagManifestDestination string) (Manifest, error) {
1915
if flagManifestDestination == "" {
2016
return Manifest{}, fmt.Errorf("--flag_manifest_destination is mandatory")
2117
}
@@ -63,7 +59,7 @@ func (m *Manifest) generateDefinitions(flagDTOs map[string]dto.DTO) (
6359
output := helper.Output{}
6460
for flagKey, flagDTO := range flagDTOs {
6561
flag := dtoCore.ConvertDtoToInternalFlag(flagDTO)
66-
flagType, err := helper.GetFlagTypeFromVariations(flag.GetVariations())
62+
flagType, err := helper.FlagTypeFromVariations(flag.GetVariations())
6763
if err != nil {
6864
return model.FlagManifest{}, output,
6965
fmt.Errorf("invalid configuration for flag %s: %s", flagKey, err.Error())

‎cmd/cli/generate/manifest/manifest_cmd.go‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@ func NewManifestCmd() *cobra.Command {
1818
"⚠️ note that this is an experimental feature and we may change this command line without warning.",
1919

2020
RunE: func(cmd *cobra.Command, _ []string) error {
21-
m, _ := NewManifest(manifestConfigFile, manifestFlagFormat, flagManifestDestination)
21+
m, err := NewManifest(manifestConfigFile, manifestFlagFormat, flagManifestDestination)
22+
if err != nil {
23+
return err
24+
}
2225
output, err := m.Generate()
2326
if err != nil {
2427
cmd.SilenceUsage = true

‎cmd/cli/helper/number_type.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"github.com/thomaspoignant/go-feature-flag/cmd/cli/generate/manifest/model"
88
)
99

10-
func GetFlagTypeFromVariations(variations map[string]*interface{}) (model.FlagType, error) {
10+
func FlagTypeFromVariations(variations map[string]*interface{}) (model.FlagType, error) {
1111
if variations == nil {
1212
return "", fmt.Errorf("impossible to find type, no variations found")
1313
}

‎cmd/cli/helper/number_type_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import (
99
"github.com/thomaspoignant/go-feature-flag/modules/core/testutils/testconvert"
1010
)
1111

12-
func TestGetFlagTypeFromVariations(t *testing.T) {
12+
func TestFlagTypeFromVariations(t *testing.T) {
1313
tests := []struct {
1414
name string
1515
variations map[string]*interface{}
@@ -101,7 +101,7 @@ func TestGetFlagTypeFromVariations(t *testing.T) {
101101

102102
for _, tt := range tests {
103103
t.Run(tt.name, func(t *testing.T) {
104-
result, err := helper.GetFlagTypeFromVariations(tt.variations)
104+
result, err := helper.FlagTypeFromVariations(tt.variations)
105105
if tt.expectErr {
106106
assert.Error(t, err)
107107
} else {

‎cmd/cli/helper/print_output.go‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,10 @@ func (o *Output) PrintLines(cmd *cobra.Command) {
4848
default:
4949
outputText = pterm.Sprint(line.Text)
5050
}
51-
_, _ = fmt.Fprintln(writer, outputText)
51+
_, err := fmt.Fprintln(writer, outputText)
52+
if err != nil {
53+
PrintFatalAndExit(err)
54+
}
5255
}
5356
}
5457

‎cmd/cli/helper/read_config_file.go‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,10 @@ func LoadConfigFile(
4242
for _, location := range defaultLocations {
4343
for _, ext := range supportedExtensions {
4444
configFile := fmt.Sprintf("%s%s.%s", location, filename, ext)
45-
if _, err := os.Stat(configFile); err == nil {
46-
return readConfigFile(configFile, ext)
45+
if _, err := os.Stat(configFile); err != nil {
46+
continue
4747
}
48+
return readConfigFile(configFile, ext)
4849
}
4950
}
5051
return nil, fmt.Errorf(
@@ -53,7 +54,7 @@ func LoadConfigFile(
5354
)
5455
}
5556

56-
func readConfigFile(configFile string, configFormat string) (map[string]dto.DTO, error) {
57+
func readConfigFile(configFile, configFormat string) (map[string]dto.DTO, error) {
5758
dat, err := os.ReadFile(configFile)
5859
if err != nil {
5960
return nil, err

‎cmd/cli/linter/lint_cmd.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func NewLintCmd() *cobra.Command {
2828
func runLint(cmd *cobra.Command, args []string, lintFlagFormat string) error {
2929
output := helper.Output{}
3030
l := Linter{
31-
InputFile: getFilePath(args),
31+
InputFile: extractFilePathFromArgs(args),
3232
InputFormat: lintFlagFormat,
3333
}
3434
if errs := l.Lint(); len(errs) > 0 {
@@ -44,7 +44,7 @@ func runLint(cmd *cobra.Command, args []string, lintFlagFormat string) error {
4444
return nil
4545
}
4646

47-
func getFilePath(args []string) string {
47+
func extractFilePathFromArgs(args []string) string {
4848
if len(args) == 0 {
4949
return ""
5050
}

0 commit comments

Comments
 (0)