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.

Sign up for GitHub

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
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
860403d
added prompt for php version
shubham-bansal96 Sep 20, 2023
fbced37
changes int to string
shubham-bansal96 Sep 25, 2023
d320bc5
Merge branch 'main' into GL-1836
shubham-bansal96 Sep 25, 2023
3eaf999
changes PHP_VERSION from int to string
shubham-bansal96 Sep 25, 2023
139fec4
Merge branch 'main' into GL-1836
shubham-bansal96 Sep 25, 2023
33d243b
added UTC
shubham-bansal96 Sep 27, 2023
7a191b1
fixed UTC
shubham-bansal96 Sep 27, 2023
62441ef
fixed UTC
shubham-bansal96 Sep 27, 2023
17efb34
fixed UTC variable name
shubham-bansal96 Sep 27, 2023
c24e1c6
fixed broken tests
shubham-bansal96 Sep 28, 2023
f8b8534
added test to increase coverage
shubham-bansal96 Sep 28, 2023
46c8a50
removed unnecessary commented lines
shubham-bansal96 Sep 29, 2023
8f0be4a
Merge branch 'main' into GL-1836
shubham-bansal96 Oct 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/Command/CodeStudio/CodeStudioCiCdVariables.php
View file
Open in desktop
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
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion tests/phpunit/src/CommandTestBase.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,7 @@ protected function getMockGitLabVariables(): array {
'protected' => FALSE,
'value' => '111aae74-e81a-4052-b4b9-a27a62e6b6a6',
'variable_type' => 'env_var',
],
],
];
}

Expand Down
43 changes: 43 additions & 0 deletions tests/phpunit/src/Commands/CodeStudio/CodeStudioWizardCommandTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,28 @@ public function providerTestCommand(): array {
[
// 'Would you like to create a new Code Studio project?
'y',
// Select PHP version 8.1
'0',
// Do you want to continue?
'y',
// Would you like to perform a one time push of code from Acquia Cloud to Code Studio now? (yes/no) [yes]:
'y',
],
// Args.
[
'--key' => $this->key,
'--secret' => $this->secret,
],
],
[
// No projects.
[],
// Inputs.
[
// 'Would you like to create a new Code Studio project?
'y',
// Select PHP version 8.2
'1',
// Do you want to continue?
'y',
// Would you like to perform a one time push of code from Acquia Cloud to Code Studio now? (yes/no) [yes]:
Expand Down Expand Up @@ -133,6 +155,27 @@ public function providerTestCommand(): array {
$this->key,
// Enter Cloud secret,
$this->secret,
// Select PHP version 8.1
'0',
// Do you want to continue?
'y',
],
// Args
[],
],
[
// No projects.
[],
// Inputs
[
// 'Would you like to create a new Code Studio project?
'y',
// Enter Cloud Key
$this->key,
// Enter Cloud secret,
$this->secret,
// Select PHP version 8.2
'1',
// Do you want to continue?
'y',
],
Expand Down