Add PGSQL to AzurePGSQL swagger changes (#7583)

* Add PGSQL to AzurePGSQL swagger changes * Add trust and encrypt connections flags to the PG scenario * Renamed postgree to postgres and configured and changed text * Adding custom words * Resolving discriminator issues * Fixing typo * Renamed 'ResultType' to 'resultType' * Made result task not read only * prettier run
Azure · Feb 7, 2020 · f1e9e42 · f1e9e42
1 parent e076a1d
commit f1e9e42
Show file tree

Hide file tree

Showing 14 changed files with 128 additions and 21 deletions.
diff --git a/custom-words.txt b/custom-words.txt
@@ -1063,6 +1063,7 @@ poolusagemetrics
 portalsettings
 postbackup
 Postgre
+Postgres
 postgresql
 postrestore
 powerbi
@@ -1364,7 +1365,9 @@ sparql
 SPDX
 SQLAG
 SQLDB
+SQLDW
 SQLMI
+SQLRDS
 sqlvirtualmachine
 sqlvm
 Sqoop

diff --git a/...source-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/Common.json b/...source-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/Common.json
@@ -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": [

diff --git a/...ft.DataMigration/preview/2018-07-15-preview/definitions/ConnectToSourceSqlServerTask.json b/...ft.DataMigration/preview/2018-07-15-preview/definitions/ConnectToSourceSqlServerTask.json
@@ -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": {

diff --git a/...Migration/preview/2018-07-15-preview/definitions/MigrateMySqlAzureDbForMySqlSyncTask.json b/...Migration/preview/2018-07-15-preview/definitions/MigrateMySqlAzureDbForMySqlSyncTask.json
@@ -54,10 +54,12 @@
         },
         "resultType": {
           "description": "Result type",
-          "type": "string",
-          "readOnly": true
+          "type": "string"
         }
       },
+      "required": [
+        "resultType"
+      ],
       "discriminator": "resultType"
     },
     "MigrateMySqlAzureDbForMySqlSyncTaskOutputMigrationLevel": {

diff --git a/...preview/2018-07-15-preview/definitions/MigratePostgreSqlAzureDbForPostgreSqlSyncTask.json b/...preview/2018-07-15-preview/definitions/MigratePostgreSqlAzureDbForPostgreSqlSyncTask.json
@@ -54,10 +54,12 @@
         },
         "resultType": {
           "description": "Result type",
-          "type": "string",
-          "readOnly": true
+          "type": "string"
         }
       },
+      "required": [
+        "resultType"
+      ],
       "discriminator": "resultType"
     },
     "MigratePostgreSqlAzureDbForPostgreSqlSyncTaskOutputMigrationLevel": {
@@ -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": [

diff --git a/...t.DataMigration/preview/2018-07-15-preview/definitions/MigrateSqlServerSqlDbSyncTask.json b/...t.DataMigration/preview/2018-07-15-preview/definitions/MigrateSqlServerSqlDbSyncTask.json
@@ -53,10 +53,12 @@
         },
         "resultType": {
           "description": "Result type",
-          "type": "string",
-          "readOnly": true
+          "type": "string"
         }
       },
+      "required": [
+        "resultType"
+      ],
       "discriminator": "resultType"
     },
     "MigrateSqlServerSqlDbSyncTaskOutputMigrationLevel": {

diff --git a/...osoft.DataMigration/preview/2018-07-15-preview/definitions/MigrateSqlServerSqlDbTask.json b/...osoft.DataMigration/preview/2018-07-15-preview/definitions/MigrateSqlServerSqlDbTask.json
@@ -53,10 +53,12 @@
         },
         "resultType": {
           "description": "Result type",
-          "type": "string",
-          "readOnly": true
+          "type": "string"
         }
       },
+      "required": [
+        "resultType"
+      ],
       "discriminator": "resultType"
     },
     "MigrateSqlServerSqlDbTaskOutputMigrationLevel": {

diff --git a/...osoft.DataMigration/preview/2018-07-15-preview/definitions/MigrateSqlServerSqlMITask.json b/...osoft.DataMigration/preview/2018-07-15-preview/definitions/MigrateSqlServerSqlMITask.json
@@ -80,10 +80,12 @@
         },
         "resultType": {
           "description": "Result type",
-          "type": "string",
-          "readOnly": true
+          "type": "string"
         }
       },
+      "required": [
+        "resultType"
+      ],
       "discriminator": "resultType"
     },
     "MigrateSqlServerSqlMITaskOutputMigrationLevel": {

diff --git a/...t.DataMigration/preview/2018-07-15-preview/definitions/MigrateSqlServerSqlMiSyncTask.json b/...t.DataMigration/preview/2018-07-15-preview/definitions/MigrateSqlServerSqlMiSyncTask.json
@@ -37,10 +37,12 @@
         },
         "resultType": {
           "description": "Result type",
-          "type": "string",
-          "readOnly": true
+          "type": "string"
         }
       },
+      "required": [
+        "resultType"
+      ],
       "discriminator": "resultType"
     },
     "MigrateSqlServerSqlMISyncTaskOutputMigrationLevel": {

diff --git a/...nager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/MigrateSsisTask.json b/...nager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/MigrateSsisTask.json
@@ -46,10 +46,12 @@
         },
         "resultType": {
           "description": "Result type",
-          "type": "string",
-          "readOnly": true
+          "type": "string"
         }
       },
+      "required": [
+        "resultType"
+      ],
       "discriminator": "resultType"
     },
     "MigrateSsisTaskOutputMigrationLevel": {

diff --git a/...-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/MongoDbTasks.json b/...-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/MongoDbTasks.json
@@ -442,7 +442,7 @@
         "totalBytes",
         "totalDocuments"
       ],
-      "discriminator": "ResultType"
+      "discriminator": "resultType"
     },
     "MongoDbMigrationProgress": {
       "x-ms-discriminator-value": "Migration",

diff --git a/...DataMigration/preview/2018-07-15-preview/definitions/OracleAzureDbPostgreSqlSyncTask.json b/...DataMigration/preview/2018-07-15-preview/definitions/OracleAzureDbPostgreSqlSyncTask.json
@@ -272,10 +272,12 @@
         },
         "resultType": {
           "description": "Result type",
-          "type": "string",
-          "readOnly": true
+          "type": "string"
         }
       },
+      "required": [
+        "resultType"
+      ],
       "discriminator": "resultType"
     },
     "MigrateOracleAzureDbPostgreSqlSyncTaskOutputMigrationLevel": {

diff --git a/...esource-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/Tasks.json b/...esource-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/Tasks.json
@@ -635,7 +635,7 @@
       ]
     },
     "MigratePostgreSqlAzureDbForPostgreSqlSyncTaskProperties": {
-      "x-ms-discriminator-value": "Migrate.PostgreSql.AzureDbForPostgreSql.Sync",
+      "x-ms-discriminator-value": "Migrate.PostgreSql.AzureDbForPostgreSql.SyncV2",
       "type": "object",
       "description": "Properties for the task that migrates PostgreSQL databases to Azure Database for PostgreSQL for online migrations",
       "properties": {

diff --git a/...e-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/TasksCommon.json b/...e-manager/Microsoft.DataMigration/preview/2018-07-15-preview/definitions/TasksCommon.json
@@ -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",
@@ -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",