mirror of
https://github.com/netbirdio/docs.git
synced 2026-05-03 07:46:35 +00:00
Handle merge api component conflicts (#539)
* Handle merge api component conflicts Added a fixConflictingEnumAllOf() function in generator/api.ts that pre-processes the spec before merging * Update API pages with v0.62.2 --------- Co-authored-by: netbirddev <dev@netbird.io>
This commit is contained in:
@@ -186,6 +186,13 @@ echo $response;
|
||||
"end": 320
|
||||
}
|
||||
],
|
||||
"authorized_groups": {
|
||||
"description": "Map of user group ids to a list of local users",
|
||||
"type": "object",
|
||||
"additionalProperties": [
|
||||
"group1"
|
||||
]
|
||||
},
|
||||
"id": "ch8i4ug6lnn4g9hqv7mg",
|
||||
"sources": [
|
||||
{
|
||||
@@ -245,6 +252,13 @@ echo $response;
|
||||
"end": "integer"
|
||||
}
|
||||
],
|
||||
"authorized_groups": {
|
||||
"description": "Map of user group ids to a list of local users",
|
||||
"type": "object",
|
||||
"additionalProperties": [
|
||||
"string"
|
||||
]
|
||||
},
|
||||
"id": "string",
|
||||
"sources": [
|
||||
{
|
||||
@@ -345,7 +359,7 @@ echo $response;
|
||||
Define if the rule is applicable in both directions, sources, and destinations.
|
||||
|
||||
</Property>
|
||||
<Property name="protocol" type="string" required={true} enumList={["all","tcp","udp","icmp"]}>
|
||||
<Property name="protocol" type="string" required={true} enumList={["all","tcp","udp","icmp","netbird-ssh"]}>
|
||||
|
||||
Policy rule type of the traffic
|
||||
|
||||
@@ -376,6 +390,11 @@ echo $response;
|
||||
</Properties>
|
||||
</details>
|
||||
|
||||
</Property>
|
||||
<Property name="authorized_groups" type="object" required={false}>
|
||||
|
||||
Map of user group ids to a list of local users
|
||||
|
||||
</Property>
|
||||
<Property name="id" type="string" required={false}>
|
||||
|
||||
@@ -398,7 +417,7 @@ echo $response;
|
||||
ID of the resource
|
||||
|
||||
</Property>
|
||||
<Property name="type" type="string" required={true} enumList={["host","subnet","domain"]}>
|
||||
<Property name="type" type="string" required={true} enumList={["host","subnet","domain","peer"]}>
|
||||
|
||||
Network resource type based of the address
|
||||
|
||||
@@ -425,7 +444,7 @@ echo $response;
|
||||
ID of the resource
|
||||
|
||||
</Property>
|
||||
<Property name="type" type="string" required={true} enumList={["host","subnet","domain"]}>
|
||||
<Property name="type" type="string" required={true} enumList={["host","subnet","domain","peer"]}>
|
||||
|
||||
Network resource type based of the address
|
||||
|
||||
@@ -478,6 +497,13 @@ curl -X POST https://api.netbird.io/api/policies \
|
||||
"end": 320
|
||||
}
|
||||
],
|
||||
"authorized_groups": {
|
||||
"description": "Map of user group ids to a list of local users",
|
||||
"type": "object",
|
||||
"additionalProperties": [
|
||||
"group1"
|
||||
]
|
||||
},
|
||||
"id": "ch8i4ug6lnn4g9hqv7mg",
|
||||
"sources": [
|
||||
"ch8i4ug6lnn4g9hqv797"
|
||||
@@ -524,6 +550,13 @@ let data = JSON.stringify({
|
||||
"end": 320
|
||||
}
|
||||
],
|
||||
"authorized_groups": {
|
||||
"description": "Map of user group ids to a list of local users",
|
||||
"type": "object",
|
||||
"additionalProperties": [
|
||||
"group1"
|
||||
]
|
||||
},
|
||||
"id": "ch8i4ug6lnn4g9hqv7mg",
|
||||
"sources": [
|
||||
"ch8i4ug6lnn4g9hqv797"
|
||||
@@ -592,6 +625,13 @@ payload = json.dumps({
|
||||
"end": 320
|
||||
}
|
||||
],
|
||||
"authorized_groups": {
|
||||
"description": "Map of user group ids to a list of local users",
|
||||
"type": "object",
|
||||
"additionalProperties": [
|
||||
"group1"
|
||||
]
|
||||
},
|
||||
"id": "ch8i4ug6lnn4g9hqv7mg",
|
||||
"sources": [
|
||||
"ch8i4ug6lnn4g9hqv797"
|
||||
@@ -660,6 +700,13 @@ func main() {
|
||||
"end": 320
|
||||
}
|
||||
],
|
||||
"authorized_groups": {
|
||||
"description": "Map of user group ids to a list of local users",
|
||||
"type": "object",
|
||||
"additionalProperties": [
|
||||
"group1"
|
||||
]
|
||||
},
|
||||
"id": "ch8i4ug6lnn4g9hqv7mg",
|
||||
"sources": [
|
||||
"ch8i4ug6lnn4g9hqv797"
|
||||
@@ -746,6 +793,13 @@ request.body = JSON.dump({
|
||||
"end": 320
|
||||
}
|
||||
],
|
||||
"authorized_groups": {
|
||||
"description": "Map of user group ids to a list of local users",
|
||||
"type": "object",
|
||||
"additionalProperties": [
|
||||
"group1"
|
||||
]
|
||||
},
|
||||
"id": "ch8i4ug6lnn4g9hqv7mg",
|
||||
"sources": [
|
||||
"ch8i4ug6lnn4g9hqv797"
|
||||
@@ -796,6 +850,13 @@ RequestBody body = RequestBody.create(mediaType, '{
|
||||
"end": 320
|
||||
}
|
||||
],
|
||||
"authorized_groups": {
|
||||
"description": "Map of user group ids to a list of local users",
|
||||
"type": "object",
|
||||
"additionalProperties": [
|
||||
"group1"
|
||||
]
|
||||
},
|
||||
"id": "ch8i4ug6lnn4g9hqv7mg",
|
||||
"sources": [
|
||||
"ch8i4ug6lnn4g9hqv797"
|
||||
@@ -862,6 +923,13 @@ curl_setopt_array($curl, array(
|
||||
"end": 320
|
||||
}
|
||||
],
|
||||
"authorized_groups": {
|
||||
"description": "Map of user group ids to a list of local users",
|
||||
"type": "object",
|
||||
"additionalProperties": [
|
||||
"group1"
|
||||
]
|
||||
},
|
||||
"id": "ch8i4ug6lnn4g9hqv7mg",
|
||||
"sources": [
|
||||
"ch8i4ug6lnn4g9hqv797"
|
||||
@@ -923,6 +991,13 @@ echo $response;
|
||||
"end": 320
|
||||
}
|
||||
],
|
||||
"authorized_groups": {
|
||||
"description": "Map of user group ids to a list of local users",
|
||||
"type": "object",
|
||||
"additionalProperties": [
|
||||
"group1"
|
||||
]
|
||||
},
|
||||
"id": "ch8i4ug6lnn4g9hqv7mg",
|
||||
"sources": [
|
||||
{
|
||||
@@ -980,6 +1055,13 @@ echo $response;
|
||||
"end": "integer"
|
||||
}
|
||||
],
|
||||
"authorized_groups": {
|
||||
"description": "Map of user group ids to a list of local users",
|
||||
"type": "object",
|
||||
"additionalProperties": [
|
||||
"string"
|
||||
]
|
||||
},
|
||||
"id": "string",
|
||||
"sources": [
|
||||
{
|
||||
@@ -1211,6 +1293,13 @@ echo $response;
|
||||
"end": 320
|
||||
}
|
||||
],
|
||||
"authorized_groups": {
|
||||
"description": "Map of user group ids to a list of local users",
|
||||
"type": "object",
|
||||
"additionalProperties": [
|
||||
"group1"
|
||||
]
|
||||
},
|
||||
"id": "ch8i4ug6lnn4g9hqv7mg",
|
||||
"sources": [
|
||||
{
|
||||
@@ -1268,6 +1357,13 @@ echo $response;
|
||||
"end": "integer"
|
||||
}
|
||||
],
|
||||
"authorized_groups": {
|
||||
"description": "Map of user group ids to a list of local users",
|
||||
"type": "object",
|
||||
"additionalProperties": [
|
||||
"string"
|
||||
]
|
||||
},
|
||||
"id": "string",
|
||||
"sources": [
|
||||
{
|
||||
@@ -1375,7 +1471,7 @@ echo $response;
|
||||
Define if the rule is applicable in both directions, sources, and destinations.
|
||||
|
||||
</Property>
|
||||
<Property name="protocol" type="string" required={true} enumList={["all","tcp","udp","icmp"]}>
|
||||
<Property name="protocol" type="string" required={true} enumList={["all","tcp","udp","icmp","netbird-ssh"]}>
|
||||
|
||||
Policy rule type of the traffic
|
||||
|
||||
@@ -1406,6 +1502,11 @@ echo $response;
|
||||
</Properties>
|
||||
</details>
|
||||
|
||||
</Property>
|
||||
<Property name="authorized_groups" type="object" required={false}>
|
||||
|
||||
Map of user group ids to a list of local users
|
||||
|
||||
</Property>
|
||||
<Property name="id" type="string" required={false}>
|
||||
|
||||
@@ -1428,7 +1529,7 @@ echo $response;
|
||||
ID of the resource
|
||||
|
||||
</Property>
|
||||
<Property name="type" type="string" required={true} enumList={["host","subnet","domain"]}>
|
||||
<Property name="type" type="string" required={true} enumList={["host","subnet","domain","peer"]}>
|
||||
|
||||
Network resource type based of the address
|
||||
|
||||
@@ -1455,7 +1556,7 @@ echo $response;
|
||||
ID of the resource
|
||||
|
||||
</Property>
|
||||
<Property name="type" type="string" required={true} enumList={["host","subnet","domain"]}>
|
||||
<Property name="type" type="string" required={true} enumList={["host","subnet","domain","peer"]}>
|
||||
|
||||
Network resource type based of the address
|
||||
|
||||
@@ -1508,6 +1609,13 @@ curl -X PUT https://api.netbird.io/api/policies/{policyId} \
|
||||
"end": 320
|
||||
}
|
||||
],
|
||||
"authorized_groups": {
|
||||
"description": "Map of user group ids to a list of local users",
|
||||
"type": "object",
|
||||
"additionalProperties": [
|
||||
"group1"
|
||||
]
|
||||
},
|
||||
"id": "ch8i4ug6lnn4g9hqv7mg",
|
||||
"sources": [
|
||||
"ch8i4ug6lnn4g9hqv797"
|
||||
@@ -1554,6 +1662,13 @@ let data = JSON.stringify({
|
||||
"end": 320
|
||||
}
|
||||
],
|
||||
"authorized_groups": {
|
||||
"description": "Map of user group ids to a list of local users",
|
||||
"type": "object",
|
||||
"additionalProperties": [
|
||||
"group1"
|
||||
]
|
||||
},
|
||||
"id": "ch8i4ug6lnn4g9hqv7mg",
|
||||
"sources": [
|
||||
"ch8i4ug6lnn4g9hqv797"
|
||||
@@ -1622,6 +1737,13 @@ payload = json.dumps({
|
||||
"end": 320
|
||||
}
|
||||
],
|
||||
"authorized_groups": {
|
||||
"description": "Map of user group ids to a list of local users",
|
||||
"type": "object",
|
||||
"additionalProperties": [
|
||||
"group1"
|
||||
]
|
||||
},
|
||||
"id": "ch8i4ug6lnn4g9hqv7mg",
|
||||
"sources": [
|
||||
"ch8i4ug6lnn4g9hqv797"
|
||||
@@ -1690,6 +1812,13 @@ func main() {
|
||||
"end": 320
|
||||
}
|
||||
],
|
||||
"authorized_groups": {
|
||||
"description": "Map of user group ids to a list of local users",
|
||||
"type": "object",
|
||||
"additionalProperties": [
|
||||
"group1"
|
||||
]
|
||||
},
|
||||
"id": "ch8i4ug6lnn4g9hqv7mg",
|
||||
"sources": [
|
||||
"ch8i4ug6lnn4g9hqv797"
|
||||
@@ -1776,6 +1905,13 @@ request.body = JSON.dump({
|
||||
"end": 320
|
||||
}
|
||||
],
|
||||
"authorized_groups": {
|
||||
"description": "Map of user group ids to a list of local users",
|
||||
"type": "object",
|
||||
"additionalProperties": [
|
||||
"group1"
|
||||
]
|
||||
},
|
||||
"id": "ch8i4ug6lnn4g9hqv7mg",
|
||||
"sources": [
|
||||
"ch8i4ug6lnn4g9hqv797"
|
||||
@@ -1826,6 +1962,13 @@ RequestBody body = RequestBody.create(mediaType, '{
|
||||
"end": 320
|
||||
}
|
||||
],
|
||||
"authorized_groups": {
|
||||
"description": "Map of user group ids to a list of local users",
|
||||
"type": "object",
|
||||
"additionalProperties": [
|
||||
"group1"
|
||||
]
|
||||
},
|
||||
"id": "ch8i4ug6lnn4g9hqv7mg",
|
||||
"sources": [
|
||||
"ch8i4ug6lnn4g9hqv797"
|
||||
@@ -1892,6 +2035,13 @@ curl_setopt_array($curl, array(
|
||||
"end": 320
|
||||
}
|
||||
],
|
||||
"authorized_groups": {
|
||||
"description": "Map of user group ids to a list of local users",
|
||||
"type": "object",
|
||||
"additionalProperties": [
|
||||
"group1"
|
||||
]
|
||||
},
|
||||
"id": "ch8i4ug6lnn4g9hqv7mg",
|
||||
"sources": [
|
||||
"ch8i4ug6lnn4g9hqv797"
|
||||
@@ -1953,6 +2103,13 @@ echo $response;
|
||||
"end": 320
|
||||
}
|
||||
],
|
||||
"authorized_groups": {
|
||||
"description": "Map of user group ids to a list of local users",
|
||||
"type": "object",
|
||||
"additionalProperties": [
|
||||
"group1"
|
||||
]
|
||||
},
|
||||
"id": "ch8i4ug6lnn4g9hqv7mg",
|
||||
"sources": [
|
||||
{
|
||||
@@ -2010,6 +2167,13 @@ echo $response;
|
||||
"end": "integer"
|
||||
}
|
||||
],
|
||||
"authorized_groups": {
|
||||
"description": "Map of user group ids to a list of local users",
|
||||
"type": "object",
|
||||
"additionalProperties": [
|
||||
"string"
|
||||
]
|
||||
},
|
||||
"id": "string",
|
||||
"sources": [
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user