Bump conditions

openflagr · Feb 13, 2019 · cc81e98 · cc81e98
1 parent 4be2291
commit cc81e98
Show file tree

Hide file tree

Showing 9 changed files with 280 additions and 57 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -142,8 +142,8 @@
   name = "github.com/yadvendar/negroni-newrelic-go-agent"
 
 [[constraint]]
-  branch = "master"
   name = "github.com/zhouzhuojie/conditions"
+  version = "0.2.2"
 
 [[constraint]]
   branch = "master"
@@ -157,11 +157,11 @@
   name = "github.com/avast/retry-go"
   version = "2.2.0"
 
+[[constraint]]
+  name = "cloud.google.com/go"
+  version = "0.35.1"
+
 
 [prune]
   go-tests = true
   unused-packages = true
-
-[[constraint]]
-  name = "cloud.google.com/go"
-  version = "0.35.1"
diff --git a/benchmark/postEvaluation.json b/benchmark/postEvaluation.json
@@ -2,8 +2,7 @@
   "entityID": "123",
     "entityType": "report",
     "entityContext": {
-      "dl_state": "CA"
+      "state": "1234"
     },
-    "flagID": 2,
-    "enableDebug": true
+    "flagID": 1
 }
diff --git a/benchmark/postEvaluation.output b/benchmark/postEvaluation.output
diff --git a/benchmark/postEvaluation.target b/benchmark/postEvaluation.target
@@ -1,2 +1,2 @@
-POST http://localhost:18000/api/evaluation
+POST http://localhost:18000/api/v1/evaluation
 Content-Type: application/json
diff --git a/pkg/handler/eval.go b/pkg/handler/eval.go
@@ -229,7 +229,7 @@ var evalSegment = func(
 		}
 		if !match {
 			log = &models.SegmentDebugLog{
-				Msg:       debugConstraintMsg(expr, m),
+				Msg:       debugConstraintMsg(evalContext.EnableDebug, expr, m),
 				SegmentID: int64(segment.ID),
 			}
 			return nil, log, true
@@ -252,7 +252,10 @@ var evalSegment = func(
 	return vID, log, false
 }
 
-func debugConstraintMsg(expr conditions.Expr, m map[string]interface{}) string {
+func debugConstraintMsg(enableDebug bool, expr conditions.Expr, m map[string]interface{}) string {
+	if !enableDebug {
+		return ""
+	}
 	return fmt.Sprintf("constraint not match. constraint: %s, entity_context: %+v.", expr, m)
 }
 

diff --git a/vendor/github.com/zhouzhuojie/conditions/ast.go b/vendor/github.com/zhouzhuojie/conditions/ast.go
diff --git a/vendor/github.com/zhouzhuojie/conditions/evaluator.go b/vendor/github.com/zhouzhuojie/conditions/evaluator.go
diff --git a/vendor/github.com/zhouzhuojie/conditions/parser.go b/vendor/github.com/zhouzhuojie/conditions/parser.go