Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added prompt for php version for cs:wizard command #1594

Merged
merged 13 commits into from
Oct 9, 2023
9 changes: 8 additions & 1 deletion src/Command/CodeStudio/CodeStudioCiCdVariables.php
shubham-bansal96 marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public static function getList(): array {
/**
* @return array<mixed>
*/
public static function getDefaults(?string $cloudApplicationUuid = NULL, ?string $cloudKey = NULL, ?string $cloudSecret = NULL, ?string $projectAccessTokenName = NULL, ?string $projectAccessToken = NULL): array {
public static function getDefaults(?string $cloudApplicationUuid = NULL, ?string $cloudKey = NULL, ?string $cloudSecret = NULL, ?string $projectAccessTokenName = NULL, ?string $projectAccessToken = NULL, ?string $phpVersion = NULL): array {
return [
[
'key' => 'ACQUIA_APPLICATION_UUID',
Expand Down Expand Up @@ -53,6 +53,13 @@ public static function getDefaults(?string $cloudApplicationUuid = NULL, ?string
'value' => $projectAccessToken,
'variable_type' => 'env_var',
],
[
'key' => 'PHP_VERSION',
'masked' => FALSE,
'protected' => FALSE,
'value' => $phpVersion,
'variable_type' => 'env_var',
],
];
}

Expand Down
15 changes: 12 additions & 3 deletions src/Command/CodeStudio/CodeStudioWizardCommand.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,15 @@ protected function execute(InputInterface $input, OutputInterface $output): int
// But, we specifically need an API Token key-pair of Code Studio.
// So we reauthenticate to be sure we're using the provided credentials.
$this->reAuthenticate($cloudKey, $cloudSecret, $this->cloudCredentials->getBaseUri(), $this->cloudCredentials->getAccountsUri());

$phpVersions = [
'PHP_version_8.1' => "8.1",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yuck. Did you pick these array keys because PHPCS was complaining or something?

'PHP_version_8.2' => "8.2",
];
$project = $this->io->choice('Select a PHP version', array_values($phpVersions), $phpVersions['PHP_version_8.1']);
$project = array_search($project, $phpVersions, TRUE);
$phpVersion = $phpVersions[$project];

$appUuid = $this->determineCloudApplication();

// Get Cloud account.
Expand Down Expand Up @@ -92,7 +101,7 @@ protected function execute(InputInterface $input, OutputInterface $output): int
$projectAccessTokenName = 'acquia-codestudio';
$projectAccessToken = $this->createProjectAccessToken($project, $projectAccessTokenName);
$this->updateGitLabProject($project);
$this->setGitLabCiCdVariables($project, $appUuid, $cloudKey, $cloudSecret, $projectAccessTokenName, $projectAccessToken);
$this->setGitLabCiCdVariables($project, $appUuid, $cloudKey, $cloudSecret, $projectAccessTokenName, $projectAccessToken, $phpVersion);
$this->createScheduledPipeline($project);

$this->io->success([
Expand Down Expand Up @@ -161,9 +170,9 @@ private function createProjectAccessToken(array $project, string $projectAccessT
return $projectAccessToken['token'];
}

private function setGitLabCiCdVariables(array $project, string $cloudApplicationUuid, string $cloudKey, string $cloudSecret, string $projectAccessTokenName, string $projectAccessToken): void {
private function setGitLabCiCdVariables(array $project, string $cloudApplicationUuid, string $cloudKey, string $cloudSecret, string $projectAccessTokenName, string $projectAccessToken, string $phpVersion): void {
$this->io->writeln("Setting GitLab CI/CD variables for {$project['path_with_namespace']}..");
$gitlabCicdVariables = CodeStudioCiCdVariables::getDefaults($cloudApplicationUuid, $cloudKey, $cloudSecret, $projectAccessTokenName, $projectAccessToken);
$gitlabCicdVariables = CodeStudioCiCdVariables::getDefaults($cloudApplicationUuid, $cloudKey, $cloudSecret, $projectAccessTokenName, $projectAccessToken, $phpVersion);
$gitlabCicdExistingVariables = $this->gitLabClient->projects()
->variables($project['id']);
$gitlabCicdExistingVariablesKeyed = [];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ public function providerTestCommand(): array {
// Args.
[
'--key' => $this->key,
'--phpVersion' => $this->phpVersion,
'--secret' => $this->secret,
],
],
Expand All @@ -83,6 +84,7 @@ public function providerTestCommand(): array {
// Args.
[
'--key' => $this->key,
'--phpVersion' => $this->phpVersion,
'--secret' => $this->secret,
],
],
Expand All @@ -101,6 +103,7 @@ public function providerTestCommand(): array {
// Args.
[
'--key' => $this->key,
'--phpVersion' => $this->phpVersion,
'--secret' => $this->secret,
],
],
Expand All @@ -119,6 +122,7 @@ public function providerTestCommand(): array {
// Args
[
'--key' => $this->key,
'--phpVersion' => $this->phpVersion,
'--secret' => $this->secret,
],
],
Expand All @@ -133,6 +137,7 @@ public function providerTestCommand(): array {
$this->key,
// Enter Cloud secret,
$this->secret,
'--phpVersion' => $this->phpVersion,
// Do you want to continue?
'y',
],
Expand Down Expand Up @@ -208,6 +213,7 @@ public function testInvalidGitLabCredentials(): void {
$this->expectExceptionMessage('Unable to authenticate with Code Studio');
$this->executeCommand([
'--key' => $this->key,
'--phpVersion' => $this->phpVersion,
'--secret' => $this->secret,
]);
}
Expand All @@ -222,6 +228,7 @@ public function testMissingGitLabCredentials(): void {
$this->expectExceptionMessage('Could not determine GitLab token');
$this->executeCommand([
'--key' => $this->key,
'--phpVersion' => $this->phpVersion,
'--secret' => $this->secret,
]);
}
Expand Down
2 changes: 2 additions & 0 deletions tests/phpunit/src/TestBase.php
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ abstract class TestBase extends TestCase {

protected string $secret = 'X1u\/PIQXtYaoeui.4RJSJpGZjwmWYmfl5AUQkAebYE=';

protected string $phpVersion = '8.1';

protected string $dataDir;

protected string $cloudConfigFilepath;
Expand Down
Loading