Merge branch 'main' into chainable-if-conditions

Signed-off-by: Michael Beemer <beeme1mr@users.noreply.github.com>
open-feature · Apr 8, 2024 · bf2ddc3 · bf2ddc3
2 parents 87e4d3c + ea4f119
commit bf2ddc3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
@@ -7,7 +7,7 @@ permissions:
   contents: read
 
 env:
-  GO_VERSION: 1.21
+  GO_VERSION: 1.22
 
 jobs:
   lint-protos:

diff --git a/json/targeting.json b/json/targeting.json
@@ -475,7 +475,7 @@
       "items": [
         {
           "description": "Bucketing value used in pseudorandom assignment; should be unique and stable for each subject of flag evaluation. Defaults to a concatenation of the flagKey and targetingKey.",
-          "$ref": "#/$defs/varRule"
+          "$ref": "#/$defs/anyRule"
         },
         {
           "$ref": "#/$defs/fractionalWeightArg"

diff --git a/json/targeting.yaml b/json/targeting.yaml
@@ -377,7 +377,7 @@ type: object
     - description: Bucketing value used in pseudorandom assignment; should be unique
         and stable for each subject of flag evaluation. Defaults to a concatenation
         of the flagKey and targetingKey.
-      $ref: "#/$defs/varRule"
+      $ref: "#/$defs/anyRule"
     - $ref: "#/$defs/fractionalWeightArg"
     - $ref: "#/$defs/fractionalWeightArg"
     additionalItems:

diff --git a/json/test/positive/custom-ops.json b/json/test/positive/custom-ops.json
@@ -14,7 +14,10 @@
       "defaultVariant": "wild",
       "targeting": {
         "fractional": [
-          { "var": "user.name" },
+          { "cat": [
+            { "var": "$flagd.flagKey" },
+            { "var": "user.name" }
+          ]},
           ["clubs", 25],
           ["diamonds", 25],
           ["hearts", 25],