Skip to content

Commit a33fb44

Browse files
osmullerosmuller
authored
[Hub Generated] Review request for Microsoft.KeyVault to add version preview/2021-06-01-preview (#14945)
* Adds base for updating Microsoft.KeyVault from version preview/2021-04-01-preview to version 2021-06-01-preview * Updates readme * Updates API version in new specs and examples * KeyVault - Add PublicNetworkAccess property to Vault resource KeyVault - Add PublicNetworkAccess property to Vault resource * Re add 'all' permissions * Revert the int64 change back to unixtime * Change * Fix lint * Add missing tag
1 parent 002ad52 commit a33fb44

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+7735
-4
lines changed

‎specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-06-01-preview/common.json

Lines changed: 91 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
1+
{
2+
"swagger": "2.0",
3+
"info": {
4+
"version": "2021-06-01-preview",
5+
"title": "KeyVaultManagementClient",
6+
"description": "The Azure management API provides a RESTful set of web services that interact with Azure Key Vault."
7+
},
8+
"paths": {},
9+
"definitions": {
10+
"CloudError": {
11+
"description": "An error response from Key Vault resource provider",
12+
"properties": {
13+
"error": {
14+
"$ref": "#/definitions/CloudErrorBody"
15+
}
16+
},
17+
"x-ms-external": true
18+
},
19+
"CloudErrorBody": {
20+
"description": "An error response from Key Vault resource provider",
21+
"properties": {
22+
"code": {
23+
"type": "string",
24+
"description": "Error code. This is a mnemonic that can be consumed programmatically."
25+
},
26+
"message": {
27+
"type": "string",
28+
"description": "User friendly error message. The message is typically localized and may vary with service version."
29+
}
30+
},
31+
"x-ms-external": true
32+
},
33+
"SystemData": {
34+
"description": "Metadata pertaining to creation and last modification of the key vault resource.",
35+
"readOnly": true,
36+
"properties": {
37+
"createdBy": {
38+
"type": "string",
39+
"description": "The identity that created the key vault resource."
40+
},
41+
"createdByType": {
42+
"description": "The type of identity that created the key vault resource.",
43+
"$ref": "#/definitions/IdentityType"
44+
},
45+
"createdAt": {
46+
"type": "string",
47+
"format": "date-time",
48+
"description": "The timestamp of the key vault resource creation (UTC)."
49+
},
50+
"lastModifiedBy": {
51+
"type": "string",
52+
"description": "The identity that last modified the key vault resource."
53+
},
54+
"lastModifiedByType": {
55+
"description": "The type of identity that last modified the key vault resource.",
56+
"$ref": "#/definitions/IdentityType"
57+
},
58+
"lastModifiedAt": {
59+
"type": "string",
60+
"format": "date-time",
61+
"description": "The timestamp of the key vault resource last modification (UTC)."
62+
}
63+
}
64+
},
65+
"IdentityType": {
66+
"type": "string",
67+
"description": "The type of identity.",
68+
"enum": [
69+
"User",
70+
"Application",
71+
"ManagedIdentity",
72+
"Key"
73+
],
74+
"x-ms-enum": {
75+
"name": "identityType",
76+
"modelAsString": true
77+
}
78+
}
79+
},
80+
"securityDefinitions": {
81+
"azure_auth": {
82+
"type": "oauth2",
83+
"authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize",
84+
"flow": "implicit",
85+
"description": "Azure Active Directory OAuth2 Flow",
86+
"scopes": {
87+
"user_impersonation": "impersonate your user account"
88+
}
89+
}
90+
}
91+
}

‎specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-06-01-preview/examples/DeletedManagedHsm_Get.json

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"parameters": {
3+
"name": "hsm1",
4+
"location": "westus",
5+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
6+
"api-version": "2021-06-01-preview"
7+
},
8+
"responses": {
9+
"200": {
10+
"body": {
11+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.KeyVault/locations/westus/deletedManagedHSMs/hsm1",
12+
"name": "vault-agile-drawer-6404",
13+
"type": "Microsoft.KeyVault/deletedManagedHSMs",
14+
"properties": {
15+
"mhsmId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/hsm-group/providers/Microsoft.KeyVault/managedHSMs/hsm1",
16+
"location": "westus",
17+
"deletionDate": "2021-04-01T00:00:59Z",
18+
"scheduledPurgeDate": "2021-04-01T00:00:59Z",
19+
"purgeProtectionEnabled": true,
20+
"tags": {
21+
"Dept": "hsm",
22+
"Environment": "production"
23+
}
24+
}
25+
}
26+
}
27+
}
28+
}

‎specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-06-01-preview/examples/DeletedManagedHsm_List.json

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
{
2+
"parameters": {
3+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
4+
"api-version": "2021-06-01-preview"
5+
},
6+
"responses": {
7+
"200": {
8+
"body": {
9+
"value": [
10+
{
11+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.KeyVault/locations/westus/deletedManagedHSMs/hsm1",
12+
"name": "vault-agile-drawer-6404",
13+
"type": "Microsoft.KeyVault/deletedManagedHSMs",
14+
"properties": {
15+
"mhsmId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/hsm-group/providers/Microsoft.KeyVault/managedHSMs/hsm1",
16+
"location": "westus",
17+
"deletionDate": "2021-04-01T00:00:59Z",
18+
"scheduledPurgeDate": "2021-04-01T00:00:59Z",
19+
"purgeProtectionEnabled": true,
20+
"tags": {
21+
"Dept": "hsm",
22+
"Environment": "production"
23+
}
24+
}
25+
},
26+
{
27+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.KeyVault/locations/westus/deletedManagedHSMs/hsm2",
28+
"name": "vault-agile-drawer-6404",
29+
"type": "Microsoft.KeyVault/deletedManagedHSMs",
30+
"properties": {
31+
"mhsmId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/hsm-group/providers/Microsoft.KeyVault/managedHSMs/hsm2",
32+
"location": "westus",
33+
"deletionDate": "2021-04-01T00:00:59Z",
34+
"scheduledPurgeDate": "2021-04-01T00:00:59Z",
35+
"purgeProtectionEnabled": true,
36+
"tags": {
37+
"Dept": "hsm",
38+
"Environment": "production"
39+
}
40+
}
41+
}
42+
],
43+
"nextLink": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.KeyVault/deletedManagedHSMs?api-version=2021-06-01-preview&$skiptoken=dmF1bHQtcGVza3ktanVyeS03MzA3Ng=="
44+
}
45+
}
46+
}
47+
}

‎specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-06-01-preview/examples/DeletedManagedHsm_Purge.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"parameters": {
3+
"name": "hsm1",
4+
"location": "westus",
5+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
6+
"api-version": "2021-06-01-preview"
7+
},
8+
"responses": {
9+
"202": {}
10+
}
11+
}

‎specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-06-01-preview/examples/ManagedHsm_CreateOrUpdate.json

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
{
2+
"parameters": {
3+
"resourceGroupName": "hsm-group",
4+
"name": "hsm1",
5+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
6+
"api-version": "2021-06-01-preview",
7+
"parameters": {
8+
"properties": {
9+
"tenantId": "00000000-0000-0000-0000-000000000000",
10+
"initialAdminObjectIds": [
11+
"00000000-0000-0000-0000-000000000000"
12+
],
13+
"enableSoftDelete": true,
14+
"softDeleteRetentionInDays": 90,
15+
"enablePurgeProtection": true
16+
},
17+
"location": "westus",
18+
"sku": {
19+
"family": "B",
20+
"name": "Standard_B1"
21+
},
22+
"tags": {
23+
"Dept": "hsm",
24+
"Environment": "dogfood"
25+
}
26+
}
27+
},
28+
"responses": {
29+
"202": {
30+
"body": {
31+
"properties": {
32+
"tenantId": "00000000-0000-0000-0000-000000000000",
33+
"initialAdminObjectIds": [
34+
"00000000-0000-0000-0000-000000000000"
35+
],
36+
"enableSoftDelete": true,
37+
"softDeleteRetentionInDays": 90,
38+
"enablePurgeProtection": true,
39+
"hsmUri": null,
40+
"provisioningState": "Provisioning",
41+
"statusMessage": "Allocating hardware"
42+
},
43+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/hsm-group/providers/Microsoft.KeyVault/managedHSMs/hsm1",
44+
"name": "hsm1",
45+
"type": "Microsoft.KeyVault/managedHSMs",
46+
"location": "westus",
47+
"sku": {
48+
"family": "B",
49+
"name": "Standard_B1"
50+
},
51+
"tags": {
52+
"Dept": "hsm",
53+
"Environment": "dogfood"
54+
}
55+
}
56+
},
57+
"200": {
58+
"body": {
59+
"properties": {
60+
"tenantId": "00000000-0000-0000-0000-000000000000",
61+
"initialAdminObjectIds": [
62+
"00000000-0000-0000-0000-000000000000"
63+
],
64+
"enableSoftDelete": true,
65+
"softDeleteRetentionInDays": 90,
66+
"enablePurgeProtection": true,
67+
"hsmUri": "https://westus.hsm1.managedhsm.azure.net",
68+
"provisioningState": "Succeeded",
69+
"statusMessage": "ManagedHsm is functional."
70+
},
71+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/hsm-group/providers/Microsoft.KeyVault/managedHSMs/hsm1",
72+
"name": "hsm1",
73+
"type": "Microsoft.KeyVault/managedHSMs",
74+
"location": "westus",
75+
"sku": {
76+
"family": "B",
77+
"name": "Standard_B1"
78+
},
79+
"tags": {
80+
"Dept": "hsm",
81+
"Environment": "dogfood"
82+
}
83+
}
84+
}
85+
}
86+
}

‎specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-06-01-preview/examples/ManagedHsm_Delete.json

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"parameters": {
3+
"resourceGroupName": "hsm-group",
4+
"name": "hsm1",
5+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
6+
"api-version": "2021-06-01-preview"
7+
},
8+
"responses": {
9+
"200": {},
10+
"202": {},
11+
"204": {}
12+
}
13+
}

‎specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-06-01-preview/examples/ManagedHsm_Get.json

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
{
2+
"parameters": {
3+
"resourceGroupName": "hsm-group",
4+
"name": "hsm1",
5+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
6+
"api-version": "2021-06-01-preview"
7+
},
8+
"responses": {
9+
"200": {
10+
"body": {
11+
"properties": {
12+
"tenantId": "00000000-0000-0000-0000-000000000000",
13+
"initialAdminObjectIds": [
14+
"00000000-0000-0000-0000-000000000000"
15+
],
16+
"enableSoftDelete": true,
17+
"softDeleteRetentionInDays": 90,
18+
"enablePurgeProtection": true,
19+
"hsmUri": "https://westus.hsm1.managedhsm.azure.net",
20+
"provisioningState": "Succeeded",
21+
"statusMessage": "ManagedHsm is functional."
22+
},
23+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/hsm-group/providers/Microsoft.KeyVault/managedHSMs/hsm1",
24+
"name": "hsm1",
25+
"type": "Microsoft.KeyVault/managedHSMs",
26+
"location": "westus",
27+
"sku": {
28+
"family": "B",
29+
"name": "Standard_B1"
30+
},
31+
"tags": {
32+
"Dept": "hsm",
33+
"Environment": "dogfood"
34+
}
35+
}
36+
},
37+
"202": {
38+
"headers": {
39+
"Retry-After": "60",
40+
"Location": "https://some.endpoint.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/hsm-group/providers/Microsoft.KeyVault/managedHSMs/hsm1?api-version=2021-06-01-preview&kv-operation=abJjb2RkIjoiAGVsZXRlTWFuYWdlZEhzbUFzeW5jYm9"
41+
}
42+
},
43+
"204": {}
44+
}
45+
}

‎specification/keyvault/resource-manager/Microsoft.KeyVault/preview/2021-06-01-preview/examples/ManagedHsm_ListByResourceGroup.json

Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
{
2+
"parameters": {
3+
"resourceGroupName": "hsm-group",
4+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
5+
"api-version": "2021-06-01-preview"
6+
},
7+
"responses": {
8+
"200": {
9+
"body": {
10+
"value": [
11+
{
12+
"properties": {
13+
"tenantId": "00000000-0000-0000-0000-000000000000",
14+
"initialAdminObjectIds": [
15+
"00000000-0000-0000-0000-000000000000"
16+
],
17+
"enableSoftDelete": true,
18+
"softDeleteRetentionInDays": 90,
19+
"enablePurgeProtection": true,
20+
"hsmUri": "https://westus.hsm1.managedhsm.azure.net",
21+
"provisioningState": "Succeeded",
22+
"statusMessage": "ManagedHsm is functional."
23+
},
24+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/hsm-group/providers/Microsoft.KeyVault/managedHSMs/hsm1",
25+
"name": "hsm1",
26+
"type": "Microsoft.KeyVault/managedHSMs",
27+
"location": "westus",
28+
"sku": {
29+
"family": "B",
30+
"name": "Standard_B1"
31+
},
32+
"tags": {
33+
"Dept": "hsm",
34+
"Environment": "dogfood"
35+
}
36+
},
37+
{
38+
"properties": {
39+
"tenantId": "00000000-0000-0000-0000-000000000000",
40+
"initialAdminObjectIds": [
41+
"00000000-0000-0000-0000-000000000000"
42+
],
43+
"enableSoftDelete": true,
44+
"softDeleteRetentionInDays": 90,
45+
"enablePurgeProtection": true,
46+
"hsmUri": "https://westus.hsm2.managedhsm.azure.net",
47+
"provisioningState": "Succeeded",
48+
"statusMessage": "ManagedHsm is functional."
49+
},
50+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/hsm-group/providers/Microsoft.KeyVault/managedHSMs/hsm2",
51+
"name": "hsm2",
52+
"type": "Microsoft.KeyVault/managedHSMs",
53+
"location": "westus",
54+
"sku": {
55+
"family": "B",
56+
"name": "Standard_B1"
57+
},
58+
"tags": {
59+
"Dept": "hsm",
60+
"Environment": "production"
61+
}
62+
}
63+
],
64+
"nextLink": "https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/hsm-group/providers/Microsoft.KeyVault/managedHSMs?api-version=2021-06-01-preview&$skiptoken=dmF1bHQtcGVza3ktanVyeS03MzA3Ng=="
65+
}
66+
}
67+
}
68+
}

0 commit comments

Comments
 (0)