Replace curl with gh CLI and remove unused docker_mirror_url parameter

- Replace manual curl GitHub API calls with gh CLI commands in DeploymentTrait
  - gh pr view for fetching PR data
  - gh repo view for checking repo visibility
  - gh issue comment for posting comments
- Remove unused docker_mirror_url parameter from BootstrapTrait
- Remove unused $github_token variable (gh CLI uses GITHUB_TOKEN env var automatically)

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

Author: AronNovak

robo-components/BootstrapTrait.php

@@ -20,25 +20,22 @@ trait BootstrapTrait {
    *   The Pantheon machine token.
    * @param string $github_token
    *   The GitHub personal access token for a user with access to this project.
-   * @param string $docker_mirror_url
-   *   The Docker mirror URL. Optional, but expect CI failures if not set,
-   *   this is due to rate limiting on Docker Hub.
    * @param string $http_basic_auth_user
    *   The HTTP basic auth user. Optional. If set, all the Pantheon environments
    *   will be protected with HTTP basic auth.
    * @param string $http_basic_auth_password
    *   The HTTP basic auth password. Optional.
    */
-  public function bootstrapProject(string $project_name, string $github_repository_url, string $terminus_token, string $github_token, string $docker_mirror_url = '', string $http_basic_auth_user = '', string $http_basic_auth_password = '') {
+  public function bootstrapProject(string $project_name, string $github_repository_url, string $terminus_token, string $github_token, string $http_basic_auth_user = '', string $http_basic_auth_password = '') {
     // Extract project name from $github_repository_url.
     // The syntax is like: git@github.com:Organization/projectname.git .
     preg_match('/github.com[:\/](.*)\/(.*)\.git/', $github_repository_url, $matches);
     $github_organization = $matches[1];
     $project_machine_name = $matches[2];
 
-    $this->verifyRequirements($project_name, $github_organization, $project_machine_name, $terminus_token, $github_token, $docker_mirror_url, $http_basic_auth_user, $http_basic_auth_password);
+    $this->verifyRequirements($project_name, $github_organization, $project_machine_name, $terminus_token, $github_token, $http_basic_auth_user, $http_basic_auth_password);
 
-    $this->prepareGithubRepository($project_name, $github_organization, $project_machine_name, $github_repository_url, $docker_mirror_url);
+    $this->prepareGithubRepository($project_name, $github_organization, $project_machine_name, $github_repository_url);
 
     $this->createPantheonProject($terminus_token, $project_name, $project_machine_name);
 
@@ -59,8 +56,8 @@ public function bootstrapProject(string $project_name, string $github_repository
     $this->say("You might want to run the following commands to properly place the project:");
     $this->say("mv .bootstrap ../$project_machine_name");
     $this->say("mv .pantheon ../$project_machine_name/.pantheon");
-    $this->say("To configure autodeployment to pantheon run:");
-    $this->say("ddev robo deploy:config-autodeploy $terminus_token, $github_token");
+    $this->say("To configure autodeployment to Pantheon run:");
+    $this->say("ddev robo deploy:config-autodeploy $terminus_token $github_token");
   }
 
   /**
@@ -74,10 +71,8 @@ public function bootstrapProject(string $project_name, string $github_repository
    *   The project machine name in GH slug.
    * @param string $github_repository_url
    *   The clone URL of the GitHub repository.
-   * @param string $docker_mirror_url
-   *   The Docker mirror URL. Optional, but expect CI failures if not set.
    */
-  protected function prepareGithubRepository(string $project_name, string $organization, string $project_machine_name, string $github_repository_url, string $docker_mirror_url = '') {
+  protected function prepareGithubRepository(string $project_name, string $organization, string $project_machine_name, string $github_repository_url) {
     $temp_remote = 'bootstrap_' . time();
     $this->taskExec("git remote add $temp_remote $github_repository_url")
       ->run();
@@ -370,14 +365,12 @@ public function lockPantheonEnvironments(string $project_machine_name, string $h
    *   The Pantheon machine token.
    * @param string $github_token
    *   The GitHub token.
-   * @param string $docker_mirror_url
-   *   The Docker mirror URL.
    * @param string $http_basic_auth_user
    *   The HTTP basic auth user.
    * @param string $http_basic_auth_password
    *   The HTTP basic auth password.
    */
-  protected function verifyRequirements(string $project_name, string $organization, string $project_machine_name, string $terminus_token, string $github_token, string $docker_mirror_url, $http_basic_auth_user, $http_basic_auth_password) {
+  protected function verifyRequirements(string $project_name, string $organization, string $project_machine_name, string $terminus_token, string $github_token, $http_basic_auth_user, $http_basic_auth_password) {
     if (is_dir('.bootstrap')) {
       throw new \Exception('The .bootstrap directory already exists. Please remove / move it and try again.');
     }
@@ -402,12 +395,6 @@ protected function verifyRequirements(string $project_name, string $organization
     if (empty(trim($github_token))) {
       throw new \Exception('The GitHub token is empty.');
     }
-    if (empty(trim($docker_mirror_url))) {
-      throw new \Exception('The Docker mirror URL is empty.');
-    }
-    if (!empty($docker_mirror_url) && !filter_var($docker_mirror_url, FILTER_VALIDATE_URL)) {
-      throw new \Exception('The Docker mirror URL is not a valid URL.');
-    }
   }
 
 }

robo-components/DeploymentTrait.php

@@ -708,19 +708,19 @@ public function deployConfigAutodeploy(string $token, string $github_token, stri
     $pantheon_info = $this->getPantheonNameAndEnv();
     $project_name = $pantheon_info['name'];
 
-    // Generate SSH key for deployment
+    // Generate SSH key for deployment.
     $result = $this->taskExec('ssh-keygen -t rsa -f deploy-key -P ""')->run();
     if ($result->getExitCode() !== 0) {
       throw new \Exception('The key generation failed.');
     }
 
-    // Encrypt the SSH key for use in GitHub Actions
+    // Encrypt the SSH key for use in GitHub Actions.
     $result = $this->taskExec('openssl rand -hex 32')->printOutput(FALSE)->run();
     if ($result->getExitCode() !== 0) {
       throw new \Exception('Failed to generate encryption key.');
     }
     $encryption_key = trim($result->getMessage());
-    
+
     $result = $this->taskExec('openssl rand -hex 16')->printOutput(FALSE)->run();
     if ($result->getExitCode() !== 0) {
       throw new \Exception('Failed to generate encryption IV.');
@@ -737,7 +737,7 @@ public function deployConfigAutodeploy(string $token, string $github_token, stri
       ->run();
     $pantheon_git_url = trim($result->getMessage());
 
-    // Update GitHub Actions workflows if they exist
+    // Update GitHub Actions workflows if they exist.
     if (file_exists('.github/workflows/lint.template.yml')) {
       $this->_exec("cp .github/workflows/lint.template.yml .github/workflows/lint.yml");
       $this->taskReplaceInFile('.github/workflows/lint.yml')
@@ -786,7 +786,6 @@ public function deployNotify(string $pantheon_environment = 'qa', string $issue_
       $data = ['body' => $issue_comment];
       $issue_comment = json_encode($data);
     }
-    $github_token = getenv('GITHUB_TOKEN');
     $git_commit_message = getenv('GITHUB_COMMIT_MESSAGE');
     if (strstr($git_commit_message, 'Merge pull request') === FALSE && strstr($git_commit_message, ' (#') === FALSE) {
       $this->say($git_commit_message);
@@ -809,21 +808,20 @@ public function deployNotify(string $pantheon_environment = 'qa', string $issue_
         $this->say("Could not determine the PR number from the commit message: $git_commit_message");
         return;
       }
-      // Retrieve the issue number from the PR description via GitHub API.
+      // Retrieve the issue number from the PR description via GitHub CLI.
       $pr_number = $pr_matches[1][0];
-      $pr = $this->taskExec("curl -H \"Authorization: token $github_token\" https://api.github.com/repos/" . self::$githubProject . "/pulls/$pr_number")
+      $pr_body = $this->taskExec("gh pr view $pr_number --json body --jq .body")
         ->printOutput(FALSE)
         ->run()
         ->getMessage();
-      $pr = json_decode($pr);
-      if (!isset($pr->body)) {
+      if (empty(trim($pr_body))) {
         $this->say("Could not determine the issue number from the PR: $git_commit_message");
         return;
       }
       // The issue number should be the "#1234"-like reference in the PR body.
-      preg_match_all('!#([0-9]+)\s+!', $pr->body, $issue_matches);
+      preg_match_all('!#([0-9]+)\s+!', $pr_body, $issue_matches);
       if (!isset($issue_matches[1][0])) {
-        $this->say("Could not determine the issue number from the PR description: $pr->body");
+        $this->say("Could not determine the issue number from the PR description: $pr_body");
         return;
       }
       foreach ($issue_matches[1] as $issue_match) {
@@ -837,17 +835,13 @@ public function deployNotify(string $pantheon_environment = 'qa', string $issue_
     $pantheon_info = $this->getPantheonNameAndEnv();
     $pantheon_terminus_environment = $pantheon_info['name'] . '.' . $pantheon_environment;
 
-    // Let's figure out if the repository is public or not via GitHub API.
-    $repo = $this->taskExec("curl -H \"Authorization: token $github_token\" https://api.github.com/repos/" . self::$githubProject)
+    // Check if the repository is private via GitHub CLI.
+    $is_private = $this->taskExec("gh repo view --json isPrivate --jq .isPrivate")
       ->printOutput(FALSE)
       ->run()
       ->getMessage();
-    $repo = json_decode($repo);
-    if (!isset($repo->private)) {
-      $this->yell("Could not determine if the repository is private or not.");
-      return;
-    }
-    if ($repo->private) {
+    $is_private = trim($is_private) === 'true';
+    if ($is_private) {
       $quick_link = $this->deployGetEnvironmentUrl($pantheon_terminus_environment);
     }
     else {
@@ -857,19 +851,25 @@ public function deployNotify(string $pantheon_environment = 'qa', string $issue_
 
     if (empty($issue_comment)) {
       if (empty($pr_number)) {
-        $issue_comment = "{\"body\": \"The latest merged PR just got deployed successfully to Pantheon [`$pantheon_environment`]($quick_link) environment\"}";
+        $comment_body = "The latest merged PR just got deployed successfully to Pantheon [`$pantheon_environment`]($quick_link) environment";
       }
       else {
-        $issue_comment = "{\"body\": \"The latest merged PR #$pr_number just got deployed successfully to Pantheon [`$pantheon_environment`]($quick_link) environment\"}";
+        $comment_body = "The latest merged PR #$pr_number just got deployed successfully to Pantheon [`$pantheon_environment`]($quick_link) environment";
       }
     }
+    else {
+      // Extract body from JSON if issue_comment was provided.
+      $comment_data = json_decode($issue_comment, TRUE);
+      $comment_body = $comment_data['body'] ?? $issue_comment;
+    }
+
     foreach ($issue_numbers as $issue_number) {
-      $result = $this->taskExec("curl -X POST -H 'Authorization: token $github_token' -d '$issue_comment' https://api.github.com/repos/" . self::$githubProject . "/issues/$issue_number/comments")
+      $result = $this->taskExec("gh issue comment $issue_number --body " . escapeshellarg($comment_body))
         ->printOutput(FALSE)
         ->run();
       $exit_code = $result->getExitCode();
       if ($exit_code) {
-        throw new \Exception("Could not notify GitHub of the deployment, GitHub API error: " . $result->getMessage());
+        throw new \Exception("Could not notify GitHub of the deployment, GitHub CLI error: " . $result->getMessage());
       }
     }
   }