Skip to content

Commit 74d0e43

Browse files
committed
fix: exclude tags, adjust starts and ends with
Signed-off-by: Lea Konvalinka <lea.konvalinka@dynatrace.com>
1 parent b51847a commit 74d0e43

4 files changed

Lines changed: 8 additions & 7 deletions

File tree

  • providers/openfeature-provider-flagd
  • tools/openfeature-flagd-core/src/openfeature/contrib/tools/flagd/core/targeting

providers/openfeature-provider-flagd/src/openfeature/contrib/provider/flagd/resolvers/process/custom_ops.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
JsonPrimitive,
77
ends_with,
88
fractional,
9-
parse_version,
9+
normalize_version,
1010
sem_ver,
1111
starts_with,
1212
string_comp,

providers/openfeature-provider-flagd/tests/e2e/inprocess/conftest.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
"~unixsocket",
1010
"~deprecated",
1111
"~fractional-v1",
12-
"~operator-errors",
1312
]
1413

1514

providers/openfeature-provider-flagd/tests/e2e/rpc/conftest.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
"~deprecated",
1313
"~fractional-v1",
1414
"~operator-errors",
15+
"~semver-v-prefix",
16+
"~fractional-single-entry",
1517
]
1618

1719

tools/openfeature-flagd-core/src/openfeature/contrib/tools/flagd/core/targeting/custom_ops.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,10 @@ def string_comp(
125125
arg1, arg2 = args
126126
if not isinstance(arg1, str):
127127
logger.debug(f"incorrect argument for first argument, expected string: {arg1}")
128-
return False
128+
return None
129129
if not isinstance(arg2, str):
130130
logger.debug(f"incorrect argument for second argument, expected string: {arg2}")
131-
return False
131+
return None
132132

133133
return comparator(arg1, arg2)
134134

@@ -144,8 +144,8 @@ def sem_ver(data: dict, *args: JsonLogicArg) -> bool | None: # noqa: C901
144144
arg1, op, arg2 = args
145145

146146
try:
147-
v1 = parse_version(arg1)
148-
v2 = parse_version(arg2)
147+
v1 = normalize_version(arg1)
148+
v2 = normalize_version(arg2)
149149
except ValueError as e:
150150
logger.exception(e)
151151
return None
@@ -171,7 +171,7 @@ def sem_ver(data: dict, *args: JsonLogicArg) -> bool | None: # noqa: C901
171171
return None
172172

173173

174-
def parse_version(arg: typing.Any) -> semver.Version:
174+
def normalize_version(arg: typing.Any) -> semver.Version:
175175
version = str(arg)
176176
if version.startswith(("v", "V")):
177177
version = version[1:]

0 commit comments

Comments
 (0)