From e8e3b59fed7e928a07fe0a383e507ee601f055f3 Mon Sep 17 00:00:00 2001 From: Mike Pateras Date: Thu, 27 Oct 2022 12:24:46 -0400 Subject: [PATCH 1/3] Revert removal of required properties. --- .../Microsoft.Batch/stable/2022-10-01/BatchManagement.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/specification/batch/resource-manager/Microsoft.Batch/stable/2022-10-01/BatchManagement.json b/specification/batch/resource-manager/Microsoft.Batch/stable/2022-10-01/BatchManagement.json index 62c87fbf777d..efb2cb834dc1 100644 --- a/specification/batch/resource-manager/Microsoft.Batch/stable/2022-10-01/BatchManagement.json +++ b/specification/batch/resource-manager/Microsoft.Batch/stable/2022-10-01/BatchManagement.json @@ -6138,6 +6138,7 @@ } }, "required": [ + "userName", "source", "password", "relativeMountPath" @@ -6174,7 +6175,8 @@ "required": [ "accountName", "azureFileUrl", - "relativeMountPath" + "relativeMountPath", + "accountKey" ], "title": "Information used to connect to an Azure Fileshare." }, From 99abf83239136112051ed7ea0fbcf231df665b24 Mon Sep 17 00:00:00 2001 From: Mike Pateras Date: Thu, 27 Oct 2022 12:25:05 -0400 Subject: [PATCH 2/3] Add x-ms-secret for secret properties. Removed secrets from examples --- .../stable/2022-10-01/BatchManagement.json | 24 ++++++++++++------- .../PoolCreate_CloudServiceConfiguration.json | 1 - .../stable/2022-10-01/examples/PoolGet.json | 1 - 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/specification/batch/resource-manager/Microsoft.Batch/stable/2022-10-01/BatchManagement.json b/specification/batch/resource-manager/Microsoft.Batch/stable/2022-10-01/BatchManagement.json index efb2cb834dc1..2cac4f5f3da2 100644 --- a/specification/batch/resource-manager/Microsoft.Batch/stable/2022-10-01/BatchManagement.json +++ b/specification/batch/resource-manager/Microsoft.Batch/stable/2022-10-01/BatchManagement.json @@ -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", @@ -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", @@ -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." @@ -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.", @@ -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", @@ -6134,7 +6140,8 @@ }, "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": [ @@ -6159,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", diff --git a/specification/batch/resource-manager/Microsoft.Batch/stable/2022-10-01/examples/PoolCreate_CloudServiceConfiguration.json b/specification/batch/resource-manager/Microsoft.Batch/stable/2022-10-01/examples/PoolCreate_CloudServiceConfiguration.json index 51844cc87ff3..69a24f0e3d33 100644 --- a/specification/batch/resource-manager/Microsoft.Batch/stable/2022-10-01/examples/PoolCreate_CloudServiceConfiguration.json +++ b/specification/batch/resource-manager/Microsoft.Batch/stable/2022-10-01/examples/PoolCreate_CloudServiceConfiguration.json @@ -192,7 +192,6 @@ { "name": "username1", "elevationLevel": "Admin", - "password": "Password", "linuxUserConfiguration": { "uid": 1234, "gid": 4567 diff --git a/specification/batch/resource-manager/Microsoft.Batch/stable/2022-10-01/examples/PoolGet.json b/specification/batch/resource-manager/Microsoft.Batch/stable/2022-10-01/examples/PoolGet.json index 2d42f187635a..88f7b7e6728f 100644 --- a/specification/batch/resource-manager/Microsoft.Batch/stable/2022-10-01/examples/PoolGet.json +++ b/specification/batch/resource-manager/Microsoft.Batch/stable/2022-10-01/examples/PoolGet.json @@ -112,7 +112,6 @@ "userAccounts": [ { "name": "username1", - "password": "password", "elevationLevel": "Admin", "linuxUserConfiguration": { "uid": 1234, From 0482b8f3e825d40140db6c50e87594ffd750f7e7 Mon Sep 17 00:00:00 2001 From: David Watrous Date: Tue, 1 Nov 2022 10:04:50 -0400 Subject: [PATCH 3/3] Fix model validation --- .../Microsoft.Batch/stable/2022-10-01/examples/PoolList.json | 1 - 1 file changed, 1 deletion(-) diff --git a/specification/batch/resource-manager/Microsoft.Batch/stable/2022-10-01/examples/PoolList.json b/specification/batch/resource-manager/Microsoft.Batch/stable/2022-10-01/examples/PoolList.json index 286bc2dfe280..55c1033310a9 100644 --- a/specification/batch/resource-manager/Microsoft.Batch/stable/2022-10-01/examples/PoolList.json +++ b/specification/batch/resource-manager/Microsoft.Batch/stable/2022-10-01/examples/PoolList.json @@ -110,7 +110,6 @@ "userAccounts": [ { "name": "username1", - "password": "", "elevationLevel": "Admin", "linuxUserConfiguration": { "uid": 1234,