Skip to content

fixing s360 errors and adding secure strings #18593

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 9 commits into from
Apr 7, 2022
Merged

fixing s360 errors and adding secure strings #18593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9e300bd
fixing s360 errors and adding secure strings
Apr 7, 2022
ac897f7
nit error
Apr 7, 2022
677d27c
pretty check
Apr 7, 2022
9eef376
fileshare password as secure string
Apr 7, 2022
f5f0353
Revert "pretty check"
Apr 7, 2022
345b38a
nit error
Apr 7, 2022
e3eba66
Revert "nit error"
Apr 7, 2022
6062673
removing extra space
Apr 7, 2022
54f6d63
moving targetDatabaseCollation and provisioningError
Apr 7, 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
35 changes: 29 additions & 6 deletions ...source-manager/Microsoft.DataMigration/preview/2022-03-30-preview/definitions/Common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -280,6 +284,10 @@
"additionalSettings": {
"type": "string",
"description": "Additional connection settings"
},
"authentication": {
"$ref": "#/definitions/AuthenticationType",
"description": "Authentication type to use for connection"
}
},
"required": [
Expand Down Expand Up @@ -383,6 +391,10 @@
"authentication": {
"$ref": "#/definitions/AuthenticationType",
"description": "Authentication type to use for connection"
},
"additionalSettings": {
"type": "string",
"description": "Additional connection settings"
}
},
"allOf": [
Expand All @@ -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": [
Expand Down Expand Up @@ -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",
Expand Down
34 changes: 10 additions & 24 deletions ...ion/resource-manager/Microsoft.DataMigration/preview/2022-03-30-preview/sqlmigration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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."
Expand All @@ -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."
Expand Down Expand Up @@ -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"
}
}
},
Expand Down Expand Up @@ -1643,6 +1627,7 @@
"password": {
"description": "Password to connect to source SQL.",
"type": "string",
"format": "password",
"x-ms-secret": true
},
"encryptConnection": {
Expand Down Expand Up @@ -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",
Expand Down