Skip to content

Commit 579c3d8

Browse files
oxide-reflector-bot[bot]oxide-reflector-bot[bot]
authored
Bump, oxide.json to omicron:71fe60ac (#763)
Co-authored-by: oxide-reflector-bot[bot] <130185838+oxide-reflector-bot[bot]@users.noreply.github.com>
1 parent 4a896d1 commit 579c3d8

File tree

4 files changed

+181
-109
lines changed

4 files changed

+181
-109
lines changed

‎cli/docs/cli.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4176,6 +4176,7 @@
41764176
{
41774177
"name": "update",
41784178
"about": "Replace firewall rules",
4179+
"long_about": "The maximum number of rules per VPC is 1024.\nTargets are used to specify the set of instances to which a firewall rule applies. You can target instances directly by name, or specify a VPC, VPC subnet, IP, or IP subnet, which will apply the rule to traffic going to all matching instances. Targets are additive: the rule applies to instances matching ANY target. The maximum number of targets is 256.\nFilters reduce the scope of a firewall rule. Without filters, the rule applies to all packets to the targets (or from the targets, if it's an outbound rule). With multiple filters, the rule applies only to packets matching ALL filters. The maximum number of each type of filter is 256.",
41794180
"args": [
41804181
{
41814182
"long": "json-body",

‎cli/src/generated_cli.rs

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5074,6 +5074,17 @@ impl<T: CliConfig> Cli<T> {
50745074
.help("XXX"),
50755075
)
50765076
.about("Replace firewall rules")
5077+
.long_about(
5078+
"The maximum number of rules per VPC is 1024.\nTargets are used to specify the \
5079+
set of instances to which a firewall rule applies. You can target instances \
5080+
directly by name, or specify a VPC, VPC subnet, IP, or IP subnet, which will \
5081+
apply the rule to traffic going to all matching instances. Targets are additive: \
5082+
the rule applies to instances matching ANY target. The maximum number of targets \
5083+
is 256.\nFilters reduce the scope of a firewall rule. Without filters, the rule \
5084+
applies to all packets to the targets (or from the targets, if it's an outbound \
5085+
rule). With multiple filters, the rule applies only to packets matching ALL \
5086+
filters. The maximum number of each type of filter is 256.",
5087+
)
50775088
}
50785089

50795090
pub fn cli_vpc_router_route_list() -> clap::Command {

‎oxide.json

Lines changed: 51 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -8297,6 +8297,7 @@
82978297
"vpcs"
82988298
],
82998299
"summary": "Replace firewall rules",
8300+
"description": "The maximum number of rules per VPC is 1024.\nTargets are used to specify the set of instances to which a firewall rule applies. You can target instances directly by name, or specify a VPC, VPC subnet, IP, or IP subnet, which will apply the rule to traffic going to all matching instances. Targets are additive: the rule applies to instances matching ANY target. The maximum number of targets is 256.\nFilters reduce the scope of a firewall rule. Without filters, the rule applies to all packets to the targets (or from the targets, if it's an outbound rule). With multiple filters, the rule applies only to packets matching ALL filters. The maximum number of each type of filter is 256.",
83008301
"operationId": "vpc_firewall_rules_update",
83018302
"parameters": [
83028303
{
@@ -16026,7 +16027,7 @@
1602616027
"L4PortRange": {
1602716028
"example": "22",
1602816029
"title": "A range of IP ports",
16029-
"description": "An inclusive-inclusive range of IP ports. The second port may be omitted to represent a single port",
16030+
"description": "An inclusive-inclusive range of IP ports. The second port may be omitted to represent a single port.",
1603016031
"type": "string",
1603116032
"pattern": "^[0-9]{1,5}(-[0-9]{1,5})?$",
1603216033
"minLength": 1,
@@ -19797,12 +19798,23 @@
1979719798
},
1979819799
"Units": {
1979919800
"description": "Measurement units for timeseries samples.",
19800-
"type": "string",
19801-
"enum": [
19802-
"count",
19803-
"bytes",
19804-
"seconds",
19805-
"nanoseconds"
19801+
"oneOf": [
19802+
{
19803+
"type": "string",
19804+
"enum": [
19805+
"count",
19806+
"bytes",
19807+
"seconds",
19808+
"nanoseconds"
19809+
]
19810+
},
19811+
{
19812+
"description": "No meaningful units, e.g. a dimensionless quanity.",
19813+
"type": "string",
19814+
"enum": [
19815+
"none"
19816+
]
19817+
}
1980619818
]
1980719819
},
1980819820
"User": {
@@ -19917,8 +19929,8 @@
1991719929
]
1991819930
},
1991919931
"UserId": {
19920-
"title": "A name unique within the parent collection",
19921-
"description": "Names must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. Names cannot be a UUID, but they may contain a UUID. They can be at most 63 characters long.",
19932+
"title": "A username for a local-only user",
19933+
"description": "Usernames must begin with a lower case ASCII letter, be composed exclusively of lowercase ASCII, uppercase ASCII, numbers, and '-', and may not end with a '-'. Usernames cannot be a UUID, but they may contain a UUID. They can be at most 63 characters long.",
1992219934
"type": "string",
1992319935
"pattern": "^(?![0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$)^[a-z]([a-zA-Z0-9-]*[a-zA-Z0-9]+)?$",
1992419936
"minLength": 1,
@@ -20331,7 +20343,7 @@
2033120343
"type": "object",
2033220344
"properties": {
2033320345
"action": {
20334-
"description": "whether traffic matching the rule should be allowed or dropped",
20346+
"description": "Whether traffic matching the rule should be allowed or dropped",
2033520347
"allOf": [
2033620348
{
2033720349
"$ref": "#/components/schemas/VpcFirewallRuleAction"
@@ -20343,15 +20355,15 @@
2034320355
"type": "string"
2034420356
},
2034520357
"direction": {
20346-
"description": "whether this rule is for incoming or outgoing traffic",
20358+
"description": "Whether this rule is for incoming or outgoing traffic",
2034720359
"allOf": [
2034820360
{
2034920361
"$ref": "#/components/schemas/VpcFirewallRuleDirection"
2035020362
}
2035120363
]
2035220364
},
2035320365
"filters": {
20354-
"description": "reductions on the scope of the rule",
20366+
"description": "Reductions on the scope of the rule",
2035520367
"allOf": [
2035620368
{
2035720369
"$ref": "#/components/schemas/VpcFirewallRuleFilter"
@@ -20372,21 +20384,21 @@
2037220384
]
2037320385
},
2037420386
"priority": {
20375-
"description": "the relative priority of this rule",
20387+
"description": "The relative priority of this rule",
2037620388
"type": "integer",
2037720389
"format": "uint16",
2037820390
"minimum": 0
2037920391
},
2038020392
"status": {
20381-
"description": "whether this rule is in effect",
20393+
"description": "Whether this rule is in effect",
2038220394
"allOf": [
2038320395
{
2038420396
"$ref": "#/components/schemas/VpcFirewallRuleStatus"
2038520397
}
2038620398
]
2038720399
},
2038820400
"targets": {
20389-
"description": "list of sets of instances that the rule applies to",
20401+
"description": "Determine the set of instances that the rule applies to",
2039020402
"type": "array",
2039120403
"items": {
2039220404
"$ref": "#/components/schemas/VpcFirewallRuleTarget"
@@ -20403,7 +20415,7 @@
2040320415
"format": "date-time"
2040420416
},
2040520417
"vpc_id": {
20406-
"description": "the VPC to which this rule belongs",
20418+
"description": "The VPC to which this rule belongs",
2040720419
"type": "string",
2040820420
"format": "uuid"
2040920421
}
@@ -20438,32 +20450,35 @@
2043820450
]
2043920451
},
2044020452
"VpcFirewallRuleFilter": {
20441-
"description": "Filter for a firewall rule. A given packet must match every field that is present for the rule to apply to it. A packet matches a field if any entry in that field matches the packet.",
20453+
"description": "Filters reduce the scope of a firewall rule. Without filters, the rule applies to all packets to the targets (or from the targets, if it's an outbound rule). With multiple filters, the rule applies only to packets matching ALL filters. The maximum number of each type of filter is 256.",
2044220454
"type": "object",
2044320455
"properties": {
2044420456
"hosts": {
2044520457
"nullable": true,
20446-
"description": "If present, the sources (if incoming) or destinations (if outgoing) this rule applies to.",
20458+
"description": "If present, host filters match the \"other end\" of traffic from the target’s perspective: for an inbound rule, they match the source of traffic. For an outbound rule, they match the destination.",
2044720459
"type": "array",
2044820460
"items": {
2044920461
"$ref": "#/components/schemas/VpcFirewallRuleHostFilter"
20450-
}
20462+
},
20463+
"maxItems": 256
2045120464
},
2045220465
"ports": {
2045320466
"nullable": true,
20454-
"description": "If present, the destination ports this rule applies to.",
20467+
"description": "If present, the destination ports or port ranges this rule applies to.",
2045520468
"type": "array",
2045620469
"items": {
2045720470
"$ref": "#/components/schemas/L4PortRange"
20458-
}
20471+
},
20472+
"maxItems": 256
2045920473
},
2046020474
"protocols": {
2046120475
"nullable": true,
2046220476
"description": "If present, the networking protocols this rule applies to.",
2046320477
"type": "array",
2046420478
"items": {
2046520479
"$ref": "#/components/schemas/VpcFirewallRuleProtocol"
20466-
}
20480+
},
20481+
"maxItems": 256
2046720482
}
2046820483
}
2046920484
},
@@ -20585,7 +20600,7 @@
2058520600
]
2058620601
},
2058720602
"VpcFirewallRuleTarget": {
20588-
"description": "A `VpcFirewallRuleTarget` is used to specify the set of `Instance`s to which a firewall rule applies.",
20603+
"description": "A `VpcFirewallRuleTarget` is used to specify the set of instances to which a firewall rule applies. You can target instances directly by name, or specify a VPC, VPC subnet, IP, or IP subnet, which will apply the rule to traffic going to all matching instances. Targets are additive: the rule applies to instances matching ANY target.",
2058920604
"oneOf": [
2059020605
{
2059120606
"description": "The rule applies to all instances in the VPC",
@@ -20690,61 +20705,62 @@
2069020705
"type": "object",
2069120706
"properties": {
2069220707
"action": {
20693-
"description": "whether traffic matching the rule should be allowed or dropped",
20708+
"description": "Whether traffic matching the rule should be allowed or dropped",
2069420709
"allOf": [
2069520710
{
2069620711
"$ref": "#/components/schemas/VpcFirewallRuleAction"
2069720712
}
2069820713
]
2069920714
},
2070020715
"description": {
20701-
"description": "human-readable free-form text about a resource",
20716+
"description": "Human-readable free-form text about a resource",
2070220717
"type": "string"
2070320718
},
2070420719
"direction": {
20705-
"description": "whether this rule is for incoming or outgoing traffic",
20720+
"description": "Whether this rule is for incoming or outgoing traffic",
2070620721
"allOf": [
2070720722
{
2070820723
"$ref": "#/components/schemas/VpcFirewallRuleDirection"
2070920724
}
2071020725
]
2071120726
},
2071220727
"filters": {
20713-
"description": "reductions on the scope of the rule",
20728+
"description": "Reductions on the scope of the rule",
2071420729
"allOf": [
2071520730
{
2071620731
"$ref": "#/components/schemas/VpcFirewallRuleFilter"
2071720732
}
2071820733
]
2071920734
},
2072020735
"name": {
20721-
"description": "name of the rule, unique to this VPC",
20736+
"description": "Name of the rule, unique to this VPC",
2072220737
"allOf": [
2072320738
{
2072420739
"$ref": "#/components/schemas/Name"
2072520740
}
2072620741
]
2072720742
},
2072820743
"priority": {
20729-
"description": "the relative priority of this rule",
20744+
"description": "The relative priority of this rule",
2073020745
"type": "integer",
2073120746
"format": "uint16",
2073220747
"minimum": 0
2073320748
},
2073420749
"status": {
20735-
"description": "whether this rule is in effect",
20750+
"description": "Whether this rule is in effect",
2073620751
"allOf": [
2073720752
{
2073820753
"$ref": "#/components/schemas/VpcFirewallRuleStatus"
2073920754
}
2074020755
]
2074120756
},
2074220757
"targets": {
20743-
"description": "list of sets of instances that the rule applies to",
20758+
"description": "Determine the set of instances that the rule applies to",
2074420759
"type": "array",
2074520760
"items": {
2074620761
"$ref": "#/components/schemas/VpcFirewallRuleTarget"
20747-
}
20762+
},
20763+
"maxItems": 256
2074820764
}
2074920765
},
2075020766
"required": [
@@ -20759,14 +20775,15 @@
2075920775
]
2076020776
},
2076120777
"VpcFirewallRuleUpdateParams": {
20762-
"description": "Updateable properties of a `Vpc`'s firewall Note that VpcFirewallRules are implicitly created along with a Vpc, so there is no explicit creation.",
20778+
"description": "Updated list of firewall rules. Will replace all existing rules.",
2076320779
"type": "object",
2076420780
"properties": {
2076520781
"rules": {
2076620782
"type": "array",
2076720783
"items": {
2076820784
"$ref": "#/components/schemas/VpcFirewallRuleUpdate"
20769-
}
20785+
},
20786+
"maxItems": 1024
2077020787
}
2077120788
},
2077220789
"required": [

0 commit comments

Comments
 (0)