From 37d38cb1ad58c0c8bfc6e9709490cf322a53f66f Mon Sep 17 00:00:00 2001 From: Jorge Herrera Date: Mon, 12 Jul 2021 15:53:04 -0700 Subject: [PATCH 1/5] Fix go/terraform package --- .../monitor/resource-manager/readme.go.md | 10 +++--- .../monitor/resource-manager/readme.md | 35 +++++++++++++++++-- 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/specification/monitor/resource-manager/readme.go.md b/specification/monitor/resource-manager/readme.go.md index 8feeda379f3e..2cf5467d3de0 100644 --- a/specification/monitor/resource-manager/readme.go.md +++ b/specification/monitor/resource-manager/readme.go.md @@ -38,7 +38,7 @@ batch: - tag: package-2019-06 - tag: package-2019-11 - tag: package-2020-10-only - - tag: package-2021-04 + - tag: package-2021-07 ``` ### Tag: package-2017-09 and go @@ -113,13 +113,13 @@ Please also specify `--go-sdk-folder=`. -``` yaml $(tag) == 'package-2021-04' && $(go) -output-folder: $(go-sdk-folder)/services/preview/monitor/mgmt/2021-04-01-preview/$(namespace) +``` yaml $(tag) == 'package-2021-07' && $(go) +output-folder: $(go-sdk-folder)/services/preview/monitor/mgmt/2021-07-01-preview/$(namespace) directive: - from: activityLogAlerts_API.json where: $.parameters diff --git a/specification/monitor/resource-manager/readme.md b/specification/monitor/resource-manager/readme.md index 064cdc336f0c..7fe7717e4b8c 100644 --- a/specification/monitor/resource-manager/readme.md +++ b/specification/monitor/resource-manager/readme.md @@ -35,7 +35,38 @@ title: MonitorManagementClient ``` yaml description: Monitor Management Client openapi-type: arm -tag: package-2021-04 +tag: package-2021-07 +``` + +### Tag: package-2021-07 + +These settings apply only when `--tag=package-2021-07` is specified on the command line. + +``` yaml $(tag) == 'package-2021-07' +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/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/stable/2020-10-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 ``` ### Tag: package-2021-04 @@ -767,7 +798,7 @@ directive: reason: Missing kind, etag ``` -``` yaml !$(python) && !$(go) && !$(java) && $(tag) == 'package-2021-04' +``` yaml !$(python) && !$(go) && !$(java) && ($(tag) == 'package-2021-04' || $(tag) == 'package-2021-07') directive: - from: scheduledQueryRule_API.json where: $.parameters From 46eff59e1d37dc405b8a822039cdb70d550ed181 Mon Sep 17 00:00:00 2001 From: Jorge Herrera Date: Wed, 14 Jul 2021 14:23:53 -0700 Subject: [PATCH 2/5] remove incompatible definitions --- specification/monitor/resource-manager/readme.md | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/specification/monitor/resource-manager/readme.md b/specification/monitor/resource-manager/readme.md index 7fe7717e4b8c..4e9adf997104 100644 --- a/specification/monitor/resource-manager/readme.md +++ b/specification/monitor/resource-manager/readme.md @@ -787,7 +787,7 @@ directive: from: autoscale_API.json where: $.paths reason: 'Operations API is defined in a separate swagger spec for Microsoft.Insights namespace (https://github.com/Azure/azure-rest-api-specs/blob/master/specification/monitor/resource-manager/Microsoft.Insights/stable/2015-04-01/operations_API.json)' - + ``` ``` yaml ($(go) && !$(track2)) || $(csharp) || $(validation) || $(typescript) @@ -796,6 +796,18 @@ directive: where: $.definitions transform: delete $["Resource"] reason: Missing kind, etag +- from: activityLogAlerts_API.json + where: $.definitions + transform: delete $["ErrorResponse"] + reason: Incompatible values (2020-10-01) +- from: activityLogAlerts_API.json + where: $.definitions + transform: delete $["AzureResource"] + reason: Incompatible values (2020-10-01) +- from: activityLogAlerts_API.json + where: $.definitions + transform: delete $["ActionGroup"] + reason: Incompatible values (2020-10-01) ``` ``` yaml !$(python) && !$(go) && !$(java) && ($(tag) == 'package-2021-04' || $(tag) == 'package-2021-07') From b5a8f8ac8e61116e6397a35fc817cdd380c5f4d4 Mon Sep 17 00:00:00 2001 From: Jorge Herrera Date: Mon, 19 Jul 2021 09:40:53 -0700 Subject: [PATCH 3/5] Force trigger checks --- specification/monitor/resource-manager/readme.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/monitor/resource-manager/readme.md b/specification/monitor/resource-manager/readme.md index 4e9adf997104..e99fd9e971f0 100644 --- a/specification/monitor/resource-manager/readme.md +++ b/specification/monitor/resource-manager/readme.md @@ -40,7 +40,7 @@ tag: package-2021-07 ### Tag: package-2021-07 -These settings apply only when `--tag=package-2021-07` is specified on the command line. +These settings apply only when `--tag=package-2021-07` is specified on the command line ``` yaml $(tag) == 'package-2021-07' input-file: @@ -857,7 +857,7 @@ directive: ### Tag: profile-hybrid-2019-03-01 These settings apply only when `--tag=profile-hybrid-2019-03-01` is specified on the command line. -Creating this tag to pick proper resources from the hybrid profile. +Creating this tag to pick proper resources from the hybrid profile. ``` yaml $(tag) == 'profile-hybrid-2019-03-01' input-file: From 0ea4cca4181fb7fa36e59629ee55e5e75a0ceab6 Mon Sep 17 00:00:00 2001 From: Jorge Herrera Date: Thu, 22 Jul 2021 09:36:04 -0700 Subject: [PATCH 4/5] fix on go package-2021-07 --- 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 e99fd9e971f0..1f23d7618eea 100644 --- a/specification/monitor/resource-manager/readme.md +++ b/specification/monitor/resource-manager/readme.md @@ -790,7 +790,7 @@ directive: ``` -``` yaml ($(go) && !$(track2)) || $(csharp) || $(validation) || $(typescript) +``` yaml ($(go) && !$(track2) $(tag) == 'package-2021-07') || $(csharp) || $(validation) || $(typescript) directive: - from: activityLogAlerts_API.json where: $.definitions From 600152eb7166ee140217a8b2e6fc7ecc39880c8d Mon Sep 17 00:00:00 2001 From: Jorge Herrera Date: Thu, 22 Jul 2021 14:39:21 -0700 Subject: [PATCH 5/5] fix condition --- 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 1f23d7618eea..626c2bb08d37 100644 --- a/specification/monitor/resource-manager/readme.md +++ b/specification/monitor/resource-manager/readme.md @@ -790,7 +790,7 @@ directive: ``` -``` yaml ($(go) && !$(track2) $(tag) == 'package-2021-07') || $(csharp) || $(validation) || $(typescript) +``` yaml ($(go) && !$(track2) && $(tag) == 'package-2021-07') || $(csharp) || $(validation) || $(typescript) directive: - from: activityLogAlerts_API.json where: $.definitions