Skip to content

Commit

Permalink
Introduce Microsoft.App/builders tracked resource and Microsoft.App/b…
Browse files Browse the repository at this point in the history 
…uilds proxy resource (#24240)

* cherry picked commit to introduce builders and builds, and updated api version

* added linting suppressions to readme

* pre feedback: v3 -> v5, common build/er params, rename identity to identityresourceid, inprogress -> creating

* fix typo

* fix model validation

* added updating provisioning status, and fixed a missed provisioning status ref

* Create identity to registry mapping in builder object (#24275)

* create identity to registry mapping in builder object

* update mapping to be a dictionary of container registries, to enforce single container registry

* run prettier

* run prettier on examples fil

* pr feedback: v5 -> v3 and added x ms param location

* fix plural naming to singular
  • Loading branch information
@pauld-msft
pauld-msft authored Jun 14, 2023
1 parent fe5fc86 commit 95521c5
Show file tree
Hide file tree
Showing 14 changed files with 2,018 additions and 0 deletions.
501 changes: 501 additions & 0 deletions specification/app/resource-manager/Microsoft.App/preview/2023-05-02-preview/Builders.json
View file

Large diffs are not rendered by default.

486 changes: 486 additions & 0 deletions specification/app/resource-manager/Microsoft.App/preview/2023-05-02-preview/Builds.json
View file

Large diffs are not rendered by default.

132 changes: 132 additions & 0 deletions ...ce-manager/Microsoft.App/preview/2023-05-02-preview/examples/Builders_CreateOrUpdate.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
{
"operationId": "Builders_CreateOrUpdate",
"title": "Builders_CreateOrUpdate_0",
"parameters": {
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"resourceGroupName": "rg",
"builderName": "testBuilder",
"api-version": "2023-05-02-preview",
"builderEnvelope": {
"identity": {
"type": "SystemAssigned,UserAssigned",
"userAssignedIdentities": {
"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1": {}
}
},
"properties": {
"environmentId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/managedEnvironments/testEnv",
"containerRegistries": [
{
"containerRegistryServer": "test.azurecr.io",
"identityResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1"
},
{
"containerRegistryServer": "test2.azurecr.io",
"identityResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1"
}
]
},
"tags": {
"company": "Microsoft"
},
"location": "eastus"
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/builders/testBuilder",
"name": "testBuilder",
"type": "Microsoft.App/builders",
"location": "eastus",
"identity": {
"type": "SystemAssigned,UserAssigned",
"principalId": "00000000-0000-0000-0000-000000000000",
"tenantId": "00000000-0000-0000-0000-000000000000",
"userAssignedIdentities": {
"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1": {
"clientId": "00000000-0000-0000-0000-000000000000",
"principalId": "00000000-0000-0000-0000-000000000000"
}
}
},
"properties": {
"provisioningState": "Succeeded",
"environmentId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/managedEnvironments/testEnv",
"buildComputeId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/jobs/build1234",
"patchComputeId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/jobs/patcher1234",
"containerRegistries": [
{
"containerRegistryServer": "test.azurecr.io",
"identityResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1"
},
{
"containerRegistryServer": "test2.azurecr.io",
"identityResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1"
}
]
},
"systemData": {
"createdBy": "[email protected]",
"createdByType": "User",
"createdAt": "2022-10-11T11:05:51.4940669Z",
"lastModifiedBy": "[email protected]",
"lastModifiedByType": "User",
"lastModifiedAt": "2022-10-11T11:05:51.4940669Z"
},
"tags": {
"company": "Microsoft"
}
}
},
"201": {
"headers": {
"Azure-AsyncOperation": "https://management.azure.com/subscriptions/{subscription-id}/providers/Microsoft.App/locations/{location}/operationStatuses/{operationId}"
},
"body": {
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/builders/testBuilder",
"name": "testBuilder",
"type": "Microsoft.App/builders",
"location": "eastus",
"identity": {
"type": "SystemAssigned,UserAssigned",
"principalId": "00000000-0000-0000-0000-000000000000",
"tenantId": "00000000-0000-0000-0000-000000000000",
"userAssignedIdentities": {
"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1": {
"clientId": "00000000-0000-0000-0000-000000000000",
"principalId": "00000000-0000-0000-0000-000000000000"
}
}
},
"properties": {
"provisioningState": "Creating",
"environmentId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/managedEnvironments/testEnv",
"buildComputeId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/jobs/build1234",
"patchComputeId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/jobs/patcher1234",
"containerRegistries": [
{
"containerRegistryServer": "test.azurecr.io",
"identityResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1"
},
{
"containerRegistryServer": "test2.azurecr.io",
"identityResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1"
}
]
},
"systemData": {
"createdBy": "[email protected]",
"createdByType": "User",
"createdAt": "2022-10-11T11:05:51.4940669Z",
"lastModifiedBy": "[email protected]",
"lastModifiedByType": "User",
"lastModifiedAt": "2022-10-11T11:05:51.4940669Z"
},
"tags": {
"company": "Microsoft"
}
}
}
}
}
19 changes: 19 additions & 0 deletions ...p/resource-manager/Microsoft.App/preview/2023-05-02-preview/examples/Builders_Delete.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"operationId": "Builders_Delete",
"title": "Builders_Delete_0",
"parameters": {
"api-version": "2023-05-02-preview",
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"resourceGroupName": "rg",
"builderName": "testBuilder"
},
"responses": {
"200": {},
"202": {
"headers": {
"Location": "https://management.azure.com/subscriptions/{subscription-id}/providers/Microsoft.App/locations/{location}/operationStatuses/{operationId}"
}
},
"204": {}
}
}
58 changes: 58 additions & 0 deletions .../app/resource-manager/Microsoft.App/preview/2023-05-02-preview/examples/Builders_Get.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"operationId": "Builders_Get",
"title": "Builders_Get_0",
"parameters": {
"api-version": "2023-05-02-preview",
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"resourceGroupName": "rg",
"builderName": "testBuilder"
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/builders/testBuilder",
"name": "testBuilder",
"type": "Microsoft.App/builders",
"location": "eastus",
"identity": {
"type": "SystemAssigned,UserAssigned",
"principalId": "00000000-0000-0000-0000-000000000000",
"tenantId": "00000000-0000-0000-0000-000000000000",
"userAssignedIdentities": {
"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1": {
"clientId": "00000000-0000-0000-0000-000000000000",
"principalId": "00000000-0000-0000-0000-000000000000"
}
}
},
"properties": {
"provisioningState": "Succeeded",
"environmentId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/managedEnvironments/testEnv",
"buildComputeId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/jobs/build1234",
"patchComputeId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/jobs/patcher1234",
"containerRegistries": [
{
"containerRegistryServer": "test.azurecr.io",
"identityResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1"
},
{
"containerRegistryServer": "test2.azurecr.io",
"identityResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1"
}
]
},
"systemData": {
"createdBy": "[email protected]",
"createdByType": "User",
"createdAt": "2022-10-11T11:05:51.4940669Z",
"lastModifiedBy": "[email protected]",
"lastModifiedByType": "User",
"lastModifiedAt": "2022-10-11T11:05:51.4940669Z"
},
"tags": {
"key": "value"
}
}
}
}
}
106 changes: 106 additions & 0 deletions ...nager/Microsoft.App/preview/2023-05-02-preview/examples/Builders_ListByResourceGroup.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
{
"operationId": "Builders_ListByResourceGroup",
"title": "Builders_ListByResourceGroup_0",
"parameters": {
"api-version": "2023-05-02-preview",
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"resourceGroupName": "rg"
},
"responses": {
"200": {
"headers": {},
"body": {
"value": [
{
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/builders/testBuilder1",
"name": "testBuilder1",
"type": "Microsoft.App/builders",
"location": "eastus",
"identity": {
"type": "SystemAssigned,UserAssigned",
"principalId": "00000000-0000-0000-0000-000000000000",
"tenantId": "00000000-0000-0000-0000-000000000000",
"userAssignedIdentities": {
"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1": {
"clientId": "00000000-0000-0000-0000-000000000000",
"principalId": "00000000-0000-0000-0000-000000000000"
}
}
},
"properties": {
"provisioningState": "Succeeded",
"environmentId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/managedEnvironments/testEnv",
"buildComputeId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/jobs/build1234",
"patchComputeId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/jobs/patcher1234",
"containerRegistries": [
{
"containerRegistryServer": "test.azurecr.io",
"identityResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1"
},
{
"containerRegistryServer": "test2.azurecr.io",
"identityResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1"
}
]
},
"systemData": {
"createdBy": "[email protected]",
"createdByType": "User",
"createdAt": "2022-10-11T11:05:51.4940669Z",
"lastModifiedBy": "[email protected]",
"lastModifiedByType": "User",
"lastModifiedAt": "2022-10-11T11:05:51.4940669Z"
},
"tags": {
"key": "value"
}
},
{
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/builders/testBuilder2",
"name": "testBuilder2",
"type": "Microsoft.App/builders",
"location": "eastus",
"identity": {
"type": "SystemAssigned,UserAssigned",
"principalId": "00000000-0000-0000-0000-000000000000",
"tenantId": "00000000-0000-0000-0000-000000000000",
"userAssignedIdentities": {
"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1": {
"clientId": "00000000-0000-0000-0000-000000000000",
"principalId": "00000000-0000-0000-0000-000000000000"
}
}
},
"properties": {
"provisioningState": "Succeeded",
"environmentId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/managedEnvironments/testEnv",
"buildComputeId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/jobs/build1234",
"patchComputeId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/jobs/patcher1234",
"containerRegistries": [
{
"containerRegistryServer": "test.azurecr.io",
"identityResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1"
},
{
"containerRegistryServer": "test2.azurecr.io",
"identityResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1"
}
]
},
"systemData": {
"createdBy": "[email protected]",
"createdByType": "User",
"createdAt": "2022-10-11T11:05:51.4940669Z",
"lastModifiedBy": "[email protected]",
"lastModifiedByType": "User",
"lastModifiedAt": "2022-10-11T11:05:51.4940669Z"
},
"tags": {
"key": "value"
}
}
]
}
}
}
}
Loading

0 comments on commit 95521c5

Please sign in to comment.