Skip to content
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

Jump to bottom

Add PGSQL to AzurePGSQL swagger changes #7583

Merged
merged 10 commits into from
Feb 7, 2020
Merged

Add PGSQL to AzurePGSQL swagger changes #7583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5fb9c77
Add PGSQL to AzurePGSQL swagger changes
ash1625 Oct 22, 2019
c6947b6
Add trust and encrypt connections flags to the PG scenario
Jan 27, 2020
f3870b6
Renamed postgree to postgres and configured and changed text
Jan 31, 2020
1bf6d6e
Adding custom words
Jan 31, 2020
e81b49e
Resolving discriminator issues
Jan 31, 2020
1047dae
Fixing typo
Jan 31, 2020
961b270
Renamed 'ResultType' to 'resultType'
Jan 31, 2020
b573819
Made result task not read only
Jan 31, 2020
8439937
Merge remote-tracking branch 'upstream/master'
Feb 5, 2020
6ef8f3f
prettier run
Feb 5, 2020
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
3 changes: 3 additions & 0 deletions custom-words.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1063,6 +1063,7 @@ poolusagemetrics
portalsettings
postbackup
Postgre
Postgres
postgresql
postrestore
powerbi
Expand Down Expand Up @@ -1364,7 +1365,9 @@ sparql
SPDX
SQLAG
SQLDB
SQLDW
SQLMI
SQLRDS
sqlvirtualmachine
sqlvm
Sqoop
Expand Down
10 changes: 10 additions & 0 deletions ...source-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/Common.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,6 +393,16 @@
"port": {
"type": "integer",
"description": "Port for Server"
},
"encryptConnection": {
"type": "boolean",
"description": "Whether to encrypt the connection",
"default": true
},
"trustServerCertificate": {
"type": "boolean",
"description": "Whether to trust the server certificate",
"default": false
}
},
"allOf": [
Expand Down
6 changes: 4 additions & 2 deletions ...ft.DataMigration/preview/2018-07-15-preview/definitions/ConnectToSourceSqlServerTask.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,12 @@
},
"resultType": {
"description": "Type of result - database level or task level",
"type": "string",
"readOnly": true
"type": "string"
}
},
"required": [
"resultType"
],
"discriminator": "resultType"
},
"ConnectToSourceSqlServerTaskOutputTaskLevel": {
Expand Down
6 changes: 4 additions & 2 deletions ...Migration/preview/2018-07-15-preview/definitions/MigrateMySqlAzureDbForMySqlSyncTask.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,12 @@
},
"resultType": {
"description": "Result type",
"type": "string",
"readOnly": true
"type": "string"
}
},
"required": [
"resultType"
],
"discriminator": "resultType"
},
"MigrateMySqlAzureDbForMySqlSyncTaskOutputMigrationLevel": {
Expand Down
21 changes: 19 additions & 2 deletions ...preview/2018-07-15-preview/definitions/MigratePostgreSqlAzureDbForPostgreSqlSyncTask.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,10 +54,12 @@
},
"resultType": {
"description": "Result type",
"type": "string",
"readOnly": true
"type": "string"
}
},
"required": [
"resultType"
],
"discriminator": "resultType"
},
"MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputMigrationLevel": {
Expand Down Expand Up @@ -95,6 +97,21 @@
"type": "string",
"description": "Target server name",
"readOnly": true
},
"sourceServerType": {
"$ref": "./TasksCommon.json#/definitions/ScenarioSource",
"description": "Source server type.",
"readOnly": true
},
"targetServerType": {
"$ref": "./TasksCommon.json#/definitions/ScenarioTarget",
"description": "Target server type.",
"readOnly": true
},
"state": {
"$ref": "./TasksCommon.json#/definitions/ReplicateMigrationState",
"description": "Migration status",
"readOnly": true
}
},
"allOf": [
Expand Down
6 changes: 4 additions & 2 deletions ...t.DataMigration/preview/2018-07-15-preview/definitions/MigrateSqlServerSqlDbSyncTask.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,12 @@
},
"resultType": {
"description": "Result type",
"type": "string",
"readOnly": true
"type": "string"
}
},
"required": [
"resultType"
],
"discriminator": "resultType"
},
"MigrateSqlServerSqlDbSyncTaskOutputMigrationLevel": {
Expand Down
6 changes: 4 additions & 2 deletions ...osoft.DataMigration/preview/2018-07-15-preview/definitions/MigrateSqlServerSqlDbTask.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,12 @@
},
"resultType": {
"description": "Result type",
"type": "string",
"readOnly": true
"type": "string"
}
},
"required": [
"resultType"
],
"discriminator": "resultType"
},
"MigrateSqlServerSqlDbTaskOutputMigrationLevel": {
Expand Down
6 changes: 4 additions & 2 deletions ...osoft.DataMigration/preview/2018-07-15-preview/definitions/MigrateSqlServerSqlMITask.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,12 @@
},
"resultType": {
"description": "Result type",
"type": "string",
"readOnly": true
"type": "string"
}
},
"required": [
"resultType"
],
"discriminator": "resultType"
},
"MigrateSqlServerSqlMITaskOutputMigrationLevel": {
Expand Down
6 changes: 4 additions & 2 deletions ...t.DataMigration/preview/2018-07-15-preview/definitions/MigrateSqlServerSqlMiSyncTask.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,12 @@
},
"resultType": {
"description": "Result type",
"type": "string",
"readOnly": true
"type": "string"
}
},
"required": [
"resultType"
],
"discriminator": "resultType"
},
"MigrateSqlServerSqlMISyncTaskOutputMigrationLevel": {
Expand Down
6 changes: 4 additions & 2 deletions ...nager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/MigrateSsisTask.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,12 @@
},
"resultType": {
"description": "Result type",
"type": "string",
"readOnly": true
"type": "string"
}
},
"required": [
"resultType"
],
"discriminator": "resultType"
},
"MigrateSsisTaskOutputMigrationLevel": {
Expand Down
2 changes: 1 addition & 1 deletion ...-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/MongoDbTasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@
"totalBytes",
"totalDocuments"
],
"discriminator": "ResultType"
"discriminator": "resultType"
},
"MongoDbMigrationProgress": {
"x-ms-discriminator-value": "Migration",
Expand Down
6 changes: 4 additions & 2 deletions ...DataMigration/preview/2018-07-15-preview/definitions/OracleAzureDbPostgreSqlSyncTask.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,10 +272,12 @@
},
"resultType": {
"description": "Result type",
"type": "string",
"readOnly": true
"type": "string"
}
},
"required": [
"resultType"
],
"discriminator": "resultType"
},
"MigrateOracleAzureDbPostgreSqlSyncTaskOutputMigrationLevel": {
Expand Down
2 changes: 1 addition & 1 deletion ...esource-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/Tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,7 +635,7 @@
]
},
"MigratePostgreSqlAzureDbForPostgreSqlSyncTaskProperties": {
"x-ms-discriminator-value": "Migrate.PostgreSql.AzureDbForPostgreSql.Sync",
"x-ms-discriminator-value": "Migrate.PostgreSql.AzureDbForPostgreSql.SyncV2",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will this child type change cause breaking change?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are making the back-end backward compatible. Same inputs and outputs will continue to work with the 'v2' type task.

"type": "object",
"description": "Properties for the task that migrates PostgreSQL databases to Azure Database for PostgreSQL for online migrations",
"properties": {
Expand Down
63 changes: 62 additions & 1 deletion ...e-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/TasksCommon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,60 @@
"modelAsString": true
}
},
"ScenarioSource": {
"type": "string",
"description": "An enumeration of source type",
"enum": [
"Access",
"DB2",
"MySQL",
"Oracle",
"SQL",
"Sybase",
"PostgreSQL",
"MongoDB",
"SQLRDS",
"MySQLRDS",
"PostgreSQLRDS"
],
"x-ms-enum": {
"name": "ScenarioSource",
"modelAsString": true
}
},
"ScenarioTarget": {
"type": "string",
"description": "An enumeration of target type",
"enum": [
"SQLServer",
"SQLDB",
"SQLDW",
"SQLMI",
"AzureDBForMySql",
"AzureDBForPostgresSQL",
"MongoDB"
],
"x-ms-enum": {
"name": "ScenarioTarget",
"modelAsString": true
}
},
"ReplicateMigrationState": {
"type": "string",
"description": "Wrapper for replicate reported migration states.",
"enum": [
"UNDEFINED",
"VALIDATING",
"PENDING",
"COMPLETE",
"ACTION_REQUIRED",
"FAILED"
],
"x-ms-enum": {
"name": "ReplicateMigrationState",
"modelAsString": true
}
},
"DatabaseObjectName": {
"type": "object",
"description": "A representation of the name of an object in a database",
Expand Down Expand Up @@ -1040,7 +1094,14 @@
"COMPLETE",
"CANCELLING",
"CANCELLED",
"FAILED"
"FAILED",
"VALIDATING",
"VALIDATION_COMPLETE",
"VALIDATION_FAILED",
"RESTORE_IN_PROGRESS",
"RESTORE_COMPLETED",
"BACKUP_IN_PROGRESS",
"BACKUP_COMPLETED"
],
"x-ms-enum": {
"name": "SyncDatabaseMigrationReportingState",
Expand Down