From b509ea0a786e2cd9785b4bb5da31f615a9fc0068 Mon Sep 17 00:00:00 2001 From: msdogra Date: Mon, 23 May 2022 23:27:38 -0700 Subject: [PATCH] Minor changes due to update of the DevOps API version (2022-02-01-preview) (#19165) * Incorporating changes due to API review comment incorporation * Fixing the Enum case mismatch Co-authored-by: Mukesh Dogra --- .../2022-02-01-preview/ServerDevOpsAudit.json | 22 ++++++++++++++----- .../examples/ServerDevOpsAuditCreateMax.json | 8 +++---- .../examples/ServerDevOpsAuditCreateMin.json | 8 +++---- .../examples/ServerDevOpsAuditGet.json | 4 ++-- ...gsList.json => ServerDevOpsAuditList.json} | 2 +- 5 files changed, 28 insertions(+), 16 deletions(-) rename specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/{ServerDevOpsAuditSettingsList.json => ServerDevOpsAuditList.json} (96%) diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/ServerDevOpsAudit.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/ServerDevOpsAudit.json index 0804d2dfde87..b12f9f8ad3d1 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/ServerDevOpsAudit.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/ServerDevOpsAudit.json @@ -53,7 +53,7 @@ }, "x-ms-examples": { "List DevOps audit settings of a server": { - "$ref": "./examples/ServerDevOpsAuditSettingsList.json" + "$ref": "./examples/ServerDevOpsAuditList.json" } } } @@ -75,9 +75,15 @@ { "name": "devOpsAuditingSettingsName", "in": "path", - "description": "The name of the devops audit settings. This should always be 'default'.", "required": true, - "type": "string" + "type": "string", + "enum": [ + "Default" + ], + "x-ms-enum": { + "name": "DevOpsAuditingSettingsName", + "modelAsString": true + } }, { "$ref": "../../../common/v1/types.json#/parameters/SubscriptionIdParameter" @@ -119,9 +125,15 @@ { "name": "devOpsAuditingSettingsName", "in": "path", - "description": "The name of the devops audit settings. This should always be 'default'.", "required": true, - "type": "string" + "type": "string", + "enum": [ + "Default" + ], + "x-ms-enum": { + "name": "DevOpsAuditingSettingsName", + "modelAsString": true + } }, { "name": "parameters", diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/ServerDevOpsAuditCreateMax.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/ServerDevOpsAuditCreateMax.json index 9028f2551ed7..c223be04ceba 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/ServerDevOpsAuditCreateMax.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/ServerDevOpsAuditCreateMax.json @@ -3,12 +3,12 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "devAuditTestRG", "serverName": "devOpsAuditTestSvr", - "devOpsAuditingSettingsName": "default", + "devOpsAuditingSettingsName": "Default", "api-version": "2022-02-01-preview", "parameters": { "properties": { "state": "Enabled", - "storageAccountAccessKey": "sdlfkjabc+sdlfkjsdlkfsjdfLDKFTERLKFDFKLjsdfksjdflsdkfD2342309432849328476458/3RSD==", + "storageAccountAccessKey": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "storageEndpoint": "https://mystorage.blob.core.windows.net", "storageAccountSubscriptionId": "00000000-1234-0000-5678-000000000000", "isAzureMonitorTargetEnabled": true @@ -19,7 +19,7 @@ "200": { "body": { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/devAuditTestRG/providers/Microsoft.Sql/servers/devOpsAuditTestSvr/devOpsAuditingSettings/default", - "name": "default", + "name": "Default", "type": "Microsoft.Sql/servers/devOpsAuditingSettings", "properties": { "state": "Enabled", @@ -30,7 +30,7 @@ } }, "202": { - "startTime": "2020-09-22T09:34:54.72Z", + "startTime": "2022-04-22T09:34:54.72Z", "operation": "UpsertServerDevOpsAuditingSettings" } } diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/ServerDevOpsAuditCreateMin.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/ServerDevOpsAuditCreateMin.json index 505493ae1ec5..387a6779dadc 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/ServerDevOpsAuditCreateMin.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/ServerDevOpsAuditCreateMin.json @@ -3,12 +3,12 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "devAuditTestRG", "serverName": "devOpsAuditTestSvr", - "devOpsAuditingSettingsName": "default", + "devOpsAuditingSettingsName": "Default", "api-version": "2022-02-01-preview", "parameters": { "properties": { "state": "Enabled", - "storageAccountAccessKey": "sdlfkjabc+sdlfkjsdlkfsjdfLDKFTERLKFDFKLjsdfksjdflsdkfD2342309432849328476458/3RSD==", + "storageAccountAccessKey": "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX", "storageEndpoint": "https://mystorage.blob.core.windows.net" } } @@ -17,7 +17,7 @@ "200": { "body": { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/devAuditTestRG/providers/Microsoft.Sql/servers/devOpsAuditTestSvr/devOpsAuditingSettings/default", - "name": "default", + "name": "Default", "type": "Microsoft.Sql/servers/devOpsAuditingSettings", "properties": { "state": "Enabled", @@ -27,7 +27,7 @@ } }, "202": { - "startTime": "2020-09-09T09:34:54.72Z", + "startTime": "2022-04-09T09:34:54.72Z", "operation": "UpsertServerDevOpsAuditingSettings" } } diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/ServerDevOpsAuditGet.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/ServerDevOpsAuditGet.json index 0acd87553c84..dff2ae8be15b 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/ServerDevOpsAuditGet.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/ServerDevOpsAuditGet.json @@ -3,14 +3,14 @@ "subscriptionId": "00000000-1111-2222-3333-444444444444", "resourceGroupName": "devAuditTestRG", "serverName": "devOpsAuditTestSvr", - "devOpsAuditingSettingsName": "default", + "devOpsAuditingSettingsName": "Default", "api-version": "2022-02-01-preview" }, "responses": { "200": { "body": { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/devAuditTestRG/providers/Microsoft.Sql/servers/devOpsAuditTestSvr/devOpsAuditingSettings/default", - "name": "default", + "name": "Default", "type": "Microsoft.Sql/servers/devOpsAuditingSettings", "properties": { "state": "Disabled", diff --git a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/ServerDevOpsAuditSettingsList.json b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/ServerDevOpsAuditList.json similarity index 96% rename from specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/ServerDevOpsAuditSettingsList.json rename to specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/ServerDevOpsAuditList.json index 234d7b20b45a..114eb906ee4b 100644 --- a/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/ServerDevOpsAuditSettingsList.json +++ b/specification/sql/resource-manager/Microsoft.Sql/preview/2022-02-01-preview/examples/ServerDevOpsAuditList.json @@ -11,7 +11,7 @@ "value": [ { "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/devAuditTestRG/providers/Microsoft.Sql/servers/devOpsAuditTestSvr/devOpsAuditingSettings/default", - "name": "default", + "name": "Default", "type": "Microsoft.Sql/servers/devOpsAuditingSettings", "properties": { "state": "Disabled",