Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@unleash/client-specification",
"version": "6.0.1",
"version": "6.1.0",
"description": "A collection of test specifications to guide client implementations in various languages",
"scripts": {
"test": "node index",
Expand Down
98 changes: 97 additions & 1 deletion specifications/14-constraint-semver-operators.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,24 @@
}
]
},
{
"name": "F8.semverGTE",
"description": "semver",
"enabled": true,
"strategies": [
{
"name": "default",
"parameters": {},
"constraints": [
{
"contextName": "version",
"operator": "SEMVER_GTE",
"value": "1.2.2"
}
]
}
]
},
{
"name": "F8.semverLT",
"description": "semver",
Expand All @@ -57,6 +75,24 @@
}
]
},
{
"name": "F8.semverLTE",
"description": "semver",
"enabled": true,
"strategies": [
{
"name": "default",
"parameters": {},
"constraints": [
{
"contextName": "version",
"operator": "SEMVER_LTE",
"value": "1.2.2"
}
]
}
]
},
{
"name": "F8.semverAlphaGT",
"description": "semver",
Expand Down Expand Up @@ -208,6 +244,36 @@
"toggleName": "F8.semverGT",
"expectedResult": false
},
{
"description": "F8.semverGTE should be enabled",
"context": {
"properties": {
"version": "1.2.2"
}
},
"toggleName": "F8.semverGTE",
"expectedResult": true
},
{
"description": "F8.semverGTE should be enabled for greater",
"context": {
"properties": {
"version": "1.2.3"
}
},
"toggleName": "F8.semverGTE",
"expectedResult": true
},
{
"description": "F8.semverGTE should be disabled",
"context": {
"properties": {
"version": "1.2.1"
}
},
"toggleName": "F8.semverGTE",
"expectedResult": false
},
{
"description": "F8.semverLT should be enabled",
"context": {
Expand All @@ -228,6 +294,36 @@
"toggleName": "F8.semverLT",
"expectedResult": false
},
{
"description": "F8.semverLTE should be enabled",
"context": {
"properties": {
"version": "1.2.2"
}
},
"toggleName": "F8.semverLTE",
"expectedResult": true
},
{
"description": "F8.semverLTE should be enabled for less",
"context": {
"properties": {
"version": "1.2.1"
}
},
"toggleName": "F8.semverLTE",
"expectedResult": true
},
{
"description": "F8.semverLTE should be disabled",
"context": {
"properties": {
"version": "1.2.3"
}
},
"toggleName": "F8.semverLTE",
"expectedResult": false
},
{
"description": "F8.semverAlphaGT is less than beta",
"context": {
Expand Down Expand Up @@ -359,4 +455,4 @@
"expectedResult": false
}
]
}
}
230 changes: 230 additions & 0 deletions specifications/22-cidr-constraint-operators.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,230 @@
{
"name": "22-cidr-constraint-operator",
"state": {
"version": 1,
"features": [
{
"name": "CIDR.exact.match",
"description": "Exact IP match using IN_CIDR",
"enabled": true,
"strategies": [
{
"name": "default",
"parameters": {},
"constraints": [
{
"contextName": "remoteAddress",
"operator": "IN_CIDR",
"values": ["127.0.0.1"]
}
]
}
]
},
{
"name": "CIDR.range.match",
"description": "CIDR range match using IN_CIDR",
"enabled": true,
"strategies": [
{
"name": "default",
"parameters": {},
"constraints": [
{
"contextName": "remoteAddress",
"operator": "IN_CIDR",
"values": ["160.33.0.0/16"]
}
]
}
]
},
{
"name": "CIDR.mixed.values",
"description": "Invalid values should be ignored when valid ones exist",
"enabled": true,
"strategies": [
{
"name": "default",
"parameters": {},
"constraints": [
{
"contextName": "remoteAddress",
"operator": "IN_CIDR",
"values": ["127.invalid", "192.168.1.0/24"]
}
]
}
]
},
{
"name": "CIDR.invalid.only",
"description": "Only invalid values should not match anything",
"enabled": true,
"strategies": [
{
"name": "default",
"parameters": {},
"constraints": [
{
"contextName": "remoteAddress",
"operator": "IN_CIDR",
"values": ["127.invalid"]
}
]
}
]
},
{
"name": "CIDR.ipv6.exact.match",
"description": "Exact IPv6 match using IN_CIDR",
"enabled": true,
"strategies": [
{
"name": "default",
"parameters": {},
"constraints": [
{
"contextName": "remoteAddress",
"operator": "IN_CIDR",
"values": ["2001:db8::1"]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this isn't a valid CIDR mask, it is a valid IP address, does that mean our IN_CIDR should be able to parse both?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Answered in standup, so yes. It's a port of the old node IP address strategy adding CIDR support.

}
]
}
]
},
{
"name": "CIDR.ipv6.range.match",
"description": "IPv6 CIDR range match using IN_CIDR",
"enabled": true,
"strategies": [
{
"name": "default",
"parameters": {},
"constraints": [
{
"contextName": "remoteAddress",
"operator": "IN_CIDR",
"values": ["2001:db8::/32"]
}
]
}
]
},
{
"name": "CIDR.ipv6.mixed.values",
"description": "Invalid values should be ignored when valid IPv6 CIDR exists",
"enabled": true,
"strategies": [
{
"name": "default",
"parameters": {},
"constraints": [
{
"contextName": "remoteAddress",
"operator": "IN_CIDR",
"values": ["bad::cidr", "2001:db8::/32"]
}
]
}
]
}
]
},
"tests": [
{
"description": "Exact IP match should be enabled",
"context": {
"remoteAddress": "127.0.0.1"
},
"toggleName": "CIDR.exact.match",
"expectedResult": true
},
{
"description": "Exact IP mismatch should be disabled",
"context": {
"remoteAddress": "127.0.0.2"
},
"toggleName": "CIDR.exact.match",
"expectedResult": false
},
{
"description": "CIDR range should enable matching IP",
"context": {
"remoteAddress": "160.33.0.33"
},
"toggleName": "CIDR.range.match",
"expectedResult": true
},
{
"description": "CIDR range should disable non-matching IP",
"context": {
"remoteAddress": "160.34.0.1"
},
"toggleName": "CIDR.range.match",
"expectedResult": false
},
{
"description": "Valid CIDR should match even when invalid entries exist",
"context": {
"remoteAddress": "192.168.1.42"
},
"toggleName": "CIDR.mixed.values",
"expectedResult": true
},
{
"description": "Invalid-only values should not match",
"context": {
"remoteAddress": "127.0.0.1"
},
"toggleName": "CIDR.invalid.only",
"expectedResult": false
},
{
"description": "Missing remoteAddress should not match",
"context": {},
"toggleName": "CIDR.range.match",
"expectedResult": false
},
{
"description": "Exact IPv6 match should be enabled",
"context": {
"remoteAddress": "2001:db8::1"
},
"toggleName": "CIDR.ipv6.exact.match",
"expectedResult": true
},
{
"description": "Exact IPv6 mismatch should be disabled",
"context": {
"remoteAddress": "2001:db8::2"
},
"toggleName": "CIDR.ipv6.exact.match",
"expectedResult": false
},
{
"description": "IPv6 CIDR range should enable matching IP",
"context": {
"remoteAddress": "2001:db8:0:1::42"
},
"toggleName": "CIDR.ipv6.range.match",
"expectedResult": true
},
{
"description": "IPv6 CIDR range should disable non-matching IP",
"context": {
"remoteAddress": "2001:db9::1"
},
"toggleName": "CIDR.ipv6.range.match",
"expectedResult": false
},
{
"description": "Valid IPv6 CIDR should match even when invalid entries exist",
"context": {
"remoteAddress": "2001:db8::abcd"
},
"toggleName": "CIDR.ipv6.mixed.values",
"expectedResult": true
}
]
}
5 changes: 3 additions & 2 deletions specifications/index.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@
"18-utf8-flag-names.json",
"19-delta-api-hydration.json",
"20-delta-api-events.json",
"21-regex-constraint-operators.json"
]
"21-regex-constraint-operators.json",
"22-cidr-constraint-operators.json"
]
Loading