From ce5b98e7d3daf69d701f62f1ffdf37aaac98544c Mon Sep 17 00:00:00 2001 From: Jorge Herrera Date: Tue, 25 May 2021 12:18:22 -0700 Subject: [PATCH 01/16] Update readme.{go/python}.md with the latest specs --- specification/monitor/resource-manager/readme.go.md | 10 ++++++++++ .../monitor/resource-manager/readme.python.md | 11 +++++++++++ 2 files changed, 21 insertions(+) diff --git a/specification/monitor/resource-manager/readme.go.md b/specification/monitor/resource-manager/readme.go.md index 518dbd0706d2..8a3d366678a1 100644 --- a/specification/monitor/resource-manager/readme.go.md +++ b/specification/monitor/resource-manager/readme.go.md @@ -21,6 +21,7 @@ batch: - tag: package-2019-06 - tag: package-2019-11 - tag: package-2020-10-only + - tag: package-2021-04-only ``` ### Tag: package-2017-09 and go @@ -94,3 +95,12 @@ Please also specify `--go-sdk-folder=`. + +``` yaml $(tag) == 'package-2020-10-only' && $(go) +output-folder: $(go-sdk-folder)/services/monitor/mgmt/2021-04-01/$(namespace) +``` \ No newline at end of file diff --git a/specification/monitor/resource-manager/readme.python.md b/specification/monitor/resource-manager/readme.python.md index 39f8e259c4f8..33bc8df23067 100644 --- a/specification/monitor/resource-manager/readme.python.md +++ b/specification/monitor/resource-manager/readme.python.md @@ -29,6 +29,7 @@ Generate all API versions currently shipped for this package ```yaml $(multiapi) && $(track2) clear-output-folder: true batch: + - tag: package-2021-04-only - tag: package-2020-10-only - tag: package-2020-05-preview-only - tag: package-2020-01-01-preview-only @@ -60,6 +61,16 @@ clear-output-folder: false perform-load: false ``` +### Tag: package-2021-04-only and python + +These settings apply only when `--tag=package-2021-04-only --python` is specified on the command line. +Please also specify `--python-sdks-folder=`. + +``` yaml $(tag) == 'package-2021-04-only' +namespace: $(python-base-namespace).v2021_04_01 +output-folder: $(python-sdks-folder)/$(python-base-folder)/v2021_04_01 +``` + ### Tag: package-2020-10-only and python These settings apply only when `--tag=package-2020-10-only --python` is specified on the command line. From 43b1846b2dcd7080c48b25c3d77bf921b9611d82 Mon Sep 17 00:00:00 2001 From: Jorge Herrera Date: Tue, 25 May 2021 22:06:56 -0700 Subject: [PATCH 02/16] add new tag: package-2021-04 --- .../monitor/resource-manager/readme.go.md | 8 ++--- .../monitor/resource-manager/readme.md | 34 ++++++++++++++++++- 2 files changed, 37 insertions(+), 5 deletions(-) diff --git a/specification/monitor/resource-manager/readme.go.md b/specification/monitor/resource-manager/readme.go.md index 8a3d366678a1..b5ed5aa23e9d 100644 --- a/specification/monitor/resource-manager/readme.go.md +++ b/specification/monitor/resource-manager/readme.go.md @@ -21,7 +21,7 @@ batch: - tag: package-2019-06 - tag: package-2019-11 - tag: package-2020-10-only - - tag: package-2021-04-only + - tag: package-2021-04 ``` ### Tag: package-2017-09 and go @@ -96,11 +96,11 @@ Please also specify `--go-sdk-folder=`. -``` yaml $(tag) == 'package-2020-10-only' && $(go) +``` yaml $(tag) == 'package-2021-04' && $(go) output-folder: $(go-sdk-folder)/services/monitor/mgmt/2021-04-01/$(namespace) ``` \ No newline at end of file diff --git a/specification/monitor/resource-manager/readme.md b/specification/monitor/resource-manager/readme.md index a4c41554fdd1..84d8e0342c76 100644 --- a/specification/monitor/resource-manager/readme.md +++ b/specification/monitor/resource-manager/readme.md @@ -34,7 +34,39 @@ title: MonitorManagementClient ``` yaml description: Monitor Management Client openapi-type: arm -tag: package-2020-03 +tag: package-2021-04 +``` + +### Tag: package-2021-04 + +These settings apply only when `--tag=package-2021-04` is specified on the command line. + +``` yaml $(tag) == 'package-2021-04' +input-file: +- Microsoft.Insights/stable/2015-04-01/autoscale_API.json +- Microsoft.Insights/stable/2015-04-01/operations_API.json +- Microsoft.Insights/stable/2016-03-01/alertRulesIncidents_API.json +- Microsoft.Insights/stable/2016-03-01/alertRules_API.json +- Microsoft.Insights/stable/2016-03-01/logProfiles_API.json +- Microsoft.Insights/preview/2017-05-01-preview/diagnosticsSettings_API.json +- Microsoft.Insights/preview/2017-05-01-preview/diagnosticsSettingsCategories_API.json +- Microsoft.Insights/stable/2019-06-01/actionGroups_API.json +- Microsoft.Insights/stable/2015-04-01/activityLogs_API.json +- Microsoft.Insights/stable/2015-04-01/eventCategories_API.json +- Microsoft.Insights/stable/2015-04-01/tenantActivityLogs_API.json +- Microsoft.Insights/stable/2018-01-01/metricDefinitions_API.json +- Microsoft.Insights/stable/2018-01-01/metrics_API.json +- Microsoft.Insights/stable/2019-03-01/metricBaselines_API.json +- Microsoft.Insights/stable/2018-03-01/metricAlert_API.json +- Microsoft.Insights/preview/2017-12-01-preview/metricNamespaces_API.json +- Microsoft.Insights/preview/2018-11-27-preview/vmInsightsOnboarding_API.json +- Microsoft.Insights/preview/2019-10-17-preview/privateLinkScopes_API.json +- Microsoft.Insights/preview/2020-01-01-preview/managementGroupDiagnosticSettings_API.json +- Microsoft.Insights/stable/2020-10-01/activityLogAlerts_API.json +- Microsoft.Insights/preview/2021-02-01-preview/scheduledQueryRule_API.json +- Microsoft.Insights/stable/2021-04-01/dataCollectionEndpoints_API.json +- Microsoft.Insights/stable/2021-04-01/dataCollectionRuleAssociations_API.json +- Microsoft.Insights/stable/2021-04-01/dataCollectionRules_API.json ``` ### Tag: package-2021-04-only From 3cb2a8e7fbc2d022448544af95faacee7cc61b0e Mon Sep 17 00:00:00 2001 From: Jorge Herrera Date: Tue, 25 May 2021 22:30:08 -0700 Subject: [PATCH 03/16] Update list for package-2021-04 --- specification/monitor/resource-manager/readme.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/specification/monitor/resource-manager/readme.md b/specification/monitor/resource-manager/readme.md index 84d8e0342c76..68d916cf8b94 100644 --- a/specification/monitor/resource-manager/readme.md +++ b/specification/monitor/resource-manager/readme.md @@ -58,12 +58,11 @@ input-file: - Microsoft.Insights/stable/2018-01-01/metrics_API.json - Microsoft.Insights/stable/2019-03-01/metricBaselines_API.json - Microsoft.Insights/stable/2018-03-01/metricAlert_API.json +- Microsoft.Insights/stable/2018-04-16/scheduledQueryRule_API.json - Microsoft.Insights/preview/2017-12-01-preview/metricNamespaces_API.json - Microsoft.Insights/preview/2018-11-27-preview/vmInsightsOnboarding_API.json - Microsoft.Insights/preview/2019-10-17-preview/privateLinkScopes_API.json -- Microsoft.Insights/preview/2020-01-01-preview/managementGroupDiagnosticSettings_API.json -- Microsoft.Insights/stable/2020-10-01/activityLogAlerts_API.json -- Microsoft.Insights/preview/2021-02-01-preview/scheduledQueryRule_API.json +- Microsoft.Insights/stable/2017-04-01/activityLogAlerts_API.json - Microsoft.Insights/stable/2021-04-01/dataCollectionEndpoints_API.json - Microsoft.Insights/stable/2021-04-01/dataCollectionRuleAssociations_API.json - Microsoft.Insights/stable/2021-04-01/dataCollectionRules_API.json From 380ea4d0bd1527b3926ba32be10d5f4585e1f90b Mon Sep 17 00:00:00 2001 From: Jorge Herrera Date: Wed, 9 Jun 2021 13:35:44 -0700 Subject: [PATCH 04/16] Fix CSharpGen adding directive and fix refs in DCR --- .../dataCollectionEndpoints_API.json | 23 +++++----- .../dataCollectionRuleAssociations_API.json | 12 +++--- .../2021-04-01/dataCollectionRules_API.json | 43 ++++++++++++++----- .../monitor/resource-manager/readme.csharp.md | 8 ++++ 4 files changed, 58 insertions(+), 28 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2021-04-01/dataCollectionEndpoints_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2021-04-01/dataCollectionEndpoints_API.json index 77b785c40fa4..e8be8ae04c65 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2021-04-01/dataCollectionEndpoints_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2021-04-01/dataCollectionEndpoints_API.json @@ -34,7 +34,7 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "./dataCollectionRules_API.json#/parameters/ResourceGroupNameParameterCommonV2" }, { "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" @@ -50,7 +50,7 @@ "default": { "description": "Error", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "./dataCollectionRules_API.json#/definitions/ErrorResponseCommonV2" } } }, @@ -92,7 +92,7 @@ "default": { "description": "Error", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "./dataCollectionRules_API.json#/definitions/ErrorResponseCommonV2" } } }, @@ -121,7 +121,7 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "./dataCollectionRules_API.json#/parameters/ResourceGroupNameParameterCommonV2" }, { "$ref": "#/parameters/DataCollectionEndpointNameParameter" @@ -140,7 +140,7 @@ "default": { "description": "Error", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "./dataCollectionRules_API.json#/definitions/ErrorResponseCommonV2" } } }, @@ -167,7 +167,7 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "./dataCollectionRules_API.json#/parameters/ResourceGroupNameParameterCommonV2" }, { "$ref": "#/parameters/DataCollectionEndpointNameParameter" @@ -200,7 +200,7 @@ "default": { "description": "Error", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "./dataCollectionRules_API.json#/definitions/ErrorResponseCommonV2" } } }, @@ -227,7 +227,7 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "./dataCollectionRules_API.json#/parameters/ResourceGroupNameParameterCommonV2" }, { "$ref": "#/parameters/DataCollectionEndpointNameParameter" @@ -254,7 +254,7 @@ "default": { "description": "Error", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "./dataCollectionRules_API.json#/definitions/ErrorResponseCommonV2" } } }, @@ -278,7 +278,7 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "./dataCollectionRules_API.json#/parameters/ResourceGroupNameParameterCommonV2" }, { "$ref": "#/parameters/DataCollectionEndpointNameParameter" @@ -297,7 +297,7 @@ "default": { "description": "Error", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "./dataCollectionRules_API.json#/definitions/ErrorResponseCommonV2" } } }, @@ -369,6 +369,7 @@ "immutableId": { "description": "The immutable ID of this data collection endpoint resource. This property is READ-ONLY.", "type": "string", + "readOnly": true, "example": "dce-b74e0d383fc9415abaa584ec41adece3" }, "configurationAccess": { diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2021-04-01/dataCollectionRuleAssociations_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2021-04-01/dataCollectionRuleAssociations_API.json index 61ae89f8e81e..d0ffb4b5787c 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2021-04-01/dataCollectionRuleAssociations_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2021-04-01/dataCollectionRuleAssociations_API.json @@ -47,7 +47,7 @@ "default": { "description": "Error", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "./dataCollectionRules_API.json#/definitions/ErrorResponseCommonV2" } } }, @@ -76,7 +76,7 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "./dataCollectionRules_API.json#/parameters/ResourceGroupNameParameterCommonV2" }, { "$ref": "#/parameters/DataCollectionRuleNameParameter" @@ -95,7 +95,7 @@ "default": { "description": "Error", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "./dataCollectionRules_API.json#/definitions/ErrorResponseCommonV2" } } }, @@ -140,7 +140,7 @@ "default": { "description": "Error", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "./dataCollectionRules_API.json#/definitions/ErrorResponseCommonV2" } } }, @@ -197,7 +197,7 @@ "default": { "description": "Error", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "./dataCollectionRules_API.json#/definitions/ErrorResponseCommonV2" } } }, @@ -237,7 +237,7 @@ "default": { "description": "Error", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "./dataCollectionRules_API.json#/definitions/ErrorResponseCommonV2" } } }, diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2021-04-01/dataCollectionRules_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2021-04-01/dataCollectionRules_API.json index 35355020ccc7..289336aec188 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2021-04-01/dataCollectionRules_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2021-04-01/dataCollectionRules_API.json @@ -34,7 +34,7 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "#/parameters/ResourceGroupNameParameterCommonV2" }, { "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" @@ -50,7 +50,7 @@ "default": { "description": "Error", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/ErrorResponseCommonV2" } } }, @@ -92,7 +92,7 @@ "default": { "description": "Error", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/ErrorResponseCommonV2" } } }, @@ -121,7 +121,7 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "#/parameters/ResourceGroupNameParameterCommonV2" }, { "$ref": "#/parameters/DataCollectionRuleNameParameter" @@ -140,7 +140,7 @@ "default": { "description": "Error", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/ErrorResponseCommonV2" } } }, @@ -167,7 +167,7 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "#/parameters/ResourceGroupNameParameterCommonV2" }, { "$ref": "#/parameters/DataCollectionRuleNameParameter" @@ -200,7 +200,7 @@ "default": { "description": "Error", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/ErrorResponseCommonV2" } } }, @@ -227,7 +227,7 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "#/parameters/ResourceGroupNameParameterCommonV2" }, { "$ref": "#/parameters/DataCollectionRuleNameParameter" @@ -254,7 +254,7 @@ "default": { "description": "Error", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/ErrorResponseCommonV2" } } }, @@ -278,7 +278,7 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" + "$ref": "#/parameters/ResourceGroupNameParameterCommonV2" }, { "$ref": "#/parameters/DataCollectionRuleNameParameter" @@ -297,7 +297,7 @@ "default": { "description": "Error", "schema": { - "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + "$ref": "#/definitions/ErrorResponseCommonV2" } } }, @@ -821,9 +821,30 @@ } } } + }, + "ErrorResponseCommonV2": { + "title": "Error response", + "description": "Common error response for all Azure Resource Manager APIs to return error details for failed operations. (This also follows the OData error response format.).", + "properties": { + "error": { + "description": "The error object.", + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorDetail" + } + } } }, "parameters": { + "ResourceGroupNameParameterCommonV2": { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group. The name is case insensitive.", + "pattern": "^[-\\w\\._\\(\\)]+$", + "minLength": 1, + "maxLength": 90, + "x-ms-parameter-location": "method" + }, "DataCollectionRuleNameParameter": { "in": "path", "name": "dataCollectionRuleName", diff --git a/specification/monitor/resource-manager/readme.csharp.md b/specification/monitor/resource-manager/readme.csharp.md index 4c45821ceb70..2a86befe440e 100644 --- a/specification/monitor/resource-manager/readme.csharp.md +++ b/specification/monitor/resource-manager/readme.csharp.md @@ -20,6 +20,14 @@ csharp: namespace: Microsoft.Azure.Management.Monitor output-folder: $(csharp-sdks-folder)/monitor/Microsoft.Azure.Management.Monitor/src/Generated clear-output-folder: true +directive: + +# activityLogAlerts_API.json#/definitions/Resource (plus other specs) -> missing kind, etag +# Removing Resource definition from activityLogsAlerts +# Generation will take the definition from scheduledQueryRule_API.json which includes kind & etag +- from: activityLogAlerts_API.json + where: $.definitions + transform: delete $["Resource"] ``` ### Profile: hybrid_2019_03_01 From bef6299ec7fd714315efeb978a43822911412dba Mon Sep 17 00:00:00 2001 From: Jorge Herrera Date: Wed, 9 Jun 2021 13:54:50 -0700 Subject: [PATCH 05/16] Moving directive for all SDKs --- specification/monitor/resource-manager/readme.csharp.md | 8 -------- specification/monitor/resource-manager/readme.md | 4 ++++ 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/specification/monitor/resource-manager/readme.csharp.md b/specification/monitor/resource-manager/readme.csharp.md index 2a86befe440e..4c45821ceb70 100644 --- a/specification/monitor/resource-manager/readme.csharp.md +++ b/specification/monitor/resource-manager/readme.csharp.md @@ -20,14 +20,6 @@ csharp: namespace: Microsoft.Azure.Management.Monitor output-folder: $(csharp-sdks-folder)/monitor/Microsoft.Azure.Management.Monitor/src/Generated clear-output-folder: true -directive: - -# activityLogAlerts_API.json#/definitions/Resource (plus other specs) -> missing kind, etag -# Removing Resource definition from activityLogsAlerts -# Generation will take the definition from scheduledQueryRule_API.json which includes kind & etag -- from: activityLogAlerts_API.json - where: $.definitions - transform: delete $["Resource"] ``` ### Profile: hybrid_2019_03_01 diff --git a/specification/monitor/resource-manager/readme.md b/specification/monitor/resource-manager/readme.md index 68d916cf8b94..cb8b52c5bd10 100644 --- a/specification/monitor/resource-manager/readme.md +++ b/specification/monitor/resource-manager/readme.md @@ -668,6 +668,10 @@ directive: - suppress: DefaultErrorResponseSchema from: activityLogAlerts_API.json reason: 'Updating the error response to the new format would be a breaking change.' + - from: activityLogAlerts_API.json + where: $.definitions + transform: delete $["Resource"] + reason: Missing kind, etag; Generation will take the definition from scheduledQueryRule_API.json which includes kind & etag ``` ### Tag: profile-hybrid-2019-03-01 From d18c812dbfd65df06fe52e18fed384fe077905ae Mon Sep 17 00:00:00 2001 From: Jorge Herrera Date: Wed, 9 Jun 2021 14:46:36 -0700 Subject: [PATCH 06/16] prettier changes --- .../stable/2021-04-01/dataCollectionRules_API.json | 8 ++++---- .../monitor/resource-manager/readme.csharp.md | 10 +++++++++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2021-04-01/dataCollectionRules_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2021-04-01/dataCollectionRules_API.json index 289336aec188..e979a321046a 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2021-04-01/dataCollectionRules_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2021-04-01/dataCollectionRules_API.json @@ -121,7 +121,7 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameterCommonV2" + "$ref": "#/parameters/ResourceGroupNameParameterCommonV2" }, { "$ref": "#/parameters/DataCollectionRuleNameParameter" @@ -167,7 +167,7 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameterCommonV2" + "$ref": "#/parameters/ResourceGroupNameParameterCommonV2" }, { "$ref": "#/parameters/DataCollectionRuleNameParameter" @@ -227,7 +227,7 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameterCommonV2" + "$ref": "#/parameters/ResourceGroupNameParameterCommonV2" }, { "$ref": "#/parameters/DataCollectionRuleNameParameter" @@ -278,7 +278,7 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameterCommonV2" + "$ref": "#/parameters/ResourceGroupNameParameterCommonV2" }, { "$ref": "#/parameters/DataCollectionRuleNameParameter" diff --git a/specification/monitor/resource-manager/readme.csharp.md b/specification/monitor/resource-manager/readme.csharp.md index 4c45821ceb70..433c37d8dccc 100644 --- a/specification/monitor/resource-manager/readme.csharp.md +++ b/specification/monitor/resource-manager/readme.csharp.md @@ -44,4 +44,12 @@ output-folder: $(csharp-sdks-folder)/$(csharp-profile)/Monitor/Management.Monito batch: - tag: profile-hybrid-2020-09-01 - ``` \ No newline at end of file + ``` + +## Local Development + +### Auto Generation +- Fork https://github.com/Azure/azure-rest-api-specs, clone it (asumming at C:\Repos) +- Fork https://github.com/Azure/azure-sdk-for-net, clone it (asumming at C:\Repos) +- Make changes +- autorest --version=V2 --csharp --reflect-api-versions --license-header=MICROSOFT_MIT_NO_VERSION --use=@microsoft.azure/autorest.csharp@2.3.82 --csharp-sdks-folder=C:\Repos\azure-sdk-for-net\sdk C:\Repos\azure-rest-api-specs\specification\monitor\resource-manager\readme.md --debug \ No newline at end of file From 132f5b251f388521409378c2f4a89ee589b6ab33 Mon Sep 17 00:00:00 2001 From: Jorge Herrera Date: Wed, 9 Jun 2021 16:30:20 -0700 Subject: [PATCH 07/16] directive only for go & .net --- specification/monitor/resource-manager/readme.csharp.md | 5 +++++ specification/monitor/resource-manager/readme.go.md | 7 ++++++- specification/monitor/resource-manager/readme.md | 4 ---- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/specification/monitor/resource-manager/readme.csharp.md b/specification/monitor/resource-manager/readme.csharp.md index 433c37d8dccc..9407976e8116 100644 --- a/specification/monitor/resource-manager/readme.csharp.md +++ b/specification/monitor/resource-manager/readme.csharp.md @@ -20,6 +20,11 @@ csharp: namespace: Microsoft.Azure.Management.Monitor output-folder: $(csharp-sdks-folder)/monitor/Microsoft.Azure.Management.Monitor/src/Generated clear-output-folder: true +directive: +- from: activityLogAlerts_API.json + where: $.definitions + transform: delete $["Resource"] + reason: Missing kind, etag; Generation will take the definition from scheduledQueryRule_API.json which includes kind & etag ``` ### Profile: hybrid_2019_03_01 diff --git a/specification/monitor/resource-manager/readme.go.md b/specification/monitor/resource-manager/readme.go.md index b5ed5aa23e9d..ab58f8602870 100644 --- a/specification/monitor/resource-manager/readme.go.md +++ b/specification/monitor/resource-manager/readme.go.md @@ -7,6 +7,11 @@ go: license-header: MICROSOFT_MIT_NO_VERSION namespace: insights clear-output-folder: true +directive: +- from: activityLogAlerts_API.json + where: $.definitions + transform: delete $["Resource"] + reason: Missing kind, etag; Generation will take the definition from scheduledQueryRule_API.json which includes kind & etag ``` ### Go multi-api @@ -102,5 +107,5 @@ These settings apply only when `--tag=package-2021-04 --go` is specified on the Please also specify `--go-sdk-folder=`. ``` yaml $(tag) == 'package-2021-04' && $(go) -output-folder: $(go-sdk-folder)/services/monitor/mgmt/2021-04-01/$(namespace) +output-folder: $(go-sdk-folder)/services/monitor/mgmt/2021-04-01-preview/$(namespace) ``` \ No newline at end of file diff --git a/specification/monitor/resource-manager/readme.md b/specification/monitor/resource-manager/readme.md index cb8b52c5bd10..68d916cf8b94 100644 --- a/specification/monitor/resource-manager/readme.md +++ b/specification/monitor/resource-manager/readme.md @@ -668,10 +668,6 @@ directive: - suppress: DefaultErrorResponseSchema from: activityLogAlerts_API.json reason: 'Updating the error response to the new format would be a breaking change.' - - from: activityLogAlerts_API.json - where: $.definitions - transform: delete $["Resource"] - reason: Missing kind, etag; Generation will take the definition from scheduledQueryRule_API.json which includes kind & etag ``` ### Tag: profile-hybrid-2019-03-01 From 29c1ea7e9fb200fbf18c4884e28c783a52a0c188 Mon Sep 17 00:00:00 2001 From: Jorge Herrera Date: Wed, 9 Jun 2021 20:12:30 -0700 Subject: [PATCH 08/16] fixing go output-folder --- specification/monitor/resource-manager/readme.csharp.md | 5 ----- specification/monitor/resource-manager/readme.go.md | 7 +------ specification/monitor/resource-manager/readme.md | 8 ++++++++ 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/specification/monitor/resource-manager/readme.csharp.md b/specification/monitor/resource-manager/readme.csharp.md index 9407976e8116..433c37d8dccc 100644 --- a/specification/monitor/resource-manager/readme.csharp.md +++ b/specification/monitor/resource-manager/readme.csharp.md @@ -20,11 +20,6 @@ csharp: namespace: Microsoft.Azure.Management.Monitor output-folder: $(csharp-sdks-folder)/monitor/Microsoft.Azure.Management.Monitor/src/Generated clear-output-folder: true -directive: -- from: activityLogAlerts_API.json - where: $.definitions - transform: delete $["Resource"] - reason: Missing kind, etag; Generation will take the definition from scheduledQueryRule_API.json which includes kind & etag ``` ### Profile: hybrid_2019_03_01 diff --git a/specification/monitor/resource-manager/readme.go.md b/specification/monitor/resource-manager/readme.go.md index ab58f8602870..7677552e999b 100644 --- a/specification/monitor/resource-manager/readme.go.md +++ b/specification/monitor/resource-manager/readme.go.md @@ -7,11 +7,6 @@ go: license-header: MICROSOFT_MIT_NO_VERSION namespace: insights clear-output-folder: true -directive: -- from: activityLogAlerts_API.json - where: $.definitions - transform: delete $["Resource"] - reason: Missing kind, etag; Generation will take the definition from scheduledQueryRule_API.json which includes kind & etag ``` ### Go multi-api @@ -107,5 +102,5 @@ These settings apply only when `--tag=package-2021-04 --go` is specified on the Please also specify `--go-sdk-folder=`. ``` yaml $(tag) == 'package-2021-04' && $(go) -output-folder: $(go-sdk-folder)/services/monitor/mgmt/2021-04-01-preview/$(namespace) +output-folder: $(go-sdk-folder)/services/preview/monitor/mgmt/2021-04-01-preview/$(namespace) ``` \ No newline at end of file diff --git a/specification/monitor/resource-manager/readme.md b/specification/monitor/resource-manager/readme.md index 68d916cf8b94..cfd70997168c 100644 --- a/specification/monitor/resource-manager/readme.md +++ b/specification/monitor/resource-manager/readme.md @@ -670,6 +670,14 @@ directive: reason: 'Updating the error response to the new format would be a breaking change.' ``` +``` yaml $(go) || $(csharp) || $(validation) || $(azure-validator) +directive: +- from: activityLogAlerts_API.json + where: $.definitions + transform: delete $["Resource"] + reason: Missing kind, etag; Generation will take the definition from scheduledQueryRule_API.json which includes kind & etag +``` + ### Tag: profile-hybrid-2019-03-01 These settings apply only when `--tag=profile-hybrid-2019-03-01` is specified on the command line. From 4dec63bfbbb03c10fa3ddab2c250665aa8cecc61 Mon Sep 17 00:00:00 2001 From: Jorge Herrera Date: Wed, 9 Jun 2021 23:17:12 -0700 Subject: [PATCH 09/16] directive, remove azure-validator, add typescript --- specification/monitor/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/monitor/resource-manager/readme.md b/specification/monitor/resource-manager/readme.md index cfd70997168c..bf1a3834987d 100644 --- a/specification/monitor/resource-manager/readme.md +++ b/specification/monitor/resource-manager/readme.md @@ -670,7 +670,7 @@ directive: reason: 'Updating the error response to the new format would be a breaking change.' ``` -``` yaml $(go) || $(csharp) || $(validation) || $(azure-validator) +``` yaml $(go) || $(csharp) || $(validation) || $(typescript) directive: - from: activityLogAlerts_API.json where: $.definitions From 2c6c7651a4123d1e98f1616259194fb8b66bd5eb Mon Sep 17 00:00:00 2001 From: Jorge Herrera Date: Fri, 11 Jun 2021 10:26:09 -0700 Subject: [PATCH 10/16] fixing PR's LintDiff findings --- specification/common-types/resource-management/v2/types.json | 2 ++ .../stable/2021-04-01/dataCollectionRules_API.json | 1 + 2 files changed, 3 insertions(+) diff --git a/specification/common-types/resource-management/v2/types.json b/specification/common-types/resource-management/v2/types.json index b883e5c7a7f0..fdd6cf7b2e07 100644 --- a/specification/common-types/resource-management/v2/types.json +++ b/specification/common-types/resource-management/v2/types.json @@ -276,6 +276,7 @@ }, "ErrorDetail": { "description": "The error detail.", + "type": "object", "properties": { "code": { "readOnly": true, @@ -313,6 +314,7 @@ "ErrorResponse": { "title": "Error response", "description": "Common error response for all Azure Resource Manager APIs to return error details for failed operations. (This also follows the OData error response format.).", + "type": "object", "properties": { "error": { "description": "The error object.", diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2021-04-01/dataCollectionRules_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2021-04-01/dataCollectionRules_API.json index e979a321046a..f0a85647ed1b 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2021-04-01/dataCollectionRules_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2021-04-01/dataCollectionRules_API.json @@ -825,6 +825,7 @@ "ErrorResponseCommonV2": { "title": "Error response", "description": "Common error response for all Azure Resource Manager APIs to return error details for failed operations. (This also follows the OData error response format.).", + "type": "object", "properties": { "error": { "description": "The error object.", From 3010592a4424d4cd48c3c4191b3d47b22ad44b25 Mon Sep 17 00:00:00 2001 From: Jorge Herrera Date: Fri, 11 Jun 2021 10:57:47 -0700 Subject: [PATCH 11/16] fixing breaking changes --- .../dataCollectionEndpoints_API.json | 11 +++-- .../dataCollectionRuleAssociations_API.json | 2 +- .../2021-04-01/dataCollectionRules_API.json | 21 +++------ .../monitor/resource-manager/readme.md | 44 +++++++++++++++++++ 4 files changed, 55 insertions(+), 23 deletions(-) diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2021-04-01/dataCollectionEndpoints_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2021-04-01/dataCollectionEndpoints_API.json index e8be8ae04c65..e801c79d733e 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2021-04-01/dataCollectionEndpoints_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2021-04-01/dataCollectionEndpoints_API.json @@ -34,7 +34,7 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "./dataCollectionRules_API.json#/parameters/ResourceGroupNameParameterCommonV2" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" @@ -121,7 +121,7 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "./dataCollectionRules_API.json#/parameters/ResourceGroupNameParameterCommonV2" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/DataCollectionEndpointNameParameter" @@ -167,7 +167,7 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "./dataCollectionRules_API.json#/parameters/ResourceGroupNameParameterCommonV2" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/DataCollectionEndpointNameParameter" @@ -227,7 +227,7 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "./dataCollectionRules_API.json#/parameters/ResourceGroupNameParameterCommonV2" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/DataCollectionEndpointNameParameter" @@ -278,7 +278,7 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "./dataCollectionRules_API.json#/parameters/ResourceGroupNameParameterCommonV2" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/DataCollectionEndpointNameParameter" @@ -369,7 +369,6 @@ "immutableId": { "description": "The immutable ID of this data collection endpoint resource. This property is READ-ONLY.", "type": "string", - "readOnly": true, "example": "dce-b74e0d383fc9415abaa584ec41adece3" }, "configurationAccess": { diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2021-04-01/dataCollectionRuleAssociations_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2021-04-01/dataCollectionRuleAssociations_API.json index d0ffb4b5787c..f76cf64b8e04 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2021-04-01/dataCollectionRuleAssociations_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2021-04-01/dataCollectionRuleAssociations_API.json @@ -76,7 +76,7 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "./dataCollectionRules_API.json#/parameters/ResourceGroupNameParameterCommonV2" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/DataCollectionRuleNameParameter" diff --git a/specification/monitor/resource-manager/Microsoft.Insights/stable/2021-04-01/dataCollectionRules_API.json b/specification/monitor/resource-manager/Microsoft.Insights/stable/2021-04-01/dataCollectionRules_API.json index f0a85647ed1b..c79465ce4dd1 100644 --- a/specification/monitor/resource-manager/Microsoft.Insights/stable/2021-04-01/dataCollectionRules_API.json +++ b/specification/monitor/resource-manager/Microsoft.Insights/stable/2021-04-01/dataCollectionRules_API.json @@ -34,7 +34,7 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameterCommonV2" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ApiVersionParameter" @@ -121,7 +121,7 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameterCommonV2" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/DataCollectionRuleNameParameter" @@ -167,7 +167,7 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameterCommonV2" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/DataCollectionRuleNameParameter" @@ -227,7 +227,7 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameterCommonV2" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/DataCollectionRuleNameParameter" @@ -278,7 +278,7 @@ "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/SubscriptionIdParameter" }, { - "$ref": "#/parameters/ResourceGroupNameParameterCommonV2" + "$ref": "../../../../../common-types/resource-management/v2/types.json#/parameters/ResourceGroupNameParameter" }, { "$ref": "#/parameters/DataCollectionRuleNameParameter" @@ -835,17 +835,6 @@ } }, "parameters": { - "ResourceGroupNameParameterCommonV2": { - "name": "resourceGroupName", - "in": "path", - "required": true, - "type": "string", - "description": "The name of the resource group. The name is case insensitive.", - "pattern": "^[-\\w\\._\\(\\)]+$", - "minLength": 1, - "maxLength": 90, - "x-ms-parameter-location": "method" - }, "DataCollectionRuleNameParameter": { "in": "path", "name": "dataCollectionRuleName", diff --git a/specification/monitor/resource-manager/readme.md b/specification/monitor/resource-manager/readme.md index bf1a3834987d..b814aa831f64 100644 --- a/specification/monitor/resource-manager/readme.md +++ b/specification/monitor/resource-manager/readme.md @@ -678,6 +678,50 @@ directive: reason: Missing kind, etag; Generation will take the definition from scheduledQueryRule_API.json which includes kind & etag ``` +``` yaml +directive: +- from: activityLogAlerts_API.json + where: $.parameters + transform: delete $["ResourceGroupNameParameter"] + reason: ResourceGroupNameParameter is taken from v2/types.json +- from: guestDiagnosticSettings_API.json + where: $.parameters + transform: delete $["ResourceGroupNameParameter"] + reason: ResourceGroupNameParameter is taken from v2/types.json +- from: guestDiagnosticSettingsAssociation_API.json + where: $.parameters + transform: delete $["ResourceGroupNameParameter"] + reason: ResourceGroupNameParameter is taken from v2/types.json +- from: privateLinkScopes_API.json + where: $.parameters + transform: delete $["ResourceGroupNameParameter"] + reason: ResourceGroupNameParameter is taken from v2/types.json +- from: scheduledQueryRule_API.json + where: $.parameters + transform: delete $["ResourceGroupNameParameter"] + reason: ResourceGroupNameParameter is taken from v2/types.json +- from: autoscale_API.json + where: $.parameters + transform: delete $["ResourceGroupNameParameter"] + reason: ResourceGroupNameParameter is taken from v2/types.json +- from: alertRules_API.json + where: $.parameters + transform: delete $["ResourceGroupNameParameter"] + reason: ResourceGroupNameParameter is taken from v2/types.json +- from: alertRulesIncidents_API.json + where: $.parameters + transform: delete $["ResourceGroupNameParameter"] + reason: ResourceGroupNameParameter is taken from v2/types.json +- from: actionGroups_API.json + where: $.parameters + transform: delete $["ResourceGroupNameParameter"] + reason: ResourceGroupNameParameter is taken from v2/types.json +- from: metricAlert_API.json + where: $.parameters + transform: delete $["ResourceGroupNameParameter"] + reason: ResourceGroupNameParameter is taken from v2/types.json +``` + ### Tag: profile-hybrid-2019-03-01 These settings apply only when `--tag=profile-hybrid-2019-03-01` is specified on the command line. From 2976c4c1cbe9c8a94e108bb3c493151c9d8f2269 Mon Sep 17 00:00:00 2001 From: Jorge Herrera Date: Fri, 11 Jun 2021 11:24:09 -0700 Subject: [PATCH 12/16] fixing go/python directives --- specification/monitor/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/monitor/resource-manager/readme.md b/specification/monitor/resource-manager/readme.md index b814aa831f64..71166e78d0f6 100644 --- a/specification/monitor/resource-manager/readme.md +++ b/specification/monitor/resource-manager/readme.md @@ -678,7 +678,7 @@ directive: reason: Missing kind, etag; Generation will take the definition from scheduledQueryRule_API.json which includes kind & etag ``` -``` yaml +``` yaml !$(go) && !$(python) directive: - from: activityLogAlerts_API.json where: $.parameters From 74c6c8e66c08087836df0ba8edd3c51caec519a8 Mon Sep 17 00:00:00 2001 From: Jorge Herrera Date: Fri, 11 Jun 2021 11:50:01 -0700 Subject: [PATCH 13/16] fix go build --- specification/monitor/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/monitor/resource-manager/readme.md b/specification/monitor/resource-manager/readme.md index 71166e78d0f6..ea260328afe3 100644 --- a/specification/monitor/resource-manager/readme.md +++ b/specification/monitor/resource-manager/readme.md @@ -678,7 +678,7 @@ directive: reason: Missing kind, etag; Generation will take the definition from scheduledQueryRule_API.json which includes kind & etag ``` -``` yaml !$(go) && !$(python) +``` yaml !$(python) directive: - from: activityLogAlerts_API.json where: $.parameters From df2c0d36db75d32c09344734a8dd65d088a4a364 Mon Sep 17 00:00:00 2001 From: Jorge Herrera Date: Fri, 11 Jun 2021 12:01:43 -0700 Subject: [PATCH 14/16] directive go && package-2021-04 --- .../monitor/resource-manager/readme.go.md | 41 +++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/specification/monitor/resource-manager/readme.go.md b/specification/monitor/resource-manager/readme.go.md index 7677552e999b..e72aeed0643f 100644 --- a/specification/monitor/resource-manager/readme.go.md +++ b/specification/monitor/resource-manager/readme.go.md @@ -103,4 +103,45 @@ Please also specify `--go-sdk-folder= Date: Fri, 11 Jun 2021 12:18:07 -0700 Subject: [PATCH 15/16] fix go build prev package-2021-04 --- specification/monitor/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/monitor/resource-manager/readme.md b/specification/monitor/resource-manager/readme.md index ea260328afe3..b8052f631835 100644 --- a/specification/monitor/resource-manager/readme.md +++ b/specification/monitor/resource-manager/readme.md @@ -678,7 +678,7 @@ directive: reason: Missing kind, etag; Generation will take the definition from scheduledQueryRule_API.json which includes kind & etag ``` -``` yaml !$(python) +``` yaml !$(python) && !$(go) directive: - from: activityLogAlerts_API.json where: $.parameters From 9f470b704f91225d79fc70de420638796a48cf13 Mon Sep 17 00:00:00 2001 From: Jorge Herrera Date: Fri, 11 Jun 2021 12:57:05 -0700 Subject: [PATCH 16/16] fix java build --- specification/monitor/resource-manager/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/monitor/resource-manager/readme.md b/specification/monitor/resource-manager/readme.md index b8052f631835..fb5b4948c4ca 100644 --- a/specification/monitor/resource-manager/readme.md +++ b/specification/monitor/resource-manager/readme.md @@ -678,7 +678,7 @@ directive: reason: Missing kind, etag; Generation will take the definition from scheduledQueryRule_API.json which includes kind & etag ``` -``` yaml !$(python) && !$(go) +``` yaml !$(python) && !$(go) && !$(java) directive: - from: activityLogAlerts_API.json where: $.parameters