diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-02-02-preview/CommonDefinitions.json b/specification/app/resource-manager/Microsoft.App/preview/2024-02-02-preview/CommonDefinitions.json index 5438a847df5d..da229fd26731 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-02-02-preview/CommonDefinitions.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-02-02-preview/CommonDefinitions.json @@ -294,6 +294,10 @@ "x-ms-identifiers": [ "triggerParameter" ] + }, + "identity": { + "description": "The resource ID of a user-assigned managed identity that is assigned to the Container App, or 'system' for system-assigned identity.", + "type": "string" } } }, @@ -429,6 +433,10 @@ "x-ms-identifiers": [ "triggerParameter" ] + }, + "identity": { + "description": "The resource ID of a user-assigned managed identity that is assigned to the Container App, or 'system' for system-assigned identity.", + "type": "string" } } }, @@ -452,6 +460,10 @@ "x-ms-identifiers": [ "triggerParameter" ] + }, + "identity": { + "description": "The resource ID of a user-assigned managed identity that is assigned to the Container App, or 'system' for system-assigned identity.", + "type": "string" } } }, @@ -477,6 +489,10 @@ "x-ms-identifiers": [ "triggerParameter" ] + }, + "identity": { + "description": "The resource ID of a user-assigned managed identity that is assigned to the Container App, or 'system' for system-assigned identity.", + "type": "string" } } }, diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-02-02-preview/Jobs.json b/specification/app/resource-manager/Microsoft.App/preview/2024-02-02-preview/Jobs.json index 61789eb9cdd7..72d787803ff1 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-02-02-preview/Jobs.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-02-02-preview/Jobs.json @@ -979,6 +979,10 @@ "items": { "$ref": "./CommonDefinitions.json#/definitions/ScaleRuleAuth" } + }, + "identity": { + "description": "The resource ID of a user-assigned managed identity that is assigned to the job, or 'system' for system-assigned identity.", + "type": "string" } } }, diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-02-02-preview/examples/ContainerApps_CreateOrUpdate.json b/specification/app/resource-manager/Microsoft.App/preview/2024-02-02-preview/examples/ContainerApps_CreateOrUpdate.json index 3b1917fd2cb5..7296b19c90ff 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-02-02-preview/examples/ContainerApps_CreateOrUpdate.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-02-02-preview/examples/ContainerApps_CreateOrUpdate.json @@ -169,6 +169,18 @@ "concurrentRequests": "50" } } + }, + { + "name": "servicebus", + "custom": { + "type": "azure-servicebus", + "metadata": { + "queueName": "myqueue", + "namespace": "mynamespace", + "messageCount": "5" + }, + "identity": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myidentity" + } } ] }, @@ -343,6 +355,18 @@ "concurrentRequests": "50" } } + }, + { + "name": "servicebus", + "custom": { + "type": "azure-servicebus", + "metadata": { + "queueName": "myqueue", + "namespace": "mynamespace", + "messageCount": "5" + }, + "identity": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myidentity" + } } ] }, diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-02-02-preview/examples/ContainerApps_Get.json b/specification/app/resource-manager/Microsoft.App/preview/2024-02-02-preview/examples/ContainerApps_Get.json index b7aebe4a113a..c9f58e12ac39 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-02-02-preview/examples/ContainerApps_Get.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-02-02-preview/examples/ContainerApps_Get.json @@ -133,6 +133,18 @@ "concurrentRequests": "50" } } + }, + { + "name": "servicebus", + "custom": { + "type": "azure-servicebus", + "metadata": { + "queueName": "myqueue", + "namespace": "mynamespace", + "messageCount": "5" + }, + "identity": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myidentity" + } } ] }, diff --git a/specification/app/resource-manager/Microsoft.App/preview/2024-02-02-preview/examples/Job_CreateorUpdate_EventTrigger.json b/specification/app/resource-manager/Microsoft.App/preview/2024-02-02-preview/examples/Job_CreateorUpdate_EventTrigger.json index c0c23b59695b..8534fa2bd3bf 100644 --- a/specification/app/resource-manager/Microsoft.App/preview/2024-02-02-preview/examples/Job_CreateorUpdate_EventTrigger.json +++ b/specification/app/resource-manager/Microsoft.App/preview/2024-02-02-preview/examples/Job_CreateorUpdate_EventTrigger.json @@ -6,6 +6,12 @@ "api-version": "2024-02-02-preview", "JobEnvelope": { "location": "East US", + "identity": { + "type": "UserAssigned", + "userAssignedIdentities": { + "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myidentity": {} + } + }, "properties": { "environmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube", "configuration": { @@ -24,7 +30,8 @@ "type": "azure-servicebus", "metadata": { "topicName": "my-topic" - } + }, + "identity": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myidentity" } ] } @@ -67,6 +74,15 @@ "name": "testcontainerAppsJob0", "type": "Microsoft.App/jobs", "location": "East US", + "identity": { + "type": "UserAssigned", + "userAssignedIdentities": { + "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myidentity": { + "principalId": "74adfa4f-dedf-8dc0-ca29-b6d1a69ab312", + "clientId": "14adfa4f-eedf-1dc0-ba29-a6d1a69ab3df" + } + } + }, "properties": { "provisioningState": "InProgress", "environmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube", @@ -82,11 +98,12 @@ "maxExecutions": 5, "rules": [ { - "name": "githubscalingrule", - "type": "github-runner", + "name": "servicebuscalingrule", + "type": "azure-servicebus", "metadata": { - "githubAPIURL": "https://api.github.com" - } + "topicName": "my-topic" + }, + "identity": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myidentity" } ] } @@ -135,6 +152,15 @@ "name": "testcontainerAppsJob0", "type": "Microsoft.App/jobs", "location": "East US", + "identity": { + "type": "UserAssigned", + "userAssignedIdentities": { + "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myidentity": { + "principalId": "74adfa4f-dedf-8dc0-ca29-b6d1a69ab312", + "clientId": "14adfa4f-eedf-1dc0-ba29-a6d1a69ab3df" + } + } + }, "properties": { "provisioningState": "InProgress", "environmentId": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/rg/providers/Microsoft.App/managedEnvironments/demokube", @@ -155,7 +181,8 @@ "metadata": { "queueName": "my-queue", "messageCount": "50" - } + }, + "identity": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourcegroups/rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/myidentity" } ] }