Skip to content

Commit 6739cc0

Browse files
author
SDKAuto
committed
CodeGen from PR 22652 in Azure/azure-rest-api-specs
Merge 4d4395b74f4a3cbc5dc7b6e47aab065e2dd6d041 into 27489e482a032b81f2e7a7bc47c8729368e2449c
1 parent ee37d9d commit 6739cc0

File tree

6 files changed

+4737
-34
lines changed

6 files changed

+4737
-34
lines changed

‎schemas/2022-01-01-preview/Microsoft.App.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1447,14 +1447,15 @@
14471447
},
14481448
"certificateId": {
14491449
"type": "string",
1450-
"description": "Resource Id of the Certificate to be bound to this hostname."
1450+
"description": "Resource Id of the Certificate to be bound to this hostname. Must exist in the Managed Environment."
14511451
},
14521452
"name": {
14531453
"type": "string",
14541454
"description": "Hostname."
14551455
}
14561456
},
14571457
"required": [
1458+
"certificateId",
14581459
"name"
14591460
],
14601461
"description": "Custom Domain of a Container App"
@@ -2811,8 +2812,7 @@
28112812
"maxReplicas": {
28122813
"oneOf": [
28132814
{
2814-
"type": "integer",
2815-
"default": "10"
2815+
"type": "integer"
28162816
},
28172817
{
28182818
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -3105,7 +3105,7 @@
31053105
},
31063106
"runtimeSubnetId": {
31073107
"type": "string",
3108-
"description": "Resource ID of a subnet that Container App containers are injected into. This subnet must be in the same VNET as the subnet defined in infrastructureSubnetId. Must not overlap with any other provided IP ranges."
3108+
"description": "This field is deprecated and not used. If you wish to provide your own subnet that Container App containers are injected into, then you should leverage the infrastructureSubnetId."
31093109
}
31103110
},
31113111
"description": "Configuration properties for apps environment to join a Virtual Network"

‎schemas/2022-03-01/Microsoft.App.json

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1447,14 +1447,15 @@
14471447
},
14481448
"certificateId": {
14491449
"type": "string",
1450-
"description": "Resource Id of the Certificate to be bound to this hostname."
1450+
"description": "Resource Id of the Certificate to be bound to this hostname. Must exist in the Managed Environment."
14511451
},
14521452
"name": {
14531453
"type": "string",
14541454
"description": "Hostname."
14551455
}
14561456
},
14571457
"required": [
1458+
"certificateId",
14581459
"name"
14591460
],
14601461
"description": "Custom Domain of a Container App"
@@ -1573,8 +1574,7 @@
15731574
"enabled": {
15741575
"oneOf": [
15751576
{
1576-
"type": "boolean",
1577-
"default": false
1577+
"type": "boolean"
15781578
},
15791579
{
15801580
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -1595,8 +1595,7 @@
15951595
"ignoreErrors": {
15961596
"oneOf": [
15971597
{
1598-
"type": "boolean",
1599-
"default": false
1598+
"type": "boolean"
16001599
},
16011600
{
16021601
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -2167,8 +2166,7 @@
21672166
"allowInsecure": {
21682167
"oneOf": [
21692168
{
2170-
"type": "boolean",
2171-
"default": false
2169+
"type": "boolean"
21722170
},
21732171
{
21742172
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -2837,8 +2835,7 @@
28372835
"maxReplicas": {
28382836
"oneOf": [
28392837
{
2840-
"type": "integer",
2841-
"default": "10"
2838+
"type": "integer"
28422839
},
28432840
{
28442841
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -3135,7 +3132,7 @@
31353132
},
31363133
"runtimeSubnetId": {
31373134
"type": "string",
3138-
"description": "Resource ID of a subnet that Container App containers are injected into. This subnet must be in the same VNET as the subnet defined in infrastructureSubnetId. Must not overlap with any other provided IP ranges."
3135+
"description": "This field is deprecated and not used. If you wish to provide your own subnet that Container App containers are injected into, then you should leverage the infrastructureSubnetId."
31393136
}
31403137
},
31413138
"description": "Configuration properties for apps environment to join a Virtual Network"

‎schemas/2022-06-01-preview/Microsoft.App.json

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1890,14 +1890,15 @@
18901890
},
18911891
"certificateId": {
18921892
"type": "string",
1893-
"description": "Resource Id of the Certificate to be bound to this hostname."
1893+
"description": "Resource Id of the Certificate to be bound to this hostname. Must exist in the Managed Environment."
18941894
},
18951895
"name": {
18961896
"type": "string",
18971897
"description": "Hostname."
18981898
}
18991899
},
19001900
"required": [
1901+
"certificateId",
19011902
"name"
19021903
],
19031904
"description": "Custom Domain of a Container App"
@@ -1906,7 +1907,15 @@
19061907
"type": "object",
19071908
"properties": {
19081909
"certificatePassword": {
1909-
"type": "string",
1910+
"oneOf": [
1911+
{
1912+
"type": "string",
1913+
"pattern": "^(?:[A-Za-z0-9+\\/]{4})*(?:[A-Za-z0-9+\\/]{2}==|[A-Za-z0-9+\\/]{3}=)?$"
1914+
},
1915+
{
1916+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
1917+
}
1918+
],
19101919
"description": "Certificate password"
19111920
},
19121921
"certificateValue": {
@@ -2053,8 +2062,7 @@
20532062
"enabled": {
20542063
"oneOf": [
20552064
{
2056-
"type": "boolean",
2057-
"default": false
2065+
"type": "boolean"
20582066
},
20592067
{
20602068
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -2114,8 +2122,7 @@
21142122
"ignoreErrors": {
21152123
"oneOf": [
21162124
{
2117-
"type": "boolean",
2118-
"default": false
2125+
"type": "boolean"
21192126
},
21202127
{
21212128
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -2738,8 +2745,7 @@
27382745
"allowInsecure": {
27392746
"oneOf": [
27402747
{
2741-
"type": "boolean",
2742-
"default": false
2748+
"type": "boolean"
27432749
},
27442750
{
27452751
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -3602,8 +3608,7 @@
36023608
"maxReplicas": {
36033609
"oneOf": [
36043610
{
3605-
"type": "integer",
3606-
"default": "10"
3611+
"type": "integer"
36073612
},
36083613
{
36093614
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -3971,7 +3976,7 @@
39713976
},
39723977
"runtimeSubnetId": {
39733978
"type": "string",
3974-
"description": "Resource ID of a subnet that Container App containers are injected into. This subnet must be in the same VNET as the subnet defined in infrastructureSubnetId. Must not overlap with any other provided IP ranges."
3979+
"description": "This field is deprecated and not used. If you wish to provide your own subnet that Container App containers are injected into, then you should leverage the infrastructureSubnetId."
39753980
}
39763981
},
39773982
"description": "Configuration properties for apps environment to join a Virtual Network"

‎schemas/2022-10-01/Microsoft.App.json

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -408,10 +408,6 @@
408408
"2022-10-01"
409409
]
410410
},
411-
"kind": {
412-
"type": "string",
413-
"description": "Kind of the Environment."
414-
},
415411
"location": {
416412
"type": "string",
417413
"description": "The geo-location where the resource lives"
@@ -1981,14 +1977,15 @@
19811977
},
19821978
"certificateId": {
19831979
"type": "string",
1984-
"description": "Resource Id of the Certificate to be bound to this hostname."
1980+
"description": "Resource Id of the Certificate to be bound to this hostname. Must exist in the Managed Environment."
19851981
},
19861982
"name": {
19871983
"type": "string",
19881984
"description": "Hostname."
19891985
}
19901986
},
19911987
"required": [
1988+
"certificateId",
19921989
"name"
19931990
],
19941991
"description": "Custom Domain of a Container App"
@@ -1997,7 +1994,15 @@
19971994
"type": "object",
19981995
"properties": {
19991996
"certificatePassword": {
2000-
"type": "string",
1997+
"oneOf": [
1998+
{
1999+
"type": "string",
2000+
"pattern": "^(?:[A-Za-z0-9+\\/]{4})*(?:[A-Za-z0-9+\\/]{2}==|[A-Za-z0-9+\\/]{3}=)?$"
2001+
},
2002+
{
2003+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
2004+
}
2005+
],
20012006
"description": "Certificate password"
20022007
},
20032008
"certificateValue": {
@@ -2205,8 +2210,7 @@
22052210
"ignoreErrors": {
22062211
"oneOf": [
22072212
{
2208-
"type": "boolean",
2209-
"default": false
2213+
"type": "boolean"
22102214
},
22112215
{
22122216
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
@@ -4089,7 +4093,7 @@
40894093
},
40904094
"runtimeSubnetId": {
40914095
"type": "string",
4092-
"description": "Resource ID of a subnet that Container App containers are injected into. This subnet must be in the same VNET as the subnet defined in infrastructureSubnetId. Must not overlap with any other provided IP ranges."
4096+
"description": "This field is deprecated and not used. If you wish to provide your own subnet that Container App containers are injected into, then you should leverage the infrastructureSubnetId."
40934097
}
40944098
},
40954099
"description": "Configuration properties for apps environment to join a Virtual Network"

0 commit comments

Comments
 (0)