[Microsoft.Storage] Add Jan21 api-version.

specification/storage/resource-manager/Microsoft.Storage/stable/2021-01-01/examples/FileServicesPut_EnableSecureSmbFeatures.json

@@ -0,0 +1,45 @@
+{
+  "parameters": {
+    "subscriptionId": "{subscription-id}",
+    "resourceGroupName": "res4410",
+    "accountName": "sto8607",
+    "FileServicesName": "default",
+    "api-version": "2021-01-01",
+    "monitor": "true",
+    "parameters": {
+      "properties": {
+        "protocolSettings": {
+          "smb": {
+            "versions": "SMB2.1;SMB3.0;SMB3.1.1",
+            "authenticationMethods": "NTLMv2;Kerberos",
+            "kerberosTicketEncryption": "RC4-HMAC;AES-256",
+            "channelEncryption": "AES-128-CCM;AES-128-GCM;AES-256-GCM"
+          }
+        }
+      }
+    }
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "id": "/subscriptions/{subscription-id}/resourceGroups/res4410/providers/Microsoft.Storage/storageAccounts/sto8607/fileServices/default",
+        "name": "default",
+        "type": "Microsoft.Storage/storageAccounts/fileServices",
+        "properties": {
+          "protocolSettings": {
+            "smb": {
+              "versions": "SMB2.1;SMB3.0;SMB3.1.1",
+              "authenticationMethods": "NTLMv2;Kerberos",
+              "kerberosTicketEncryption": "RC4-HMAC;AES-256",
+              "channelEncryption": "AES-128-CCM;AES-128-GCM;AES-256-GCM"
+            }
+          }
+        },
+        "sku": {
+          "name": "Premium_LRS",
+          "tier": "Premium"
+        }
+      }
+    }
+  }
+}

specification/storage/resource-manager/Microsoft.Storage/stable/2021-01-01/examples/NfsV3AccountCreate.json

@@ -0,0 +1,61 @@
+{
+    "parameters": {
+      "subscriptionId": "{subscription-id}",
+      "resourceGroupName": "res9101",
+      "accountName": "sto4445",
+      "api-version": "2021-01-01",
+      "parameters": {
+        "sku": {
+          "name": "Premium_LRS"
+        },
+        "kind": "BlockBlobStorage",
+        "location": "eastus",
+        "properties": {
+          "isHnsEnabled": true,
+          "isNfsV3Enabled": true,
+          "supportsHttpsTrafficOnly": false,
+          "networkAcls": {
+            "bypass": "AzureServices",
+            "defaultAction": "Allow",
+            "ipRules": [],
+            "virtualNetworkRules": [
+              {
+                "id": "/subscriptions/{subscription-id}/resourceGroups/res9101/providers/Microsoft.Network/virtualNetworks/net123/subnets/subnet12"
+              }
+            ]
+          }
+        }
+      }
+    },
+    "responses": {
+      "200": {
+        "body": {
+          "id": "/subscriptions/{subscription-id}/resourceGroups/res9101/providers/Microsoft.Storage/storageAccounts/sto4445",
+          "kind": "BlockBlobStorage",
+          "location": "eastus",
+          "name": "sto4445",
+          "properties": {
+            "isHnsEnabled": true,
+            "isNfsV3Enabled": true,
+            "supportsHttpsTrafficOnly": false,
+            "networkAcls": {
+              "bypass": "AzureServices",
+              "defaultAction": "Allow",
+              "ipRules": [],
+              "virtualNetworkRules": [
+                {
+                  "id": "/subscriptions/{subscription-id}/resourceGroups/res9101/providers/Microsoft.Network/virtualNetworks/net123/subnets/subnet12"
+                }
+              ]
+            }
+          },
+          "sku": {
+            "name": "Premium_LRS",
+            "tier": "Premium"
+          },
+          "type": "Microsoft.Storage/storageAccounts"
+        }
+      },
+      "202": {}
+    }
+  }

specification/storage/resource-manager/Microsoft.Storage/stable/2021-01-01/examples/StorageAccountCreateUserAssignedEncryptionIdentityWithCMK.json

@@ -0,0 +1,121 @@
+{
+    "parameters": {
+      "subscriptionId": "{subscription-id}",
+      "resourceGroupName": "res9101",
+      "accountName": "sto4445",
+      "api-version": "2021-01-01",
+      "parameters": {
+         "identity": {
+           "type": "UserAssigned", 
+           "userAssignedIdentities": { 
+               "/subscriptions/{subscription-id}/resourceGroups/res9101/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{managed-identity-name}": {
+             } 
+         }
+        },
+        "sku": {
+          "name": "Standard_LRS"
+        },
+        "kind": "Storage",
+        "location": "eastus",
+        "properties": {
+          "encryption": {
+            "services": {
+              "file": {
+                "keyType": "Account",
+                "enabled": true
+              },
+              "blob": {
+                "keyType": "Account",
+                "enabled": true
+              }
+            },
+            "keyvaultproperties": {
+              "keyvaulturi": "https://myvault8569.vault.azure.net",
+              "keyname": "wrappingKey",
+              "keyversion": ""
+            },
+            "keySource": "Microsoft.Keyvault",
+            "identity":{
+              "type": "ManagedServiceIdentity",
+              "userAssignedIdentity": "/subscriptions/{subscription-id}/resourceGroups/res9101/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{managed-identity-name}"
+            }
+          }
+        }
+      }
+    },
+    "responses": {
+      "200": {
+        "body": {
+          "identity": {
+            "userAssignedIdentities": {
+              "/subscriptions/{subscription-id}/resourceGroups/res9101/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{managed-identity-name}": {
+                "principalId": "8d823284-1060-42a5-9ec4-ed3d831e24d7",
+                "clientId": "fbaa6278-1ecc-415c-819f-6e2058d3acb5"
+              }
+            },
+            "type": "UserAssigned"
+          },
+          "sku": {
+            "name": "Standard_LRS",
+            "tier": "Standard"
+          },
+          "kind": "StorageV2",
+          "id": "/subscriptions/{subscription-id}/resourceGroups/res9101/providers/Microsoft.Storage/storageAccounts/sto4445",
+          "name": "sto4445",
+          "type": "Microsoft.Storage/storageAccounts",
+          "location": "eastus",
+          "tags": {},
+          "properties": {
+            "privateEndpointConnections": [],
+            "networkAcls": {
+              "bypass": "AzureServices",
+              "virtualNetworkRules": [],
+              "ipRules": [],
+              "defaultAction": "Allow"
+          },
+          "supportsHttpsTrafficOnly": true,
+          "encryption": {
+            "identity": {
+              "type": "ManagedServiceIdentity",
+              "userAssignedIdentity": "/subscriptions/{subscription-id}/resourcegroups/res9101/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{managed-identity-name}"
+            },
+          "keyvaultproperties": {
+             "keyvaulturi": "https://myvault8569.vault.azure.net",
+             "keyname": "wrappingKey",
+             "keyversion": "",
+             "currentVersionedKeyIdentifier": "https://myvault8569.vault.azure.net/keys/wrappingKey/0682afdd9c104f4285df20107e956cad",
+             "lastKeyRotationTimestamp": "2019-12-13T20:36:23.7023290Z"
+            },
+          "services": {
+             "file": {
+               "keyType": "Account",
+               "enabled": true,
+               "lastEnabledTime": "2020-12-15T00:43:14.1739587Z"
+             },
+            "blob": {
+               "keyType": "Account",
+               "enabled": true,
+               "lastEnabledTime": "2020-12-15T00:43:14.1739587Z"
+             }
+           },
+           "keySource": "Microsoft.Keyvault"
+          },
+          "accessTier": "Hot",
+          "provisioningState": "Succeeded",
+          "creationTime": "2020-12-15T00:43:14.0839093Z",
+          "primaryEndpoints": {
+            "web": "https://sto4445.web.core.windows.net/",
+            "dfs": "https://sto4445.dfs.core.windows.net/",
+            "blob": "https://sto4445.blob.core.windows.net/",
+            "file": "https://sto4445.file.core.windows.net/",
+            "queue": "https://sto4445.queue.core.windows.net/",
+            "table": "https://sto4445.table.core.windows.net/"
+          },
+          "primaryLocation": "eastus",
+          "statusOfPrimary": "available"
+         }
+        }
+     },
+      "202": {}
+    }
+  }

specification/storage/resource-manager/Microsoft.Storage/stable/2021-01-01/examples/StorageAccountPatchEncryptionScope.json

@@ -25,7 +25,10 @@
           "source": "Microsoft.KeyVault",
           "state": "Enabled",
           "keyVaultProperties": {
-            "keyUri": "https://testvault.vault.core.windows.net/keys/key1/863425f1358359c"
+            "keyUri": "https://testvault.vault.core.windows.net/keys/key1/863425f1358359c",
+            "currentVersionedKeyIdentifier": "https://testvault.vault.core.windows.net/keys/key1/863425f1358359c",
+            "lastKeyRotationTimestamp": "2019-12-13T20:36:23.7023290Z"
+
           },
           "creationTime": "2018-10-16T02:42:41.7633306Z",
           "lastModifiedTime": "2018-10-17T06:23:14.4513306Z"

specification/storage/resource-manager/Microsoft.Storage/stable/2021-01-01/examples/StorageAccountUpdateUserAssignedEncryptionIdentityWithCMK.json

@@ -0,0 +1,119 @@
+{
+    "parameters": {
+      "subscriptionId": "{subscription-id}",
+      "resourceGroupName": "res9101",
+      "accountName": "sto4445",
+      "api-version": "2021-01-01",
+      "parameters": {
+         "identity": {
+           "type": "UserAssigned", 
+           "userAssignedIdentities": { 
+               "/subscriptions/{subscription-id}/resourceGroups/res9101/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{managed-identity-name}": {
+             } 
+         }
+        },
+        "sku": {
+          "name": "Standard_LRS"
+        },
+        "kind": "Storage",
+        "properties": {
+          "encryption": {
+            "services": {
+              "file": {
+                "keyType": "Account",
+                "enabled": true
+              },
+              "blob": {
+                "keyType": "Account",
+                "enabled": true
+              }
+            },
+            "keyvaultproperties": {
+              "keyvaulturi": "https://myvault8569.vault.azure.net",
+              "keyname": "wrappingKey",
+              "keyversion": ""
+            },
+            "keySource": "Microsoft.Keyvault",
+            "identity":{
+              "type": "ManagedServiceIdentity",
+              "userAssignedIdentity": "/subscriptions/{subscription-id}/resourceGroups/res9101/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{managed-identity-name}"
+            }
+          }
+        }
+      }
+    },
+    "responses": {
+      "200": {
+        "body": {
+          "identity": {
+            "userAssignedIdentities": {
+              "/subscriptions/{subscription-id}/resourceGroups/res9101/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{managed-identity-name}": {
+                "principalId": "8d823284-1060-42a5-9ec4-ed3d831e24d7",
+                "clientId": "fbaa6278-1ecc-415c-819f-6e2058d3acb5"
+              }
+            },
+            "type": "UserAssigned"
+          },
+          "sku": {
+            "name": "Standard_LRS",
+            "tier": "Standard"
+          },
+          "kind": "StorageV2",
+          "id": "/subscriptions/{subscription-id}/resourceGroups/res9101/providers/Microsoft.Storage/storageAccounts/sto4445",
+          "name": "sto4445",
+          "type": "Microsoft.Storage/storageAccounts",
+          "location": "eastus",
+          "tags": {},
+          "properties": {
+            "privateEndpointConnections": [],
+            "networkAcls": {
+              "bypass": "AzureServices",
+              "virtualNetworkRules": [],
+              "ipRules": [],
+              "defaultAction": "Allow"
+          },
+          "supportsHttpsTrafficOnly": true,
+          "encryption": {
+            "identity": {
+              "type": "ManagedServiceIdentity",
+              "userAssignedIdentity": "/subscriptions/{subscription-id}/resourcegroups/res9101/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{managed-identity-name}"
+            },
+          "keyvaultproperties": {
+             "keyvaulturi": "https://myvault8569.vault.azure.net",
+             "keyname": "wrappingKey",
+             "keyversion": "",
+             "currentVersionedKeyIdentifier": "https://myvault8569.vault.azure.net/keys/wrappingKey/0682afdd9c104f4285df20107e956cad",
+             "lastKeyRotationTimestamp": "2019-12-13T20:36:23.7023290Z"
+            },
+          "services": {
+             "file": {
+               "keyType": "Account",
+               "enabled": true,
+               "lastEnabledTime": "2020-12-15T00:43:14.1739587Z"
+             },
+            "blob": {
+               "keyType": "Account",
+               "enabled": true,
+               "lastEnabledTime": "2020-12-15T00:43:14.1739587Z"
+             }
+           },
+           "keySource": "Microsoft.Keyvault"
+          },
+          "accessTier": "Hot",
+          "provisioningState": "Succeeded",
+          "creationTime": "2020-12-15T00:43:14.0839093Z",
+          "primaryEndpoints": {
+            "web": "https://sto4445.web.core.windows.net/",
+            "dfs": "https://sto4445.dfs.core.windows.net/",
+            "blob": "https://sto4445.blob.core.windows.net/",
+            "file": "https://sto4445.file.core.windows.net/",
+            "queue": "https://sto4445.queue.core.windows.net/",
+            "table": "https://sto4445.table.core.windows.net/"
+          },
+          "primaryLocation": "eastus",
+          "statusOfPrimary": "available"
+         }
+        }
+     }
+    }
+  }

specification/storage/resource-manager/Microsoft.Storage/stable/2021-01-01/file.json

@@ -70,7 +70,10 @@
           },
           "PutFileServices_EnableSMBMultichannel": {
             "$ref": "./examples/FileServicesPut_EnableSMBMultichannel.json"
-          }
+          },
+          "PutFileServices_EnableSecureSmbFeatures": {
+            "$ref": "./examples/FileServicesPut_EnableSecureSmbFeatures.json"
+          }          
         },
         "description": "Sets the properties of file services in storage accounts, including CORS (Cross-Origin Resource Sharing) rules. ",
         "parameters": [
@@ -598,6 +601,22 @@
         "multichannel": {
           "$ref": "#/definitions/Multichannel",
           "description": "Multichannel setting. Applies to Premium FileStorage only."
+        },
+        "versions": {
+          "type": "string",
+          "description": "SMB protocol versions supported by server. Valid values are SMB2.1, SMB3.0, SMB3.1.1. Should be passed as a string with delimiter ';'."
+        },
+        "authenticationMethods": {
+          "type": "string",
+          "description": "SMB authentication methods supported by server. Valid values are NTLMv2, Kerberos. Should be passed as a string with delimiter ';'."
+        },
+        "kerberosTicketEncryption": {
+          "type": "string",
+          "description": "Kerberos ticket encryption supported by server. Valid values are RC4-HMAC, AES-256. Should be passed as a string with delimiter ';'"
+        },
+        "channelEncryption": {
+          "type": "string",
+          "description": "SMB channel encryption supported by server. Valid values are AES-128-CCM, AES-128-GCM, AES-256-GCM. Should be passed as a string with delimiter ';'."
         }
       },
       "description": "Setting for SMB protocol"