Fix advanced options for CMS and MSSQL (#22708)

extensions/cms/package.json

@@ -220,15 +220,123 @@
           "objectType": null,
           "categoryValues": [
             {
-              "displayName": null,
+              "displayName": "%cms.disabled%",
-              "name": "Disabled"
+              "name": "disabled"
             },
             {
-              "displayName": null,
+              "displayName": "%cms.enabled%",
-              "name": "Enabled"
+              "name": "enabled"
             }
           ],
           "isRequired": false,
+          "isArray": false,
+          "onSelectionChange": [
+            {
+              "values": [
+                "disabled",
+                ""
+              ],
+              "dependentOptionActions": [
+                {
+                  "optionName": "secureEnclaves",
+                  "action": "hide"
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "specialValueType": null,
+          "isIdentity": false,
+          "name": "secureEnclaves",
+          "displayName": "%cms.connectionOptions.secureEnclaves.displayName%",
+          "description": "%cms.connectionOptions.secureEnclaves.description%",
+          "groupName": "%cms.connectionOptions.groupName.security%",
+          "valueType": "category",
+          "defaultValue": null,
+          "objectType": null,
+          "categoryValues": [
+            {
+              "displayName": "%cms.disabled%",
+              "name": "disabled"
+            },
+            {
+              "displayName": "%cms.enabled%",
+              "name": "enabled"
+            }
+          ],
+          "isRequired": false,
+          "isArray": false,
+          "onSelectionChange": [
+            {
+              "values": [
+                "disabled",
+                ""
+              ],
+              "dependentOptionActions": [
+                {
+                  "optionName": "attestationProtocol",
+                  "action": "hide",
+                  "required": true
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "specialValueType": null,
+          "isIdentity": false,
+          "name": "attestationProtocol",
+          "displayName": "%cms.connectionOptions.enclaveAttestationProtocol.displayName%",
+          "description": "%cms.connectionOptions.enclaveAttestationProtocol.description%",
+          "groupName": "%cms.connectionOptions.groupName.security%",
+          "valueType": "category",
+          "defaultValue": null,
+          "objectType": null,
+          "categoryValues": [
+            {
+              "displayName": "%cms.connectionOptions.enclaveAttestationProtocol.categoryValues.HGS%",
+              "name": "hgs"
+            },
+            {
+              "displayName": "%cms.connectionOptions.enclaveAttestationProtocol.categoryValues.AAS%",
+              "name": "aas"
+            },
+            {
+              "displayName": "%cms.connectionOptions.enclaveAttestationProtocol.categoryValues.None%",
+              "name": "none"
+            }
+          ],
+          "isRequired": false,
+          "isArray": false,
+          "onSelectionChange": [
+            {
+              "values": [
+                "none",
+                ""
+              ],
+              "dependentOptionActions": [
+                {
+                  "optionName": "enclaveAttestationUrl",
+                  "action": "hide",
+                  "required": true
+                }
+              ]
+            }
+          ]
+        },
+        {
+          "specialValueType": null,
+          "isIdentity": false,
+          "name": "enclaveAttestationUrl",
+          "displayName": "%cms.connectionOptions.enclaveAttestationUrl.displayName%",
+          "description": "%cms.connectionOptions.enclaveAttestationUrl.description%",
+          "groupName": "%cms.connectionOptions.groupName.security%",
+          "valueType": "string",
+          "defaultValue": null,
+          "objectType": null,
+          "categoryValues": null,
+          "isRequired": false,
           "isArray": false
         },
         {
@@ -302,20 +410,6 @@
           "isArray": false,
           "showOnConnectionDialog": true
         },
-        {
-          "specialValueType": null,
-          "isIdentity": false,
-          "name": "attachedDBFileName",
-          "displayName": "%cms.connectionOptions.attachedDBFileName.displayName%",
-          "description": "%cms.connectionOptions.attachedDBFileName.description%",
-          "groupName": "%cms.connectionOptions.groupName.source%",
-          "valueType": "string",
-          "defaultValue": null,
-          "objectType": null,
-          "categoryValues": null,
-          "isRequired": false,
-          "isArray": false
-        },
         {
           "specialValueType": null,
           "isIdentity": false,
@@ -475,8 +569,8 @@
           "isIdentity": false,
           "name": "attachDbFilename",
           "displayName": "%cms.connectionOptions.attachDbFilename.displayName%",
-          "description": null,
+          "description": "%cms.connectionOptions.attachDbFilename.description%",
-          "groupName": null,
+          "groupName": "%cms.connectionOptions.groupName.source%",
           "valueType": "string",
           "defaultValue": null,
           "objectType": null,

extensions/cms/package.nls.json

@@ -23,6 +23,8 @@
 	"cms.tracingLevel": "[Optional] Log level for backend services. Azure Data Studio generates a file name every time it starts and if the file already exists the logs entries are appended to that file. For cleanup of old log files see logRetentionMinutes and logFilesRemovalLimit settings. The default tracingLevel does not log much. Changing verbosity could lead to extensive logging and disk space requirements for the logs. Error includes Critical, Warning includes Error, Information includes Warning and Verbose includes Information",
 	"cms.logRetentionMinutes": "Number of minutes to retain log files for backend services. Default is 1 week.",
 	"cms.logFilesRemovalLimit": "Maximum number of old files to remove upon startup that have expired mssql.logRetentionMinutes. Files that do not get cleaned up due to this limitation get cleaned up next time Azure Data Studio starts up.",
+	"cms.disabled": "Disabled",
+	"cms.enabled": "Enabled",
 	"ignorePlatformWarning": "[Optional] Do not show unsupported platform warnings",
 	"onprem.databaseProperties.recoveryModel": "Recovery Model",
 	"onprem.databaseProperties.lastBackupDate": "Last Database Backup",
@@ -64,8 +66,17 @@
 	"cms.connectionOptions.commandTimeout.description": "The length of time (in seconds) to wait for a command to execute before terminating the attempt and generating an error",
 	"cms.connectionOptions.currentLanguage.displayName": "Current language",
 	"cms.connectionOptions.currentLanguage.description": "The SQL Server language record name",
-	"cms.connectionOptions.columnEncryptionSetting.displayName": "Column encryption",
+	"cms.connectionOptions.columnEncryptionSetting.displayName": "Always Encrypted",
-	"cms.connectionOptions.columnEncryptionSetting.description": "Default column encryption setting for all the commands on the connection",
+	"cms.connectionOptions.columnEncryptionSetting.description": "Enables or disables Always Encrypted for the connection",
+	"cms.connectionOptions.secureEnclaves.displayName": "Secure enclaves",
+	"cms.connectionOptions.secureEnclaves.description": "Enables or disables Secure enclaves for the connection",
+	"cms.connectionOptions.enclaveAttestationProtocol.displayName": "Attestation protocol",
+	"cms.connectionOptions.enclaveAttestationProtocol.description": "Specifies a protocol for attesting a server-side enclave used with Always Encrypted with Secure enclaves",
+	"cms.connectionOptions.enclaveAttestationProtocol.categoryValues.AAS": "Azure Attestation",
+	"cms.connectionOptions.enclaveAttestationProtocol.categoryValues.HGS": "Host Guardian Service",
+	"cms.connectionOptions.enclaveAttestationProtocol.categoryValues.None": "None",
+	"cms.connectionOptions.enclaveAttestationUrl.displayName": "Attestation URL",
+	"cms.connectionOptions.enclaveAttestationUrl.description": "Specifies an endpoint for attesting a server-side enclave used with Always Encrypted with Secure enclaves",
 	"cms.connectionOptions.encrypt.displayName": "Encrypt",
 	"cms.connectionOptions.encrypt.description": "When 'Mandatory' or 'Strict', SQL Server uses SSL encryption for all data sent between the client and server if the server has a certificate installed. When set to 'Strict', SQL Server uses TDS 8.0 for all data transfer between the client and server. 'Strict' is supported on SQL Server 2022 onwards.",
 	"cms.connectionOptions.encrypt.categoryValues.strict": "Strict",
@@ -77,8 +88,6 @@
 	"cms.connectionOptions.hostNameInCertificate.description": "Indicates the host name specified in TLS certificate that will be used by SQL Server to validate server certificate. When not specified, the server name is used by default for certificate validation.",
 	"cms.connectionOptions.trustServerCertificate.displayName": "Trust server certificate",
 	"cms.connectionOptions.trustServerCertificate.description": "When true (and encrypt=true), SQL Server uses SSL encryption for all data sent between the client and server without validating the server certificate. This property is not supported with Encrypt=Strict.",
-	"cms.connectionOptions.attachedDBFileName.displayName": "Attached DB file name",
-	"cms.connectionOptions.attachedDBFileName.description": "The name of the primary file, including the full path name, of an attachable database",
 	"cms.connectionOptions.contextConnection.displayName": "Context connection",
 	"cms.connectionOptions.contextConnection.description": "When true, indicates the connection should be from the SQL server context. Available only when running in the SQL Server process",
 	"cms.connectionOptions.port.displayName": "Port",
@@ -101,6 +110,7 @@
 	"cms.connectionOptions.replication.displayName": "Replication",
 	"cms.connectionOptions.replication.description": "Used by SQL Server in Replication",
 	"cms.connectionOptions.attachDbFilename.displayName": "Attach DB filename",
+	"cms.connectionOptions.attachDbFilename.description": "The name of the primary file, including the full path name, of an attachable database",
 	"cms.connectionOptions.failoverPartner.displayName": "Failover partner",
 	"cms.connectionOptions.failoverPartner.description": "The name or network address of the instance of SQL Server that acts as a failover partner",
 	"cms.connectionOptions.multiSubnetFailover.displayName": "Multi subnet failover",

extensions/mssql/package.json

@@ -1198,20 +1198,6 @@
           "isArray": false,
           "showOnConnectionDialog": true
         },
-        {
-          "specialValueType": null,
-          "isIdentity": false,
-          "name": "attachedDBFileName",
-          "displayName": "%mssql.connectionOptions.attachedDBFileName.displayName%",
-          "description": "%mssql.connectionOptions.attachedDBFileName.description%",
-          "groupName": "%mssql.connectionOptions.groupName.source%",
-          "valueType": "string",
-          "defaultValue": null,
-          "objectType": null,
-          "categoryValues": null,
-          "isRequired": false,
-          "isArray": false
-        },
         {
           "specialValueType": null,
           "isIdentity": false,
@@ -1371,8 +1357,8 @@
           "isIdentity": false,
           "name": "attachDbFilename",
           "displayName": "%mssql.connectionOptions.attachDbFilename.displayName%",
-          "description": null,
+          "description": "%mssql.connectionOptions.attachDbFilename.description%",
-          "groupName": null,
+          "groupName": "%mssql.connectionOptions.groupName.source%",
           "valueType": "string",
           "defaultValue": null,
           "objectType": null,

extensions/mssql/package.nls.json

@@ -109,12 +109,12 @@
 	"mssql.connectionOptions.secureEnclaves.displayName": "Secure enclaves",
 	"mssql.connectionOptions.secureEnclaves.description": "Enables or disables Secure enclaves for the connection",
 	"mssql.connectionOptions.enclaveAttestationProtocol.displayName": "Attestation protocol",
-	"mssql.connectionOptions.enclaveAttestationProtocol.description": "Specifies a protocol for attesting a server-side enclave used with Always Encrypted with secure enclaves",
+	"mssql.connectionOptions.enclaveAttestationProtocol.description": "Specifies a protocol for attesting a server-side enclave used with Always Encrypted with Secure enclaves",
 	"mssql.connectionOptions.enclaveAttestationProtocol.categoryValues.AAS": "Azure Attestation",
 	"mssql.connectionOptions.enclaveAttestationProtocol.categoryValues.HGS": "Host Guardian Service",
 	"mssql.connectionOptions.enclaveAttestationProtocol.categoryValues.None": "None",
 	"mssql.connectionOptions.enclaveAttestationUrl.displayName": "Attestation URL",
-	"mssql.connectionOptions.enclaveAttestationUrl.description": "Specifies an endpoint for attesting a server-side enclave used with Always Encrypted with secure enclaves",
+	"mssql.connectionOptions.enclaveAttestationUrl.description": "Specifies an endpoint for attesting a server-side enclave used with Always Encrypted with Secure enclaves",
 	"mssql.connectionOptions.encrypt.displayName": "Encrypt",
 	"mssql.connectionOptions.encrypt.description": "When 'Mandatory' or 'Strict', SQL Server uses SSL encryption for all data sent between the client and server if the server has a certificate installed. When set to 'Strict', SQL Server uses TDS 8.0 for all data transfer between the client and server. 'Strict' is supported on SQL Server 2022 onwards.",
 	"mssql.connectionOptions.encrypt.categoryValues.strict": "Strict",
@@ -126,8 +126,6 @@
 	"mssql.connectionOptions.hostNameInCertificate.description": "Indicates the host name specified in TLS certificate that will be used by SQL Server to validate server certificate. When not specified, the server name is used by default for certificate validation.",
 	"mssql.connectionOptions.trustServerCertificate.displayName": "Trust server certificate",
 	"mssql.connectionOptions.trustServerCertificate.description": "When true (and encrypt=true), SQL Server uses SSL encryption for all data sent between the client and server without validating the server certificate. This property is not supported with Encrypt=Strict.",
-	"mssql.connectionOptions.attachedDBFileName.displayName": "Attached DB file name",
-	"mssql.connectionOptions.attachedDBFileName.description": "The name of the primary file, including the full path name, of an attachable database",
 	"mssql.connectionOptions.contextConnection.displayName": "Context connection",
 	"mssql.connectionOptions.contextConnection.description": "When true, indicates the connection should be from the SQL server context. Available only when running in the SQL Server process",
 	"mssql.connectionOptions.port.displayName": "Port",
@@ -150,6 +148,7 @@
 	"mssql.connectionOptions.replication.displayName": "Replication",
 	"mssql.connectionOptions.replication.description": "Used by SQL Server in Replication",
 	"mssql.connectionOptions.attachDbFilename.displayName": "Attach DB filename",
+	"mssql.connectionOptions.attachDbFilename.description": "The name of the primary file, including the full path name, of an attachable database",
 	"mssql.connectionOptions.failoverPartner.displayName": "Failover partner",
 	"mssql.connectionOptions.failoverPartner.description": "The name or network address of the instance of SQL Server that acts as a failover partner",
 	"mssql.connectionOptions.multiSubnetFailover.displayName": "Multi subnet failover",