Skip to content

Commit e582297

Browse files
akshaysnguptaMikhailTryakhov
authored andcommitted
Application gateway Identity and Keyvault support (#4387)
* identity and keyvault * Capitalization comment
1 parent d5e3525 commit e582297

File tree

3 files changed

+85
-3
lines changed

3 files changed

+85
-3
lines changed

specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/applicationGateway.json

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -824,9 +824,9 @@
824824
"type": "string",
825825
"description": "Certificate public data."
826826
},
827-
"keyvaultSecretId": {
827+
"keyVaultSecretId": {
828828
"type": "string",
829-
"description": "KeyVault Secret Id for certificate."
829+
"description": "Secret Id of (base-64 encoded unencrypted pfx) 'Secret' or 'Certificate' object stored in KeyVault."
830830
},
831831
"provisioningState": {
832832
"type": "string",
@@ -875,6 +875,10 @@
875875
"type": "string",
876876
"description": "Base-64 encoded Public cert data corresponding to pfx specified in data. Only applicable in GET request."
877877
},
878+
"keyVaultSecretId": {
879+
"type": "string",
880+
"description": "Secret Id of (base-64 encoded unencrypted pfx) 'Secret' or 'Certificate' object stored in KeyVault."
881+
},
878882
"provisioningState": {
879883
"type": "string",
880884
"description": "Provisioning state of the SSL certificate resource Possible values are: 'Updating', 'Deleting', and 'Failed'."
@@ -1818,6 +1822,10 @@
18181822
"type": "string"
18191823
},
18201824
"description": "A list of availability zones denoting where the resource needs to come from."
1825+
},
1826+
"identity": {
1827+
"$ref": "./network.json#/definitions/ManagedServiceIdentity",
1828+
"description": "The identity of the application gateway, if configured."
18211829
}
18221830
},
18231831
"allOf": [

specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/examples/ApplicationGatewayCreate.json

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@
55
"resourceGroupName": "rg1",
66
"applicationGatewayName": "appgw",
77
"parameters": {
8+
"identity": {
9+
"type":"UserAssigned",
10+
"userAssignedIdentities": {
11+
"/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.ManagedIdentity/userAssignedIdentities/identity1": {}
12+
}
13+
},
814
"properties": {
915
"sku": {
1016
"name": "Standard_Medium",
@@ -28,6 +34,26 @@
2834
"data": "****",
2935
"password": "****"
3036
}
37+
},
38+
{
39+
"name": "sslcert2",
40+
"properties": {
41+
"keyVaultSecretId": "https://kv/secret"
42+
}
43+
}
44+
],
45+
"trustedRootCertificates": [
46+
{
47+
"name": "rootcert",
48+
"properties": {
49+
"data": "****"
50+
}
51+
},
52+
{
53+
"name": "rootcert1",
54+
"properties": {
55+
"keyVaultSecretId": "https://kv/secret"
56+
}
3157
}
3258
],
3359
"frontendIPConfigurations": [

specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/network.json

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,54 @@
144144
}
145145
},
146146
"description": "Tags object for patch operations."
147+
},
148+
"ManagedServiceIdentity": {
149+
"properties": {
150+
"principalId": {
151+
"readOnly": true,
152+
"type": "string",
153+
"description": "The principal id of the system assigned identity. This property will only be provided for a system assigned identity."
154+
},
155+
"tenantId": {
156+
"readOnly": true,
157+
"type": "string",
158+
"description": "The tenant id of the system assigned identity. This property will only be provided for a system assigned identity."
159+
},
160+
"type": {
161+
"type": "string",
162+
"description": "The type of identity used for the resource. The type 'SystemAssigned, UserAssigned' includes both an implicitly created identity and a set of user assigned identities. The type 'None' will remove any identities from the virtual machine.",
163+
"enum": [
164+
"SystemAssigned",
165+
"UserAssigned",
166+
"SystemAssigned, UserAssigned",
167+
"None"
168+
],
169+
"x-ms-enum": {
170+
"name": "ResourceIdentityType",
171+
"modelAsString": false
172+
}
173+
},
174+
"userAssignedIdentities": {
175+
"type": "object",
176+
"additionalProperties": {
177+
"type": "object",
178+
"properties": {
179+
"principalId": {
180+
"readOnly": true,
181+
"type": "string",
182+
"description": "The principal id of user assigned identity."
183+
},
184+
"clientId": {
185+
"readOnly": true,
186+
"type": "string",
187+
"description": "The client id of user assigned identity."
188+
}
189+
}
190+
},
191+
"description": "The list of user identities associated with resource. The user identity dictionary key references will be ARM resource ids in the form: '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'."
192+
}
193+
},
194+
"description": "Identity for the resource."
147195
}
148196
},
149197
"parameters": {
@@ -162,4 +210,4 @@
162210
"description": "Client API version."
163211
}
164212
}
165-
}
213+
}

0 commit comments

Comments
 (0)