Skip to content

Commit ffcfd93

Browse files
committed
codegen
1 parent 8c65f4a commit ffcfd93

File tree

6 files changed

+382
-1643
lines changed

6 files changed

+382
-1643
lines changed

src/azure-cli/azure/cli/command_modules/network/aaz/latest/network/application_gateway/waf_policy/_create.py

Lines changed: 73 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ class Create(AAZCommand):
2222
"""
2323

2424
_aaz_info = {
25-
"version": "2024-03-01",
25+
"version": "2024-07-01",
2626
"resources": [
27-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/applicationgatewaywebapplicationfirewallpolicies/{}", "2024-03-01"],
27+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/applicationgatewaywebapplicationfirewallpolicies/{}", "2024-07-01"],
2828
]
2929
}
3030

@@ -160,7 +160,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
160160
options=["variable-name"],
161161
help="User Session clause variable.",
162162
required=True,
163-
enum={"ClientAddr": "ClientAddr", "GeoLocation": "GeoLocation", "None": "None"},
163+
enum={"ClientAddr": "ClientAddr", "ClientAddrXFFHeader": "ClientAddrXFFHeader", "GeoLocation": "GeoLocation", "GeoLocationXFFHeader": "GeoLocationXFFHeader", "None": "None"},
164164
)
165165

166166
match_conditions = cls._args_schema.custom_rules.Element.match_conditions
@@ -170,6 +170,7 @@ def _build_arguments_schema(cls, *args, **kwargs):
170170
_element.values = AAZListArg(
171171
options=["values"],
172172
help="Space-separated list of values to match.",
173+
required=True,
173174
)
174175
_element.variables = AAZListArg(
175176
options=["variables"],
@@ -613,7 +614,7 @@ def url_parameters(self):
613614
def query_parameters(self):
614615
parameters = {
615616
**self.serialize_query_param(
616-
"api-version", "2024-03-01",
617+
"api-version", "2024-07-01",
617618
required=True,
618619
),
619620
}
@@ -686,7 +687,7 @@ def content(self):
686687

687688
_elements = _builder.get(".properties.customRules[].matchConditions[]")
688689
if _elements is not None:
689-
_elements.set_prop("matchValues", AAZListType, ".values")
690+
_elements.set_prop("matchValues", AAZListType, ".values", typ_kwargs={"flags": {"required": True}})
690691
_elements.set_prop("matchVariables", AAZListType, ".variables", typ_kwargs={"flags": {"required": True}})
691692
_elements.set_prop("negationConditon", AAZBoolType, ".negate")
692693
_elements.set_prop("operator", AAZStrType, ".operator", typ_kwargs={"flags": {"required": True}})
@@ -924,7 +925,7 @@ def _build_schema_on_200_201(cls):
924925
flags={"read_only": True},
925926
)
926927
_element.id = AAZStrType()
927-
_element.identity = AAZObjectType()
928+
_element.identity = AAZIdentityObjectType()
928929
_CreateHelper._build_schema_managed_service_identity_read(_element.identity)
929930
_element.location = AAZStrType()
930931
_element.name = AAZStrType(
@@ -2154,6 +2155,7 @@ def _build_schema_on_200_201(cls):
21542155
_element = cls._schema_on_200_201.properties.custom_rules.Element.match_conditions.Element
21552156
_element.match_values = AAZListType(
21562157
serialized_name="matchValues",
2158+
flags={"required": True},
21572159
)
21582160
_element.match_variables = AAZListType(
21592161
serialized_name="matchVariables",
@@ -2250,6 +2252,10 @@ def _build_schema_on_200_201(cls):
22502252
managed_rule_sets.Element = AAZObjectType()
22512253

22522254
_element = cls._schema_on_200_201.properties.managed_rules.managed_rule_sets.Element
2255+
_element.computed_disabled_rules = AAZListType(
2256+
serialized_name="computedDisabledRules",
2257+
flags={"read_only": True},
2258+
)
22532259
_element.rule_group_overrides = AAZListType(
22542260
serialized_name="ruleGroupOverrides",
22552261
)
@@ -2262,6 +2268,19 @@ def _build_schema_on_200_201(cls):
22622268
flags={"required": True},
22632269
)
22642270

2271+
computed_disabled_rules = cls._schema_on_200_201.properties.managed_rules.managed_rule_sets.Element.computed_disabled_rules
2272+
computed_disabled_rules.Element = AAZObjectType()
2273+
2274+
_element = cls._schema_on_200_201.properties.managed_rules.managed_rule_sets.Element.computed_disabled_rules.Element
2275+
_element.rule_group_name = AAZStrType(
2276+
serialized_name="ruleGroupName",
2277+
flags={"required": True},
2278+
)
2279+
_element.rules = AAZListType()
2280+
2281+
rules = cls._schema_on_200_201.properties.managed_rules.managed_rule_sets.Element.computed_disabled_rules.Element.rules
2282+
rules.Element = AAZStrType()
2283+
22652284
rule_group_overrides = cls._schema_on_200_201.properties.managed_rules.managed_rule_sets.Element.rule_group_overrides
22662285
rule_group_overrides.Element = AAZObjectType()
22672286

@@ -2853,7 +2872,7 @@ def _build_schema_managed_service_identity_read(cls, _schema):
28532872
_schema.user_assigned_identities = cls._schema_managed_service_identity_read.user_assigned_identities
28542873
return
28552874

2856-
cls._schema_managed_service_identity_read = _schema_managed_service_identity_read = AAZObjectType()
2875+
cls._schema_managed_service_identity_read = _schema_managed_service_identity_read = AAZIdentityObjectType()
28572876

28582877
managed_service_identity_read = _schema_managed_service_identity_read
28592878
managed_service_identity_read.principal_id = AAZStrType(
@@ -3275,6 +3294,10 @@ def _build_schema_network_interface_read(cls, _schema):
32753294
properties.auxiliary_sku = AAZStrType(
32763295
serialized_name="auxiliarySku",
32773296
)
3297+
properties.default_outbound_connectivity_enabled = AAZBoolType(
3298+
serialized_name="defaultOutboundConnectivityEnabled",
3299+
flags={"read_only": True},
3300+
)
32783301
properties.disable_tcp_state_tracking = AAZBoolType(
32793302
serialized_name="disableTcpStateTracking",
32803303
)
@@ -3628,7 +3651,7 @@ def _build_schema_network_security_group_read(cls, _schema):
36283651
flags={"read_only": True},
36293652
)
36303653
_element.id = AAZStrType()
3631-
_element.identity = AAZObjectType()
3654+
_element.identity = AAZIdentityObjectType()
36323655
cls._build_schema_managed_service_identity_read(_element.identity)
36333656
_element.location = AAZStrType()
36343657
_element.name = AAZStrType(
@@ -4098,13 +4121,23 @@ def _build_schema_public_ip_address_read(cls, _schema):
40984121
properties.public_ip_addresses = AAZListType(
40994122
serialized_name="publicIpAddresses",
41004123
)
4124+
properties.public_ip_addresses_v6 = AAZListType(
4125+
serialized_name="publicIpAddressesV6",
4126+
)
41014127
properties.public_ip_prefixes = AAZListType(
41024128
serialized_name="publicIpPrefixes",
41034129
)
4130+
properties.public_ip_prefixes_v6 = AAZListType(
4131+
serialized_name="publicIpPrefixesV6",
4132+
)
41044133
properties.resource_guid = AAZStrType(
41054134
serialized_name="resourceGuid",
41064135
flags={"read_only": True},
41074136
)
4137+
properties.source_virtual_network = AAZObjectType(
4138+
serialized_name="sourceVirtualNetwork",
4139+
)
4140+
cls._build_schema_sub_resource_read(properties.source_virtual_network)
41084141
properties.subnets = AAZListType(
41094142
flags={"read_only": True},
41104143
)
@@ -4113,10 +4146,18 @@ def _build_schema_public_ip_address_read(cls, _schema):
41134146
public_ip_addresses.Element = AAZObjectType()
41144147
cls._build_schema_sub_resource_read(public_ip_addresses.Element)
41154148

4149+
public_ip_addresses_v6 = _schema_public_ip_address_read.properties.nat_gateway.properties.public_ip_addresses_v6
4150+
public_ip_addresses_v6.Element = AAZObjectType()
4151+
cls._build_schema_sub_resource_read(public_ip_addresses_v6.Element)
4152+
41164153
public_ip_prefixes = _schema_public_ip_address_read.properties.nat_gateway.properties.public_ip_prefixes
41174154
public_ip_prefixes.Element = AAZObjectType()
41184155
cls._build_schema_sub_resource_read(public_ip_prefixes.Element)
41194156

4157+
public_ip_prefixes_v6 = _schema_public_ip_address_read.properties.nat_gateway.properties.public_ip_prefixes_v6
4158+
public_ip_prefixes_v6.Element = AAZObjectType()
4159+
cls._build_schema_sub_resource_read(public_ip_prefixes_v6.Element)
4160+
41204161
subnets = _schema_public_ip_address_read.properties.nat_gateway.properties.subnets
41214162
subnets.Element = AAZObjectType()
41224163
cls._build_schema_sub_resource_read(subnets.Element)
@@ -4316,6 +4357,9 @@ def _build_schema_subnet_read(cls, _schema):
43164357
serialized_name="ipConfigurations",
43174358
flags={"read_only": True},
43184359
)
4360+
properties.ipam_pool_prefix_allocations = AAZListType(
4361+
serialized_name="ipamPoolPrefixAllocations",
4362+
)
43194363
properties.nat_gateway = AAZObjectType(
43204364
serialized_name="natGateway",
43214365
)
@@ -4430,6 +4474,27 @@ def _build_schema_subnet_read(cls, _schema):
44304474
ip_configurations.Element = AAZObjectType()
44314475
cls._build_schema_ip_configuration_read(ip_configurations.Element)
44324476

4477+
ipam_pool_prefix_allocations = _schema_subnet_read.properties.ipam_pool_prefix_allocations
4478+
ipam_pool_prefix_allocations.Element = AAZObjectType()
4479+
4480+
_element = _schema_subnet_read.properties.ipam_pool_prefix_allocations.Element
4481+
_element.allocated_address_prefixes = AAZListType(
4482+
serialized_name="allocatedAddressPrefixes",
4483+
flags={"read_only": True},
4484+
)
4485+
_element.number_of_ip_addresses = AAZStrType(
4486+
serialized_name="numberOfIpAddresses",
4487+
)
4488+
_element.pool = AAZObjectType(
4489+
flags={"client_flatten": True},
4490+
)
4491+
4492+
allocated_address_prefixes = _schema_subnet_read.properties.ipam_pool_prefix_allocations.Element.allocated_address_prefixes
4493+
allocated_address_prefixes.Element = AAZStrType()
4494+
4495+
pool = _schema_subnet_read.properties.ipam_pool_prefix_allocations.Element.pool
4496+
pool.id = AAZStrType()
4497+
44334498
private_endpoints = _schema_subnet_read.properties.private_endpoints
44344499
private_endpoints.Element = AAZObjectType()
44354500
cls._build_schema_private_endpoint_read(private_endpoints.Element)

src/azure-cli/azure/cli/command_modules/network/aaz/latest/network/application_gateway/waf_policy/_delete.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ class Delete(AAZCommand):
2222
"""
2323

2424
_aaz_info = {
25-
"version": "2024-03-01",
25+
"version": "2024-07-01",
2626
"resources": [
27-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/applicationgatewaywebapplicationfirewallpolicies/{}", "2024-03-01"],
27+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/applicationgatewaywebapplicationfirewallpolicies/{}", "2024-07-01"],
2828
]
2929
}
3030

@@ -145,7 +145,7 @@ def url_parameters(self):
145145
def query_parameters(self):
146146
parameters = {
147147
**self.serialize_query_param(
148-
"api-version", "2024-03-01",
148+
"api-version", "2024-07-01",
149149
required=True,
150150
),
151151
}

0 commit comments

Comments
 (0)