diff --git a/specification/workloads/resource-manager/Microsoft.Workloads/preview/2021-12-01-preview/commonTypes.json b/specification/workloads/resource-manager/Microsoft.Workloads/preview/2021-12-01-preview/commonTypes.json new file mode 100644 index 000000000000..48d9bb62e095 --- /dev/null +++ b/specification/workloads/resource-manager/Microsoft.Workloads/preview/2021-12-01-preview/commonTypes.json @@ -0,0 +1,41 @@ +{ + "swagger": "2.0", + "info": { + "version": "2021-12-01-preview", + "title": "Workloads Client", + "description": "Workloads client provides access to various workload operations" + }, + "paths": {}, + "definitions": { + "ManagedServiceIdentityType": { + "description": "Type of managed service identity (only None, UserAssigned types are allowed).", + "enum": [ + "None", + "UserAssigned" + ], + "type": "string", + "x-ms-enum": { + "name": "ManagedServiceIdentityType", + "modelAsString": true + } + }, + "UserAssignedServiceIdentity": { + "description": "Managed service identity (user assigned identities)", + "type": "object", + "properties": { + "type": { + "description": "Type of manage identity", + "$ref": "#/definitions/ManagedServiceIdentityType" + }, + "userAssignedIdentities": { + "description": "User assigned identities dictionary", + "$ref": "../../../../../common-types/resource-management/v3/managedidentity.json#/definitions/UserAssignedIdentities" + } + }, + "required": [ + "type" + ] + } + }, + "parameters": {} +} diff --git a/specification/workloads/resource-manager/Microsoft.Workloads/preview/2021-12-01-preview/examples/workloadmonitor/monitors_PatchTags.json b/specification/workloads/resource-manager/Microsoft.Workloads/preview/2021-12-01-preview/examples/workloadmonitor/monitors_PatchTags.json index 54aef7c4b83c..a7524bc7bc6f 100644 --- a/specification/workloads/resource-manager/Microsoft.Workloads/preview/2021-12-01-preview/examples/workloadmonitor/monitors_PatchTags.json +++ b/specification/workloads/resource-manager/Microsoft.Workloads/preview/2021-12-01-preview/examples/workloadmonitor/monitors_PatchTags.json @@ -4,9 +4,12 @@ "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "myResourceGroup", "monitorName": "mySapMonitor", - "tagsParameter": { + "body": { "tags": { "testkey": "testvalue" + }, + "identity": { + "type": "None" } } }, @@ -28,6 +31,9 @@ "lastModifiedByType": "User", "lastModifiedAt": "2021-08-19T15:10:46.196Z" }, + "identity": { + "type": "None" + }, "properties": { "provisioningState": "Succeeded", "errors": [ diff --git a/specification/workloads/resource-manager/Microsoft.Workloads/preview/2021-12-01-preview/examples/workloadmonitor/monitors_PatchTags_Delete.json b/specification/workloads/resource-manager/Microsoft.Workloads/preview/2021-12-01-preview/examples/workloadmonitor/monitors_PatchTags_Delete.json index aee9dec3eeaa..86b0436721cc 100644 --- a/specification/workloads/resource-manager/Microsoft.Workloads/preview/2021-12-01-preview/examples/workloadmonitor/monitors_PatchTags_Delete.json +++ b/specification/workloads/resource-manager/Microsoft.Workloads/preview/2021-12-01-preview/examples/workloadmonitor/monitors_PatchTags_Delete.json @@ -4,8 +4,11 @@ "subscriptionId": "00000000-0000-0000-0000-000000000000", "resourceGroupName": "myResourceGroup", "monitorName": "mySapMonitor", - "tagsParameter": { - "tags": {} + "body": { + "tags": {}, + "identity": { + "type": "None" + } } }, "responses": { @@ -26,6 +29,9 @@ "lastModifiedByType": "User", "lastModifiedAt": "2021-08-19T15:10:46.196Z" }, + "identity": { + "type": "None" + }, "properties": { "provisioningState": "Succeeded", "errors": [ diff --git a/specification/workloads/resource-manager/Microsoft.Workloads/preview/2021-12-01-preview/monitors.json b/specification/workloads/resource-manager/Microsoft.Workloads/preview/2021-12-01-preview/monitors.json index 3b0d64f93dd9..83e0f622c579 100644 --- a/specification/workloads/resource-manager/Microsoft.Workloads/preview/2021-12-01-preview/monitors.json +++ b/specification/workloads/resource-manager/Microsoft.Workloads/preview/2021-12-01-preview/monitors.json @@ -286,7 +286,13 @@ "$ref": "#/parameters/monitorNameParameter" }, { - "$ref": "#/parameters/TagsParameter" + "in": "body", + "name": "body", + "required": true, + "description": "The Update SAP workload monitor request body.", + "schema": { + "$ref": "#/definitions/UpdateMonitorRequest" + } } ], "responses": { @@ -744,6 +750,9 @@ "Monitor": { "type": "object", "properties": { + "identity": { + "$ref": "./commonTypes.json#/definitions/UserAssignedServiceIdentity" + }, "properties": { "x-ms-client-flatten": true, "$ref": "#/definitions/MonitorProperties", @@ -823,6 +832,22 @@ }, "description": "Describes the properties of a SAP monitor." }, + "UpdateMonitorRequest": { + "description": "Defines the request body for updating SAP monitor resource.", + "type": "object", + "properties": { + "tags": { + "description": "Gets or sets the Resource tags.", + "type": "object", + "additionalProperties": { + "type": "string" + } + }, + "identity": { + "$ref": "./commonTypes.json#/definitions/UserAssignedServiceIdentity" + } + } + }, "ProviderInstanceListResult": { "type": "object", "properties": { @@ -843,6 +868,9 @@ "ProviderInstance": { "type": "object", "properties": { + "identity": { + "$ref": "./commonTypes.json#/definitions/UserAssignedServiceIdentity" + }, "properties": { "x-ms-client-flatten": true, "$ref": "#/definitions/ProviderInstanceProperties", @@ -1156,16 +1184,6 @@ "description": "Name of the provider instance.", "x-ms-parameter-location": "method" }, - "TagsParameter": { - "name": "tagsParameter", - "in": "body", - "required": true, - "schema": { - "$ref": "#/definitions/Tags" - }, - "description": "Request body that only contains the new Tags field", - "x-ms-parameter-location": "method" - }, "MonitorParameter": { "name": "MonitorParameter", "in": "body",