From 8ef59b8fee89eb92cc38e06f476ec5e8b43056aa Mon Sep 17 00:00:00 2001 From: Sadaf Mohammed Akhlaque Shaikh Date: Wed, 6 Apr 2022 11:43:18 +0530 Subject: [PATCH 1/3] Added x-ms-identifier for s360 linting issue --- .../preview/2020-07-01-preview/elastic.json | 7 +++++++ .../preview/2021-09-01-preview/elastic.json | 8 ++++++++ .../preview/2021-10-01-preview/elastic.json | 9 +++++++++ 3 files changed, 24 insertions(+) diff --git a/specification/elastic/resource-manager/Microsoft.Elastic/preview/2020-07-01-preview/elastic.json b/specification/elastic/resource-manager/Microsoft.Elastic/preview/2020-07-01-preview/elastic.json index f86884a05375..edf4b52c9c9e 100644 --- a/specification/elastic/resource-manager/Microsoft.Elastic/preview/2020-07-01-preview/elastic.json +++ b/specification/elastic/resource-manager/Microsoft.Elastic/preview/2020-07-01-preview/elastic.json @@ -823,6 +823,7 @@ "details": { "description": "Error details.", "type": "array", + "x-ms-identifiers": [], "items": { "$ref": "#/definitions/ErrorResponseBody" } @@ -891,6 +892,7 @@ "value": { "description": "List of operations supported by the Microsoft.Elastic provider.", "type": "array", + "x-ms-identifiers": [], "items": { "$ref": "#/definitions/OperationResult" } @@ -1225,6 +1227,7 @@ "value": { "description": "Results of a list operation.", "type": "array", + "x-ms-identifiers": [], "items": { "$ref": "#/definitions/ElasticMonitorResource" } @@ -1286,6 +1289,7 @@ "value": { "description": "Results of a list operation.", "type": "array", + "x-ms-identifiers": [], "items": { "$ref": "#/definitions/MonitoredResource" } @@ -1345,6 +1349,7 @@ "filteringTags": { "description": "List of filtering tags to be used for capturing logs. This only takes effect if SendActivityLogs flag is enabled. If empty, all resources will be captured. If only Exclude action is specified, the rules will apply to the list of all available resources. If Include actions are specified, the rules will only include resources with the associated tags.", "type": "array", + "x-ms-identifiers": [], "items": { "$ref": "#/definitions/FilteringTag" } @@ -1404,6 +1409,7 @@ "value": { "description": "Results of a list operation.", "type": "array", + "x-ms-identifiers": [], "items": { "$ref": "#/definitions/MonitoringTagRules" } @@ -1459,6 +1465,7 @@ "value": { "description": "Results of a list operation.", "type": "array", + "x-ms-identifiers": [], "items": { "$ref": "#/definitions/VMResources" } diff --git a/specification/elastic/resource-manager/Microsoft.Elastic/preview/2021-09-01-preview/elastic.json b/specification/elastic/resource-manager/Microsoft.Elastic/preview/2021-09-01-preview/elastic.json index e50249e05cf7..d0ebbc878df6 100644 --- a/specification/elastic/resource-manager/Microsoft.Elastic/preview/2021-09-01-preview/elastic.json +++ b/specification/elastic/resource-manager/Microsoft.Elastic/preview/2021-09-01-preview/elastic.json @@ -876,6 +876,7 @@ "details": { "description": "Error details.", "type": "array", + "x-ms-identifiers": [], "items": { "$ref": "#/definitions/ErrorResponseBody" } @@ -944,6 +945,7 @@ "value": { "description": "List of operations supported by the Microsoft.Elastic provider.", "type": "array", + "x-ms-identifiers": [], "items": { "$ref": "#/definitions/OperationResult" } @@ -1278,6 +1280,7 @@ "value": { "description": "Results of a list operation.", "type": "array", + "x-ms-identifiers": [], "items": { "$ref": "#/definitions/ElasticMonitorResource" } @@ -1339,6 +1342,7 @@ "value": { "description": "Results of a list operation.", "type": "array", + "x-ms-identifiers": [], "items": { "$ref": "#/definitions/MonitoredResource" } @@ -1398,6 +1402,7 @@ "filteringTags": { "description": "List of filtering tags to be used for capturing logs. This only takes effect if SendActivityLogs flag is enabled. If empty, all resources will be captured. If only Exclude action is specified, the rules will apply to the list of all available resources. If Include actions are specified, the rules will only include resources with the associated tags.", "type": "array", + "x-ms-identifiers": [], "items": { "$ref": "#/definitions/FilteringTag" } @@ -1457,6 +1462,7 @@ "value": { "description": "Results of a list operation.", "type": "array", + "x-ms-identifiers": [], "items": { "$ref": "#/definitions/MonitoringTagRules" } @@ -1540,6 +1546,7 @@ "roles": { "description": "Roles to be assigned for created or updated user", "type": "array", + "x-ms-identifiers": [], "items": { "type": "string" } @@ -1553,6 +1560,7 @@ "value": { "description": "Results of a list operation.", "type": "array", + "x-ms-identifiers": [], "items": { "$ref": "#/definitions/VMResources" } diff --git a/specification/elastic/resource-manager/Microsoft.Elastic/preview/2021-10-01-preview/elastic.json b/specification/elastic/resource-manager/Microsoft.Elastic/preview/2021-10-01-preview/elastic.json index 886b7cfd78f6..b02a4cef988f 100644 --- a/specification/elastic/resource-manager/Microsoft.Elastic/preview/2021-10-01-preview/elastic.json +++ b/specification/elastic/resource-manager/Microsoft.Elastic/preview/2021-10-01-preview/elastic.json @@ -975,6 +975,7 @@ "details": { "description": "Error details.", "type": "array", + "x-ms-identifiers": [], "items": { "$ref": "#/definitions/ErrorResponseBody" } @@ -1043,6 +1044,7 @@ "value": { "description": "List of operations supported by the Microsoft.Elastic provider.", "type": "array", + "x-ms-identifiers": [], "items": { "$ref": "#/definitions/OperationResult" } @@ -1381,6 +1383,7 @@ "value": { "description": "Results of a list operation.", "type": "array", + "x-ms-identifiers": [], "items": { "$ref": "#/definitions/ElasticMonitorResource" } @@ -1442,6 +1445,7 @@ "value": { "description": "Results of a list operation.", "type": "array", + "x-ms-identifiers": [], "items": { "$ref": "#/definitions/MonitoredResource" } @@ -1501,6 +1505,7 @@ "filteringTags": { "description": "List of filtering tags to be used for capturing logs. This only takes effect if SendActivityLogs flag is enabled. If empty, all resources will be captured. If only Exclude action is specified, the rules will apply to the list of all available resources. If Include actions are specified, the rules will only include resources with the associated tags.", "type": "array", + "x-ms-identifiers": [], "items": { "$ref": "#/definitions/FilteringTag" } @@ -1560,6 +1565,7 @@ "value": { "description": "Results of a list operation.", "type": "array", + "x-ms-identifiers": [], "items": { "$ref": "#/definitions/MonitoringTagRules" } @@ -1643,6 +1649,7 @@ "roles": { "description": "Roles to be assigned for created or updated user", "type": "array", + "x-ms-identifiers": [], "items": { "type": "string" } @@ -1656,6 +1663,7 @@ "value": { "description": "Results of a list operation.", "type": "array", + "x-ms-identifiers": [], "items": { "$ref": "#/definitions/VMResources" } @@ -1729,6 +1737,7 @@ }, "upgradableVersions": { "type": "array", + "x-ms-identifiers": [], "description": "Stack Versions that this version can upgrade to", "items": { "type": "string" From cfff9b87f723e927e50795d02d2b287d980eca7b Mon Sep 17 00:00:00 2001 From: Sadaf Mohammed Akhlaque Shaikh Date: Wed, 6 Apr 2022 11:47:23 +0530 Subject: [PATCH 2/3] removed from main --- .../preview/2020-07-01-preview/elastic.json | 7 ------- .../preview/2021-09-01-preview/elastic.json | 8 -------- .../preview/2021-10-01-preview/elastic.json | 9 --------- 3 files changed, 24 deletions(-) diff --git a/specification/elastic/resource-manager/Microsoft.Elastic/preview/2020-07-01-preview/elastic.json b/specification/elastic/resource-manager/Microsoft.Elastic/preview/2020-07-01-preview/elastic.json index edf4b52c9c9e..f86884a05375 100644 --- a/specification/elastic/resource-manager/Microsoft.Elastic/preview/2020-07-01-preview/elastic.json +++ b/specification/elastic/resource-manager/Microsoft.Elastic/preview/2020-07-01-preview/elastic.json @@ -823,7 +823,6 @@ "details": { "description": "Error details.", "type": "array", - "x-ms-identifiers": [], "items": { "$ref": "#/definitions/ErrorResponseBody" } @@ -892,7 +891,6 @@ "value": { "description": "List of operations supported by the Microsoft.Elastic provider.", "type": "array", - "x-ms-identifiers": [], "items": { "$ref": "#/definitions/OperationResult" } @@ -1227,7 +1225,6 @@ "value": { "description": "Results of a list operation.", "type": "array", - "x-ms-identifiers": [], "items": { "$ref": "#/definitions/ElasticMonitorResource" } @@ -1289,7 +1286,6 @@ "value": { "description": "Results of a list operation.", "type": "array", - "x-ms-identifiers": [], "items": { "$ref": "#/definitions/MonitoredResource" } @@ -1349,7 +1345,6 @@ "filteringTags": { "description": "List of filtering tags to be used for capturing logs. This only takes effect if SendActivityLogs flag is enabled. If empty, all resources will be captured. If only Exclude action is specified, the rules will apply to the list of all available resources. If Include actions are specified, the rules will only include resources with the associated tags.", "type": "array", - "x-ms-identifiers": [], "items": { "$ref": "#/definitions/FilteringTag" } @@ -1409,7 +1404,6 @@ "value": { "description": "Results of a list operation.", "type": "array", - "x-ms-identifiers": [], "items": { "$ref": "#/definitions/MonitoringTagRules" } @@ -1465,7 +1459,6 @@ "value": { "description": "Results of a list operation.", "type": "array", - "x-ms-identifiers": [], "items": { "$ref": "#/definitions/VMResources" } diff --git a/specification/elastic/resource-manager/Microsoft.Elastic/preview/2021-09-01-preview/elastic.json b/specification/elastic/resource-manager/Microsoft.Elastic/preview/2021-09-01-preview/elastic.json index d0ebbc878df6..e50249e05cf7 100644 --- a/specification/elastic/resource-manager/Microsoft.Elastic/preview/2021-09-01-preview/elastic.json +++ b/specification/elastic/resource-manager/Microsoft.Elastic/preview/2021-09-01-preview/elastic.json @@ -876,7 +876,6 @@ "details": { "description": "Error details.", "type": "array", - "x-ms-identifiers": [], "items": { "$ref": "#/definitions/ErrorResponseBody" } @@ -945,7 +944,6 @@ "value": { "description": "List of operations supported by the Microsoft.Elastic provider.", "type": "array", - "x-ms-identifiers": [], "items": { "$ref": "#/definitions/OperationResult" } @@ -1280,7 +1278,6 @@ "value": { "description": "Results of a list operation.", "type": "array", - "x-ms-identifiers": [], "items": { "$ref": "#/definitions/ElasticMonitorResource" } @@ -1342,7 +1339,6 @@ "value": { "description": "Results of a list operation.", "type": "array", - "x-ms-identifiers": [], "items": { "$ref": "#/definitions/MonitoredResource" } @@ -1402,7 +1398,6 @@ "filteringTags": { "description": "List of filtering tags to be used for capturing logs. This only takes effect if SendActivityLogs flag is enabled. If empty, all resources will be captured. If only Exclude action is specified, the rules will apply to the list of all available resources. If Include actions are specified, the rules will only include resources with the associated tags.", "type": "array", - "x-ms-identifiers": [], "items": { "$ref": "#/definitions/FilteringTag" } @@ -1462,7 +1457,6 @@ "value": { "description": "Results of a list operation.", "type": "array", - "x-ms-identifiers": [], "items": { "$ref": "#/definitions/MonitoringTagRules" } @@ -1546,7 +1540,6 @@ "roles": { "description": "Roles to be assigned for created or updated user", "type": "array", - "x-ms-identifiers": [], "items": { "type": "string" } @@ -1560,7 +1553,6 @@ "value": { "description": "Results of a list operation.", "type": "array", - "x-ms-identifiers": [], "items": { "$ref": "#/definitions/VMResources" } diff --git a/specification/elastic/resource-manager/Microsoft.Elastic/preview/2021-10-01-preview/elastic.json b/specification/elastic/resource-manager/Microsoft.Elastic/preview/2021-10-01-preview/elastic.json index b02a4cef988f..886b7cfd78f6 100644 --- a/specification/elastic/resource-manager/Microsoft.Elastic/preview/2021-10-01-preview/elastic.json +++ b/specification/elastic/resource-manager/Microsoft.Elastic/preview/2021-10-01-preview/elastic.json @@ -975,7 +975,6 @@ "details": { "description": "Error details.", "type": "array", - "x-ms-identifiers": [], "items": { "$ref": "#/definitions/ErrorResponseBody" } @@ -1044,7 +1043,6 @@ "value": { "description": "List of operations supported by the Microsoft.Elastic provider.", "type": "array", - "x-ms-identifiers": [], "items": { "$ref": "#/definitions/OperationResult" } @@ -1383,7 +1381,6 @@ "value": { "description": "Results of a list operation.", "type": "array", - "x-ms-identifiers": [], "items": { "$ref": "#/definitions/ElasticMonitorResource" } @@ -1445,7 +1442,6 @@ "value": { "description": "Results of a list operation.", "type": "array", - "x-ms-identifiers": [], "items": { "$ref": "#/definitions/MonitoredResource" } @@ -1505,7 +1501,6 @@ "filteringTags": { "description": "List of filtering tags to be used for capturing logs. This only takes effect if SendActivityLogs flag is enabled. If empty, all resources will be captured. If only Exclude action is specified, the rules will apply to the list of all available resources. If Include actions are specified, the rules will only include resources with the associated tags.", "type": "array", - "x-ms-identifiers": [], "items": { "$ref": "#/definitions/FilteringTag" } @@ -1565,7 +1560,6 @@ "value": { "description": "Results of a list operation.", "type": "array", - "x-ms-identifiers": [], "items": { "$ref": "#/definitions/MonitoringTagRules" } @@ -1649,7 +1643,6 @@ "roles": { "description": "Roles to be assigned for created or updated user", "type": "array", - "x-ms-identifiers": [], "items": { "type": "string" } @@ -1663,7 +1656,6 @@ "value": { "description": "Results of a list operation.", "type": "array", - "x-ms-identifiers": [], "items": { "$ref": "#/definitions/VMResources" } @@ -1737,7 +1729,6 @@ }, "upgradableVersions": { "type": "array", - "x-ms-identifiers": [], "description": "Stack Versions that this version can upgrade to", "items": { "type": "string" From f2834ec0df232fb8acac21a1475cf901303c3e3a Mon Sep 17 00:00:00 2001 From: Sadaf Mohammed Akhlaque Shaikh Date: Thu, 7 Apr 2022 13:19:08 +0530 Subject: [PATCH 3/3] Removed enum from ApiVersionParameter --- .../preview/2020-07-01-preview/elastic.json | 5 +---- .../preview/2021-09-01-preview/elastic.json | 7 +------ .../preview/2021-10-01-preview/elastic.json | 8 +------- .../Microsoft.Elastic/stable/2020-07-01/elastic.json | 5 +---- 4 files changed, 4 insertions(+), 21 deletions(-) diff --git a/specification/elastic/resource-manager/Microsoft.Elastic/preview/2020-07-01-preview/elastic.json b/specification/elastic/resource-manager/Microsoft.Elastic/preview/2020-07-01-preview/elastic.json index f86884a05375..76fe7e2cf3dd 100644 --- a/specification/elastic/resource-manager/Microsoft.Elastic/preview/2020-07-01-preview/elastic.json +++ b/specification/elastic/resource-manager/Microsoft.Elastic/preview/2020-07-01-preview/elastic.json @@ -1529,10 +1529,7 @@ "in": "query", "description": "The API version to be used with the HTTP request.", "required": true, - "type": "string", - "enum": [ - "2020-07-01-preview" - ] + "type": "string" }, "SubscriptionIdParameter": { "name": "subscriptionId", diff --git a/specification/elastic/resource-manager/Microsoft.Elastic/preview/2021-09-01-preview/elastic.json b/specification/elastic/resource-manager/Microsoft.Elastic/preview/2021-09-01-preview/elastic.json index e50249e05cf7..b1c18c3debfa 100644 --- a/specification/elastic/resource-manager/Microsoft.Elastic/preview/2021-09-01-preview/elastic.json +++ b/specification/elastic/resource-manager/Microsoft.Elastic/preview/2021-09-01-preview/elastic.json @@ -1623,12 +1623,7 @@ "in": "query", "description": "The API version to be used with the HTTP request.", "required": true, - "type": "string", - "enum": [ - "2020-07-01-preview", - "2020-07-01", - "2021-09-01-preview" - ] + "type": "string" }, "SubscriptionIdParameter": { "name": "subscriptionId", diff --git a/specification/elastic/resource-manager/Microsoft.Elastic/preview/2021-10-01-preview/elastic.json b/specification/elastic/resource-manager/Microsoft.Elastic/preview/2021-10-01-preview/elastic.json index 886b7cfd78f6..99e19541e45e 100644 --- a/specification/elastic/resource-manager/Microsoft.Elastic/preview/2021-10-01-preview/elastic.json +++ b/specification/elastic/resource-manager/Microsoft.Elastic/preview/2021-10-01-preview/elastic.json @@ -1753,13 +1753,7 @@ "in": "query", "description": "The API version to be used with the HTTP request.", "required": true, - "type": "string", - "enum": [ - "2020-07-01-preview", - "2020-07-01", - "2021-09-01-preview", - "2021-10-01-preview" - ] + "type": "string" }, "SubscriptionIdParameter": { "name": "subscriptionId", diff --git a/specification/elastic/resource-manager/Microsoft.Elastic/stable/2020-07-01/elastic.json b/specification/elastic/resource-manager/Microsoft.Elastic/stable/2020-07-01/elastic.json index 04870dd910e8..6105668d6d43 100644 --- a/specification/elastic/resource-manager/Microsoft.Elastic/stable/2020-07-01/elastic.json +++ b/specification/elastic/resource-manager/Microsoft.Elastic/stable/2020-07-01/elastic.json @@ -1529,10 +1529,7 @@ "in": "query", "description": "The API version to be used with the HTTP request.", "required": true, - "type": "string", - "enum": [ - "2020-07-01" - ] + "type": "string" }, "SubscriptionIdParameter": { "name": "subscriptionId",