Skip to content

Commit 95521c5

Browse files
pauld-msftpauld-msft
authored
Introduce Microsoft.App/builders tracked resource and Microsoft.App/builds 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
1 parent fe5fc86 commit 95521c5

14 files changed

+2018
-0
lines changed

‎specification/app/resource-manager/Microsoft.App/preview/2023-05-02-preview/Builders.json

Lines changed: 501 additions & 0 deletions
Large diffs are not rendered by default.

‎specification/app/resource-manager/Microsoft.App/preview/2023-05-02-preview/Builds.json

Lines changed: 486 additions & 0 deletions
Large diffs are not rendered by default.

‎specification/app/resource-manager/Microsoft.App/preview/2023-05-02-preview/examples/Builders_CreateOrUpdate.json

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,132 @@
1+
{
2+
"operationId": "Builders_CreateOrUpdate",
3+
"title": "Builders_CreateOrUpdate_0",
4+
"parameters": {
5+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
6+
"resourceGroupName": "rg",
7+
"builderName": "testBuilder",
8+
"api-version": "2023-05-02-preview",
9+
"builderEnvelope": {
10+
"identity": {
11+
"type": "SystemAssigned,UserAssigned",
12+
"userAssignedIdentities": {
13+
"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1": {}
14+
}
15+
},
16+
"properties": {
17+
"environmentId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/managedEnvironments/testEnv",
18+
"containerRegistries": [
19+
{
20+
"containerRegistryServer": "test.azurecr.io",
21+
"identityResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1"
22+
},
23+
{
24+
"containerRegistryServer": "test2.azurecr.io",
25+
"identityResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1"
26+
}
27+
]
28+
},
29+
"tags": {
30+
"company": "Microsoft"
31+
},
32+
"location": "eastus"
33+
}
34+
},
35+
"responses": {
36+
"200": {
37+
"body": {
38+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/builders/testBuilder",
39+
"name": "testBuilder",
40+
"type": "Microsoft.App/builders",
41+
"location": "eastus",
42+
"identity": {
43+
"type": "SystemAssigned,UserAssigned",
44+
"principalId": "00000000-0000-0000-0000-000000000000",
45+
"tenantId": "00000000-0000-0000-0000-000000000000",
46+
"userAssignedIdentities": {
47+
"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1": {
48+
"clientId": "00000000-0000-0000-0000-000000000000",
49+
"principalId": "00000000-0000-0000-0000-000000000000"
50+
}
51+
}
52+
},
53+
"properties": {
54+
"provisioningState": "Succeeded",
55+
"environmentId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/managedEnvironments/testEnv",
56+
"buildComputeId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/jobs/build1234",
57+
"patchComputeId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/jobs/patcher1234",
58+
"containerRegistries": [
59+
{
60+
"containerRegistryServer": "test.azurecr.io",
61+
"identityResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1"
62+
},
63+
{
64+
"containerRegistryServer": "test2.azurecr.io",
65+
"identityResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1"
66+
}
67+
]
68+
},
69+
"systemData": {
70+
"createdBy": "[email protected]",
71+
"createdByType": "User",
72+
"createdAt": "2022-10-11T11:05:51.4940669Z",
73+
"lastModifiedBy": "[email protected]",
74+
"lastModifiedByType": "User",
75+
"lastModifiedAt": "2022-10-11T11:05:51.4940669Z"
76+
},
77+
"tags": {
78+
"company": "Microsoft"
79+
}
80+
}
81+
},
82+
"201": {
83+
"headers": {
84+
"Azure-AsyncOperation": "https://management.azure.com/subscriptions/{subscription-id}/providers/Microsoft.App/locations/{location}/operationStatuses/{operationId}"
85+
},
86+
"body": {
87+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/builders/testBuilder",
88+
"name": "testBuilder",
89+
"type": "Microsoft.App/builders",
90+
"location": "eastus",
91+
"identity": {
92+
"type": "SystemAssigned,UserAssigned",
93+
"principalId": "00000000-0000-0000-0000-000000000000",
94+
"tenantId": "00000000-0000-0000-0000-000000000000",
95+
"userAssignedIdentities": {
96+
"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1": {
97+
"clientId": "00000000-0000-0000-0000-000000000000",
98+
"principalId": "00000000-0000-0000-0000-000000000000"
99+
}
100+
}
101+
},
102+
"properties": {
103+
"provisioningState": "Creating",
104+
"environmentId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/managedEnvironments/testEnv",
105+
"buildComputeId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/jobs/build1234",
106+
"patchComputeId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/jobs/patcher1234",
107+
"containerRegistries": [
108+
{
109+
"containerRegistryServer": "test.azurecr.io",
110+
"identityResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1"
111+
},
112+
{
113+
"containerRegistryServer": "test2.azurecr.io",
114+
"identityResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1"
115+
}
116+
]
117+
},
118+
"systemData": {
119+
"createdBy": "[email protected]",
120+
"createdByType": "User",
121+
"createdAt": "2022-10-11T11:05:51.4940669Z",
122+
"lastModifiedBy": "[email protected]",
123+
"lastModifiedByType": "User",
124+
"lastModifiedAt": "2022-10-11T11:05:51.4940669Z"
125+
},
126+
"tags": {
127+
"company": "Microsoft"
128+
}
129+
}
130+
}
131+
}
132+
}

‎specification/app/resource-manager/Microsoft.App/preview/2023-05-02-preview/examples/Builders_Delete.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"operationId": "Builders_Delete",
3+
"title": "Builders_Delete_0",
4+
"parameters": {
5+
"api-version": "2023-05-02-preview",
6+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
7+
"resourceGroupName": "rg",
8+
"builderName": "testBuilder"
9+
},
10+
"responses": {
11+
"200": {},
12+
"202": {
13+
"headers": {
14+
"Location": "https://management.azure.com/subscriptions/{subscription-id}/providers/Microsoft.App/locations/{location}/operationStatuses/{operationId}"
15+
}
16+
},
17+
"204": {}
18+
}
19+
}

‎specification/app/resource-manager/Microsoft.App/preview/2023-05-02-preview/examples/Builders_Get.json

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
{
2+
"operationId": "Builders_Get",
3+
"title": "Builders_Get_0",
4+
"parameters": {
5+
"api-version": "2023-05-02-preview",
6+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
7+
"resourceGroupName": "rg",
8+
"builderName": "testBuilder"
9+
},
10+
"responses": {
11+
"200": {
12+
"body": {
13+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/builders/testBuilder",
14+
"name": "testBuilder",
15+
"type": "Microsoft.App/builders",
16+
"location": "eastus",
17+
"identity": {
18+
"type": "SystemAssigned,UserAssigned",
19+
"principalId": "00000000-0000-0000-0000-000000000000",
20+
"tenantId": "00000000-0000-0000-0000-000000000000",
21+
"userAssignedIdentities": {
22+
"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1": {
23+
"clientId": "00000000-0000-0000-0000-000000000000",
24+
"principalId": "00000000-0000-0000-0000-000000000000"
25+
}
26+
}
27+
},
28+
"properties": {
29+
"provisioningState": "Succeeded",
30+
"environmentId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/managedEnvironments/testEnv",
31+
"buildComputeId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/jobs/build1234",
32+
"patchComputeId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/jobs/patcher1234",
33+
"containerRegistries": [
34+
{
35+
"containerRegistryServer": "test.azurecr.io",
36+
"identityResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1"
37+
},
38+
{
39+
"containerRegistryServer": "test2.azurecr.io",
40+
"identityResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1"
41+
}
42+
]
43+
},
44+
"systemData": {
45+
"createdBy": "[email protected]",
46+
"createdByType": "User",
47+
"createdAt": "2022-10-11T11:05:51.4940669Z",
48+
"lastModifiedBy": "[email protected]",
49+
"lastModifiedByType": "User",
50+
"lastModifiedAt": "2022-10-11T11:05:51.4940669Z"
51+
},
52+
"tags": {
53+
"key": "value"
54+
}
55+
}
56+
}
57+
}
58+
}

‎specification/app/resource-manager/Microsoft.App/preview/2023-05-02-preview/examples/Builders_ListByResourceGroup.json

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
{
2+
"operationId": "Builders_ListByResourceGroup",
3+
"title": "Builders_ListByResourceGroup_0",
4+
"parameters": {
5+
"api-version": "2023-05-02-preview",
6+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
7+
"resourceGroupName": "rg"
8+
},
9+
"responses": {
10+
"200": {
11+
"headers": {},
12+
"body": {
13+
"value": [
14+
{
15+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/builders/testBuilder1",
16+
"name": "testBuilder1",
17+
"type": "Microsoft.App/builders",
18+
"location": "eastus",
19+
"identity": {
20+
"type": "SystemAssigned,UserAssigned",
21+
"principalId": "00000000-0000-0000-0000-000000000000",
22+
"tenantId": "00000000-0000-0000-0000-000000000000",
23+
"userAssignedIdentities": {
24+
"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1": {
25+
"clientId": "00000000-0000-0000-0000-000000000000",
26+
"principalId": "00000000-0000-0000-0000-000000000000"
27+
}
28+
}
29+
},
30+
"properties": {
31+
"provisioningState": "Succeeded",
32+
"environmentId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/managedEnvironments/testEnv",
33+
"buildComputeId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/jobs/build1234",
34+
"patchComputeId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/jobs/patcher1234",
35+
"containerRegistries": [
36+
{
37+
"containerRegistryServer": "test.azurecr.io",
38+
"identityResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1"
39+
},
40+
{
41+
"containerRegistryServer": "test2.azurecr.io",
42+
"identityResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1"
43+
}
44+
]
45+
},
46+
"systemData": {
47+
"createdBy": "[email protected]",
48+
"createdByType": "User",
49+
"createdAt": "2022-10-11T11:05:51.4940669Z",
50+
"lastModifiedBy": "[email protected]",
51+
"lastModifiedByType": "User",
52+
"lastModifiedAt": "2022-10-11T11:05:51.4940669Z"
53+
},
54+
"tags": {
55+
"key": "value"
56+
}
57+
},
58+
{
59+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/builders/testBuilder2",
60+
"name": "testBuilder2",
61+
"type": "Microsoft.App/builders",
62+
"location": "eastus",
63+
"identity": {
64+
"type": "SystemAssigned,UserAssigned",
65+
"principalId": "00000000-0000-0000-0000-000000000000",
66+
"tenantId": "00000000-0000-0000-0000-000000000000",
67+
"userAssignedIdentities": {
68+
"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1": {
69+
"clientId": "00000000-0000-0000-0000-000000000000",
70+
"principalId": "00000000-0000-0000-0000-000000000000"
71+
}
72+
}
73+
},
74+
"properties": {
75+
"provisioningState": "Succeeded",
76+
"environmentId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/managedEnvironments/testEnv",
77+
"buildComputeId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/jobs/build1234",
78+
"patchComputeId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/rg/providers/Microsoft.App/jobs/patcher1234",
79+
"containerRegistries": [
80+
{
81+
"containerRegistryServer": "test.azurecr.io",
82+
"identityResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1"
83+
},
84+
{
85+
"containerRegistryServer": "test2.azurecr.io",
86+
"identityResourceId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1"
87+
}
88+
]
89+
},
90+
"systemData": {
91+
"createdBy": "[email protected]",
92+
"createdByType": "User",
93+
"createdAt": "2022-10-11T11:05:51.4940669Z",
94+
"lastModifiedBy": "[email protected]",
95+
"lastModifiedByType": "User",
96+
"lastModifiedAt": "2022-10-11T11:05:51.4940669Z"
97+
},
98+
"tags": {
99+
"key": "value"
100+
}
101+
}
102+
]
103+
}
104+
}
105+
}
106+
}

0 commit comments

Comments
 (0)