Skip to content

Commit 3fbd54c

Browse files
author
SDKAuto
committed
CodeGen from PR 13078 in Azure/azure-rest-api-specs
Merge ea620fc790040da0e59a0951722ce8b5a2abb29e into 21159753c7a34b0347169c139cea18c5d24c8575
1 parent 0cf8394 commit 3fbd54c

File tree

10 files changed

+181
-36
lines changed

10 files changed

+181
-36
lines changed

‎schemas/2015-06-01-preview/Microsoft.Security.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -703,4 +703,4 @@
703703
"description": "Represents a machine that is part of a VM/server group"
704704
}
705705
}
706-
}
706+
}

‎schemas/2017-08-01-preview/Microsoft.Security.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1557,4 +1557,4 @@
15571557
"description": "Workspace setting data"
15581558
}
15591559
}
1560-
}
1560+
}

‎schemas/2018-06-01/Microsoft.Security.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,4 @@
7171
"description": "Pricing properties for the relevant scope"
7272
}
7373
}
74-
}
74+
}

‎schemas/2019-01-01-preview/Microsoft.Security.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -899,4 +899,4 @@
899899
]
900900
}
901901
}
902-
}
902+
}

‎schemas/2019-01-01/Microsoft.Security.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,4 +155,4 @@
155155
"description": "Represents a data export setting"
156156
}
157157
}
158-
}
158+
}

‎schemas/2019-08-01/Microsoft.Security.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -931,4 +931,4 @@
931931
"description": "Properties of the IoT Security solution's user defined resources."
932932
}
933933
}
934-
}
934+
}

‎schemas/2020-01-01-preview/Microsoft.Security.json‎

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -43,33 +43,6 @@
4343
"type"
4444
],
4545
"description": "Microsoft.Security/connectors"
46-
},
47-
"securityContacts": {
48-
"type": "object",
49-
"properties": {
50-
"apiVersion": {
51-
"type": "string",
52-
"enum": [
53-
"2020-01-01-preview"
54-
]
55-
},
56-
"name": {
57-
"type": "string",
58-
"description": "Name of the security contact object"
59-
},
60-
"type": {
61-
"type": "string",
62-
"enum": [
63-
"Microsoft.Security/securityContacts"
64-
]
65-
}
66-
},
67-
"required": [
68-
"apiVersion",
69-
"name",
70-
"type"
71-
],
72-
"description": "Microsoft.Security/securityContacts"
7346
}
7447
},
7548
"definitions": {
@@ -320,4 +293,4 @@
320293
"description": "Details of the service principal."
321294
}
322295
}
323-
}
296+
}

‎schemas/2020-01-01/Microsoft.Security.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1236,4 +1236,4 @@
12361236
"description": "Represents a machine that is part of a machine group"
12371237
}
12381238
}
1239-
}
1239+
}

‎schemas/2020-07-01-preview/Microsoft.Security.json‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
{
2+
"id": "https://schema.management.azure.com/schemas/2020-07-01-preview/Microsoft.Security.json#",
3+
"$schema": "http://json-schema.org/draft-04/schema#",
4+
"title": "Microsoft.Security",
5+
"description": "Microsoft Security Resource Types",
6+
"resourceDefinitions": {},
7+
"unknown_resourceDefinitions": {
8+
"sqlVulnerabilityAssessments_baselineRules": {
9+
"type": "object",
10+
"properties": {
11+
"apiVersion": {
12+
"type": "string",
13+
"enum": [
14+
"2020-07-01-preview"
15+
]
16+
},
17+
"latestScan": {
18+
"oneOf": [
19+
{
20+
"type": "boolean"
21+
},
22+
{
23+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
24+
}
25+
],
26+
"description": "Take results from latest scan."
27+
},
28+
"name": {
29+
"type": "string",
30+
"description": "The rule Id."
31+
},
32+
"results": {
33+
"oneOf": [
34+
{
35+
"type": "array",
36+
"items": {
37+
"type": "array",
38+
"items": {
39+
"type": "string"
40+
}
41+
}
42+
},
43+
{
44+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
45+
}
46+
],
47+
"description": "Expected results to be inserted into the baseline.\r\nLeave this field empty it LatestScan == true."
48+
},
49+
"type": {
50+
"type": "string",
51+
"enum": [
52+
"Microsoft.Security/sqlVulnerabilityAssessments/baselineRules"
53+
]
54+
}
55+
},
56+
"required": [
57+
"apiVersion",
58+
"name",
59+
"type"
60+
],
61+
"description": "Microsoft.Security/sqlVulnerabilityAssessments/baselineRules"
62+
}
63+
},
64+
"definitions": {}
65+
}

‎schemas/2020-08-06-preview/Microsoft.Security.json‎

Lines changed: 108 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,33 @@
4545
"type"
4646
],
4747
"description": "Microsoft.Security/iotDefenderSettings"
48+
},
49+
"onPremiseIotSensors": {
50+
"type": "object",
51+
"properties": {
52+
"apiVersion": {
53+
"type": "string",
54+
"enum": [
55+
"2020-08-06-preview"
56+
]
57+
},
58+
"name": {
59+
"type": "string",
60+
"description": "Name of the on-premise IoT sensor"
61+
},
62+
"type": {
63+
"type": "string",
64+
"enum": [
65+
"Microsoft.Security/onPremiseIotSensors"
66+
]
67+
}
68+
},
69+
"required": [
70+
"apiVersion",
71+
"name",
72+
"type"
73+
],
74+
"description": "Microsoft.Security/onPremiseIotSensors"
4875
}
4976
},
5077
"unknown_resourceDefinitions": {
@@ -86,6 +113,47 @@
86113
"type"
87114
],
88115
"description": "Microsoft.Security/iotSensors"
116+
},
117+
"iotSites": {
118+
"type": "object",
119+
"properties": {
120+
"apiVersion": {
121+
"type": "string",
122+
"enum": [
123+
"2020-08-06-preview"
124+
]
125+
},
126+
"name": {
127+
"type": "string",
128+
"enum": [
129+
"default"
130+
]
131+
},
132+
"properties": {
133+
"oneOf": [
134+
{
135+
"$ref": "#/definitions/IotSiteProperties"
136+
},
137+
{
138+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
139+
}
140+
],
141+
"description": "IoT site properties"
142+
},
143+
"type": {
144+
"type": "string",
145+
"enum": [
146+
"Microsoft.Security/iotSites"
147+
]
148+
}
149+
},
150+
"required": [
151+
"apiVersion",
152+
"name",
153+
"properties",
154+
"type"
155+
],
156+
"description": "Microsoft.Security/iotSites"
89157
}
90158
},
91159
"definitions": {
@@ -128,6 +196,17 @@
128196
"IotSensorProperties": {
129197
"type": "object",
130198
"properties": {
199+
"isEnterpriseSensor": {
200+
"oneOf": [
201+
{
202+
"type": "boolean"
203+
},
204+
{
205+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
206+
}
207+
],
208+
"description": "Is type of sensor is enterprise IoT sensor"
209+
},
131210
"tiAutomaticUpdates": {
132211
"oneOf": [
133212
{
@@ -145,6 +224,34 @@
145224
}
146225
},
147226
"description": "IoT sensor properties"
227+
},
228+
"IotSiteProperties": {
229+
"type": "object",
230+
"properties": {
231+
"displayName": {
232+
"type": "string",
233+
"description": "Display name of the IoT site"
234+
},
235+
"tags": {
236+
"oneOf": [
237+
{
238+
"type": "object",
239+
"additionalProperties": {
240+
"type": "string"
241+
},
242+
"properties": {}
243+
},
244+
{
245+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
246+
}
247+
],
248+
"description": "Tags of the IoT site"
249+
}
250+
},
251+
"required": [
252+
"displayName"
253+
],
254+
"description": "IoT site properties"
148255
}
149256
}
150-
}
257+
}

0 commit comments

Comments
 (0)