Skip to content

Commit 175c328

Browse files
author
SDK Automation
committed
Update from master
1 parent 487bf18 commit 175c328

File tree

8 files changed

+93
-464
lines changed

8 files changed

+93
-464
lines changed

‎schemas/2014-04-01-preview/deploymentTemplate.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -619,12 +619,9 @@
619619
{ "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Sql.json#/resourceDefinitions/servers_elasticPools" },
620620
{ "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Sql.json#/resourceDefinitions/servers_firewallRules" },
621621
{ "$ref": "https://schema.management.azure.com/schemas/2015-05-01/Microsoft.Insights.json#/resourceDefinitions/components" },
622-
{ "$ref": "https://schema.management.azure.com/schemas/2015-05-01/Microsoft.Insights.json#/resourceDefinitions/workbooks" },
623-
{ "$ref": "https://schema.management.azure.com/schemas/2018-06-17-preview/microsoft.insights.json#/resourceDefinitions/workbooks" },
624622
{ "$ref": "https://schema.management.azure.com/schemas/2019-10-17-preview/microsoft.insights.json#/resourceDefinitions/privateLinkScopes" },
625623
{ "$ref": "https://schema.management.azure.com/schemas/2019-10-17-preview/microsoft.insights.json#/resourceDefinitions/privateLinkScopes_privateEndpointConnections" },
626624
{ "$ref": "https://schema.management.azure.com/schemas/2019-10-17-preview/microsoft.insights.json#/resourceDefinitions/privateLinkScopes_scopedResources" },
627-
{ "$ref": "https://schema.management.azure.com/schemas/2019-10-17-preview/microsoft.insights.json#/resourceDefinitions/workbooktemplates" },
628625
{ "$ref": "https://schema.management.azure.com/schemas/2015-05-01/Microsoft.Insights.json#/resourceDefinitions/webtests" },
629626
{ "$ref": "https://schema.management.azure.com/schemas/2015-05-01-preview/Microsoft.Sql.json#/resourceDefinitions/managedInstances" },
630627
{ "$ref": "https://schema.management.azure.com/schemas/2015-05-01-preview/Microsoft.Sql.json#/resourceDefinitions/servers" },

‎schemas/2015-01-01/deploymentTemplate.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -719,12 +719,9 @@
719719
{ "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Sql.json#/resourceDefinitions/servers_elasticPools" },
720720
{ "$ref": "https://schema.management.azure.com/schemas/2014-04-01/Microsoft.Sql.json#/resourceDefinitions/servers_firewallRules" },
721721
{ "$ref": "https://schema.management.azure.com/schemas/2015-05-01/Microsoft.Insights.json#/resourceDefinitions/components" },
722-
{ "$ref": "https://schema.management.azure.com/schemas/2015-05-01/Microsoft.Insights.json#/resourceDefinitions/workbooks" },
723-
{ "$ref": "https://schema.management.azure.com/schemas/2018-06-17-preview/microsoft.insights.json#/resourceDefinitions/workbooks" },
724722
{ "$ref": "https://schema.management.azure.com/schemas/2019-10-17-preview/microsoft.insights.json#/resourceDefinitions/privateLinkScopes" },
725723
{ "$ref": "https://schema.management.azure.com/schemas/2019-10-17-preview/microsoft.insights.json#/resourceDefinitions/privateLinkScopes_privateEndpointConnections" },
726724
{ "$ref": "https://schema.management.azure.com/schemas/2019-10-17-preview/microsoft.insights.json#/resourceDefinitions/privateLinkScopes_scopedResources" },
727-
{ "$ref": "https://schema.management.azure.com/schemas/2019-10-17-preview/microsoft.insights.json#/resourceDefinitions/workbooktemplates" },
728725
{ "$ref": "https://schema.management.azure.com/schemas/2015-05-01/Microsoft.Insights.json#/resourceDefinitions/webtests" },
729726
{ "$ref": "https://schema.management.azure.com/schemas/2015-05-01-preview/Microsoft.Sql.json#/resourceDefinitions/managedInstances" },
730727
{ "$ref": "https://schema.management.azure.com/schemas/2015-05-01-preview/Microsoft.Sql.json#/resourceDefinitions/servers" },

‎schemas/2015-05-01/Microsoft.Insights.json‎

Lines changed: 1 addition & 145 deletions
Original file line numberDiff line numberDiff line change
@@ -139,79 +139,6 @@
139139
"properties"
140140
],
141141
"description": "Microsoft.Insights/webtests"
142-
},
143-
"workbooks": {
144-
"type": "object",
145-
"properties": {
146-
"apiVersion": {
147-
"type": "string",
148-
"enum": [
149-
"2015-05-01"
150-
]
151-
},
152-
"kind": {
153-
"oneOf": [
154-
{
155-
"type": "string",
156-
"enum": [
157-
"user",
158-
"shared"
159-
]
160-
},
161-
{
162-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
163-
}
164-
],
165-
"description": "The kind of workbook. Choices are user and shared."
166-
},
167-
"location": {
168-
"type": "string",
169-
"description": "Resource location"
170-
},
171-
"name": {
172-
"type": "string",
173-
"description": "The name of the Application Insights component resource."
174-
},
175-
"properties": {
176-
"oneOf": [
177-
{
178-
"$ref": "#/definitions/WorkbookProperties"
179-
},
180-
{
181-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
182-
}
183-
],
184-
"description": "Properties that contain a workbook."
185-
},
186-
"tags": {
187-
"oneOf": [
188-
{
189-
"type": "object",
190-
"additionalProperties": {
191-
"type": "string"
192-
},
193-
"properties": {}
194-
},
195-
{
196-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
197-
}
198-
],
199-
"description": "Resource tags"
200-
},
201-
"type": {
202-
"type": "string",
203-
"enum": [
204-
"microsoft.insights/workbooks"
205-
]
206-
}
207-
},
208-
"required": [
209-
"apiVersion",
210-
"name",
211-
"properties",
212-
"type"
213-
],
214-
"description": "microsoft.insights/workbooks"
215142
}
216143
},
217144
"definitions": {
@@ -411,77 +338,6 @@
411338
}
412339
},
413340
"description": "An XML configuration specification for a WebTest."
414-
},
415-
"WorkbookProperties": {
416-
"type": "object",
417-
"properties": {
418-
"category": {
419-
"type": "string",
420-
"description": "Workbook category, as defined by the user at creation time."
421-
},
422-
"kind": {
423-
"oneOf": [
424-
{
425-
"type": "string",
426-
"enum": [
427-
"user",
428-
"shared"
429-
]
430-
},
431-
{
432-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
433-
}
434-
],
435-
"description": "Enum indicating if this workbook definition is owned by a specific user or is shared between all users with access to the Application Insights component."
436-
},
437-
"name": {
438-
"type": "string",
439-
"description": "The user-defined name of the workbook."
440-
},
441-
"serializedData": {
442-
"type": "string",
443-
"description": "Configuration of this particular workbook. Configuration data is a string containing valid JSON"
444-
},
445-
"sourceResourceId": {
446-
"type": "string",
447-
"description": "Optional resourceId for a source resource."
448-
},
449-
"tags": {
450-
"oneOf": [
451-
{
452-
"type": "array",
453-
"items": {
454-
"type": "string"
455-
}
456-
},
457-
{
458-
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
459-
}
460-
],
461-
"description": "A list of 0 or more tags that are associated with this workbook definition"
462-
},
463-
"userId": {
464-
"type": "string",
465-
"description": "Unique user id of the specific user that owns this workbook."
466-
},
467-
"version": {
468-
"type": "string",
469-
"description": "This instance's version of the data model. This can change as new features are added that can be marked workbook."
470-
},
471-
"workbookId": {
472-
"type": "string",
473-
"description": "Internally assigned unique id of the workbook definition."
474-
}
475-
},
476-
"required": [
477-
"category",
478-
"kind",
479-
"name",
480-
"serializedData",
481-
"userId",
482-
"workbookId"
483-
],
484-
"description": "Properties that contain a workbook."
485341
}
486342
}
487-
}
343+
}

‎schemas/2016-06-01/Microsoft.Subscription.json‎

Lines changed: 88 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,88 @@
1+
{
2+
"id": "https://schema.management.azure.com/schemas/2016-06-01/Microsoft.Subscription.json#",
3+
"$schema": "http://json-schema.org/draft-04/schema#",
4+
"title": "Microsoft.Subscription",
5+
"description": "Microsoft Subscription Resource Types",
6+
"resourceDefinitions": {},
7+
"tenant_resourceDefinitions": {
8+
"aliases": {
9+
"type": "object",
10+
"properties": {
11+
"apiVersion": {
12+
"type": "string",
13+
"enum": [
14+
"2016-06-01"
15+
]
16+
},
17+
"name": {
18+
"type": "string",
19+
"description": "Alias Name"
20+
},
21+
"properties": {
22+
"oneOf": [
23+
{
24+
"$ref": "#/definitions/PutAliasRequestProperties"
25+
},
26+
{
27+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
28+
}
29+
],
30+
"description": "Put subscription properties."
31+
},
32+
"type": {
33+
"type": "string",
34+
"enum": [
35+
"Microsoft.Subscription/aliases"
36+
]
37+
}
38+
},
39+
"required": [
40+
"apiVersion",
41+
"name",
42+
"properties",
43+
"type"
44+
],
45+
"description": "Microsoft.Subscription/aliases"
46+
}
47+
},
48+
"definitions": {
49+
"PutAliasRequestProperties": {
50+
"type": "object",
51+
"properties": {
52+
"billingScope": {
53+
"type": "string",
54+
"description": "Determines whether subscription is fieldLed, partnerLed or LegacyEA"
55+
},
56+
"displayName": {
57+
"type": "string",
58+
"description": "The friendly name of the subscription."
59+
},
60+
"subscriptionId": {
61+
"type": "string",
62+
"description": "This parameter can be used to create alias for existing subscription Id"
63+
},
64+
"workload": {
65+
"oneOf": [
66+
{
67+
"type": "string",
68+
"enum": [
69+
"Production",
70+
"DevTest"
71+
]
72+
},
73+
{
74+
"$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
75+
}
76+
],
77+
"description": "The workload type of the subscription. It can be either Production or DevTest."
78+
}
79+
},
80+
"required": [
81+
"billingScope",
82+
"displayName",
83+
"workload"
84+
],
85+
"description": "Put subscription properties."
86+
}
87+
}
88+
}

0 commit comments

Comments
 (0)