Allow terminus to work in an IPv6-only environment with DNS64/NAT64

Author: No0ne

docs/examples/PantheonAliases.php

@@ -78,7 +78,7 @@ private function constructAlias($environment)
     'db-allows-remote' => true,
     'remote-host'      => $remote_host,
     'remote-user'      => $remote_user,
-    'ssh-options'      => '-p 2222 -o \"AddressFamily inet\"',
+    'ssh-options'      => '-p 2222',
     'path-aliases'     => array(
       '%files'        => 'code/sites/default/files',
       '%drush-script' => 'drush',

src/Commands/Remote/SSHBaseCommand.php

@@ -373,7 +373,7 @@ private function getConnectionString()
         $command = $this->getConfig()->get('ssh_command');
 
         return vsprintf(
-            '%s -T %s@%s -p %s -o "StrictHostKeyChecking=no" -o "AddressFamily inet"',
+            '%s -T %s@%s -p %s -o "StrictHostKeyChecking=no"',
             [$command, $sftp['username'], $this->lookupHostViaAlternateNameserver($sftp['host']), $sftp['port']]
         );
     }

templates/aliases/fragment.aliases.drushrc.php.twig

@@ -2,7 +2,7 @@
     'uri' => '{{env_label}}-{{site_name}}.pantheonsite.io',
     'remote-host' => 'appserver.{{env_label}}.{{site_id}}.drush.in',
     'remote-user' => '{{env_label}}.{{site_id}}',
-    'ssh-options' => '-p 2222 -o "AddressFamily inet"',
+    'ssh-options' => '-p 2222',
     'path-aliases' => array(
       '%files' => 'files',
      ),

templates/aliases/fragment.site.yml.twig

@@ -5,6 +5,6 @@
   uri: {{env_label}}-{{site_name}}.pantheonsite.io
   user: {{env_label}}.{{site_id}}
   ssh:
-    options: '-p 2222 -o "AddressFamily inet"'
+    options: '-p 2222'
     tty: false
 

tests/Functional/AliasesCommandTest.php

@@ -62,8 +62,8 @@ public function testGetAliases()
             sprintf('"remote-user" value should match "${env-name}.%s"', $this->getSiteId())
         );
         $this->assertTrue(
-            false !== strpos($alias_printed, '-p 2222 -o "AddressFamily inet"'),
-            '"ssh-options" value should match "-p 2222 -o "AddressFamily inet"'
+            false !== strpos($alias_printed, '-p 2222'),
+            '"ssh-options" value should match "-p 2222'
         );
         $this->assertTrue(
             false !== strpos($alias_printed, '\'path-aliases\'')
@@ -107,7 +107,7 @@ public function testGetAliases()
   uri: {$site_alias['uri']}
   user: {$site_alias['remote-user']}
   ssh:
-    options: '-p 2222 -o "AddressFamily inet"'
+    options: '-p 2222'
     tty: false
 EOF;
         $this->assertEquals($expected_drush_9_site_alias, $drush_9_site_alias_in_file);

tests/features/aliases.feature

@@ -31,7 +31,7 @@ Feature: Gathering sites' aliases
        'uri' => '${env-name}-a-far-off-site-with-no-org.pantheonsite.io',
        'remote-host' => 'appserver.${env-name}.8a5311d2-162a-4a88-8561-ebf8706568cb.drush.in',
        'remote-user' => '${env-name}.8a5311d2-162a-4a88-8561-ebf8706568cb',
-       'ssh-options' => '-p 2222 -o "AddressFamily inet"',
+       'ssh-options' => '-p 2222',
        'path-aliases' => array(
          '%files' => 'files',
         ),

tests/fixtures/aliases/drushrcEmitter/standardAliasFixtureWithoutDbUrl.out

@@ -15,7 +15,7 @@
     'uri' => '${env-name}-personalsite.pantheonsite.io',
     'remote-host' => 'appserver.${env-name}.33333333-3333-3333-3333-333333333333.drush.in',
     'remote-user' => '${env-name}.33333333-3333-3333-3333-333333333333',
-    'ssh-options' => '-p 2222 -o "AddressFamily inet"',
+    'ssh-options' => '-p 2222',
     'path-aliases' => array(
       '%files' => 'files',
      ),
@@ -25,7 +25,7 @@
     'uri' => '${env-name}-demo.pantheonsite.io',
     'remote-host' => 'appserver.${env-name}.44444444-4444-4444-4444-444444444444.drush.in',
     'remote-user' => '${env-name}.44444444-4444-4444-4444-444444444444',
-    'ssh-options' => '-p 2222 -o "AddressFamily inet"',
+    'ssh-options' => '-p 2222',
     'path-aliases' => array(
       '%files' => 'files',
      ),
@@ -35,7 +35,7 @@
     'uri' => '${env-name}-agency.pantheonsite.io',
     'remote-host' => 'appserver.${env-name}.55555555-5555-5555-5555-555555555555.drush.in',
     'remote-user' => '${env-name}.55555555-5555-5555-5555-555555555555',
-    'ssh-options' => '-p 2222 -o "AddressFamily inet"',
+    'ssh-options' => '-p 2222',
     'path-aliases' => array(
       '%files' => 'files',
      ),

tests/fixtures/aliases/sitesYmlEmitter/standardWithoutDbUrl/sites/pantheon/agency.site.yml

@@ -5,5 +5,5 @@
   uri: ${env-name}-agency.pantheonsite.io
   user: ${env-name}.55555555-5555-5555-5555-555555555555
   ssh:
-    options: '-p 2222 -o "AddressFamily inet"'
+    options: '-p 2222'
     tty: false

tests/fixtures/aliases/sitesYmlEmitter/standardWithoutDbUrl/sites/pantheon/demo.site.yml

@@ -5,5 +5,5 @@
   uri: ${env-name}-demo.pantheonsite.io
   user: ${env-name}.44444444-4444-4444-4444-444444444444
   ssh:
-    options: '-p 2222 -o "AddressFamily inet"'
+    options: '-p 2222'
     tty: false

tests/fixtures/aliases/sitesYmlEmitter/standardWithoutDbUrl/sites/pantheon/personalsite.site.yml

@@ -5,5 +5,5 @@
   uri: ${env-name}-personalsite.pantheonsite.io
   user: ${env-name}.33333333-3333-3333-3333-333333333333
   ssh:
-    options: '-p 2222 -o "AddressFamily inet"'
+    options: '-p 2222'
     tty: false