connection validator for postgres

src/Directory.Packages.props

@@ -48,7 +48,8 @@
     <PackageVersion Include="NServiceBus.Transport.Msmq.Sources" Version="3.0.1" />
     <PackageVersion Include="NServiceBus.Transport.SqlServer" Version="8.1.3" />
     <PackageVersion Include="NServiceBus.Transport.PostgreSql" Version="8.1.3" />
-    <PackageVersion Include="NuGet.Versioning" Version="6.11.0" />
+    <PackageVersion Include="Npgsql" Version="8.0.3" />
+    <PackageVersion Include="NuGet.Versioning" Version="6.11.0" />    
     <PackageVersion Include="NUnit" Version="4.2.2" />
     <PackageVersion Include="NUnit.Analyzers" Version="4.3.0" />
     <PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />

src/ServiceControl.Transports.PostgreSql/transport.manifest

@@ -5,9 +5,9 @@
       "DisplayName": "PostgreSQL",
       "AssemblyName": "ServiceControl.Transports.PostgreSql",
       "TypeName": "ServiceControl.Transports.PostgreSql.PostgreSqlTransportCustomization, ServiceControl.Transports.PostgreSql",
-      "SampleConnectionString": "Data Source=<SQLInstance>;Initial Catalog=nservicebus;Integrated Security=True;Queue Schema=myschema;Subscriptions Table=tablename@schema@catalog",
+      "SampleConnectionString": "Server=<ServerName>;Database==nservicebus;Port=5432;User Id=<Username>;Password=<Password>;Queue Schema=myschema;Subscriptions Table=tablename@schema@catalog",
       "AvailableInSCMU": true,
-      "Help": "Specify optional 'Queue Schema' to override the default schema. Specify optional 'Subscriptions Table' to override the default subscriptions table location. When integrated authentication is specified in the PostgreSql connection string the the current installing user is used to create the required SQL tables structure not the service account."     
+      "Help": "Specify optional 'Queue Schema' to override the default schema. Specify optional 'Subscriptions Table' to override the default subscriptions table location. When integrated authentication is specified in the PostgreSql connection string the the current installing user is used to create the required SQL tables structure not the service account."
     }
   ]
 }

src/ServiceControlInstaller.Engine/ServiceControlInstaller.Engine.csproj

@@ -17,6 +17,7 @@
   <ItemGroup>
     <PackageReference Include="DotNetZip" />
     <PackageReference Include="Microsoft.Data.SqlClient" />
+    <PackageReference Include="Npgsql" />
     <PackageReference Include="NuGet.Versioning" />
     <PackageReference Include="System.DirectoryServices.AccountManagement" />
     <PackageReference Include="System.Management" />

src/ServiceControlInstaller.Engine/Validation/ConnectionStringValidator.cs

@@ -5,7 +5,8 @@
     using System.Linq;
     using Accounts;
     using Microsoft.Data.SqlClient;
-    //TODO postgres
+    using Npgsql;
+
     class ConnectionStringValidator
     {
         ConnectionStringValidator(string connectionString, string serviceAccount)
@@ -21,6 +22,10 @@ public static void Validate(IServiceControlAuditInstance instance)
             {
                 validator.CheckMsSqlConnectionString();
             }
+            else if (instance.TransportPackage.Name == "PostgreSQL")
+            {
+                validator.CheckPostgreSqlConnectString();
+            }
         }
 
         public static void Validate(IServiceControlInstance instance)
@@ -30,6 +35,10 @@ public static void Validate(IServiceControlInstance instance)
             {
                 validator.CheckMsSqlConnectionString();
             }
+            else if (instance.TransportPackage.Name == "PostgreSQL")
+            {
+                validator.CheckPostgreSqlConnectString();
+            }
         }
 
         public static void Validate(IMonitoringInstance instance)
@@ -39,6 +48,10 @@ public static void Validate(IMonitoringInstance instance)
             {
                 validator.CheckMsSqlConnectionString();
             }
+            else if (instance.TransportPackage.Name == "PostgreSQL")
+            {
+                validator.CheckPostgreSqlConnectString();
+            }
         }
 
         void CheckMsSqlConnectionString()
@@ -96,6 +109,42 @@ void CheckMsSqlConnectionString()
             }
         }
 
+        //TODO postgres - do we actually look at the 'Subscriptions Table' custom key anywhere? 
+        void CheckPostgreSqlConnectString()
+        {
+            string[] customKeys = { "Queue Schema", "Subscriptions Table" };
+
+            try
+            {
+                //Check  validity of connection string. This will throw if invalid
+                var builder = new DbConnectionStringBuilder { ConnectionString = connectionString };
+
+                //The NSB PostgreSQL Transport can have custom key/value pairs in the connection string
+                // that won't make sense to PostgreSQL. Remove these from the string we want to validate.
+                foreach (var customKey in customKeys)
+                {
+                    if (builder.ContainsKey(customKey))
+                    {
+                        builder.Remove(customKey);
+                    }
+                }
+
+                //Attempt to connect to DB
+                using (var s = new NpgsqlConnection(builder.ConnectionString))
+                {
+                    s.Open();
+                }
+            }
+            catch (ArgumentException argumentException)
+            {
+                throw new EngineValidationException($"Connection String is invalid - {argumentException.Message}");
+            }
+            catch (SqlException sqlEx)
+            {
+                throw new EngineValidationException($"PostgreSQL connection failed - {sqlEx.Message}");
+            }
+        }
+
         string connectionString;
         string serviceAccount;
     }