Skip to content

Commit f2d6727

Browse files
SDKAutoAdam Holliday
SDKAuto
and
Adam Holliday
committed
CodeGen from PR 16096 in Azure/azure-rest-api-specs
[Hub Generated] Review request for Microsoft.Security to add version preview/2021-08-01-preview (#16096) * Adds base for updating Microsoft.Security from version stable/2021-07-01 to version 2021-08-01-preview * Updates readme * Updates API version in new specs and examples * First pass at Microsoft.Security/standards for review/preview * Addressing Round-1 feedback, adding missing descriptions and changing scoping to match ProxyResource type * First pass for Microsoft.Security\standardComponents * Changes to fix a typo in an example spec * Added Microsoft.Security/standardAssignments * Fix naming convention issue * Removed types based on Hila's feedback * Changes to data model for both API calls * Fix example errors and typos * Add systemData to Microsoft.Security/standards * Changes to fix systemData linting * un-nest systemData fields in examples * More systemData placement * Naming convention name to assignments from standardAssignment * Additional example added * Changes to address descriptive comments on field types * Add systemData readOnly * prettier-fix against examples * Cleaned types to ref standard v2 common-types entry similar to securityForIoT * Re-added v2 folder? * Missed a change here? * Cleanup of v2 type completely, updated readme.md * Adds suppression to readme * Adds suppression to readme * Change modification to suppress operations linting Co-authored-by: Adam Holliday <[email protected]>
1 parent 298c518 commit f2d6727

File tree

2 files changed

+285
-0
lines changed

2 files changed

+285
-0
lines changed

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

Lines changed: 279 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,279 @@
1+
{
2+
"id": "https://schema.management.azure.com/schemas/2021-08-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+
"assignments": {
8+
"type": "object",
9+
"properties": {
10+
"apiVersion": {
11+
"type": "string",
12+
"enum": [
13+
"2021-08-01-preview"
14+
]
15+
},
16+
"etag": {
17+
"type": "string",
18+
"description": "Entity tag is used for comparing two or more entities from the same requested resource."
19+
},
20+
"kind": {
21+
"type": "string",
22+
"description": "Kind of the resource"
23+
},
24+
"location": {
25+
"type": "string",
26+
"description": "Location where the resource is stored"
27+
},
28+
"name": {
29+
"type": "string",
30+
"description": "The security assignment key - unique key for the standard assignment"
31+
},
32+
"properties": {
33+
"oneOf": [
34+
{
35+
"$ref": "#/definitions/AssignmentProperties"
36+
},
37+
{
38+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
39+
}
40+
],
41+
"description": "Describes the properties of a standardAssignment"
42+
},
43+
"tags": {
44+
"oneOf": [
45+
{
46+
"type": "object",
47+
"additionalProperties": {
48+
"type": "string"
49+
},
50+
"properties": {}
51+
},
52+
{
53+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
54+
}
55+
],
56+
"description": "A list of key value pairs that describe the resource."
57+
},
58+
"type": {
59+
"type": "string",
60+
"enum": [
61+
"Microsoft.Security/assignments"
62+
]
63+
}
64+
},
65+
"required": [
66+
"apiVersion",
67+
"name",
68+
"properties",
69+
"type"
70+
],
71+
"description": "Microsoft.Security/assignments"
72+
},
73+
"standards": {
74+
"type": "object",
75+
"properties": {
76+
"apiVersion": {
77+
"type": "string",
78+
"enum": [
79+
"2021-08-01-preview"
80+
]
81+
},
82+
"etag": {
83+
"type": "string",
84+
"description": "Entity tag is used for comparing two or more entities from the same requested resource."
85+
},
86+
"kind": {
87+
"type": "string",
88+
"description": "Kind of the resource"
89+
},
90+
"location": {
91+
"type": "string",
92+
"description": "Location where the resource is stored"
93+
},
94+
"name": {
95+
"type": "string",
96+
"description": "The Security Standard key - unique key for the standard type"
97+
},
98+
"properties": {
99+
"oneOf": [
100+
{
101+
"$ref": "#/definitions/StandardProperties"
102+
},
103+
{
104+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
105+
}
106+
],
107+
"description": "Describes properties of a standard."
108+
},
109+
"tags": {
110+
"oneOf": [
111+
{
112+
"type": "object",
113+
"additionalProperties": {
114+
"type": "string"
115+
},
116+
"properties": {}
117+
},
118+
{
119+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
120+
}
121+
],
122+
"description": "A list of key value pairs that describe the resource."
123+
},
124+
"type": {
125+
"type": "string",
126+
"enum": [
127+
"Microsoft.Security/standards"
128+
]
129+
}
130+
},
131+
"required": [
132+
"apiVersion",
133+
"name",
134+
"properties",
135+
"type"
136+
],
137+
"description": "Microsoft.Security/standards"
138+
}
139+
},
140+
"definitions": {
141+
"AssignedComponentItem": {
142+
"type": "object",
143+
"properties": {
144+
"key": {
145+
"type": "string",
146+
"description": "unique key to a security assessment object"
147+
}
148+
},
149+
"description": "describe the properties of a security assessment object reference (by key)"
150+
},
151+
"AssignedStandardItem": {
152+
"type": "object",
153+
"properties": {
154+
"id": {
155+
"type": "string",
156+
"description": "full resourceId of the Microsoft.Security/standard object"
157+
}
158+
},
159+
"description": "describe the properties of a of a security standard object reference"
160+
},
161+
"AssignmentProperties": {
162+
"type": "object",
163+
"properties": {
164+
"additionalData": {
165+
"oneOf": [
166+
{
167+
"$ref": "#/definitions/AssignmentPropertiesAdditionalData"
168+
},
169+
{
170+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
171+
}
172+
],
173+
"description": "Additional data about the assignment"
174+
},
175+
"assignedComponent": {
176+
"oneOf": [
177+
{
178+
"$ref": "#/definitions/AssignedComponentItem"
179+
},
180+
{
181+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
182+
}
183+
],
184+
"description": "describe the properties of a security assessment object reference (by key)"
185+
},
186+
"assignedStandard": {
187+
"oneOf": [
188+
{
189+
"$ref": "#/definitions/AssignedStandardItem"
190+
},
191+
{
192+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
193+
}
194+
],
195+
"description": "describe the properties of a of a security standard object reference"
196+
},
197+
"description": {
198+
"type": "string",
199+
"description": "description of the standardAssignment"
200+
},
201+
"displayName": {
202+
"type": "string",
203+
"description": "display name of the standardAssignment"
204+
},
205+
"effect": {
206+
"type": "string",
207+
"description": "expected effect of this assignment (Disable/Exempt/etc)"
208+
},
209+
"expiresOn": {
210+
"type": "string",
211+
"format": "date-time",
212+
"description": "Expiration date of this assignment as a full ISO date"
213+
},
214+
"metadata": {
215+
"type": "object",
216+
"properties": {},
217+
"description": "The assignment metadata. Metadata is an open ended object and is typically a collection of key value pairs."
218+
},
219+
"scope": {
220+
"type": "string",
221+
"description": "Scope to which the standardAssignment applies - can be a subscription path or a resource group under that subscription"
222+
}
223+
},
224+
"description": "Describes the properties of a standardAssignment"
225+
},
226+
"AssignmentPropertiesAdditionalData": {
227+
"type": "object",
228+
"properties": {
229+
"exemptionCategory": {
230+
"type": "string",
231+
"description": "Exemption category of this assignment"
232+
}
233+
},
234+
"description": "Additional data about the assignment"
235+
},
236+
"StandardComponentProperties": {
237+
"type": "object",
238+
"properties": {
239+
"key": {
240+
"type": "string",
241+
"description": "Component Key matching componentMetadata"
242+
}
243+
},
244+
"description": "Describes properties of an component as related to the standard"
245+
},
246+
"StandardProperties": {
247+
"type": "object",
248+
"properties": {
249+
"category": {
250+
"type": "string",
251+
"description": "category of the standard provided"
252+
},
253+
"components": {
254+
"oneOf": [
255+
{
256+
"type": "array",
257+
"items": {
258+
"$ref": "#/definitions/StandardComponentProperties"
259+
}
260+
},
261+
{
262+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
263+
}
264+
],
265+
"description": "List of component objects containing component unique keys (such as assessment keys) to apply to standard scope. Currently only supports assessment keys."
266+
},
267+
"description": {
268+
"type": "string",
269+
"description": "description of the standard"
270+
},
271+
"displayName": {
272+
"type": "string",
273+
"description": "display name of the standard, equivalent to the standardId"
274+
}
275+
},
276+
"description": "Describes properties of a standard."
277+
}
278+
}
279+
}

‎schemas/common/autogeneratedResources.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9214,6 +9214,12 @@
92149214
{
92159215
"$ref": "https://schema.management.azure.com/schemas/2021-07-01-preview/Microsoft.Security.json#/resourceDefinitions/customEntityStoreAssignments"
92169216
},
9217+
{
9218+
"$ref": "https://schema.management.azure.com/schemas/2021-08-01-preview/Microsoft.Security.json#/resourceDefinitions/assignments"
9219+
},
9220+
{
9221+
"$ref": "https://schema.management.azure.com/schemas/2021-08-01-preview/Microsoft.Security.json#/resourceDefinitions/standards"
9222+
},
92179223
{
92189224
"$ref": "https://schema.management.azure.com/schemas/2015-08-01/Microsoft.ServiceBus.json#/resourceDefinitions/namespaces"
92199225
},

0 commit comments

Comments
 (0)