From 83b00d50b01e16a694b8c1512ec20531867fbb44 Mon Sep 17 00:00:00 2001 From: Shimon Arzuan Date: Tue, 26 Jul 2022 16:27:32 +0300 Subject: [PATCH 1/6] Add package-composite-v5 tag to SqlVulnerabilityAssessment API --- specification/sql/resource-manager/readme.md | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/specification/sql/resource-manager/readme.md b/specification/sql/resource-manager/readme.md index 2b30135b842b..67c76c355219 100644 --- a/specification/sql/resource-manager/readme.md +++ b/specification/sql/resource-manager/readme.md @@ -436,6 +436,12 @@ input-file: - ./Microsoft.Sql/preview/2020-11-01-preview/DatabaseRecommendedActions.json - ./Microsoft.Sql/preview/2020-11-01-preview/DatabaseSchemas.json - ./Microsoft.Sql/preview/2020-11-01-preview/DatabaseSecurityAlertPolicies.json +- ./Microsoft.Sql/preview/2022-02-01-preview/DatabaseSqlVulnerabilityAssessmentBaselines.json +- ./Microsoft.Sql/preview/2022-02-01-preview/DatabaseSqlVulnerabilityAssessmentExecuteScan.json +- ./Microsoft.Sql/preview/2022-02-01-preview/DatabaseSqlVulnerabilityAssessmentRuleBaselines.json +- ./Microsoft.Sql/preview/2022-02-01-preview/DatabaseSqlVulnerabilityAssessmentScanResult.json +- ./Microsoft.Sql/preview/2022-02-01-preview/DatabaseSqlVulnerabilityAssessmentScans.json +- ./Microsoft.Sql/preview/2022-02-01-preview/DatabaseSqlVulnerabilityAssessmentsSettings.json - ./Microsoft.Sql/preview/2020-11-01-preview/DatabaseTables.json - ./Microsoft.Sql/preview/2020-11-01-preview/DatabaseVulnerabilityAssesmentRuleBaselines.json - ./Microsoft.Sql/preview/2020-11-01-preview/DatabaseVulnerabilityAssessments.json @@ -503,6 +509,12 @@ input-file: - ./Microsoft.Sql/preview/2020-11-01-preview/ServerTrustGroups.json - ./Microsoft.Sql/preview/2020-11-01-preview/ServerVulnerabilityAssessments.json - ./Microsoft.Sql/preview/2020-11-01-preview/SqlAgent.json +- ./Microsoft.Sql/preview/2022-02-01-preview/SqlVulnerabilityAssessmentBaseline.json +- ./Microsoft.Sql/preview/2022-02-01-preview/SqlVulnerabilityAssessmentExecuteScan.json +- ./Microsoft.Sql/preview/2022-02-01-preview/SqlVulnerabilityAssessmentRuleBaseline.json +- ./Microsoft.Sql/preview/2022-02-01-preview/SqlVulnerabilityAssessmentScanResult.json +- ./Microsoft.Sql/preview/2022-02-01-preview/SqlVulnerabilityAssessmentScans.json +- ./Microsoft.Sql/preview/2022-02-01-preview/SqlVulnerabilityAssessmentsSettings.json - ./Microsoft.Sql/preview/2020-11-01-preview/SubscriptionUsages.json - ./Microsoft.Sql/preview/2020-11-01-preview/SyncAgents.json - ./Microsoft.Sql/preview/2020-11-01-preview/SyncGroups.json From d8fabea2e54e3bcaeeb94ff54691382f5b021792 Mon Sep 17 00:00:00 2001 From: Ahmad Abas Date: Sun, 7 Aug 2022 23:13:05 +0300 Subject: [PATCH 2/6] Fix duplicate ids for baseline APIs for SQL vulnerability assessment --- .../DatabaseSqlVulnerabilityAssessmentBaselines.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/DatabaseSqlVulnerabilityAssessmentBaselines.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/DatabaseSqlVulnerabilityAssessmentBaselines.json index 6e9ce86255ee..9638bebb31de 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/DatabaseSqlVulnerabilityAssessmentBaselines.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/DatabaseSqlVulnerabilityAssessmentBaselines.json @@ -148,7 +148,7 @@ "DatabaseSqlVulnerabilityAssessmentBaselines" ], "description": "Add a database's vulnerability assessment rule baseline list.", - "operationId": "DatabaseSqlVulnerabilityAssessmentBaselines_CreateOrUpdate", + "operationId": "SqlVulnerabilityAssessmentBaselines_CreateOrUpdate", "parameters": [ { "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter" From e78ed1bb4c63259544fbcac4191034d8cbf82d70 Mon Sep 17 00:00:00 2001 From: Ahmad Abas Date: Sun, 7 Aug 2022 23:38:44 +0300 Subject: [PATCH 3/6] Fix ids mix up --- .../DatabaseSqlVulnerabilityAssessmentBaselines.json | 2 +- .../2022-02-01-preview/SqlVulnerabilityAssessmentBaseline.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/DatabaseSqlVulnerabilityAssessmentBaselines.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/DatabaseSqlVulnerabilityAssessmentBaselines.json index 9638bebb31de..6e9ce86255ee 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/DatabaseSqlVulnerabilityAssessmentBaselines.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/DatabaseSqlVulnerabilityAssessmentBaselines.json @@ -148,7 +148,7 @@ "DatabaseSqlVulnerabilityAssessmentBaselines" ], "description": "Add a database's vulnerability assessment rule baseline list.", - "operationId": "SqlVulnerabilityAssessmentBaselines_CreateOrUpdate", + "operationId": "DatabaseSqlVulnerabilityAssessmentBaselines_CreateOrUpdate", "parameters": [ { "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter" diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/SqlVulnerabilityAssessmentBaseline.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/SqlVulnerabilityAssessmentBaseline.json index 11c7bb476a5a..0201be6a8179 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/SqlVulnerabilityAssessmentBaseline.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/SqlVulnerabilityAssessmentBaseline.json @@ -170,7 +170,7 @@ "SqlVulnerabilityAssessmentBaseline" ], "description": "Add a database's vulnerability assessment rule baseline list.", - "operationId": "DatabaseSqlVulnerabilityAssessmentBaselines_CreateOrUpdate", + "operationId": "SqlVulnerabilityAssessmentBaselines_CreateOrUpdate", "parameters": [ { "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter" From c376f434b374717aee7722f0ec3b8f9dc5e5118e Mon Sep 17 00:00:00 2001 From: Ahmad Abas Date: Mon, 8 Aug 2022 17:36:00 +0300 Subject: [PATCH 4/6] Fix duplicate ids for delete baseline rules --- .../SqlVulnerabilityAssessmentRuleBaseline.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/SqlVulnerabilityAssessmentRuleBaseline.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/SqlVulnerabilityAssessmentRuleBaseline.json index d8bf218dae74..e143418c4df8 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/SqlVulnerabilityAssessmentRuleBaseline.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/SqlVulnerabilityAssessmentRuleBaseline.json @@ -284,7 +284,7 @@ "SqlVulnerabilityAssessmentRuleBaseline" ], "description": "Removes the database's vulnerability assessment rule baseline.", - "operationId": "DatabaseSqlVulnerabilityAssessmentRuleBaselines_Delete", + "operationId": "SqlVulnerabilityAssessmentRuleBaselines_Delete", "parameters": [ { "$ref": "../../../common/v1/types.json#/parameters/ResourceGroupParameter" From f3cbd5a5d4fb46c659dd4bf41cd59635bd27e218 Mon Sep 17 00:00:00 2001 From: Ahmad Abas Date: Tue, 9 Aug 2022 00:20:42 +0300 Subject: [PATCH 5/6] update read me --- specification/sql/resource-manager/readme.md | 24 ++++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/specification/sql/resource-manager/readme.md b/specification/sql/resource-manager/readme.md index 67c76c355219..55c8f471ed4b 100644 --- a/specification/sql/resource-manager/readme.md +++ b/specification/sql/resource-manager/readme.md @@ -436,12 +436,6 @@ input-file: - ./Microsoft.Sql/preview/2020-11-01-preview/DatabaseRecommendedActions.json - ./Microsoft.Sql/preview/2020-11-01-preview/DatabaseSchemas.json - ./Microsoft.Sql/preview/2020-11-01-preview/DatabaseSecurityAlertPolicies.json -- ./Microsoft.Sql/preview/2022-02-01-preview/DatabaseSqlVulnerabilityAssessmentBaselines.json -- ./Microsoft.Sql/preview/2022-02-01-preview/DatabaseSqlVulnerabilityAssessmentExecuteScan.json -- ./Microsoft.Sql/preview/2022-02-01-preview/DatabaseSqlVulnerabilityAssessmentRuleBaselines.json -- ./Microsoft.Sql/preview/2022-02-01-preview/DatabaseSqlVulnerabilityAssessmentScanResult.json -- ./Microsoft.Sql/preview/2022-02-01-preview/DatabaseSqlVulnerabilityAssessmentScans.json -- ./Microsoft.Sql/preview/2022-02-01-preview/DatabaseSqlVulnerabilityAssessmentsSettings.json - ./Microsoft.Sql/preview/2020-11-01-preview/DatabaseTables.json - ./Microsoft.Sql/preview/2020-11-01-preview/DatabaseVulnerabilityAssesmentRuleBaselines.json - ./Microsoft.Sql/preview/2020-11-01-preview/DatabaseVulnerabilityAssessments.json @@ -509,12 +503,6 @@ input-file: - ./Microsoft.Sql/preview/2020-11-01-preview/ServerTrustGroups.json - ./Microsoft.Sql/preview/2020-11-01-preview/ServerVulnerabilityAssessments.json - ./Microsoft.Sql/preview/2020-11-01-preview/SqlAgent.json -- ./Microsoft.Sql/preview/2022-02-01-preview/SqlVulnerabilityAssessmentBaseline.json -- ./Microsoft.Sql/preview/2022-02-01-preview/SqlVulnerabilityAssessmentExecuteScan.json -- ./Microsoft.Sql/preview/2022-02-01-preview/SqlVulnerabilityAssessmentRuleBaseline.json -- ./Microsoft.Sql/preview/2022-02-01-preview/SqlVulnerabilityAssessmentScanResult.json -- ./Microsoft.Sql/preview/2022-02-01-preview/SqlVulnerabilityAssessmentScans.json -- ./Microsoft.Sql/preview/2022-02-01-preview/SqlVulnerabilityAssessmentsSettings.json - ./Microsoft.Sql/preview/2020-11-01-preview/SubscriptionUsages.json - ./Microsoft.Sql/preview/2020-11-01-preview/SyncAgents.json - ./Microsoft.Sql/preview/2020-11-01-preview/SyncGroups.json @@ -552,10 +540,22 @@ input-file: - ./Microsoft.Sql/preview/2021-11-01-preview/ServerAdvancedThreatProtectionSettings.json - ./Microsoft.Sql/preview/2021-11-01-preview/ManagedServerDnsAliases.json - ./Microsoft.Sql/preview/2022-02-01-preview/Databases.json +- ./Microsoft.Sql/preview/2022-02-01-preview/DatabaseSqlVulnerabilityAssessmentBaselines.json +- ./Microsoft.Sql/preview/2022-02-01-preview/DatabaseSqlVulnerabilityAssessmentExecuteScan.json +- ./Microsoft.Sql/preview/2022-02-01-preview/DatabaseSqlVulnerabilityAssessmentRuleBaselines.json +- ./Microsoft.Sql/preview/2022-02-01-preview/DatabaseSqlVulnerabilityAssessmentScanResult.json +- ./Microsoft.Sql/preview/2022-02-01-preview/DatabaseSqlVulnerabilityAssessmentScans.json +- ./Microsoft.Sql/preview/2022-02-01-preview/DatabaseSqlVulnerabilityAssessmentsSettings.json - ./Microsoft.Sql/preview/2022-02-01-preview/ManagedInstanceDtcs.json - ./Microsoft.Sql/preview/2022-02-01-preview/ManagedDatabaseAdvancedThreatProtectionSettings.json - ./Microsoft.Sql/preview/2022-02-01-preview/ManagedInstanceAdvancedThreatProtectionSettings.json - ./Microsoft.Sql/preview/2022-02-01-preview/ReplicationLinks.json +- ./Microsoft.Sql/preview/2022-02-01-preview/SqlVulnerabilityAssessmentBaseline.json +- ./Microsoft.Sql/preview/2022-02-01-preview/SqlVulnerabilityAssessmentExecuteScan.json +- ./Microsoft.Sql/preview/2022-02-01-preview/SqlVulnerabilityAssessmentRuleBaseline.json +- ./Microsoft.Sql/preview/2022-02-01-preview/SqlVulnerabilityAssessmentScanResult.json +- ./Microsoft.Sql/preview/2022-02-01-preview/SqlVulnerabilityAssessmentScans.json +- ./Microsoft.Sql/preview/2022-02-01-preview/SqlVulnerabilityAssessmentsSettings.json # Needed when there is more than one input file From 48b917dca8f7b2da643722805eb1dc1a1eed9849 Mon Sep 17 00:00:00 2001 From: tadelesh Date: Thu, 25 Aug 2022 11:42:07 +0800 Subject: [PATCH 6/6] add directive to mitigate Go stuttering removal collision --- specification/sql/resource-manager/readme.go.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/specification/sql/resource-manager/readme.go.md b/specification/sql/resource-manager/readme.go.md index f35d6b4fb133..1fe7f45c97f5 100644 --- a/specification/sql/resource-manager/readme.go.md +++ b/specification/sql/resource-manager/readme.go.md @@ -8,6 +8,22 @@ module-name: sdk/resourcemanager/sql/armsql module: github.com/Azure/azure-sdk-for-go/$(module-name) output-folder: $(go-sdk-folder)/$(module-name) azure-arm: true +directive: +- rename-model: + from: 'SqlVulnerabilityAssessmentScanRecord' + to: 'VulnerabilityAssessmentScanRecordForSql' +- rename-model: + from: 'SqlVulnerabilityAssessmentScanRecordListResult' + to: 'VulnerabilityAssessmentScanRecordForSqlListResult' +- rename-model: + from: 'SQLVulnerabilityAssessmentScanRecordProperties' + to: 'VulnerabilityAssessmentScanRecordForSqlProperties' +- rename-model: + from: 'SqlVulnerabilityAssessmentScanRecordProperties' + to: 'VulnerabilityAssessmentScanRecordForSqlProperties' +- rename-model: + from: 'SqlVulnerabilityAssessmentScanError' + to: 'VulnerabilityAssessmentScanForSqlError' ``` ``` yaml $(go) && !$(track2)