Skip to content

Commit f5b57bb

Browse files
author
Sushil Upadhyay
committed
Fix Duplicate Schema error
1 parent 534a625 commit f5b57bb

23 files changed

+1047
-13
lines changed

‎specification/automation/resource-manager/Microsoft.Automation/common/v5/definitions.json

Lines changed: 98 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,98 @@
1+
{
2+
"swagger": "2.0",
3+
"security": [
4+
{
5+
"azure_auth": [
6+
"user_impersonation"
7+
]
8+
}
9+
],
10+
"securityDefinitions": {
11+
"azure_auth": {
12+
"type": "oauth2",
13+
"authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
14+
"flow": "implicit",
15+
"description": "Azure Active Directory OAuth2 Flow",
16+
"scopes": {
17+
"user_impersonation": "impersonate your user account"
18+
}
19+
}
20+
},
21+
"info": {
22+
"version": "2018-06-10",
23+
"title": "Common types"
24+
},
25+
"paths": {},
26+
"definitions": {
27+
"PrivateEndpointConnection": {
28+
"description": "A private endpoint connection",
29+
"type": "object",
30+
"properties": {
31+
"properties": {
32+
"$ref": "#/definitions/PrivateEndpointConnectionProperties",
33+
"description": "Resource properties.",
34+
"x-ms-client-flatten": true
35+
}
36+
},
37+
"allOf": [
38+
{
39+
"$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource"
40+
}
41+
]
42+
},
43+
"PrivateEndpointConnectionProperties": {
44+
"description": "Properties of a private endpoint connection.",
45+
"type": "object",
46+
"properties": {
47+
"privateEndpoint": {
48+
"$ref": "#/definitions/PrivateEndpointProperty",
49+
"description": "Private endpoint which the connection belongs to."
50+
},
51+
"groupIds": {
52+
"$ref": "#/definitions/GroupIdsProperty",
53+
"description": "Gets the groupIds."
54+
},
55+
"privateLinkServiceConnectionState": {
56+
"$ref": "#/definitions/PrivateLinkServiceConnectionStateProperty",
57+
"description": "Connection State of the Private Endpoint Connection."
58+
}
59+
}
60+
},
61+
"PrivateEndpointProperty": {
62+
"type": "object",
63+
"description": "Private endpoint which the connection belongs to.",
64+
"properties": {
65+
"id": {
66+
"type": "string",
67+
"description": "Resource id of the private endpoint."
68+
}
69+
}
70+
},
71+
"GroupIdsProperty": {
72+
"type": "array",
73+
"items": {
74+
"type": "string"
75+
},
76+
"description": "Gets the groupIds."
77+
},
78+
"PrivateLinkServiceConnectionStateProperty": {
79+
"type": "object",
80+
"description": "Connection State of the Private Endpoint Connection.",
81+
"properties": {
82+
"status": {
83+
"type": "string",
84+
"description": "The private link service connection status."
85+
},
86+
"description": {
87+
"type": "string",
88+
"description": "The private link service connection description."
89+
},
90+
"actionsRequired": {
91+
"type": "string",
92+
"description": "Any action that is required beyond basic workflow (approve/ reject/ disconnect)",
93+
"readOnly": true
94+
}
95+
}
96+
}
97+
}
98+
}

‎specification/automation/resource-manager/Microsoft.Automation/preview/2023-05-15-preview/account.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@
586586
"privateEndpointConnections": {
587587
"type": "array",
588588
"items": {
589-
"$ref": "../../common/v1/definitions.json#/definitions/PrivateEndpointConnection"
589+
"$ref": "../../common/v5/definitions.json#/definitions/PrivateEndpointConnection"
590590
},
591591
"description": "List of Automation operations supported by the Automation resource provider."
592592
},

‎specification/automation/resource-manager/Microsoft.Automation/preview/2023-05-15-preview/dscCompilationJob.json

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -329,7 +329,7 @@
329329
},
330330
"allOf": [
331331
{
332-
"$ref": "../../../../../common-types/resource-management/v5/types.json#/definitions/ProxyResource"
332+
"$ref": "../../common/v1/definitions.json#/definitions/ProxyResource"
333333
}
334334
],
335335
"description": "Definition of the Dsc Compilation job."
@@ -514,7 +514,6 @@
514514
"description": "The Dsc configuration property associated with the entity."
515515
},
516516
"JobStream": {
517-
"type": "object",
518517
"properties": {
519518
"id": {
520519
"type": "string",
@@ -529,7 +528,6 @@
529528
"description": "Definition of the job stream."
530529
},
531530
"JobStreamListResult": {
532-
"type": "object",
533531
"properties": {
534532
"value": {
535533
"type": "array",
@@ -581,7 +579,6 @@
581579
},
582580
"summary": {
583581
"type": "string",
584-
"x-nullable": true,
585582
"description": "Gets or sets the summary."
586583
},
587584
"value": {

‎specification/automation/resource-manager/Microsoft.Automation/preview/2023-05-15-preview/examples/createOrUpdateWatcher.json

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "subid",
4+
"resourceGroupName": "rg",
5+
"automationAccountName": "MyTestAutomationAccount",
6+
"watcherName": "MyTestWatcher",
7+
"api-version": "2023-05-15-preview",
8+
"parameters": {
9+
"type": null,
10+
"location": null,
11+
"tags": {},
12+
"etag": null,
13+
"properties": {
14+
"executionFrequencyInSeconds": 60,
15+
"scriptName": "MyTestWatcherRunbook",
16+
"scriptParameters": null,
17+
"description": "This is a test watcher.",
18+
"scriptRunOn": "MyTestHybridWorkerGroup",
19+
"lastModifiedBy": null
20+
}
21+
}
22+
},
23+
"responses": {
24+
"201": {
25+
"headers": {},
26+
"body": {
27+
"id": "/subscriptions/subId/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/MyTestAutomationAccount/watchers/MyTestWatcher",
28+
"name": "MyTestWatcher",
29+
"type": null,
30+
"location": null,
31+
"tags": {},
32+
"etag": null,
33+
"properties": {
34+
"executionFrequencyInSeconds": 60,
35+
"scriptName": "MyTestWatcherRunbook",
36+
"scriptParameters": null,
37+
"description": "This is a test watcher.",
38+
"status": "New",
39+
"scriptRunOn": "MyTestHybridWorkerGroup",
40+
"creationTime": "2018-05-14T21:14:09.607+00:00",
41+
"lastModifiedBy": null,
42+
"lastModifiedTime": "2018-05-14T21:14:09.607+00:00"
43+
}
44+
}
45+
},
46+
"200": {
47+
"headers": {},
48+
"body": {
49+
"id": "/subscriptions/subId/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/MyTestAutomationAccount/watchers/MyTestWatcher",
50+
"name": "MyTestWatcher",
51+
"type": null,
52+
"location": null,
53+
"tags": {},
54+
"etag": null,
55+
"properties": {
56+
"executionFrequencyInSeconds": 60,
57+
"scriptName": "MyTestWatcherRunbook",
58+
"scriptParameters": null,
59+
"description": "This is a test watcher.",
60+
"status": "New",
61+
"scriptRunOn": "MyTestHybridWorkerGroup",
62+
"creationTime": "2018-05-14T21:14:09.607+00:00",
63+
"lastModifiedBy": null,
64+
"lastModifiedTime": "2018-05-14T21:14:09.607+00:00"
65+
}
66+
}
67+
}
68+
}
69+
}

‎specification/automation/resource-manager/Microsoft.Automation/preview/2023-05-15-preview/examples/deleteWatcher.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "subid",
4+
"resourceGroupName": "rg",
5+
"automationAccountName": "MyTestAutomationAccount",
6+
"watcherName": "MyTestWatcher",
7+
"api-version": "2023-05-15-preview"
8+
},
9+
"responses": {
10+
"200": {}
11+
}
12+
}

‎specification/automation/resource-manager/Microsoft.Automation/preview/2023-05-15-preview/examples/getHybridRunbookWorker.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"headers": {},
1313
"body": {
1414
"id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/testaccount/hybridRunbookWorkerGroups/TestHybridGroup/hybridRunbookWorkers/c010ad12-ef14-4a2a-aa9e-ef22c4745ddd",
15+
"location": "East US 2",
1516
"name": "c010ad12-ef14-4a2a-aa9e-ef22c4745ddd",
1617
"type": "Microsoft.Automation/AutomationAccounts/HybridRunbookWorkerGroups/HybridRunbookWorkers",
1718
"properties": {

‎specification/automation/resource-manager/Microsoft.Automation/preview/2023-05-15-preview/examples/getHybridRunbookWorkerGroup.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"headers": {},
1212
"body": {
1313
"id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/testaccount/hybridRunbookWorkerGroups/TestHybridGroup",
14+
"location": "East US 2",
1415
"name": "TestHybridGroup",
1516
"type": "Microsoft.Automation/AutomationAccounts/HybridRunbookWorkerGroups",
1617
"properties": {

‎specification/automation/resource-manager/Microsoft.Automation/preview/2023-05-15-preview/examples/getWatcher.json

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "subid",
4+
"resourceGroupName": "rg",
5+
"automationAccountName": "MyTestAutomationAccount",
6+
"watcherName": "MyTestWatcher",
7+
"api-version": "2023-05-15-preview"
8+
},
9+
"responses": {
10+
"200": {
11+
"headers": {},
12+
"body": {
13+
"id": "/subscriptions/subId/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/MyTestAutomationAccount/watchers/MyTestWatcher",
14+
"name": "MyTestWatcher",
15+
"type": null,
16+
"location": null,
17+
"tags": {},
18+
"etag": null,
19+
"properties": {
20+
"executionFrequencyInSeconds": 60,
21+
"scriptName": "MyTestWatcherRunbook",
22+
"scriptParameters": {},
23+
"description": "",
24+
"status": "Running",
25+
"scriptRunOn": "MyTestHybridWorkerGroup",
26+
"creationTime": "2017-11-30T18:50:17.163+00:00",
27+
"lastModifiedBy": null,
28+
"lastModifiedTime": "2017-11-30T18:50:17.163+00:00"
29+
}
30+
}
31+
}
32+
}
33+
}

‎specification/automation/resource-manager/Microsoft.Automation/preview/2023-05-15-preview/examples/listHybridRunbookWorker.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"value": [
1414
{
1515
"id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/testaccount/hybridRunbookWorkerGroups/TestHybridGroup/hybridRunbookWorkers/c010ad12-ef14-4a2a-aa9e-ef22c4745ddd",
16+
"location": "East US 2",
1617
"name": "c010ad12-ef14-4a2a-aa9e-ef22c4745ddd",
1718
"type": "Microsoft.Automation/AutomationAccounts/HybridRunbookWorkerGroups/HybridRunbookWorkers",
1819
"properties": {
@@ -34,6 +35,7 @@
3435
},
3536
{
3637
"id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/testaccount/hybridRunbookWorkerGroups/TestHybridGroup/hybridRunbookWorkers/e18fe971-75b1-4351-987f-6fe3604bc721",
38+
"location": "East US 2",
3739
"name": "e18fe971-75b1-4351-987f-6fe3604bc721",
3840
"type": "Microsoft.Automation/AutomationAccounts/HybridRunbookWorkerGroups/HybridRunbookWorkers",
3941
"properties": {

‎specification/automation/resource-manager/Microsoft.Automation/preview/2023-05-15-preview/examples/listHybridRunbookWorkerGroup.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"value": [
1313
{
1414
"id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Automation/automationAccounts/testaccount/hybridRunbookWorkerGroups/TestHybridGroup",
15+
"location": "East US 2",
1516
"name": "TestHybridGroup",
1617
"properties": {
1718
"groupType": "User",

0 commit comments

Comments
 (0)