fixing s360 errors and adding secure strings (#18593)

* fixing s360 errors and adding secure strings

* nit error

* pretty check

* fileshare password as secure string

* Revert "pretty check"

This reverts commit 677d27c.

* nit error

* Revert "nit error"

This reverts commit 345b38a.

* removing extra space

* moving targetDatabaseCollation and provisioningError

Co-authored-by: Vasundhra Manhas <[email protected]>

Author: vasundhraManhas

specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2022-03-30-preview/definitions/Common.json

@@ -265,6 +265,10 @@
           "type": "string",
           "description": "server version"
         },
+        "serverName": {
+          "type": "string",
+          "description": "name of the server"
+        },
         "trustServerCertificate": {
           "type": "boolean",
           "description": "Whether to trust the server certificate",
@@ -280,6 +284,10 @@
         "additionalSettings": {
           "type": "string",
           "description": "Additional connection settings"
+        },
+        "authentication": {
+          "$ref": "#/definitions/AuthenticationType",
+          "description": "Authentication type to use for connection"
         }
       },
       "required": [
@@ -383,6 +391,10 @@
         "authentication": {
           "$ref": "#/definitions/AuthenticationType",
           "description": "Authentication type to use for connection"
+        },
+        "additionalSettings": {
+          "type": "string",
+          "description": "Additional connection settings"
         }
       },
       "allOf": [
@@ -403,6 +415,22 @@
         "dataSource": {
           "type": "string",
           "description": "EZConnect or TNSName connection string."
+        },
+        "serverName": {
+          "type": "string",
+          "description": "name of the server"
+        },
+        "serverVersion": {
+          "type": "string",
+          "description": "server version"
+        },
+        "port": {
+          "type": "integer",
+          "description": "port for server"
+        },
+        "authentication": {
+          "$ref": "#/definitions/AuthenticationType",
+          "description": "Authentication type to use for connection"
         }
       },
       "allOf": [
@@ -518,12 +546,7 @@
           "type": "boolean",
           "description": "Ignore checking azure permissions on the AAD app"
         }
-      },
-      "required": [
-        "applicationId",
-        "appKey",
-        "tenantId"
-      ]
+      }
     },
     "MiSqlConnectionInfo": {
       "x-ms-discriminator-value": "MiSqlConnectionInfo",

specification/datamigration/resource-manager/Microsoft.DataMigration/preview/2022-03-30-preview/sqlmigration.json

@@ -1307,6 +1307,14 @@
           "$ref": "#/definitions/ErrorInfo",
           "description": "Error details in case of migration failure.",
           "readOnly": true
+        },
+        "targetDatabaseCollation": {
+          "description": "Database collation to be used for the target database.",
+          "type": "string"
+        },
+        "provisioningError": {
+          "description": "Error message for migration provisioning failure, if any.",
+          "type": "string"
         }
       },
       "discriminator": "kind"
@@ -1326,14 +1334,6 @@
           "description": "Detailed migration status. Not included by default.",
           "readOnly": true
         },
-        "targetDatabaseCollation": {
-          "description": "Database collation to be used for the target database.",
-          "type": "string"
-        },
-        "provisioningError": {
-          "description": "Error message for migration provisioning failure, if any.",
-          "type": "string"
-        },
         "backupConfiguration": {
           "$ref": "#/definitions/BackupConfiguration",
           "description": "Backup configuration info."
@@ -1359,14 +1359,6 @@
           "description": "Detailed migration status. Not included by default.",
           "readOnly": true
         },
-        "targetDatabaseCollation": {
-          "description": "Database collation to be used for the target database.",
-          "type": "string"
-        },
-        "provisioningError": {
-          "description": "Error message for migration provisioning failure, if any.",
-          "type": "string"
-        },
         "backupConfiguration": {
           "$ref": "#/definitions/BackupConfiguration",
           "description": "Backup configuration info."
@@ -1407,14 +1399,6 @@
           "items": {
             "type": "string"
           }
-        },
-        "targetDatabaseCollation": {
-          "description": "Database collation to be used for the target database.",
-          "type": "string"
-        },
-        "provisioningError": {
-          "description": "Error message for migration provisioning failure, if any.",
-          "type": "string"
         }
       }
     },
@@ -1643,6 +1627,7 @@
         "password": {
           "description": "Password to connect to source SQL.",
           "type": "string",
+          "format": "password",
           "x-ms-secret": true
         },
         "encryptConnection": {
@@ -1870,6 +1855,7 @@
         "password": {
           "description": "Password for username to access file share location.",
           "type": "string",
+          "format": "password",
           "x-ms-secret": true,
           "x-ms-mutability": [
             "create",