Skip to content

Batch 2022-10-01 control plane fix #21316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 1, 2022
Merged

Batch 2022-10-01 control plane fix #21316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e8e3b59
Revert removal of required properties.
paterasMSFT Oct 27, 2022
99abf83
Add x-ms-secret for secret properties.
paterasMSFT Oct 27, 2022
0482b8f
Fix model validation
dpwatrous Nov 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 19 additions & 9 deletions specification/batch/resource-manager/Microsoft.Batch/stable/2022-10-01/BatchManagement.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3678,7 +3678,8 @@
"password": {
"type": "string",
"title": "The password to access the certificate's private key.",
"description": "This must not be specified if the certificate format is Cer."
"description": "This must not be specified if the certificate format is Cer.",
"x-ms-secret": true
}
},
"description": "Certificate properties for create operations",
Expand Down Expand Up @@ -4694,7 +4695,8 @@
},
"password": {
"type": "string",
"title": "The password to log into the registry server."
"title": "The password to log into the registry server.",
"x-ms-secret": true
},
"registryServer": {
"type": "string",
Expand Down Expand Up @@ -4996,7 +4998,8 @@
"sshPrivateKey": {
"type": "string",
"title": "The SSH private key for the user account.",
"description": "The private key must not be password protected. The private key is used to automatically configure asymmetric-key based authentication for SSH between nodes in a Linux pool when the pool's enableInterNodeCommunication property is true (it is ignored if enableInterNodeCommunication is false). It does this by placing the key pair into the user's .ssh directory. If not specified, password-less SSH is not configured between nodes (no modification of the user's .ssh directory is done)."
"description": "The private key must not be password protected. The private key is used to automatically configure asymmetric-key based authentication for SSH between nodes in a Linux pool when the pool's enableInterNodeCommunication property is true (it is ignored if enableInterNodeCommunication is false). It does this by placing the key pair into the user's .ssh directory. If not specified, password-less SSH is not configured between nodes (no modification of the user's .ssh directory is done).",
"x-ms-secret": true
}
},
"title": "Properties used to create a user account on a Linux node."
Expand Down Expand Up @@ -5039,7 +5042,8 @@
},
"password": {
"type": "string",
"title": "The password for the user account."
"title": "The password for the user account.",
"x-ms-secret": true
},
"elevationLevel": {
"title": "The elevation level of the user account.",
Expand Down Expand Up @@ -6057,12 +6061,14 @@
"accountKey": {
"type": "string",
"title": "The Azure Storage Account key.",
"description": "This property is mutually exclusive with both sasKey and identity; exactly one must be specified."
"description": "This property is mutually exclusive with both sasKey and identity; exactly one must be specified.",
"x-ms-secret": true
},
"sasKey": {
"type": "string",
"title": "The Azure Storage SAS token.",
"description": "This property is mutually exclusive with both accountKey and identity; exactly one must be specified."
"description": "This property is mutually exclusive with both accountKey and identity; exactly one must be specified.",
"x-ms-secret": true
},
"blobfuseOptions": {
"type": "string",
Expand Down Expand Up @@ -6134,10 +6140,12 @@
},
"password": {
"type": "string",
"title": "The password to use for authentication against the CIFS file system."
"title": "The password to use for authentication against the CIFS file system.",
"x-ms-secret": true
}
},
"required": [
"userName",
"source",
"password",
"relativeMountPath"
Expand All @@ -6158,7 +6166,8 @@
},
"accountKey": {
"type": "string",
"title": "The Azure Storage account key."
"title": "The Azure Storage account key.",
"x-ms-secret": true
},
"relativeMountPath": {
"type": "string",
Expand All @@ -6174,7 +6183,8 @@
"required": [
"accountName",
"azureFileUrl",
"relativeMountPath"
"relativeMountPath",
"accountKey"
],
"title": "Information used to connect to an Azure Fileshare."
},
Expand Down
1 change: 0 additions & 1 deletion ...ager/Microsoft.Batch/stable/2022-10-01/examples/PoolCreate_CloudServiceConfiguration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,6 @@
{
"name": "username1",
"elevationLevel": "Admin",
"password": "Password",
"linuxUserConfiguration": {
"uid": 1234,
"gid": 4567
Expand Down
1 change: 0 additions & 1 deletion specification/batch/resource-manager/Microsoft.Batch/stable/2022-10-01/examples/PoolGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@
"userAccounts": [
{
"name": "username1",
"password": "password",
"elevationLevel": "Admin",
"linuxUserConfiguration": {
"uid": 1234,
Expand Down
1 change: 0 additions & 1 deletion ...ification/batch/resource-manager/Microsoft.Batch/stable/2022-10-01/examples/PoolList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@
"userAccounts": [
{
"name": "username1",
"password": "<ExamplePassword>",
"elevationLevel": "Admin",
"linuxUserConfiguration": {
"uid": 1234,
Expand Down