Skip to content

Commit

Permalink
[Hub Generated] Review request for Microsoft.Cache to add version pre…
Browse files Browse the repository at this point in the history
…view/2022-11-01-preview (Azure#21026)

* Update example value for module argument

* Adds base for updating Microsoft.Cache from version stable/2022-01-01 to version 2022-11-01-preview

* Updates readme

* Updates API version in new specs and examples

* Add changes

* Changes from feedback

* Adding changes to fix checks

* fix error

* fix error

* revert changes

* change

* Adds base for updating Microsoft.Cache from version stable/2022-01-01 to version 2022-11-01-preview

* Updates readme

* Updates API version in new specs and examples

* Update spec and examples for redisenterprise 2022-11-01-preview

* Fix update example by properly defining headers

* Add identity to patch to satisfy linter

* Improve description of keyId

* Switch to v3 types and use ref for location/operation

* Change missed v2 types to v3

* change keyId to keyUrl and add "format": "url" for it

* Match common api contract

This commit changes `encryption` field in the API spec to match the
recommendation in the following repository and file:

azure-resource-manager-rpc:v1.0/common-api-contracts.md#customer-managed-key-encryption

* add identityType with description that states only userAssigned is supported

* Update encryption description to say encryption-at-rest

* fix(example): use correct API version in SKUs example

* fixes for checks

* updating from main

* fix

* change header

* add headers subsection

* updating 2022-01-01

* removing read only, adding location common types

* Update specification/redisenterprise/resource-manager/Microsoft.Cache/preview/2022-11-01-preview/redisenterprise.json

Co-authored-by: jantache-microsoft <jantache@microsoft.com>

* review updates - for linter issues

* edit

* prettier fix

---------

Co-authored-by: Riya Simon <riyasimon@microsoft.com>
Co-authored-by: jantache-microsoft <jantache@microsoft.com>
  • Loading branch information
3 people authored and aviyerMSFT committed Mar 22, 2023
1 parent ef1681b commit d582bf6
Show file tree
Hide file tree
Showing 27 changed files with 3,140 additions and 2 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"parameters": {
"api-version": "2022-11-01-preview"
},
"responses": {
"200": {
"body": {
"value": [
{
"name": "Microsoft.Cache/redisEnterprise/read",
"display": {
"provider": "Microsoft Cache",
"resource": "Redis Enterprise cache",
"operation": "Manage Redis Enterprise cache (read)",
"description": "View the Redis Enterprise cache's settings and configuration in the management portal"
}
},
{
"name": "Microsoft.Cache/redisEnterprise/write",
"display": {
"provider": "Microsoft Cache",
"resource": "Redis Enterprise cache",
"operation": "Manage Redis Enterprise cache (write)",
"description": "Modify the Redis Enterprise cache's settings and configuration in the management portal"
}
}
]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"parameters": {
"subscriptionId": "subid",
"location": "West US",
"operationId": "testoperationid",
"api-version": "2022-11-01-preview"
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subid/providers/Microsoft.Cache/locations/westus/operationsStatus/testoperationid",
"name": "testoperationid",
"startTime": "2017-01-01T13:13:13.933Z",
"endTime": "2017-01-01T16:13:13.933Z",
"status": "Succeeded"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
{
"parameters": {
"clusterName": "cache1",
"resourceGroupName": "rg1",
"api-version": "2022-11-01-preview",
"subscriptionId": "subid",
"parameters": {
"location": "West US",
"sku": {
"name": "EnterpriseFlash_F300",
"capacity": 3
},
"zones": [
"1",
"2",
"3"
],
"identity": {
"type": "UserAssigned",
"userAssignedIdentities": {
"/subscriptions/your-subscription/resourceGroups/your-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/your-identity": {}
}
},
"properties": {
"minimumTlsVersion": "1.2",
"encryption": {
"customerManagedKeyEncryption": {
"keyEncryptionKeyIdentity": {
"identityType": "userAssignedIdentity",
"userAssignedIdentityResourceId": "/subscriptions/your-subscription/resourceGroups/your-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/your-identity"
},
"keyEncryptionKeyUrl": "https://your-kv.vault.azure.net/keys/your-key/your-key-version"
}
}
},
"tags": {
"tag1": "value1"
}
}
},
"responses": {
"201": {
"body": {
"name": "cache1",
"type": "Microsoft.Cache/redisEnterprise",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cache/redisEnterprise/cache1",
"location": "West US",
"sku": {
"name": "EnterpriseFlash_F300",
"capacity": 3
},
"zones": [
"1",
"2",
"3"
],
"identity": {
"type": "UserAssigned",
"userAssignedIdentities": {
"/subscriptions/your-subscription/resourceGroups/your-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/your-identity": {
"principalId": "00000000-0000-0000-0000-000000000000",
"clientId": "00000000-0000-0000-0000-000000000000"
}
}
},
"properties": {
"provisioningState": "Creating",
"resourceState": "Creating",
"hostName": "cache1.westus.something.azure.net",
"redisVersion": "5",
"minimumTlsVersion": "1.2",
"encryption": {
"customerManagedKeyEncryption": {
"keyEncryptionKeyIdentity": {
"userAssignedIdentityResourceId": "/subscriptions/your-subscription/resourceGroups/your-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/your-identity",
"identityType": "userAssignedIdentity"
},
"keyEncryptionKeyUrl": "https://your-kv.vault.azure.net/keys/your-key/your-key-version"
}
}
},
"tags": {
"tag1": "value1"
}
}
},
"200": {
"body": {
"name": "cache1",
"type": "Microsoft.Cache/redisEnterprise",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cache/redisEnterprise/cache1",
"location": "West US",
"sku": {
"name": "EnterpriseFlash_F300",
"capacity": 3
},
"zones": [
"1",
"2",
"3"
],
"identity": {
"type": "UserAssigned",
"userAssignedIdentities": {
"/subscriptions/your-subscription/resourceGroups/your-rg/providers/Microsoft.ManagedIdentity/userAssignedIdentities/your-identity": {
"principalId": "00000000-0000-0000-0000-000000000000",
"clientId": "00000000-0000-0000-0000-000000000000"
}
}
},
"properties": {
"provisioningState": "Succeeded",
"resourceState": "Running",
"hostName": "cache1.westus.something.azure.net",
"redisVersion": "5",
"minimumTlsVersion": "1.2"
},
"tags": {
"tag1": "value1"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
{
"parameters": {
"databaseName": "default",
"clusterName": "cache1",
"resourceGroupName": "rg1",
"api-version": "2022-11-01-preview",
"subscriptionId": "subid",
"parameters": {
"properties": {
"clientProtocol": "Encrypted",
"clusteringPolicy": "EnterpriseCluster",
"evictionPolicy": "AllKeysLRU",
"persistence": {
"aofEnabled": true,
"aofFrequency": "1s"
},
"port": 10000,
"modules": [
{
"name": "RedisBloom",
"args": "ERROR_RATE 0.00 INITIAL_SIZE 400"
},
{
"name": "RedisTimeSeries",
"args": "RETENTION_POLICY 20"
},
{
"name": "RediSearch"
}
]
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cache/redisEnterprise/cache1/databases/default",
"name": "cache1/default",
"type": "Microsoft.Cache/redisEnterprise/databases",
"properties": {
"provisioningState": "Updating",
"resourceState": "Updating",
"clientProtocol": "Encrypted",
"clusteringPolicy": "EnterpriseCluster",
"evictionPolicy": "AllKeysLRU",
"persistence": {
"aofEnabled": true,
"aofFrequency": "1s"
},
"port": 10000,
"modules": [
{
"name": "RedisBloom",
"args": "ERROR_RATE 0.00 INITIAL_SIZE 400",
"version": "1.0.0"
},
{
"name": "RedisTimeSeries",
"args": "RETENTION_POLICY 20",
"version": "1.0.0"
},
{
"name": "RediSearch",
"args": "",
"version": "1.0.0"
}
]
}
}
},
"201": {
"body": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Cache/redisEnterprise/cache1/databases/db1",
"name": "cache1/db1",
"type": "Microsoft.Cache/redisEnterprise/databases",
"properties": {
"provisioningState": "Creating",
"resourceState": "Creating",
"clientProtocol": "Encrypted",
"clusteringPolicy": "EnterpriseCluster",
"evictionPolicy": "AllKeysLRU",
"persistence": {
"aofEnabled": true,
"aofFrequency": "1s"
},
"port": 10000,
"modules": [
{
"name": "RedisBloom",
"args": "ERROR_RATE 0.00 INITIAL_SIZE 400",
"version": "1.0.0"
},
{
"name": "RedisTimeSeries",
"args": "RETENTION_POLICY 20",
"version": "1.0.0"
},
{
"name": "RediSearch",
"args": "",
"version": "1.0.0"
}
]
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
{
"parameters": {
"databaseName": "default",
"clusterName": "cache1",
"resourceGroupName": "rg1",
"api-version": "2022-11-01-preview",
"subscriptionId": "subid1",
"parameters": {
"properties": {
"clientProtocol": "Encrypted",
"clusteringPolicy": "EnterpriseCluster",
"evictionPolicy": "NoEviction",
"port": 10000,
"geoReplication": {
"groupNickname": "groupName",
"linkedDatabases": [
{
"id": "/subscriptions/subid1/resourceGroups/rg1/providers/Microsoft.Cache/redisEnterprise/cache1/databases/default"
},
{
"id": "/subscriptions/subid2/resourceGroups/rg2/providers/Microsoft.Cache/redisEnterprise/cache2/databases/default"
}
]
}
}
}
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/subid1/resourceGroups/rg1/providers/Microsoft.Cache/redisEnterprise/cache1/databases/default",
"name": "cache1/default",
"type": "Microsoft.Cache/redisEnterprise/databases",
"properties": {
"provisioningState": "Updating",
"resourceState": "Updating",
"clientProtocol": "Encrypted",
"clusteringPolicy": "EnterpriseCluster",
"evictionPolicy": "NoEviction",
"port": 10000,
"geoReplication": {
"groupNickname": "groupName",
"linkedDatabases": [
{
"id": "/subscriptions/subid1/resourceGroups/rg1/providers/Microsoft.Cache/redisEnterprise/cache1/databases/default",
"state": "Linking"
},
{
"id": "/subscriptions/subid2/resourceGroups/rg2/providers/Microsoft.Cache/redisEnterprise/cache2/databases/default",
"state": "Linking"
}
]
}
}
}
},
"201": {
"body": {
"id": "/subscriptions/subid1/resourceGroups/rg1/providers/Microsoft.Cache/redisEnterprise/cache1/databases/db1",
"name": "cache1/db1",
"type": "Microsoft.Cache/redisEnterprise/databases",
"properties": {
"provisioningState": "Creating",
"resourceState": "Creating",
"clientProtocol": "Plaintext",
"clusteringPolicy": "EnterpriseCluster",
"evictionPolicy": "NoEviction",
"port": 10000,
"geoReplication": {
"groupNickname": "groupName",
"linkedDatabases": [
{
"id": "/subscriptions/subid1/resourceGroups/rg1/providers/Microsoft.Cache/redisEnterprise/cache1/databases/default",
"state": "Linking"
},
{
"id": "/subscriptions/subid2/resourceGroups/rg2/providers/Microsoft.Cache/redisEnterprise/cache2/databases/default",
"state": "Linking"
}
]
}
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"parameters": {
"databaseName": "db1",
"clusterName": "cache1",
"resourceGroupName": "rg1",
"api-version": "2022-11-01-preview",
"subscriptionId": "subid"
},
"responses": {
"200": {},
"202": {
"headers": {
"Azure-AsyncOperation": "https://management.azure.com/subscriptions/subid/providers/Microsoft.Cache/...pathToOperationStatus...",
"Location": "https://management.azure.com/subscriptions/subid/providers/Microsoft.Cache/...pathToOperationResult..."
}
},
"204": {}
}
}
Loading

0 comments on commit d582bf6

Please sign in to comment.