mirror of
https://github.com/andres-montanez/Magallanes
synced 2024-05-21 07:06:38 +02:00
[BUGFIX] [Issue#405] Malformed ssh command when defining host:port notation
This commit is contained in:
parent
bab5e164a5
commit
4232059d7e
|
@ -3,6 +3,7 @@ CHANGELOG for 3.X
|
||||||
|
|
||||||
* 3.4.0 (2018-03-29)
|
* 3.4.0 (2018-03-29)
|
||||||
* [Issue#380] Throw exception if log_dir is defined but directory doesn't exists
|
* [Issue#380] Throw exception if log_dir is defined but directory doesn't exists
|
||||||
|
* [Issue#405] Malformed ssh command when defining host:port notation
|
||||||
|
|
||||||
|
|
||||||
* 3.3.0 (2017-07-22)
|
* 3.3.0 (2017-07-22)
|
||||||
|
|
|
@ -175,8 +175,8 @@ class DeployCommand extends AbstractCommand
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($this->runtime->getWorkingHost() !== null) {
|
if ($this->runtime->getHostName() !== null) {
|
||||||
$output->writeln(sprintf(' Starting <fg=black;options=bold>%s</> tasks on host <fg=black;options=bold>%s</>:', $this->getStageName(), $this->runtime->getWorkingHost()));
|
$output->writeln(sprintf(' Starting <fg=black;options=bold>%s</> tasks on host <fg=black;options=bold>%s</>:', $this->getStageName(), $this->runtime->getHostName()));
|
||||||
} else {
|
} else {
|
||||||
$output->writeln(sprintf(' Starting <fg=black;options=bold>%s</> tasks:', $this->getStageName()));
|
$output->writeln(sprintf(' Starting <fg=black;options=bold>%s</> tasks:', $this->getStageName()));
|
||||||
}
|
}
|
||||||
|
|
|
@ -429,7 +429,7 @@ class Runtime
|
||||||
{
|
{
|
||||||
$user = $this->getEnvOption('user', $this->getCurrentUser());
|
$user = $this->getEnvOption('user', $this->getCurrentUser());
|
||||||
$sudo = $this->getEnvOption('sudo', false);
|
$sudo = $this->getEnvOption('sudo', false);
|
||||||
$host = $this->getWorkingHost();
|
$host = $this->getHostName();
|
||||||
$sshConfig = $this->getSSHConfig();
|
$sshConfig = $this->getSSHConfig();
|
||||||
|
|
||||||
$cmdDelegate = $cmd;
|
$cmdDelegate = $cmd;
|
||||||
|
@ -485,6 +485,17 @@ class Runtime
|
||||||
return isset($info[1]) ? $info[1] : null;
|
return isset($info[1]) ? $info[1] : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the current Host Name
|
||||||
|
*
|
||||||
|
* @return string
|
||||||
|
*/
|
||||||
|
public function getHostName()
|
||||||
|
{
|
||||||
|
$info = explode(':', $this->getWorkingHost());
|
||||||
|
return $info[0];
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Gets a Temporal File name
|
* Gets a Temporal File name
|
||||||
*
|
*
|
||||||
|
|
|
@ -36,7 +36,7 @@ class RsyncTask extends AbstractTask
|
||||||
$flags = $this->runtime->getEnvOption('rsync', '-avz');
|
$flags = $this->runtime->getEnvOption('rsync', '-avz');
|
||||||
$sshConfig = $this->runtime->getSSHConfig();
|
$sshConfig = $this->runtime->getSSHConfig();
|
||||||
$user = $this->runtime->getEnvOption('user', $this->runtime->getCurrentUser());
|
$user = $this->runtime->getEnvOption('user', $this->runtime->getCurrentUser());
|
||||||
$host = $this->runtime->getWorkingHost();
|
$host = $this->runtime->getHostName();
|
||||||
$hostPath = rtrim($this->runtime->getEnvOption('host_path'), '/');
|
$hostPath = rtrim($this->runtime->getEnvOption('host_path'), '/');
|
||||||
$targetDir = rtrim($hostPath, '/');
|
$targetDir = rtrim($hostPath, '/');
|
||||||
|
|
||||||
|
|
|
@ -38,7 +38,7 @@ class CopyTask extends AbstractTask
|
||||||
}
|
}
|
||||||
|
|
||||||
$user = $this->runtime->getEnvOption('user', $this->runtime->getCurrentUser());
|
$user = $this->runtime->getEnvOption('user', $this->runtime->getCurrentUser());
|
||||||
$host = $this->runtime->getWorkingHost();
|
$host = $this->runtime->getHostName();
|
||||||
$sshConfig = $sshConfig = $this->runtime->getSSHConfig();
|
$sshConfig = $sshConfig = $this->runtime->getSSHConfig();
|
||||||
$hostPath = rtrim($this->runtime->getEnvOption('host_path'), '/');
|
$hostPath = rtrim($this->runtime->getEnvOption('host_path'), '/');
|
||||||
$currentReleaseId = $this->runtime->getReleaseId();
|
$currentReleaseId = $this->runtime->getReleaseId();
|
||||||
|
|
|
@ -61,8 +61,8 @@ abstract class AbstractFileTask extends AbstractTask
|
||||||
'%environment%' => $this->runtime->getEnvironment(),
|
'%environment%' => $this->runtime->getEnvironment(),
|
||||||
];
|
];
|
||||||
|
|
||||||
if ($this->runtime->getWorkingHost() !== null) {
|
if ($this->runtime->getHostName() !== null) {
|
||||||
$mapping['%host%'] = $this->runtime->getWorkingHost();
|
$mapping['%host%'] = $this->runtime->getHostName();
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($this->runtime->getReleaseId() !== null) {
|
if ($this->runtime->getReleaseId() !== null) {
|
||||||
|
|
|
@ -68,6 +68,56 @@ class DeployCommandWithReleasesTest extends TestCase
|
||||||
$this->assertEquals(0, $tester->getStatusCode());
|
$this->assertEquals(0, $tester->getStatusCode());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testDeploymentWithReleasesWithPortCommands()
|
||||||
|
{
|
||||||
|
$application = new MageApplicationMockup(__DIR__ . '/../../Resources/testhost-with-port.yml');
|
||||||
|
|
||||||
|
$application->getRuntime()->setReleaseId('20170101015120');
|
||||||
|
|
||||||
|
/** @var AbstractCommand $command */
|
||||||
|
$command = $application->find('deploy');
|
||||||
|
$this->assertTrue($command instanceof DeployCommand);
|
||||||
|
|
||||||
|
$tester = new CommandTester($command);
|
||||||
|
$tester->execute(['command' => $command->getName(), 'environment' => 'test']);
|
||||||
|
|
||||||
|
$ranCommands = $application->getRuntime()->getRanCommands();
|
||||||
|
|
||||||
|
$testCase = array(
|
||||||
|
0 => 'git branch | grep "*"',
|
||||||
|
1 => 'git checkout test',
|
||||||
|
2 => 'git pull',
|
||||||
|
3 => 'composer install --optimize-autoloader',
|
||||||
|
4 => 'composer dump-autoload --optimize',
|
||||||
|
5 => 'tar cfzp /tmp/mageXYZ --exclude=".git" --exclude="./var/cache/*" --exclude="./var/log/*" --exclude="./web/app_dev.php" ./',
|
||||||
|
6 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "mkdir -p /var/www/test/releases/1234567890"',
|
||||||
|
7 => 'scp -P 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no /tmp/mageXYZ tester@testhost:/var/www/test/releases/1234567890/mageXYZ',
|
||||||
|
8 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && tar xfzop mageXYZ"',
|
||||||
|
9 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "rm /var/www/test/releases/1234567890/mageXYZ"',
|
||||||
|
10 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console cache:warmup --env=dev"',
|
||||||
|
11 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console assets:install web --env=dev --symlink --relative"',
|
||||||
|
12 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test/releases/1234567890 && bin/console assetic:dump --env=dev"',
|
||||||
|
13 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && ln -snf releases/1234567890 current"',
|
||||||
|
14 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "ls -1 /var/www/test/releases"',
|
||||||
|
15 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "rm -rf /var/www/test/releases/20170101015110"',
|
||||||
|
16 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "rm -rf /var/www/test/releases/20170101015111"',
|
||||||
|
17 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "rm -rf /var/www/test/releases/20170101015112"',
|
||||||
|
18 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "rm -rf /var/www/test/releases/20170101015113"',
|
||||||
|
19 => 'rm /tmp/mageXYZ',
|
||||||
|
20 => 'git checkout master',
|
||||||
|
);
|
||||||
|
|
||||||
|
// Check total of Executed Commands
|
||||||
|
$this->assertEquals(count($testCase), count($ranCommands));
|
||||||
|
|
||||||
|
// Check Generated Commands
|
||||||
|
foreach ($testCase as $index => $command) {
|
||||||
|
$this->assertEquals($command, $ranCommands[$index]);
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->assertEquals(0, $tester->getStatusCode());
|
||||||
|
}
|
||||||
|
|
||||||
public function testDeploymentWithReleasesWithFromCommands()
|
public function testDeploymentWithReleasesWithFromCommands()
|
||||||
{
|
{
|
||||||
$application = new MageApplicationMockup(__DIR__ . '/../../Resources/testhost-with-from.yml');
|
$application = new MageApplicationMockup(__DIR__ . '/../../Resources/testhost-with-from.yml');
|
||||||
|
|
|
@ -55,6 +55,43 @@ class DeployCommandWithoutReleasesTest extends TestCase
|
||||||
$this->assertEquals(0, $tester->getStatusCode());
|
$this->assertEquals(0, $tester->getStatusCode());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function testDeploymentWithoutReleasesWithPortCommands()
|
||||||
|
{
|
||||||
|
$application = new MageApplicationMockup(__DIR__ . '/../../Resources/testhost-without-releases-with-port.yml');
|
||||||
|
|
||||||
|
/** @var AbstractCommand $command */
|
||||||
|
$command = $application->find('deploy');
|
||||||
|
$this->assertTrue($command instanceof DeployCommand);
|
||||||
|
|
||||||
|
$tester = new CommandTester($command);
|
||||||
|
$tester->execute(['command' => $command->getName(), 'environment' => 'test']);
|
||||||
|
|
||||||
|
$ranCommands = $application->getRuntime()->getRanCommands();
|
||||||
|
|
||||||
|
$testCase = array(
|
||||||
|
0 => 'git branch | grep "*"',
|
||||||
|
1 => 'git checkout test',
|
||||||
|
2 => 'git pull',
|
||||||
|
3 => 'composer install --optimize-autoloader',
|
||||||
|
4 => 'composer dump-autoload --optimize',
|
||||||
|
5 => 'rsync -e "ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" -avz --exclude=.git --exclude=./var/cache/* --exclude=./var/log/* --exclude=./web/app_dev.php ./ tester@testhost:/var/www/test',
|
||||||
|
6 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console cache:warmup --env=dev"',
|
||||||
|
7 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console assets:install web --env=dev --symlink --relative"',
|
||||||
|
8 => 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "cd /var/www/test && bin/console assetic:dump --env=dev"',
|
||||||
|
9 => 'git checkout master',
|
||||||
|
);
|
||||||
|
|
||||||
|
// Check total of Executed Commands
|
||||||
|
$this->assertEquals(count($testCase), count($ranCommands));
|
||||||
|
|
||||||
|
// Check Generated Commands
|
||||||
|
foreach ($testCase as $index => $command) {
|
||||||
|
$this->assertEquals($command, $ranCommands[$index]);
|
||||||
|
}
|
||||||
|
|
||||||
|
$this->assertEquals(0, $tester->getStatusCode());
|
||||||
|
}
|
||||||
|
|
||||||
public function testDeploymentWithoutReleasesWithFromCommands()
|
public function testDeploymentWithoutReleasesWithFromCommands()
|
||||||
{
|
{
|
||||||
$application = new MageApplicationMockup(__DIR__ . '/../../Resources/testhost-without-releases-with-from.yml');
|
$application = new MageApplicationMockup(__DIR__ . '/../../Resources/testhost-without-releases-with-from.yml');
|
||||||
|
|
27
tests/Resources/testhost-with-port.yml
Normal file
27
tests/Resources/testhost-with-port.yml
Normal file
|
@ -0,0 +1,27 @@
|
||||||
|
magephp:
|
||||||
|
log_dir: /tmp
|
||||||
|
environments:
|
||||||
|
test:
|
||||||
|
user: tester
|
||||||
|
branch: test
|
||||||
|
host_path: /var/www/test
|
||||||
|
releases: 4
|
||||||
|
exclude:
|
||||||
|
- ./var/cache/*
|
||||||
|
- ./var/log/*
|
||||||
|
- ./web/app_dev.php
|
||||||
|
-
|
||||||
|
-
|
||||||
|
hosts:
|
||||||
|
- testhost:202
|
||||||
|
pre-deploy:
|
||||||
|
- git/update
|
||||||
|
- composer/install
|
||||||
|
- composer/dump-autoload
|
||||||
|
on-deploy:
|
||||||
|
- symfony/cache-warmup: { env: 'dev' }
|
||||||
|
- symfony/assets-install: { env: 'dev' }
|
||||||
|
- symfony/assetic-dump: { env: 'dev' }
|
||||||
|
on-release:
|
||||||
|
post-release:
|
||||||
|
post-deploy:
|
24
tests/Resources/testhost-without-releases-with-port.yml
Normal file
24
tests/Resources/testhost-without-releases-with-port.yml
Normal file
|
@ -0,0 +1,24 @@
|
||||||
|
magephp:
|
||||||
|
log_dir: /tmp
|
||||||
|
environments:
|
||||||
|
test:
|
||||||
|
user: tester
|
||||||
|
branch: test
|
||||||
|
host_path: /var/www/test
|
||||||
|
exclude:
|
||||||
|
- ./var/cache/*
|
||||||
|
- ./var/log/*
|
||||||
|
- ./web/app_dev.php
|
||||||
|
hosts:
|
||||||
|
- testhost:202
|
||||||
|
pre-deploy:
|
||||||
|
- git/update
|
||||||
|
- composer/install
|
||||||
|
- composer/dump-autoload
|
||||||
|
on-deploy:
|
||||||
|
- symfony/cache-warmup: { env: 'dev' }
|
||||||
|
- symfony/assets-install: { env: 'dev' }
|
||||||
|
- symfony/assetic-dump: { env: 'dev' }
|
||||||
|
on-release:
|
||||||
|
post-release:
|
||||||
|
post-deploy:
|
|
@ -99,6 +99,14 @@ class ProcessMockup extends Process
|
||||||
return '/var/www/test/releases/20170101015117';
|
return '/var/www/test/releases/20170101015117';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($this->commandline == 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "ls -1 /var/www/test/releases"') {
|
||||||
|
return implode(PHP_EOL, ['20170101015110', '20170101015111', '20170101015112', '20170101015113', '20170101015114', '20170101015115', '20170101015116', '20170101015117']);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($this->commandline == 'ssh -p 202 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@testhost "readlink -f /var/www/test/current"') {
|
||||||
|
return '/var/www/test/releases/20170101015117';
|
||||||
|
}
|
||||||
|
|
||||||
if ($this->commandline == 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@host1 "ls -1 /var/www/test/releases"') {
|
if ($this->commandline == 'ssh -p 22 -q -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no tester@host1 "ls -1 /var/www/test/releases"') {
|
||||||
return implode(PHP_EOL, ['20170101015110', '20170101015111', '20170101015112', '20170101015113', '20170101015114', '20170101015115', '20170101015116', '20170101015117']);
|
return implode(PHP_EOL, ['20170101015110', '20170101015111', '20170101015112', '20170101015113', '20170101015114', '20170101015115', '20170101015116', '20170101015117']);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue