Merge branch 'main' into list-pagination

* main: mod tidy Update changelog for release Fix parse error for bool/number to not return 500 (#1047) Bump codecov/codecov-action from 3.1.0 to 3.1.1 (#1043)
flipt-io · Sep 30, 2022 · 1d01cb3 · 1d01cb3
2 parents 134fa2f + 5518bc5
commit 1d01cb3
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 11 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -61,7 +61,7 @@ jobs:
         run: go test -race -covermode=atomic -coverprofile=coverage.txt -count=1 ./...
 
       - name: Upload Coverage
-        uses: codecov/codecov-action@v3.1.0
+        uses: codecov/codecov-action@v3.1.1
 
   database:
     name: Database Test

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,17 @@
 This format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v1.12.1](https://github.com/markphelps/flipt/releases/tag/v1.12.1) - 2022-09-30
+
+### Fixed
+
+- Issue where parsing value with incorrect type would return 500 from the evaluation API [#1047](https://github.com/flipt-io/flipt/pull/1047)
+
+### Changed
+
+- Dependency updates
+- Use testcontainers for MySQL/Postgres tests to run locally [#1045](https://github.com/flipt-io/flipt/pull/1045)
+
 ## [v1.12.0](https://github.com/markphelps/flipt/releases/tag/v1.12.0) - 2022-09-22
 
 ### Added

diff --git a/server/evaluator.go b/server/evaluator.go
@@ -3,7 +3,6 @@ package server
 import (
 	"context"
 	"errors"
-	"fmt"
 	"hash/crc32"
 	"sort"
 	"strconv"
@@ -294,12 +293,13 @@ func matchesNumber(c storage.EvaluationConstraint, v string) (bool, error) {
 
 	n, err := strconv.ParseFloat(v, 64)
 	if err != nil {
-		return false, fmt.Errorf("parsing number from %q", v)
+		return false, errs.ErrInvalidf("parsing number from %q", v)
 	}
 
+	// TODO: we should consider parsing this at creation time since it doesn't change and it doesnt make sense to allow invalid constraint values
 	value, err := strconv.ParseFloat(c.Value, 64)
 	if err != nil {
-		return false, fmt.Errorf("parsing number from %q", c.Value)
+		return false, errs.ErrInvalidf("parsing number from %q", c.Value)
 	}
 
 	switch c.Operator {
@@ -335,7 +335,7 @@ func matchesBool(c storage.EvaluationConstraint, v string) (bool, error) {
 
 	value, err := strconv.ParseBool(v)
 	if err != nil {
-		return false, fmt.Errorf("parsing boolean from %q", v)
+		return false, errs.ErrInvalidf("parsing boolean from %q", v)
 	}
 
 	switch c.Operator {

diff --git a/server/evaluator_test.go b/server/evaluator_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
-	"go.flipt.io/flipt/errors"
+	errs "go.flipt.io/flipt/errors"
 	flipt "go.flipt.io/flipt/rpc/flipt"
 	"go.flipt.io/flipt/storage"
 	"go.uber.org/zap/zaptest"
@@ -83,7 +83,7 @@ func TestBatchEvaluate_FlagNotFoundExcluded(t *testing.T) {
 	}
 	store.On("GetFlag", mock.Anything, "foo").Return(enabledFlag, nil)
 	store.On("GetFlag", mock.Anything, "bar").Return(disabled, nil)
-	store.On("GetFlag", mock.Anything, "NotFoundFlag").Return(&flipt.Flag{}, errors.ErrNotFoundf("flag %q", "NotFoundFlag"))
+	store.On("GetFlag", mock.Anything, "NotFoundFlag").Return(&flipt.Flag{}, errs.ErrNotFoundf("flag %q", "NotFoundFlag"))
 
 	store.On("GetEvaluationRules", mock.Anything, "foo").Return([]*storage.EvaluationRule{}, nil)
 
@@ -131,7 +131,7 @@ func TestBatchEvaluate_FlagNotFound(t *testing.T) {
 	}
 	store.On("GetFlag", mock.Anything, "foo").Return(enabledFlag, nil)
 	store.On("GetFlag", mock.Anything, "bar").Return(disabled, nil)
-	store.On("GetFlag", mock.Anything, "NotFoundFlag").Return(&flipt.Flag{}, errors.ErrNotFoundf("flag %q", "NotFoundFlag"))
+	store.On("GetFlag", mock.Anything, "NotFoundFlag").Return(&flipt.Flag{}, errs.ErrNotFoundf("flag %q", "NotFoundFlag"))
 
 	store.On("GetEvaluationRules", mock.Anything, "foo").Return([]*storage.EvaluationRule{}, nil)
 
@@ -171,7 +171,7 @@ func TestEvaluate_FlagNotFound(t *testing.T) {
 		}
 	)
 
-	store.On("GetFlag", mock.Anything, "foo").Return(&flipt.Flag{}, errors.ErrNotFoundf("flag %q", "foo"))
+	store.On("GetFlag", mock.Anything, "foo").Return(&flipt.Flag{}, errs.ErrNotFoundf("flag %q", "foo"))
 
 	resp, err := s.Evaluate(context.TODO(), &flipt.EvaluationRequest{
 		EntityId: "1",
@@ -1952,6 +1952,8 @@ func Test_matchesNumber(t *testing.T) {
 
 			if wantErr {
 				require.Error(t, err)
+				var ierr errs.ErrInvalid
+				require.ErrorAs(t, err, &ierr)
 				return
 			}
 
@@ -2074,6 +2076,8 @@ func Test_matchesBool(t *testing.T) {
 
 			if wantErr {
 				require.Error(t, err)
+				var ierr errs.ErrInvalid
+				require.ErrorAs(t, err, &ierr)
 				return
 			}
 

diff --git a/storage/sql/db_test.go b/storage/sql/db_test.go
@@ -281,12 +281,13 @@ func TestParse(t *testing.T) {
 			driver  = tt.driver
 			url     = tt.dsn
 			wantErr = tt.wantErr
+			opts    = tt.options
 		)
 
 		t.Run(tt.name, func(t *testing.T) {
 			d, u, err := parse(config.Config{
 				Database: cfg,
-			}, tt.options)
+			}, opts)
 
 			if wantErr {
 				require.Error(t, err)

diff --git a/ui/src/components/Flags/DebugConsole.vue b/ui/src/components/Flags/DebugConsole.vue
@@ -99,7 +99,15 @@ export default {
           this.response = response.data;
         })
         .catch((error) => {
-          this.response = { error: error.response.data.error };
+          if (error.response) {
+            this.response = {
+              error: error.response.data.message,
+            };
+          } else {
+            this.response = {
+              error: error.message,
+            };
+          }
         });
     },
   },