Connect-DbaInstance - modify ComputerName resolution (#5687)

* update connect command * update comments, prettify linux
dataplat · Jun 7, 2019 · 8ef23ff · 8ef23ff
1 parent 21dc055
commit 8ef23ff
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/functions/Connect-DbaInstance.ps1 b/functions/Connect-DbaInstance.ps1
@@ -812,8 +812,20 @@ function Connect-DbaInstance {
                 continue
             } else {
                 if (-not $server.ComputerName) {
+                    # Not every environment supports .NetName
+                    if ($server.DatabaseEngineType -ne "SqlAzureDatabase") {
+                        try {
+                            $computername = $server.NetName
+                        } catch {
+                            $computername = $instance.ComputerName
+                        }
+                    }
+                    # SQL on Linux is often on docker and the internal name is not useful
+                    if (-not $computername -or $server.HostPlatform -eq "Linux") {
+                        $computername = $instance.ComputerName
+                    }
                     Add-Member -InputObject $server -NotePropertyName IsAzure -NotePropertyValue $false -Force
-                    Add-Member -InputObject $server -NotePropertyName ComputerName -NotePropertyValue $instance.ComputerName -Force
+                    Add-Member -InputObject $server -NotePropertyName ComputerName -NotePropertyValue $computername -Force
                     Add-Member -InputObject $server -NotePropertyName DbaInstanceName -NotePropertyValue $instance.InstanceName -Force
                     Add-Member -InputObject $server -NotePropertyName NetPort -NotePropertyValue $instance.Port -Force
                 }