Skip to content

Commit 2e3093a

Browse files
travist13travist13
committed
Add back old Resource definition to attempt to fix an error in the module generation.
1 parent 0a4d036 commit 2e3093a

File tree

7 files changed

+84
-233
lines changed

7 files changed

+84
-233
lines changed

‎specification/azsadmin/resource-manager/compute/Microsoft.Compute.Admin/preview/2015-12-01-preview/Compute.json‎

Lines changed: 30 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"default": {
4343
"description": "Default Response.",
4444
"schema": {
45-
"$ref": "#/definitions/ErrorDetails"
45+
"$ref": "Compute.json#/definitions/CrpErrorDetails"
4646
}
4747
}
4848
},
@@ -53,6 +53,32 @@
5353
}
5454
},
5555
"definitions": {
56+
"Resource": {
57+
"description": "Base resource object.",
58+
"type": "object",
59+
"properties": {
60+
"id": {
61+
"readOnly": true,
62+
"description": "ID of the resource.",
63+
"type": "string"
64+
},
65+
"name": {
66+
"readOnly": true,
67+
"description": "Name of the resource.",
68+
"type": "string"
69+
},
70+
"type": {
71+
"readOnly": true,
72+
"description": "Type of Resource.",
73+
"type": "string"
74+
},
75+
"location": {
76+
"description": "Location of the resource.",
77+
"type": "string"
78+
}
79+
},
80+
"x-ms-azure-resource": true
81+
},
5682
"CrpResource": {
5783
"description": "Base resource object.",
5884
"type": "object",
@@ -80,17 +106,17 @@
80106
"x-ms-azure-resource": true
81107
},
82108
"CrpErrorDetails": {
83-
"description": "Error details.",
109+
"description": "Crp Error details.",
84110
"type": "object",
85111
"properties": {
86112
"error": {
87113
"description": "Object containing error details.",
88-
"$ref": "#/definitions/CrpErrorDetailsInternal"
114+
"$ref": "Compute.json#/definitions/CrpErrorDetailsInternal"
89115
}
90116
}
91117
},
92118
"CrpErrorDetailsInternal": {
93-
"description": "Error details.",
119+
"description": "Crp Error details.",
94120
"type": "object",
95121
"properties": {
96122
"code": {
@@ -177,37 +203,6 @@
177203
"type": "string"
178204
}
179205
}
180-
},
181-
"ErrorDetails": {
182-
"description": "Error details.",
183-
"type": "object",
184-
"properties": {
185-
"error": {
186-
"description": "Object containing error details.",
187-
"$ref": "#/definitions/ErrorDetailsInternal"
188-
}
189-
}
190-
},
191-
"ErrorDetailsInternal": {
192-
"description": "Error details.",
193-
"type": "object",
194-
"properties": {
195-
"code": {
196-
"description": "The error code.",
197-
"type": "string",
198-
"readOnly": true
199-
},
200-
"message": {
201-
"description": "The error message.",
202-
"type": "string",
203-
"readOnly": true
204-
},
205-
"target": {
206-
"description": "The target of the particular error.",
207-
"type": "string",
208-
"readOnly": true
209-
}
210-
}
211206
}
212207
},
213208
"parameters": {

‎specification/azsadmin/resource-manager/compute/Microsoft.Compute.Admin/preview/2018-07-30-preview/Disks.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"$ref": "../2015-12-01-preview/Compute.json#/parameters/LocationParameter"
3737
},
3838
{
39-
"$ref": "Disks.json#/parameters/UserSubscriptionIdParameter"
39+
"$ref": "../2015-12-01-preview/Compute.json#/parameters/UserSubscriptionIdParameter"
4040
},
4141
{
4242
"$ref": "Disks.json#/parameters/DiskStateParameter"

‎specification/azsadmin/resource-manager/compute/Microsoft.Compute.Admin/stable/2020-11-01/Features.json‎

Lines changed: 20 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@
3030
],
3131
"parameters": [
3232
{
33-
"$ref": "Features.json#/parameters/SubscriptionIdParameter"
33+
"$ref": "../../preview/2015-12-01-preview/Compute.json#/parameters/SubscriptionIdParameter"
3434
},
3535
{
36-
"$ref": "Features.json#/parameters/LocationParameter"
36+
"$ref": "../../preview/2015-12-01-preview/Compute.json#/parameters/LocationParameter"
3737
},
3838
{
3939
"$ref": "Features.json#/parameters/FeatureParameter"
4040
},
4141
{
42-
"$ref": "Features.json#/parameters/ApiVersionParameter"
42+
"$ref": "../../preview/2015-12-01-preview/Compute.json#/parameters/ApiVersionParameter"
4343
}
4444
],
4545
"responses": {
@@ -52,7 +52,7 @@
5252
"default": {
5353
"description": "Default error response.",
5454
"schema": {
55-
"$ref": "#/definitions/ErrorDetails"
55+
"$ref": "../../preview/2015-12-01-preview/Compute.json#/definitions/CrpErrorDetails"
5656
}
5757
}
5858
}
@@ -79,13 +79,13 @@
7979
],
8080
"parameters": [
8181
{
82-
"$ref": "Features.json#/parameters/SubscriptionIdParameter"
82+
"$ref": "../../preview/2015-12-01-preview/Compute.json#/parameters/SubscriptionIdParameter"
8383
},
8484
{
85-
"$ref": "Features.json#/parameters/LocationParameter"
85+
"$ref": "../../preview/2015-12-01-preview/Compute.json#/parameters/LocationParameter"
8686
},
8787
{
88-
"$ref": "Features.json#/parameters/ApiVersionParameter"
88+
"$ref": "../../preview/2015-12-01-preview/Compute.json#/parameters/ApiVersionParameter"
8989
}
9090
],
9191
"responses": {
@@ -98,7 +98,7 @@
9898
"default": {
9999
"description": "Default error response.",
100100
"schema": {
101-
"$ref": "#/definitions/ErrorDetails"
101+
"$ref": "../../preview/2015-12-01-preview/Compute.json#/definitions/CrpErrorDetails"
102102
}
103103
}
104104
},
@@ -128,16 +128,16 @@
128128
],
129129
"parameters": [
130130
{
131-
"$ref": "Features.json#/parameters/SubscriptionIdParameter"
131+
"$ref": "../../preview/2015-12-01-preview/Compute.json#/parameters/SubscriptionIdParameter"
132132
},
133133
{
134-
"$ref": "Features.json#/parameters/LocationParameter"
134+
"$ref": "../../preview/2015-12-01-preview/Compute.json#/parameters/LocationParameter"
135135
},
136136
{
137137
"$ref": "Features.json#/parameters/FeatureParameter"
138138
},
139139
{
140-
"$ref": "Features.json#/parameters/ApiVersionParameter"
140+
"$ref": "../../preview/2015-12-01-preview/Compute.json#/parameters/ApiVersionParameter"
141141
},
142142
{
143143
"$ref": "Features.json#/parameters/GlobalFeatureSettingsParameter"
@@ -150,7 +150,7 @@
150150
"default": {
151151
"description": "Default error response.",
152152
"schema": {
153-
"$ref": "#/definitions/ErrorDetails"
153+
"$ref": "../../preview/2015-12-01-preview/Compute.json#/definitions/CrpErrorDetails"
154154
}
155155
}
156156
}
@@ -177,16 +177,16 @@
177177
],
178178
"parameters": [
179179
{
180-
"$ref": "Features.json#/parameters/SubscriptionIdParameter"
180+
"$ref": "../../preview/2015-12-01-preview/Compute.json#/parameters/SubscriptionIdParameter"
181181
},
182182
{
183-
"$ref": "Features.json#/parameters/LocationParameter"
183+
"$ref": "../../preview/2015-12-01-preview/Compute.json#/parameters/LocationParameter"
184184
},
185185
{
186186
"$ref": "Features.json#/parameters/FeatureParameter"
187187
},
188188
{
189-
"$ref": "Features.json#/parameters/ApiVersionParameter"
189+
"$ref": "../../preview/2015-12-01-preview/Compute.json#/parameters/ApiVersionParameter"
190190
},
191191
{
192192
"$ref": "Features.json#/parameters/TenantSubscriptionFeatureSettingsParameter"
@@ -199,7 +199,7 @@
199199
"default": {
200200
"description": "Default error response.",
201201
"schema": {
202-
"$ref": "#/definitions/ErrorDetails"
202+
"$ref": "../../preview/2015-12-01-preview/Compute.json#/definitions/CrpErrorDetails"
203203
}
204204
}
205205
}
@@ -226,16 +226,16 @@
226226
],
227227
"parameters": [
228228
{
229-
"$ref": "Features.json#/parameters/SubscriptionIdParameter"
229+
"$ref": "../../preview/2015-12-01-preview/Compute.json#/parameters/SubscriptionIdParameter"
230230
},
231231
{
232-
"$ref": "Features.json#/parameters/LocationParameter"
232+
"$ref": "../../preview/2015-12-01-preview/Compute.json#/parameters/LocationParameter"
233233
},
234234
{
235235
"$ref": "Features.json#/parameters/FeatureParameter"
236236
},
237237
{
238-
"$ref": "Features.json#/parameters/ApiVersionParameter"
238+
"$ref": "../../preview/2015-12-01-preview/Compute.json#/parameters/ApiVersionParameter"
239239
},
240240
{
241241
"$ref": "Features.json#/parameters/TenantSubscriptionFeatureSettingsParameter"
@@ -248,7 +248,7 @@
248248
"default": {
249249
"description": "Default error response.",
250250
"schema": {
251-
"$ref": "#/definitions/ErrorDetails"
251+
"$ref": "../../preview/2015-12-01-preview/Compute.json#/definitions/CrpErrorDetails"
252252
}
253253
}
254254
}
@@ -341,62 +341,9 @@
341341
"type": "string"
342342
}
343343
}
344-
},
345-
"ErrorDetails": {
346-
"description": "Error details.",
347-
"type": "object",
348-
"properties": {
349-
"error": {
350-
"description": "Object containing error details.",
351-
"$ref": "#/definitions/ErrorDetailsInternal"
352-
}
353-
}
354-
},
355-
"ErrorDetailsInternal": {
356-
"description": "Error details.",
357-
"type": "object",
358-
"properties": {
359-
"code": {
360-
"description": "The error code.",
361-
"type": "string",
362-
"readOnly": true
363-
},
364-
"message": {
365-
"description": "The error message.",
366-
"type": "string",
367-
"readOnly": true
368-
},
369-
"target": {
370-
"description": "The target of the particular error.",
371-
"type": "string",
372-
"readOnly": true
373-
}
374-
}
375344
}
376345
},
377346
"parameters": {
378-
"SubscriptionIdParameter": {
379-
"name": "subscriptionId",
380-
"in": "path",
381-
"description": "Subscription credentials that uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.",
382-
"required": true,
383-
"type": "string"
384-
},
385-
"ApiVersionParameter": {
386-
"name": "api-version",
387-
"in": "query",
388-
"description": "Client API Version.",
389-
"required": true,
390-
"type": "string"
391-
},
392-
"LocationParameter": {
393-
"description": "Location of the resource.",
394-
"name": "location",
395-
"in": "path",
396-
"required": true,
397-
"type": "string",
398-
"x-ms-parameter-location": "method"
399-
},
400347
"FeatureParameter": {
401348
"description": "Name of the feature.",
402349
"name": "featureName",

0 commit comments

Comments
 (0)