Skip to content

Commit 8f9abea

Browse files
anat-gilensonAnat Gilenson
anat-gilenson
and
Anat Gilenson
authored
Extract OData parameters to Common types and use in newest versions (#15463)
Co-authored-by: Anat Gilenson <anatgilenson@microsoft.com>
1 parent d218371 commit 8f9abea

File tree

5 files changed

+72
-138
lines changed

5 files changed

+72
-138
lines changed

‎specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2021-03-01-preview/Incidents.json‎

Lines changed: 12 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,16 @@
6363
"$ref": "../../../common/1.0/types.json#/parameters/WorkspaceName"
6464
},
6565
{
66-
"$ref": "#/parameters/ODataFilter"
66+
"$ref": "../../../common/1.0/types.json#/parameters/ODataFilter"
6767
},
6868
{
69-
"$ref": "#/parameters/ODataOrderBy"
69+
"$ref": "../../../common/1.0/types.json#/parameters/ODataOrderBy"
7070
},
7171
{
72-
"$ref": "#/parameters/ODataTop"
72+
"$ref": "../../../common/1.0/types.json#/parameters/ODataTop"
7373
},
7474
{
75-
"$ref": "#/parameters/ODataSkipToken"
75+
"$ref": "../../../common/1.0/types.json#/parameters/ODataSkipToken"
7676
}
7777
],
7878
"responses": {
@@ -422,16 +422,16 @@
422422
"$ref": "#/parameters/IncidentId"
423423
},
424424
{
425-
"$ref": "#/parameters/ODataFilter"
425+
"$ref": "../../../common/1.0/types.json#/parameters/ODataFilter"
426426
},
427427
{
428-
"$ref": "#/parameters/ODataOrderBy"
428+
"$ref": "../../../common/1.0/types.json#/parameters/ODataOrderBy"
429429
},
430430
{
431-
"$ref": "#/parameters/ODataTop"
431+
"$ref": "../../../common/1.0/types.json#/parameters/ODataTop"
432432
},
433433
{
434-
"$ref": "#/parameters/ODataSkipToken"
434+
"$ref": "../../../common/1.0/types.json#/parameters/ODataSkipToken"
435435
}
436436
],
437437
"responses": {
@@ -692,16 +692,16 @@
692692
"$ref": "#/parameters/IncidentId"
693693
},
694694
{
695-
"$ref": "#/parameters/ODataFilter"
695+
"$ref": "../../../common/1.0/types.json#/parameters/ODataFilter"
696696
},
697697
{
698-
"$ref": "#/parameters/ODataOrderBy"
698+
"$ref": "../../../common/1.0/types.json#/parameters/ODataOrderBy"
699699
},
700700
{
701-
"$ref": "#/parameters/ODataTop"
701+
"$ref": "../../../common/1.0/types.json#/parameters/ODataTop"
702702
},
703703
{
704-
"$ref": "#/parameters/ODataSkipToken"
704+
"$ref": "../../../common/1.0/types.json#/parameters/ODataSkipToken"
705705
}
706706
],
707707
"responses": {
@@ -4174,39 +4174,6 @@
41744174
"type": "string",
41754175
"x-ms-parameter-location": "method"
41764176
},
4177-
"ODataFilter": {
4178-
"description": "Filters the results, based on a Boolean condition. Optional.",
4179-
"in": "query",
4180-
"name": "$filter",
4181-
"required": false,
4182-
"type": "string",
4183-
"x-ms-parameter-location": "method"
4184-
},
4185-
"ODataOrderBy": {
4186-
"description": "Sorts the results. Optional.",
4187-
"in": "query",
4188-
"name": "$orderby",
4189-
"required": false,
4190-
"type": "string",
4191-
"x-ms-parameter-location": "method"
4192-
},
4193-
"ODataSkipToken": {
4194-
"description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls. Optional.",
4195-
"in": "query",
4196-
"name": "$skipToken",
4197-
"required": false,
4198-
"type": "string",
4199-
"x-ms-parameter-location": "method"
4200-
},
4201-
"ODataTop": {
4202-
"description": "Returns only the first n results. Optional.",
4203-
"format": "int32",
4204-
"in": "query",
4205-
"name": "$top",
4206-
"required": false,
4207-
"type": "integer",
4208-
"x-ms-parameter-location": "method"
4209-
},
42104177
"Relation": {
42114178
"name": "relation",
42124179
"in": "body",

‎specification/securityinsights/resource-manager/Microsoft.SecurityInsights/preview/2021-03-01-preview/Metadata.json‎

Lines changed: 4 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,16 @@
6666
"$ref": "../../../common/1.0/types.json#/parameters/WorkspaceName"
6767
},
6868
{
69-
"$ref": "#/parameters/ODataFilter"
69+
"$ref": "../../../common/1.0/types.json#/parameters/ODataFilter"
7070
},
7171
{
72-
"$ref": "#/parameters/ODataOrderBy"
72+
"$ref": "../../../common/1.0/types.json#/parameters/ODataOrderBy"
7373
},
7474
{
75-
"$ref": "#/parameters/ODataTop"
75+
"$ref": "../../../common/1.0/types.json#/parameters/ODataTop"
7676
},
7777
{
78-
"$ref": "#/parameters/ODataSkip"
78+
"$ref": "../../../common/1.0/types.json#/parameters/ODataSkip"
7979
}
8080
],
8181
"responses": {
@@ -737,40 +737,6 @@
737737
"required": true,
738738
"type": "string",
739739
"x-ms-parameter-location": "method"
740-
},
741-
"ODataFilter": {
742-
"description": "Filters the results, based on a Boolean condition. Optional.",
743-
"in": "query",
744-
"name": "$filter",
745-
"required": false,
746-
"type": "string",
747-
"x-ms-parameter-location": "method"
748-
},
749-
"ODataOrderBy": {
750-
"description": "Sorts the results. Optional.",
751-
"in": "query",
752-
"name": "$orderby",
753-
"required": false,
754-
"type": "string",
755-
"x-ms-parameter-location": "method"
756-
},
757-
"ODataSkip": {
758-
"description": "Used to skip n elements in the OData query (offset). Returns a nextLink to the next page of results if there are any left.",
759-
"in": "query",
760-
"name": "$skip",
761-
"required": false,
762-
"type": "integer",
763-
"format": "int32",
764-
"x-ms-parameter-location": "method"
765-
},
766-
"ODataTop": {
767-
"description": "Returns only the first n results. Optional.",
768-
"in": "query",
769-
"name": "$top",
770-
"required": false,
771-
"type": "integer",
772-
"format": "int32",
773-
"x-ms-parameter-location": "method"
774740
}
775741
}
776742
}

‎specification/securityinsights/resource-manager/Microsoft.SecurityInsights/stable/2021-04-01/Incidents.json‎

Lines changed: 12 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,16 @@
6060
"$ref": "../../../common/1.0/types.json#/parameters/WorkspaceName"
6161
},
6262
{
63-
"$ref": "#/parameters/ODataFilter"
63+
"$ref": "../../../common/1.0/types.json#/parameters/ODataFilter"
6464
},
6565
{
66-
"$ref": "#/parameters/ODataOrderBy"
66+
"$ref": "../../../common/1.0/types.json#/parameters/ODataOrderBy"
6767
},
6868
{
69-
"$ref": "#/parameters/ODataTop"
69+
"$ref": "../../../common/1.0/types.json#/parameters/ODataTop"
7070
},
7171
{
72-
"$ref": "#/parameters/ODataSkipToken"
72+
"$ref": "../../../common/1.0/types.json#/parameters/ODataSkipToken"
7373
}
7474
],
7575
"responses": {
@@ -350,16 +350,16 @@
350350
"$ref": "#/parameters/IncidentId"
351351
},
352352
{
353-
"$ref": "#/parameters/ODataFilter"
353+
"$ref": "../../../common/1.0/types.json#/parameters/ODataFilter"
354354
},
355355
{
356-
"$ref": "#/parameters/ODataOrderBy"
356+
"$ref": "../../../common/1.0/types.json#/parameters/ODataOrderBy"
357357
},
358358
{
359-
"$ref": "#/parameters/ODataTop"
359+
"$ref": "../../../common/1.0/types.json#/parameters/ODataTop"
360360
},
361361
{
362-
"$ref": "#/parameters/ODataSkipToken"
362+
"$ref": "../../../common/1.0/types.json#/parameters/ODataSkipToken"
363363
}
364364
],
365365
"responses": {
@@ -605,16 +605,16 @@
605605
"$ref": "#/parameters/IncidentId"
606606
},
607607
{
608-
"$ref": "#/parameters/ODataFilter"
608+
"$ref": "../../../common/1.0/types.json#/parameters/ODataFilter"
609609
},
610610
{
611-
"$ref": "#/parameters/ODataOrderBy"
611+
"$ref": "../../../common/1.0/types.json#/parameters/ODataOrderBy"
612612
},
613613
{
614-
"$ref": "#/parameters/ODataTop"
614+
"$ref": "../../../common/1.0/types.json#/parameters/ODataTop"
615615
},
616616
{
617-
"$ref": "#/parameters/ODataSkipToken"
617+
"$ref": "../../../common/1.0/types.json#/parameters/ODataSkipToken"
618618
}
619619
],
620620
"responses": {
@@ -3792,39 +3792,6 @@
37923792
"type": "string",
37933793
"x-ms-parameter-location": "method"
37943794
},
3795-
"ODataFilter": {
3796-
"description": "Filters the results, based on a Boolean condition. Optional.",
3797-
"in": "query",
3798-
"name": "$filter",
3799-
"required": false,
3800-
"type": "string",
3801-
"x-ms-parameter-location": "method"
3802-
},
3803-
"ODataOrderBy": {
3804-
"description": "Sorts the results. Optional.",
3805-
"in": "query",
3806-
"name": "$orderby",
3807-
"required": false,
3808-
"type": "string",
3809-
"x-ms-parameter-location": "method"
3810-
},
3811-
"ODataSkipToken": {
3812-
"description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls. Optional.",
3813-
"in": "query",
3814-
"name": "$skipToken",
3815-
"required": false,
3816-
"type": "string",
3817-
"x-ms-parameter-location": "method"
3818-
},
3819-
"ODataTop": {
3820-
"description": "Returns only the first n results. Optional.",
3821-
"format": "int32",
3822-
"in": "query",
3823-
"name": "$top",
3824-
"required": false,
3825-
"type": "integer",
3826-
"x-ms-parameter-location": "method"
3827-
},
38283795
"Relation": {
38293796
"name": "relation",
38303797
"in": "body",

‎specification/securityinsights/resource-manager/Microsoft.SecurityInsights/stable/2021-04-01/Watchlists.json‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
"$ref": "../../../common/1.0/types.json#/parameters/WorkspaceName"
6464
},
6565
{
66-
"$ref": "#/parameters/ODataSkipToken"
66+
"$ref": "../../../common/1.0/types.json#/parameters/ODataSkipToken"
6767
}
6868
],
6969
"responses": {
@@ -269,7 +269,7 @@
269269
"$ref": "#/parameters/WatchlistAlias"
270270
},
271271
{
272-
"$ref": "#/parameters/ODataSkipToken"
272+
"$ref": "../../../common/1.0/types.json#/parameters/ODataSkipToken"
273273
}
274274
],
275275
"responses": {
@@ -761,14 +761,6 @@
761761
"type": "string",
762762
"x-ms-parameter-location": "method"
763763
},
764-
"ODataSkipToken": {
765-
"description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls. Optional.",
766-
"in": "query",
767-
"name": "$skipToken",
768-
"required": false,
769-
"type": "string",
770-
"x-ms-parameter-location": "method"
771-
},
772764
"SubscriptionId": {
773765
"description": "Azure subscription ID",
774766
"in": "path",

‎specification/securityinsights/resource-manager/common/1.0/types.json‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,48 @@
9595
"required": true,
9696
"type": "string",
9797
"x-ms-parameter-location": "method"
98+
},
99+
"ODataFilter": {
100+
"description": "Filters the results, based on a Boolean condition. Optional.",
101+
"in": "query",
102+
"name": "$filter",
103+
"required": false,
104+
"type": "string",
105+
"x-ms-parameter-location": "method"
106+
},
107+
"ODataOrderBy": {
108+
"description": "Sorts the results. Optional.",
109+
"in": "query",
110+
"name": "$orderby",
111+
"required": false,
112+
"type": "string",
113+
"x-ms-parameter-location": "method"
114+
},
115+
"ODataSkipToken": {
116+
"description": "Skiptoken is only used if a previous operation returned a partial result. If a previous response contains a nextLink element, the value of the nextLink element will include a skiptoken parameter that specifies a starting point to use for subsequent calls. Optional.",
117+
"in": "query",
118+
"name": "$skipToken",
119+
"required": false,
120+
"type": "string",
121+
"x-ms-parameter-location": "method"
122+
},
123+
"ODataTop": {
124+
"description": "Returns only the first n results. Optional.",
125+
"format": "int32",
126+
"in": "query",
127+
"name": "$top",
128+
"required": false,
129+
"type": "integer",
130+
"x-ms-parameter-location": "method"
131+
},
132+
"ODataSkip": {
133+
"description": "Used to skip n elements in the OData query (offset). Returns a nextLink to the next page of results if there are any left.",
134+
"in": "query",
135+
"name": "$skip",
136+
"required": false,
137+
"type": "integer",
138+
"format": "int32",
139+
"x-ms-parameter-location": "method"
98140
}
99141
}
100142
}

0 commit comments

Comments
 (0)