diff --git a/specification/resources/resource-manager/Microsoft.Solutions/preview/2020-08-21-preview/examples/updateApplication.json b/specification/resources/resource-manager/Microsoft.Solutions/preview/2020-08-21-preview/examples/updateApplication.json new file mode 100644 index 000000000000..b9722b2d6d2e --- /dev/null +++ b/specification/resources/resource-manager/Microsoft.Solutions/preview/2020-08-21-preview/examples/updateApplication.json @@ -0,0 +1,42 @@ +{ + "parameters": { + "subscriptionId": "subid", + "resourceGroupName": "rg", + "applicationName": "myManagedApplication", + "api-version": "2021-07-01", + "parameters": { + "properties": { + "applicationDefinitionId": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Solutions/applicationDefinitions/myAppDef", + "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG" + }, + "kind": "ServiceCatalog" + } + }, + "responses": { + "200": { + "headers": {}, + "body": { + "name": "myManagedApplication", + "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Solutions/applications/myManagedApplication", + "type": "Microsoft.Solutions/applications", + "managedBy": null, + "plan": null, + "identity": null, + "kind": "ServiceCatalog", + "sku": null, + "properties": { + "applicationDefinitionId": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Solutions/applicationDefinitions/myAppDef", + "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG", + "outputs": null, + "parameters": null, + "provisioningState": "Created" + } + } + }, + "202": { + "headers": { + "location": "https://url.to.query" + } + } + } +} diff --git a/specification/resources/resource-manager/Microsoft.Solutions/preview/2020-08-21-preview/managedapplications.json b/specification/resources/resource-manager/Microsoft.Solutions/preview/2020-08-21-preview/managedapplications.json index 285104f4ea18..c076ddc41af3 100644 --- a/specification/resources/resource-manager/Microsoft.Solutions/preview/2020-08-21-preview/managedapplications.json +++ b/specification/resources/resource-manager/Microsoft.Solutions/preview/2020-08-21-preview/managedapplications.json @@ -248,6 +248,11 @@ ], "operationId": "Applications_Update", "description": "Updates an existing managed application. The only value that can be updated via PATCH currently is the tags.", + "x-ms-examples": { + "Create or update managed application": { + "$ref": "./examples/updateApplication.json" + } + }, "parameters": [ { "name": "resourceGroupName", @@ -290,6 +295,9 @@ "$ref": "#/definitions/Application" } }, + "202": { + "description": "Accepted - Returns this status until the asynchronous operation has completed." + }, "default": { "description": "Error response describing why the operation failed.", "schema": { @@ -1931,6 +1939,13 @@ "type": "string" }, "description": "The deny assignment excluded actions." + }, + "allowedDataActions": { + "type": "array", + "items": { + "type": "string" + }, + "description": "The deny assignment excluded data actions." } }, "description": "Managed application locking policy." diff --git a/specification/resources/resource-manager/Microsoft.Solutions/stable/2019-07-01/examples/updateApplication.json b/specification/resources/resource-manager/Microsoft.Solutions/stable/2019-07-01/examples/updateApplication.json new file mode 100644 index 000000000000..b9722b2d6d2e --- /dev/null +++ b/specification/resources/resource-manager/Microsoft.Solutions/stable/2019-07-01/examples/updateApplication.json @@ -0,0 +1,42 @@ +{ + "parameters": { + "subscriptionId": "subid", + "resourceGroupName": "rg", + "applicationName": "myManagedApplication", + "api-version": "2021-07-01", + "parameters": { + "properties": { + "applicationDefinitionId": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Solutions/applicationDefinitions/myAppDef", + "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG" + }, + "kind": "ServiceCatalog" + } + }, + "responses": { + "200": { + "headers": {}, + "body": { + "name": "myManagedApplication", + "id": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Solutions/applications/myManagedApplication", + "type": "Microsoft.Solutions/applications", + "managedBy": null, + "plan": null, + "identity": null, + "kind": "ServiceCatalog", + "sku": null, + "properties": { + "applicationDefinitionId": "/subscriptions/subid/resourceGroups/rg/providers/Microsoft.Solutions/applicationDefinitions/myAppDef", + "managedResourceGroupId": "/subscriptions/subid/resourceGroups/myManagedRG", + "outputs": null, + "parameters": null, + "provisioningState": "Created" + } + } + }, + "202": { + "headers": { + "location": "https://url.to.query" + } + } + } +} diff --git a/specification/resources/resource-manager/Microsoft.Solutions/stable/2019-07-01/managedapplications.json b/specification/resources/resource-manager/Microsoft.Solutions/stable/2019-07-01/managedapplications.json index df4427a208ec..49a2f615d2cd 100644 --- a/specification/resources/resource-manager/Microsoft.Solutions/stable/2019-07-01/managedapplications.json +++ b/specification/resources/resource-manager/Microsoft.Solutions/stable/2019-07-01/managedapplications.json @@ -242,6 +242,11 @@ ], "operationId": "Applications_Update", "description": "Updates an existing managed application. The only value that can be updated via PATCH currently is the tags.", + "x-ms-examples": { + "Create or update managed application": { + "$ref": "./examples/updateApplication.json" + } + }, "parameters": [ { "name": "resourceGroupName", @@ -284,6 +289,9 @@ "$ref": "#/definitions/Application" } }, + "202": { + "description": "Accepted - Returns this status until the asynchronous operation has completed." + }, "default": { "description": "Error response describing why the operation failed.", "schema": { @@ -1918,6 +1926,13 @@ "type": "string" }, "description": "The deny assignment excluded actions." + }, + "allowedDataActions": { + "type": "array", + "items": { + "type": "string" + }, + "description": "The deny assignment excluded data actions." } }, "description": "Managed application locking policy." diff --git a/specification/solutions/resource-manager/Microsoft.Solutions/stable/2021-07-01/examples/updateApplication.json b/specification/solutions/resource-manager/Microsoft.Solutions/stable/2021-07-01/examples/updateApplication.json index 63c25deb6d3d..b9722b2d6d2e 100644 --- a/specification/solutions/resource-manager/Microsoft.Solutions/stable/2021-07-01/examples/updateApplication.json +++ b/specification/solutions/resource-manager/Microsoft.Solutions/stable/2021-07-01/examples/updateApplication.json @@ -32,6 +32,11 @@ "provisioningState": "Created" } } + }, + "202": { + "headers": { + "location": "https://url.to.query" + } } } } diff --git a/specification/solutions/resource-manager/Microsoft.Solutions/stable/2021-07-01/managedapplications.json b/specification/solutions/resource-manager/Microsoft.Solutions/stable/2021-07-01/managedapplications.json index 7347bef5d809..67bae8f35a19 100644 --- a/specification/solutions/resource-manager/Microsoft.Solutions/stable/2021-07-01/managedapplications.json +++ b/specification/solutions/resource-manager/Microsoft.Solutions/stable/2021-07-01/managedapplications.json @@ -254,6 +254,9 @@ "$ref": "#/definitions/Application" } }, + "202": { + "description": "Accepted - Returns this status until the asynchronous operation has completed." + }, "default": { "description": "Error response describing why the operation failed.", "schema": { @@ -986,7 +989,7 @@ "pattern": "^[-\\w\\._,\\(\\)]+$" }, "identity": { - "$ref": "../../../../../common-types/resource-management/v3/managedidentity.json#/definitions/ManagedServiceIdentity", + "$ref": "#/definitions/Identity", "description": "The identity of the resource." } }, @@ -1019,7 +1022,7 @@ "pattern": "^[-\\w\\._,\\(\\)]+$" }, "identity": { - "$ref": "../../../../../common-types/resource-management/v3/managedidentity.json#/definitions/ManagedServiceIdentity", + "$ref": "#/definitions/Identity", "description": "The identity of the resource." } }, @@ -1367,6 +1370,59 @@ ], "description": "SKU for the resource." }, + "Identity": { + "type": "object", + "properties": { + "principalId": { + "readOnly": true, + "type": "string", + "description": "The principal ID of resource identity." + }, + "tenantId": { + "readOnly": true, + "type": "string", + "description": "The tenant ID of resource." + }, + "type": { + "type": "string", + "description": "The identity type.", + "enum": [ + "SystemAssigned", + "UserAssigned", + "SystemAssigned, UserAssigned", + "None" + ], + "x-ms-enum": { + "name": "ResourceIdentityType", + "modelAsString": false + } + }, + "userAssignedIdentities": { + "type": "object", + "additionalProperties": { + "$ref": "#/definitions/userAssignedResourceIdentity" + }, + "description": "The list of user identities associated with the resource. The user identity dictionary key references will be resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'." + } + }, + "description": "Identity for the resource." + }, + "userAssignedResourceIdentity": { + "type": "object", + "properties": { + "principalId": { + "readOnly": true, + "type": "string", + "description": "The principal id of user assigned identity." + }, + "tenantId": { + "readOnly": true, + "type": "string", + "description": "The tenant id of user assigned identity." + } + }, + "description": "Represents the user assigned identity that is contained within the UserAssignedIdentities dictionary on ResourceIdentity" + }, "Resource": { "type": "object", "properties": { @@ -1596,6 +1652,13 @@ "type": "string" }, "description": "The deny assignment excluded actions." + }, + "allowedDataActions": { + "type": "array", + "items": { + "type": "string" + }, + "description": "The deny assignment excluded data actions." } }, "description": "Managed application locking policy."