Follow-on to 3075: do not inject global site alias options

src/Commands/core/RsyncCommands.php

@@ -140,8 +140,17 @@ protected function injectAliasPathParameterOptions($input, $parameterName)
         $evaluatedPath = HostPath::create($manager, $aliasName);
         $this->pathEvaluator->evaluate($evaluatedPath);
 
+        $aliasRecord = $evaluatedPath->getAliasRecord();
+
         // Inject the source and target alias records into the alias config context.
-        $evaluatedPath->getAliasRecord()->injectIntoConfig($aliasConfigContext, $parameterName);
+        $aliasRecord->injectIntoConfig($aliasConfigContext, $parameterName);
+
+        // If the path is remote, then we will also inject the global
+        // options into the alias config context so that we pick up
+        // things like ssh-options.
+        if ($aliasRecord->isRemote()) {
+            $aliasConfigContext->combine($aliasRecord->export());
+        }
 
         return $evaluatedPath;
     }

src/SiteAlias/AliasRecord.php

@@ -267,14 +267,11 @@ protected function remap($data)
     public function injectIntoConfig($config, $parameterName = '')
     {
         $aliasData = $this->export();
-        $aliasOptions = $aliasData;
-        unset($aliasOptions['alias-parameters']);
         $parameterSpecificData = $this->getParameterSpecificOptions($aliasData, $parameterName);
         if (!empty($parameterSpecificData)) {
-            $aliasOptions = ArrayUtil::mergeRecursiveDistinct($aliasOptions, $parameterSpecificData);
+            // Combine the data from the parameter-specific
+            $config->combine($parameterSpecificData);
         }
-        // Combine the data from the parameter-specific
-        $config->combine($aliasOptions);
         return $this;
     }
 
@@ -298,9 +295,14 @@ protected function getParameterSpecificOptions($aliasData, $parameterName)
     public function legacyRecord()
     {
         $result = $this->exportConfig()->get('options', []);
+
+        // Backend invoke needs a couple of critical items in specific locations.
         if ($this->has('paths.drush-script')) {
             $result['path-aliases']['%drush-script'] = $this->get('paths.drush-script');
         }
+        if ($this->has('ssh.options')) {
+            $result['ssh-options'] = $this->get('ssh.options');
+        }
         return $result;
     }
 

tests/resources/alias-fixtures/example.alias.yml

@@ -35,3 +35,7 @@ live:
   host: service-provider.com
   root: /path/on/service-provider
   uri: https://example.com
+  ssh:
+    options: '-o PasswordAuthentication=example'
+  paths:
+    drush-script: '/example/path/to/drush'

tests/rsyncTest.php

@@ -33,6 +33,11 @@ public function testSimulated() {
     $expected = "Calling system(rsync -e 'ssh ' -akz --include=\"dev-source\" --exclude=\"stage-target\" /path/to/dev/files /path/to/stage/files);";
     $this->assertOutputEquals($expected);
 
+    // Test simulated rsync on local machine with a remote target
+    $this->drush('rsync', ['@example.dev:files', '@example.live:files'], $options, NULL, NULL, self::EXIT_SUCCESS, '2>&1');
+    $expected = "Calling system(rsync -e 'ssh -o PasswordAuthentication=example' -akz --include=\"dev-source\" /path/to/dev/files [email protected]:/path/on/service-provider/files);";
+    $this->assertOutputEquals($expected);
+
     // Test simulated backend invoke.
     // Note that command-specific options are not processed for remote
     // targets. The aliases are not interpreted at all until they recach

tests/sqlSyncTest.php

@@ -52,7 +52,7 @@ public function testSimulatedSqlSync() {
     // injection will be done.
     $this->drush('sql:sync', ['@synctest.remote', '@synctest.local'], $options, 'user@server/path/to/drupal#sitename', NULL, self::EXIT_SUCCESS, '2>&1');
     $output = $this->getSimplifiedOutput();
-    $this->assertContains("Simulating backend invoke: ssh -o PasswordAuthentication=whatever user@server '/path/to/drush --alias-path=__DIR__/resources/alias-fixtures:__SANDBOX__/etc/drush --root=/path/to/drupal --uri=sitename --no-ansi sql:sync '\''@synctest.remote'\'' '\''@synctest.local'\''", $output);
+    $this->assertContains("Simulating backend invoke: ssh -o PasswordAuthentication=no user@server 'drush --alias-path=__DIR__/resources/alias-fixtures:__SANDBOX__/etc/drush --root=/path/to/drupal --uri=sitename --no-ansi sql:sync '\''@synctest.remote'\'' '\''@synctest.local'\''", $output);
   }
 
   /**