diff --git a/schemas/2019-04-01/Microsoft.ContainerService.json b/schemas/2019-04-01/Microsoft.ContainerService.json
index 348d1ea7bc..91af724f82 100644
--- a/schemas/2019-04-01/Microsoft.ContainerService.json
+++ b/schemas/2019-04-01/Microsoft.ContainerService.json
@@ -1240,28 +1240,12 @@
"type": "object",
"properties": {
"adminPassword": {
- "oneOf": [
- {
- "type": "string",
- "pattern": "^(?=.*[a-z])(?=.*[A-Z])(?=.*[!@#$%\\^&\\*\\(\\)])[a-zA-Z\\d!@#$%\\^&\\*\\(\\)]{12,123}$"
- },
- {
- "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
- }
- ],
- "description": "The administrator password to use for Windows VMs."
+ "type": "string",
+ "description": "Specifies the password of the administrator account.
**Minimum-length:** 8 characters
**Max-length:** 123 characters
**Complexity requirements:** 3 out of 4 conditions below need to be fulfilled
Has lower characters
Has upper characters
Has a digit
Has a special character (Regex match [\\W_])
**Disallowed values:** \"abc@123\", \"P@$$w0rd\", \"P@ssw0rd\", \"P@ssword123\", \"Pa$$word\", \"pass@word1\", \"Password!\", \"Password1\", \"Password22\", \"iloveyou!\""
},
"adminUsername": {
- "oneOf": [
- {
- "type": "string",
- "pattern": "^[a-zA-Z0-9]+([._]?[a-zA-Z0-9]+)*$"
- },
- {
- "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
- }
- ],
- "description": "The administrator username to use for Windows VMs."
+ "type": "string",
+ "description": "Specifies the name of the administrator account.
**restriction:** Cannot end in \".\"
**Disallowed values:** \"administrator\", \"admin\", \"user\", \"user1\", \"test\", \"user2\", \"test1\", \"user3\", \"admin1\", \"1\", \"123\", \"a\", \"actuser\", \"adm\", \"admin2\", \"aspnet\", \"backup\", \"console\", \"david\", \"guest\", \"john\", \"owner\", \"root\", \"server\", \"sql\", \"support\", \"support_388945a0\", \"sys\", \"test2\", \"test3\", \"user4\", \"user5\".
**Minimum-length:** 1 character
**Max-length:** 20 characters"
}
},
"required": [
diff --git a/schemas/2019-06-01/Microsoft.ContainerService.json b/schemas/2019-06-01/Microsoft.ContainerService.json
index 5de019b237..3e87997236 100644
--- a/schemas/2019-06-01/Microsoft.ContainerService.json
+++ b/schemas/2019-06-01/Microsoft.ContainerService.json
@@ -1338,28 +1338,12 @@
"type": "object",
"properties": {
"adminPassword": {
- "oneOf": [
- {
- "type": "string",
- "pattern": "^(?=.*[a-z])(?=.*[A-Z])(?=.*[!@#$%\\^&\\*\\(\\)])[a-zA-Z\\d!@#$%\\^&\\*\\(\\)]{12,123}$"
- },
- {
- "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
- }
- ],
- "description": "The administrator password to use for Windows VMs."
+ "type": "string",
+ "description": "Specifies the password of the administrator account.
**Minimum-length:** 8 characters
**Max-length:** 123 characters
**Complexity requirements:** 3 out of 4 conditions below need to be fulfilled
Has lower characters
Has upper characters
Has a digit
Has a special character (Regex match [\\W_])
**Disallowed values:** \"abc@123\", \"P@$$w0rd\", \"P@ssw0rd\", \"P@ssword123\", \"Pa$$word\", \"pass@word1\", \"Password!\", \"Password1\", \"Password22\", \"iloveyou!\""
},
"adminUsername": {
- "oneOf": [
- {
- "type": "string",
- "pattern": "^[a-zA-Z0-9]+([._]?[a-zA-Z0-9]+)*$"
- },
- {
- "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
- }
- ],
- "description": "The administrator username to use for Windows VMs."
+ "type": "string",
+ "description": "Specifies the name of the administrator account.
**restriction:** Cannot end in \".\"
**Disallowed values:** \"administrator\", \"admin\", \"user\", \"user1\", \"test\", \"user2\", \"test1\", \"user3\", \"admin1\", \"1\", \"123\", \"a\", \"actuser\", \"adm\", \"admin2\", \"aspnet\", \"backup\", \"console\", \"david\", \"guest\", \"john\", \"owner\", \"root\", \"server\", \"sql\", \"support\", \"support_388945a0\", \"sys\", \"test2\", \"test3\", \"user4\", \"user5\".
**Minimum-length:** 1 character
**Max-length:** 20 characters"
}
},
"required": [
diff --git a/schemas/2019-08-01/Microsoft.ContainerService.json b/schemas/2019-08-01/Microsoft.ContainerService.json
index 12c29b9b8a..bcb1463f2b 100644
--- a/schemas/2019-08-01/Microsoft.ContainerService.json
+++ b/schemas/2019-08-01/Microsoft.ContainerService.json
@@ -1490,28 +1490,12 @@
"type": "object",
"properties": {
"adminPassword": {
- "oneOf": [
- {
- "type": "string",
- "pattern": "^(?=.*[a-z])(?=.*[A-Z])(?=.*[!@#$%\\^&\\*\\(\\)])[a-zA-Z\\d!@#$%\\^&\\*\\(\\)]{12,123}$"
- },
- {
- "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
- }
- ],
- "description": "The administrator password to use for Windows VMs."
+ "type": "string",
+ "description": "Specifies the password of the administrator account.
**Minimum-length:** 8 characters
**Max-length:** 123 characters
**Complexity requirements:** 3 out of 4 conditions below need to be fulfilled
Has lower characters
Has upper characters
Has a digit
Has a special character (Regex match [\\W_])
**Disallowed values:** \"abc@123\", \"P@$$w0rd\", \"P@ssw0rd\", \"P@ssword123\", \"Pa$$word\", \"pass@word1\", \"Password!\", \"Password1\", \"Password22\", \"iloveyou!\""
},
"adminUsername": {
- "oneOf": [
- {
- "type": "string",
- "pattern": "^[a-zA-Z0-9]+([._]?[a-zA-Z0-9]+)*$"
- },
- {
- "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
- }
- ],
- "description": "The administrator username to use for Windows VMs."
+ "type": "string",
+ "description": "Specifies the name of the administrator account.
**restriction:** Cannot end in \".\"
**Disallowed values:** \"administrator\", \"admin\", \"user\", \"user1\", \"test\", \"user2\", \"test1\", \"user3\", \"admin1\", \"1\", \"123\", \"a\", \"actuser\", \"adm\", \"admin2\", \"aspnet\", \"backup\", \"console\", \"david\", \"guest\", \"john\", \"owner\", \"root\", \"server\", \"sql\", \"support\", \"support_388945a0\", \"sys\", \"test2\", \"test3\", \"user4\", \"user5\".
**Minimum-length:** 1 character
**Max-length:** 20 characters"
}
},
"required": [
diff --git a/schemas/2019-10-01/Microsoft.ContainerService.json b/schemas/2019-10-01/Microsoft.ContainerService.json
index 0f29e89189..4c32974871 100644
--- a/schemas/2019-10-01/Microsoft.ContainerService.json
+++ b/schemas/2019-10-01/Microsoft.ContainerService.json
@@ -1490,28 +1490,12 @@
"type": "object",
"properties": {
"adminPassword": {
- "oneOf": [
- {
- "type": "string",
- "pattern": "^(?=.*[a-z])(?=.*[A-Z])(?=.*[!@#$%\\^&\\*\\(\\)])[a-zA-Z\\d!@#$%\\^&\\*\\(\\)]{12,123}$"
- },
- {
- "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
- }
- ],
- "description": "The administrator password to use for Windows VMs."
+ "type": "string",
+ "description": "Specifies the password of the administrator account.
**Minimum-length:** 8 characters
**Max-length:** 123 characters
**Complexity requirements:** 3 out of 4 conditions below need to be fulfilled
Has lower characters
Has upper characters
Has a digit
Has a special character (Regex match [\\W_])
**Disallowed values:** \"abc@123\", \"P@$$w0rd\", \"P@ssw0rd\", \"P@ssword123\", \"Pa$$word\", \"pass@word1\", \"Password!\", \"Password1\", \"Password22\", \"iloveyou!\""
},
"adminUsername": {
- "oneOf": [
- {
- "type": "string",
- "pattern": "^[a-zA-Z0-9]+([._]?[a-zA-Z0-9]+)*$"
- },
- {
- "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
- }
- ],
- "description": "The administrator username to use for Windows VMs."
+ "type": "string",
+ "description": "Specifies the name of the administrator account.
**restriction:** Cannot end in \".\"
**Disallowed values:** \"administrator\", \"admin\", \"user\", \"user1\", \"test\", \"user2\", \"test1\", \"user3\", \"admin1\", \"1\", \"123\", \"a\", \"actuser\", \"adm\", \"admin2\", \"aspnet\", \"backup\", \"console\", \"david\", \"guest\", \"john\", \"owner\", \"root\", \"server\", \"sql\", \"support\", \"support_388945a0\", \"sys\", \"test2\", \"test3\", \"user4\", \"user5\".
**Minimum-length:** 1 character
**Max-length:** 20 characters"
}
},
"required": [
diff --git a/schemas/2019-11-01/Microsoft.ContainerService.json b/schemas/2019-11-01/Microsoft.ContainerService.json
index d75d63e607..58a83e6f14 100644
--- a/schemas/2019-11-01/Microsoft.ContainerService.json
+++ b/schemas/2019-11-01/Microsoft.ContainerService.json
@@ -1625,28 +1625,12 @@
"type": "object",
"properties": {
"adminPassword": {
- "oneOf": [
- {
- "type": "string",
- "pattern": "^(?=.*[a-z])(?=.*[A-Z])(?=.*[!@#$%\\^&\\*\\(\\)])[a-zA-Z\\d!@#$%\\^&\\*\\(\\)]{12,123}$"
- },
- {
- "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
- }
- ],
- "description": "The administrator password to use for Windows VMs."
+ "type": "string",
+ "description": "Specifies the password of the administrator account.
**Minimum-length:** 8 characters
**Max-length:** 123 characters
**Complexity requirements:** 3 out of 4 conditions below need to be fulfilled
Has lower characters
Has upper characters
Has a digit
Has a special character (Regex match [\\W_])
**Disallowed values:** \"abc@123\", \"P@$$w0rd\", \"P@ssw0rd\", \"P@ssword123\", \"Pa$$word\", \"pass@word1\", \"Password!\", \"Password1\", \"Password22\", \"iloveyou!\""
},
"adminUsername": {
- "oneOf": [
- {
- "type": "string",
- "pattern": "^[a-zA-Z0-9]+([._]?[a-zA-Z0-9]+)*$"
- },
- {
- "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
- }
- ],
- "description": "The administrator username to use for Windows VMs."
+ "type": "string",
+ "description": "Specifies the name of the administrator account.
**restriction:** Cannot end in \".\"
**Disallowed values:** \"administrator\", \"admin\", \"user\", \"user1\", \"test\", \"user2\", \"test1\", \"user3\", \"admin1\", \"1\", \"123\", \"a\", \"actuser\", \"adm\", \"admin2\", \"aspnet\", \"backup\", \"console\", \"david\", \"guest\", \"john\", \"owner\", \"root\", \"server\", \"sql\", \"support\", \"support_388945a0\", \"sys\", \"test2\", \"test3\", \"user4\", \"user5\".
**Minimum-length:** 1 character
**Max-length:** 20 characters"
}
},
"required": [
diff --git a/schemas/2020-01-01/Microsoft.ContainerService.json b/schemas/2020-01-01/Microsoft.ContainerService.json
index 54616fd4cd..7fb84fa203 100644
--- a/schemas/2020-01-01/Microsoft.ContainerService.json
+++ b/schemas/2020-01-01/Microsoft.ContainerService.json
@@ -1629,28 +1629,12 @@
"type": "object",
"properties": {
"adminPassword": {
- "oneOf": [
- {
- "type": "string",
- "pattern": "^(?=.*[a-z])(?=.*[A-Z])(?=.*[!@#$%\\^&\\*\\(\\)])[a-zA-Z\\d!@#$%\\^&\\*\\(\\)]{12,123}$"
- },
- {
- "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
- }
- ],
- "description": "The administrator password to use for Windows VMs."
+ "type": "string",
+ "description": "Specifies the password of the administrator account.
**Minimum-length:** 8 characters
**Max-length:** 123 characters
**Complexity requirements:** 3 out of 4 conditions below need to be fulfilled
Has lower characters
Has upper characters
Has a digit
Has a special character (Regex match [\\W_])
**Disallowed values:** \"abc@123\", \"P@$$w0rd\", \"P@ssw0rd\", \"P@ssword123\", \"Pa$$word\", \"pass@word1\", \"Password!\", \"Password1\", \"Password22\", \"iloveyou!\""
},
"adminUsername": {
- "oneOf": [
- {
- "type": "string",
- "pattern": "^[a-zA-Z0-9]+([._]?[a-zA-Z0-9]+)*$"
- },
- {
- "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
- }
- ],
- "description": "The administrator username to use for Windows VMs."
+ "type": "string",
+ "description": "Specifies the name of the administrator account.
**restriction:** Cannot end in \".\"
**Disallowed values:** \"administrator\", \"admin\", \"user\", \"user1\", \"test\", \"user2\", \"test1\", \"user3\", \"admin1\", \"1\", \"123\", \"a\", \"actuser\", \"adm\", \"admin2\", \"aspnet\", \"backup\", \"console\", \"david\", \"guest\", \"john\", \"owner\", \"root\", \"server\", \"sql\", \"support\", \"support_388945a0\", \"sys\", \"test2\", \"test3\", \"user4\", \"user5\".
**Minimum-length:** 1 character
**Max-length:** 20 characters"
}
},
"required": [
diff --git a/schemas/2020-02-01/Microsoft.ContainerService.json b/schemas/2020-02-01/Microsoft.ContainerService.json
index c6e5bd7336..16751053cc 100644
--- a/schemas/2020-02-01/Microsoft.ContainerService.json
+++ b/schemas/2020-02-01/Microsoft.ContainerService.json
@@ -1711,28 +1711,12 @@
"type": "object",
"properties": {
"adminPassword": {
- "oneOf": [
- {
- "type": "string",
- "pattern": "^(?=.*[a-z])(?=.*[A-Z])(?=.*[!@#$%\\^&\\*\\(\\)])[a-zA-Z\\d!@#$%\\^&\\*\\(\\)]{12,123}$"
- },
- {
- "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
- }
- ],
- "description": "The administrator password to use for Windows VMs."
+ "type": "string",
+ "description": "Specifies the password of the administrator account.
**Minimum-length:** 8 characters
**Max-length:** 123 characters
**Complexity requirements:** 3 out of 4 conditions below need to be fulfilled
Has lower characters
Has upper characters
Has a digit
Has a special character (Regex match [\\W_])
**Disallowed values:** \"abc@123\", \"P@$$w0rd\", \"P@ssw0rd\", \"P@ssword123\", \"Pa$$word\", \"pass@word1\", \"Password!\", \"Password1\", \"Password22\", \"iloveyou!\""
},
"adminUsername": {
- "oneOf": [
- {
- "type": "string",
- "pattern": "^[a-zA-Z0-9]+([._]?[a-zA-Z0-9]+)*$"
- },
- {
- "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
- }
- ],
- "description": "The administrator username to use for Windows VMs."
+ "type": "string",
+ "description": "Specifies the name of the administrator account.
**restriction:** Cannot end in \".\"
**Disallowed values:** \"administrator\", \"admin\", \"user\", \"user1\", \"test\", \"user2\", \"test1\", \"user3\", \"admin1\", \"1\", \"123\", \"a\", \"actuser\", \"adm\", \"admin2\", \"aspnet\", \"backup\", \"console\", \"david\", \"guest\", \"john\", \"owner\", \"root\", \"server\", \"sql\", \"support\", \"support_388945a0\", \"sys\", \"test2\", \"test3\", \"user4\", \"user5\".
**Minimum-length:** 1 character
**Max-length:** 20 characters"
}
},
"required": [
diff --git a/schemas/2020-03-01/Microsoft.ContainerService.json b/schemas/2020-03-01/Microsoft.ContainerService.json
index 39cf5df7c9..3ee3a024ad 100644
--- a/schemas/2020-03-01/Microsoft.ContainerService.json
+++ b/schemas/2020-03-01/Microsoft.ContainerService.json
@@ -1809,28 +1809,12 @@
"type": "object",
"properties": {
"adminPassword": {
- "oneOf": [
- {
- "type": "string",
- "pattern": "^(?=.*[a-z])(?=.*[A-Z])(?=.*[!@#$%\\^&\\*\\(\\)])[a-zA-Z\\d!@#$%\\^&\\*\\(\\)]{12,123}$"
- },
- {
- "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
- }
- ],
- "description": "The administrator password to use for Windows VMs."
+ "type": "string",
+ "description": "Specifies the password of the administrator account.
**Minimum-length:** 8 characters
**Max-length:** 123 characters
**Complexity requirements:** 3 out of 4 conditions below need to be fulfilled
Has lower characters
Has upper characters
Has a digit
Has a special character (Regex match [\\W_])
**Disallowed values:** \"abc@123\", \"P@$$w0rd\", \"P@ssw0rd\", \"P@ssword123\", \"Pa$$word\", \"pass@word1\", \"Password!\", \"Password1\", \"Password22\", \"iloveyou!\""
},
"adminUsername": {
- "oneOf": [
- {
- "type": "string",
- "pattern": "^[a-zA-Z0-9]+([._]?[a-zA-Z0-9]+)*$"
- },
- {
- "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
- }
- ],
- "description": "The administrator username to use for Windows VMs."
+ "type": "string",
+ "description": "Specifies the name of the administrator account.
**restriction:** Cannot end in \".\"
**Disallowed values:** \"administrator\", \"admin\", \"user\", \"user1\", \"test\", \"user2\", \"test1\", \"user3\", \"admin1\", \"1\", \"123\", \"a\", \"actuser\", \"adm\", \"admin2\", \"aspnet\", \"backup\", \"console\", \"david\", \"guest\", \"john\", \"owner\", \"root\", \"server\", \"sql\", \"support\", \"support_388945a0\", \"sys\", \"test2\", \"test3\", \"user4\", \"user5\".
**Minimum-length:** 1 character
**Max-length:** 20 characters"
}
},
"required": [
diff --git a/schemas/2020-04-01/Microsoft.ContainerService.json b/schemas/2020-04-01/Microsoft.ContainerService.json
index 970597841d..06428fde6f 100644
--- a/schemas/2020-04-01/Microsoft.ContainerService.json
+++ b/schemas/2020-04-01/Microsoft.ContainerService.json
@@ -1847,28 +1847,12 @@
"type": "object",
"properties": {
"adminPassword": {
- "oneOf": [
- {
- "type": "string",
- "pattern": "^(?=.*[a-z])(?=.*[A-Z])(?=.*[!@#$%\\^&\\*\\(\\)])[a-zA-Z\\d!@#$%\\^&\\*\\(\\)]{12,123}$"
- },
- {
- "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
- }
- ],
- "description": "The administrator password to use for Windows VMs."
+ "type": "string",
+ "description": "Specifies the password of the administrator account.
**Minimum-length:** 8 characters
**Max-length:** 123 characters
**Complexity requirements:** 3 out of 4 conditions below need to be fulfilled
Has lower characters
Has upper characters
Has a digit
Has a special character (Regex match [\\W_])
**Disallowed values:** \"abc@123\", \"P@$$w0rd\", \"P@ssw0rd\", \"P@ssword123\", \"Pa$$word\", \"pass@word1\", \"Password!\", \"Password1\", \"Password22\", \"iloveyou!\""
},
"adminUsername": {
- "oneOf": [
- {
- "type": "string",
- "pattern": "^[a-zA-Z0-9]+([._]?[a-zA-Z0-9]+)*$"
- },
- {
- "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
- }
- ],
- "description": "The administrator username to use for Windows VMs."
+ "type": "string",
+ "description": "Specifies the name of the administrator account.
**restriction:** Cannot end in \".\"
**Disallowed values:** \"administrator\", \"admin\", \"user\", \"user1\", \"test\", \"user2\", \"test1\", \"user3\", \"admin1\", \"1\", \"123\", \"a\", \"actuser\", \"adm\", \"admin2\", \"aspnet\", \"backup\", \"console\", \"david\", \"guest\", \"john\", \"owner\", \"root\", \"server\", \"sql\", \"support\", \"support_388945a0\", \"sys\", \"test2\", \"test3\", \"user4\", \"user5\".
**Minimum-length:** 1 character
**Max-length:** 20 characters"
}
},
"required": [
diff --git a/schemas/2020-06-01/Microsoft.ContainerService.json b/schemas/2020-06-01/Microsoft.ContainerService.json
index 5e67abe7e6..81ce6a2fee 100644
--- a/schemas/2020-06-01/Microsoft.ContainerService.json
+++ b/schemas/2020-06-01/Microsoft.ContainerService.json
@@ -1967,28 +1967,12 @@
"type": "object",
"properties": {
"adminPassword": {
- "oneOf": [
- {
- "type": "string",
- "pattern": "^(?=.*[a-z])(?=.*[A-Z])(?=.*[!@#$%\\^&\\*\\(\\)])[a-zA-Z\\d!@#$%\\^&\\*\\(\\)]{12,123}$"
- },
- {
- "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
- }
- ],
- "description": "The administrator password to use for Windows VMs."
+ "type": "string",
+ "description": "Specifies the password of the administrator account.
**Minimum-length:** 8 characters
**Max-length:** 123 characters
**Complexity requirements:** 3 out of 4 conditions below need to be fulfilled
Has lower characters
Has upper characters
Has a digit
Has a special character (Regex match [\\W_])
**Disallowed values:** \"abc@123\", \"P@$$w0rd\", \"P@ssw0rd\", \"P@ssword123\", \"Pa$$word\", \"pass@word1\", \"Password!\", \"Password1\", \"Password22\", \"iloveyou!\""
},
"adminUsername": {
- "oneOf": [
- {
- "type": "string",
- "pattern": "^[a-zA-Z0-9]+([._]?[a-zA-Z0-9]+)*$"
- },
- {
- "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
- }
- ],
- "description": "The administrator username to use for Windows VMs."
+ "type": "string",
+ "description": "Specifies the name of the administrator account.
**restriction:** Cannot end in \".\"
**Disallowed values:** \"administrator\", \"admin\", \"user\", \"user1\", \"test\", \"user2\", \"test1\", \"user3\", \"admin1\", \"1\", \"123\", \"a\", \"actuser\", \"adm\", \"admin2\", \"aspnet\", \"backup\", \"console\", \"david\", \"guest\", \"john\", \"owner\", \"root\", \"server\", \"sql\", \"support\", \"support_388945a0\", \"sys\", \"test2\", \"test3\", \"user4\", \"user5\".
**Minimum-length:** 1 character
**Max-length:** 20 characters"
}
},
"required": [
diff --git a/schemas/2020-07-01/Microsoft.ContainerService.json b/schemas/2020-07-01/Microsoft.ContainerService.json
index b5eceef712..157f84a543 100644
--- a/schemas/2020-07-01/Microsoft.ContainerService.json
+++ b/schemas/2020-07-01/Microsoft.ContainerService.json
@@ -1959,28 +1959,12 @@
"type": "object",
"properties": {
"adminPassword": {
- "oneOf": [
- {
- "type": "string",
- "pattern": "^(?=.*[a-z])(?=.*[A-Z])(?=.*[!@#$%\\^&\\*\\(\\)])[a-zA-Z\\d!@#$%\\^&\\*\\(\\)]{12,123}$"
- },
- {
- "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
- }
- ],
- "description": "The administrator password to use for Windows VMs."
+ "type": "string",
+ "description": "Specifies the password of the administrator account.
**Minimum-length:** 8 characters
**Max-length:** 123 characters
**Complexity requirements:** 3 out of 4 conditions below need to be fulfilled
Has lower characters
Has upper characters
Has a digit
Has a special character (Regex match [\\W_])
**Disallowed values:** \"abc@123\", \"P@$$w0rd\", \"P@ssw0rd\", \"P@ssword123\", \"Pa$$word\", \"pass@word1\", \"Password!\", \"Password1\", \"Password22\", \"iloveyou!\""
},
"adminUsername": {
- "oneOf": [
- {
- "type": "string",
- "pattern": "^[a-zA-Z0-9]+([._]?[a-zA-Z0-9]+)*$"
- },
- {
- "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
- }
- ],
- "description": "The administrator username to use for Windows VMs."
+ "type": "string",
+ "description": "Specifies the name of the administrator account.
**restriction:** Cannot end in \".\"
**Disallowed values:** \"administrator\", \"admin\", \"user\", \"user1\", \"test\", \"user2\", \"test1\", \"user3\", \"admin1\", \"1\", \"123\", \"a\", \"actuser\", \"adm\", \"admin2\", \"aspnet\", \"backup\", \"console\", \"david\", \"guest\", \"john\", \"owner\", \"root\", \"server\", \"sql\", \"support\", \"support_388945a0\", \"sys\", \"test2\", \"test3\", \"user4\", \"user5\".
**Minimum-length:** 1 character
**Max-length:** 20 characters"
},
"licenseType": {
"oneOf": [
diff --git a/schemas/2020-09-01/Microsoft.ContainerService.json b/schemas/2020-09-01/Microsoft.ContainerService.json
index fca2ffa9d9..e1a172ceb2 100644
--- a/schemas/2020-09-01/Microsoft.ContainerService.json
+++ b/schemas/2020-09-01/Microsoft.ContainerService.json
@@ -2022,28 +2022,12 @@
"type": "object",
"properties": {
"adminPassword": {
- "oneOf": [
- {
- "type": "string",
- "pattern": "^(?=.*[a-z])(?=.*[A-Z])(?=.*[!@#$%\\^&\\*\\(\\)])[a-zA-Z\\d!@#$%\\^&\\*\\(\\)]{12,123}$"
- },
- {
- "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
- }
- ],
- "description": "The administrator password to use for Windows VMs."
+ "type": "string",
+ "description": "Specifies the password of the administrator account.
**Minimum-length:** 8 characters
**Max-length:** 123 characters
**Complexity requirements:** 3 out of 4 conditions below need to be fulfilled
Has lower characters
Has upper characters
Has a digit
Has a special character (Regex match [\\W_])
**Disallowed values:** \"abc@123\", \"P@$$w0rd\", \"P@ssw0rd\", \"P@ssword123\", \"Pa$$word\", \"pass@word1\", \"Password!\", \"Password1\", \"Password22\", \"iloveyou!\""
},
"adminUsername": {
- "oneOf": [
- {
- "type": "string",
- "pattern": "^[a-zA-Z0-9]+([._]?[a-zA-Z0-9]+)*$"
- },
- {
- "$ref": "https://schema.management.azure.com/schemas/common/definitions.json#/definitions/expression"
- }
- ],
- "description": "The administrator username to use for Windows VMs."
+ "type": "string",
+ "description": "Specifies the name of the administrator account.
**restriction:** Cannot end in \".\"
**Disallowed values:** \"administrator\", \"admin\", \"user\", \"user1\", \"test\", \"user2\", \"test1\", \"user3\", \"admin1\", \"1\", \"123\", \"a\", \"actuser\", \"adm\", \"admin2\", \"aspnet\", \"backup\", \"console\", \"david\", \"guest\", \"john\", \"owner\", \"root\", \"server\", \"sql\", \"support\", \"support_388945a0\", \"sys\", \"test2\", \"test3\", \"user4\", \"user5\".
**Minimum-length:** 1 character
**Max-length:** 20 characters"
},
"licenseType": {
"oneOf": [
diff --git a/schemas/common/autogeneratedResources.json b/schemas/common/autogeneratedResources.json
index 0bb594f711..61a1528135 100644
--- a/schemas/common/autogeneratedResources.json
+++ b/schemas/common/autogeneratedResources.json
@@ -5329,4 +5329,4 @@
]
}
]
-}
+}
\ No newline at end of file