Skip to content

Commit 0e18f46

Browse files
bowen5bowen5
authored
Fix Swagger Correctness. (#12271)
* Fix Swagger Correctness. * Fix Prettier. * Fix file mode. * Update 2020-07-01 as well.
1 parent 735c034 commit 0e18f46

File tree

15 files changed

+573
-35
lines changed

15 files changed

+573
-35
lines changed

‎specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/appplatform.json‎

Lines changed: 58 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2386,11 +2386,13 @@
23862386
"properties": {
23872387
"name": {
23882388
"description": "Name of the Sku",
2389-
"type": "string"
2389+
"type": "string",
2390+
"default": "S0"
23902391
},
23912392
"tier": {
23922393
"description": "Tier of the Sku",
2393-
"type": "string"
2394+
"type": "string",
2395+
"default": "Standard"
23942396
},
23952397
"capacity": {
23962398
"format": "int32",
@@ -2500,6 +2502,60 @@
25002502
"description": "A list of public IP addresses."
25012503
}
25022504
}
2505+
},
2506+
"requiredTraffics": {
2507+
"description": "Required inbound or outbound traffics for Azure Spring Cloud instance.",
2508+
"type": "array",
2509+
"readOnly": true,
2510+
"items": {
2511+
"$ref": "#/definitions/RequiredTraffic"
2512+
}
2513+
}
2514+
}
2515+
},
2516+
"RequiredTraffic": {
2517+
"description": "Required inbound or outbound traffic for Azure Spring Cloud instance.",
2518+
"type": "object",
2519+
"properties": {
2520+
"protocol": {
2521+
"description": "The protocol of required traffic",
2522+
"type": "string",
2523+
"readOnly": true
2524+
},
2525+
"port": {
2526+
"description": "The port of required traffic",
2527+
"type": "integer",
2528+
"format": "int32",
2529+
"readOnly": true
2530+
},
2531+
"ips": {
2532+
"description": "The ip list of required traffic",
2533+
"type": "array",
2534+
"readOnly": true,
2535+
"items": {
2536+
"type": "string"
2537+
}
2538+
},
2539+
"fqdns": {
2540+
"description": "The FQDN list of required traffic",
2541+
"type": "array",
2542+
"readOnly": true,
2543+
"items": {
2544+
"type": "string"
2545+
}
2546+
},
2547+
"direction": {
2548+
"description": "The direction of required traffic",
2549+
"type": "string",
2550+
"readOnly": true,
2551+
"enum": [
2552+
"Inbound",
2553+
"Outbound"
2554+
],
2555+
"x-ms-enum": {
2556+
"name": "trafficDirection",
2557+
"modelAsString": true
2558+
}
25032559
}
25042560
}
25052561
},

‎specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Services_CreateOrUpdate.json‎

Lines changed: 60 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,36 @@
6161
"20.39.3.173",
6262
"40.64.67.13"
6363
]
64-
}
64+
},
65+
"requiredTraffics": [
66+
{
67+
"protocol": "TCP",
68+
"port": 443,
69+
"ips": [
70+
"20.62.211.25",
71+
"52.188.47.226"
72+
],
73+
"direction": "Outbound"
74+
},
75+
{
76+
"protocol": "UDP",
77+
"port": 1194,
78+
"ips": [
79+
"20.62.211.25",
80+
"52.188.47.226"
81+
],
82+
"direction": "Outbound"
83+
},
84+
{
85+
"protocol": "TCP",
86+
"port": 9000,
87+
"ips": [
88+
"20.62.211.25",
89+
"52.188.47.226"
90+
],
91+
"direction": "Outbound"
92+
}
93+
]
6594
}
6695
},
6796
"type": "Microsoft.AppPlatform/Spring",
@@ -105,7 +134,36 @@
105134
"20.39.3.173",
106135
"40.64.67.13"
107136
]
108-
}
137+
},
138+
"requiredTraffics": [
139+
{
140+
"protocol": "TCP",
141+
"port": 443,
142+
"ips": [
143+
"20.62.211.25",
144+
"52.188.47.226"
145+
],
146+
"direction": "Outbound"
147+
},
148+
{
149+
"protocol": "UDP",
150+
"port": 1194,
151+
"ips": [
152+
"20.62.211.25",
153+
"52.188.47.226"
154+
],
155+
"direction": "Outbound"
156+
},
157+
{
158+
"protocol": "TCP",
159+
"port": 9000,
160+
"ips": [
161+
"20.62.211.25",
162+
"52.188.47.226"
163+
],
164+
"direction": "Outbound"
165+
}
166+
]
109167
}
110168
},
111169
"type": "Microsoft.AppPlatform/Spring",

‎specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Services_CreateOrUpdate_VNetInjection.json‎

Lines changed: 60 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,36 @@
3939
"publicIPs": [
4040
"40.64.67.13"
4141
]
42-
}
42+
},
43+
"requiredTraffics": [
44+
{
45+
"protocol": "TCP",
46+
"port": 443,
47+
"ips": [
48+
"20.62.211.25",
49+
"52.188.47.226"
50+
],
51+
"direction": "Outbound"
52+
},
53+
{
54+
"protocol": "UDP",
55+
"port": 1194,
56+
"ips": [
57+
"20.62.211.25",
58+
"52.188.47.226"
59+
],
60+
"direction": "Outbound"
61+
},
62+
{
63+
"protocol": "TCP",
64+
"port": 9000,
65+
"ips": [
66+
"20.62.211.25",
67+
"52.188.47.226"
68+
],
69+
"direction": "Outbound"
70+
}
71+
]
4372
},
4473
"serviceId": "12345678abcd1234abcd12345678abcd"
4574
},
@@ -70,7 +99,36 @@
7099
"publicIPs": [
71100
"40.64.67.13"
72101
]
73-
}
102+
},
103+
"requiredTraffics": [
104+
{
105+
"protocol": "TCP",
106+
"port": 443,
107+
"ips": [
108+
"20.62.211.25",
109+
"52.188.47.226"
110+
],
111+
"direction": "Outbound"
112+
},
113+
{
114+
"protocol": "UDP",
115+
"port": 1194,
116+
"ips": [
117+
"20.62.211.25",
118+
"52.188.47.226"
119+
],
120+
"direction": "Outbound"
121+
},
122+
{
123+
"protocol": "TCP",
124+
"port": 9000,
125+
"ips": [
126+
"20.62.211.25",
127+
"52.188.47.226"
128+
],
129+
"direction": "Outbound"
130+
}
131+
]
74132
},
75133
"serviceId": "12345678abcd1234abcd12345678abcd"
76134
},

‎specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Services_Get.json‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,36 @@
3434
"20.39.3.173",
3535
"40.64.67.13"
3636
]
37-
}
37+
},
38+
"requiredTraffics": [
39+
{
40+
"protocol": "TCP",
41+
"port": 443,
42+
"ips": [
43+
"20.62.211.25",
44+
"52.188.47.226"
45+
],
46+
"direction": "Outbound"
47+
},
48+
{
49+
"protocol": "UDP",
50+
"port": 1194,
51+
"ips": [
52+
"20.62.211.25",
53+
"52.188.47.226"
54+
],
55+
"direction": "Outbound"
56+
},
57+
{
58+
"protocol": "TCP",
59+
"port": 9000,
60+
"ips": [
61+
"20.62.211.25",
62+
"52.188.47.226"
63+
],
64+
"direction": "Outbound"
65+
}
66+
]
3867
}
3968
},
4069
"type": "Microsoft.AppPlatform/Spring",

‎specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Services_List.json‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,36 @@
3535
"20.39.3.173",
3636
"40.64.67.13"
3737
]
38-
}
38+
},
39+
"requiredTraffics": [
40+
{
41+
"protocol": "TCP",
42+
"port": 443,
43+
"ips": [
44+
"20.62.211.25",
45+
"52.188.47.226"
46+
],
47+
"direction": "Outbound"
48+
},
49+
{
50+
"protocol": "UDP",
51+
"port": 1194,
52+
"ips": [
53+
"20.62.211.25",
54+
"52.188.47.226"
55+
],
56+
"direction": "Outbound"
57+
},
58+
{
59+
"protocol": "TCP",
60+
"port": 9000,
61+
"ips": [
62+
"20.62.211.25",
63+
"52.188.47.226"
64+
],
65+
"direction": "Outbound"
66+
}
67+
]
3968
}
4069
},
4170
"type": "Microsoft.AppPlatform/Spring",

‎specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Services_ListBySubscription.json‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,36 @@
3434
"20.39.3.173",
3535
"40.64.67.13"
3636
]
37-
}
37+
},
38+
"requiredTraffics": [
39+
{
40+
"protocol": "TCP",
41+
"port": 443,
42+
"ips": [
43+
"20.62.211.25",
44+
"52.188.47.226"
45+
],
46+
"direction": "Outbound"
47+
},
48+
{
49+
"protocol": "UDP",
50+
"port": 1194,
51+
"ips": [
52+
"20.62.211.25",
53+
"52.188.47.226"
54+
],
55+
"direction": "Outbound"
56+
},
57+
{
58+
"protocol": "TCP",
59+
"port": 9000,
60+
"ips": [
61+
"20.62.211.25",
62+
"52.188.47.226"
63+
],
64+
"direction": "Outbound"
65+
}
66+
]
3867
}
3968
},
4069
"type": "Microsoft.AppPlatform/Spring",

0 commit comments

Comments
 (0)