fix(ci): fix repo check for new components (#9152)

bshaffer · web-flow · commit 43ef99a13624 · 2026-05-01T16:40:43.000-04:00
* fix(ci): fix repo check for new components

* new packages bypass packagist check

* add skipped emoji

* revert VERSION file change

* Update dev/src/Command/RepoComplianceCommand.php

* improve repo execute cmd
diff --git a/.github/workflows/release-checks.yaml b/.github/workflows/release-checks.yaml
@@ -96,37 +96,6 @@ jobs:
             exit 1
           fi
 
-  # Ensure that if the release PR contains any NEW components, the new component's corresponding
-  # sub-repo exists
-  new-component-subrepo-check:
-    name: New Component Sub-Repo Check
-    runs-on: ubuntu-latest
-    if: github.event.pull_request.user.login == 'release-please[bot]'
-    steps:
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-      - name: "Verify the subrepos exist for new components"
-        run: |
-          COMPONENTS=$(git diff origin/main --name-only | grep VERSION | xargs dirname)
-          FAIL=""
-          for COMPONENT in ${COMPONENTS}; do {
-            if [[ "$(cat $COMPONENT/VERSION)" == "0.1.0" ]]; then
-              SUBREPO=$(cat $COMPONENT/composer.json | jq -r '.extra.component.target')
-              echo "New component found: $COMPONENT"
-              if curl --head --silent --fail "https://api.github.com/repos/$SUBREPO" -H 'Authorization: Bearer ${{secrets.SPLIT_TOKEN}}' > /dev/null; then
-                  echo "✅ Target Repo '$SUBREPO' exists"
-              else
-                  echo "❌ Target Repo '$SUBREPO' DOES NOT EXIST"
-                  FAIL="true"
-              fi
-            fi
-          }; done
-          if [[ "$FAIL" == "true" ]]; then
-              echo "Missing repositories for one or more new components"
-              exit 1
-          fi
-
   next-release-label-check:
     name: Check for "next release" label
     uses: GoogleCloudPlatform/php-tools/.github/workflows/release-checks.yml@main
diff --git a/dev/src/Command/ComponentExecuteCommand.php b/dev/src/Command/ComponentExecuteCommand.php
@@ -22,6 +22,11 @@
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Output\OutputInterface;
 use Google\Cloud\Dev\Component;
+use Google\Cloud\Dev\GitHub;
+use Google\Cloud\Dev\Packagist;
+use Google\Cloud\Dev\RunShell;
+use GuzzleHttp\Client;
+use Symfony\Component\Console\Input\InputOption;
 
 /**
  * Execute commands for every Component
@@ -37,6 +42,8 @@
  */
 class ComponentExecuteCommand extends Command
 {
+    private const PACKAGIST_USERNAME = 'google-cloud';
+
     protected function configure()
     {
         $this->setName('component:execute')
@@ -52,22 +59,37 @@ protected function configure()
 
 EOF)
             ->addArgument('code', InputArgument::REQUIRED, 'Path to a file or PHP code to execute')
+            ->addOption('component', 'c', InputOption::VALUE_REQUIRED, 'If specified, display repo info for this component only', '')
+            ->addOption('token', 't', InputOption::VALUE_REQUIRED, 'Github token to use for authentication', '')
+            ->addOption('packagist-token', 'p', InputOption::VALUE_REQUIRED, 'Packagist token for the webhook')
         ;
     }
 
     protected function execute(InputInterface $input, OutputInterface $output): int
     {
-        $code = $input->getArgument('code');
-        $components = Component::getComponents();
+        // Create github client wrapper
+        $http = new Client();
+        $github = new GitHub(new RunShell(), $http, $input->getOption('token'), $output);
+        $packagist = new Packagist($http, self::PACKAGIST_USERNAME, $input->getOption('packagist-token') ?? '');
+
+        $componentName = $input->getOption('component');
+        $components = $componentName ? [new Component($componentName)] : Component::getComponents();
 
-        $codeToExecute = file_exists($code) ? file_get_contents($code) : $code;
-        if (0 === strpos($codeToExecute, '<?php')) {
-            $codeToExecute = substr($codeToExecute, 5);
+        $code = $input->getArgument('code');
+        if (file_exists($code)) {
+            $executeFn = require $code;
+        } else {
+            if (0 === strpos($code, '<?php')) {
+                $code = substr($code, 5);
+            }
+            $executeFn = function ($component, $github, $packagist, $output) use ($code) {
+                eval($code);
+            };
         }
-        $output->writeln('<info>' . $codeToExecute . '</>');
+
         foreach ($components as $component) {
             $output->writeln('Executing for ' . $component->getName());
-            eval($codeToExecute);
+            $executeFn($component, $github, $packagist, $output);
         }
 
         return 0;
diff --git a/dev/src/Command/RepoComplianceCommand.php b/dev/src/Command/RepoComplianceCommand.php
@@ -66,7 +66,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         }
 
         $table = (new Table($output));
-        $table->setColumnWidths([55, 20, 20, 25, 50]);
+        $table->setColumnWidths([55, 20, 22, 33, 50]);
         $table->setStyle('compact');
         $headers = $format == 'ci' ? ['Name', 'Compliance'] : [
             'Name',
@@ -81,38 +81,47 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $components = $componentName ? [new Component($componentName)] : Component::getComponents();
 
         $isCompliant = true;
+        $emoji = fn ($check) => match ($check) { 'skipped' => '⚪', false => '❌', true => '✅', null => '❓'};
         foreach ($components as $i => $component) {
+            $isNewComponent = $component->getPackageVersion() === '0.0.0'
+                || $component->getPackageVersion() === '0.1.0' && $format == 'ci';
+
             do {
-                $details = $this->getRepoDetails($component);
-                $settingsCheck = $packagistCheck = $webhookCheck = $teamCheck = true;
                 $refreshDetails = false;
+                if (!$details = $this->getRepoDetails($component)) {
+                    $isCompliant = $settingsCheck = $packagistCheck = $webhookCheck = $teamCheck = false;
+                    $details = array_fill(0, count($headers) - 1, '**REPO NOT FOUND**');
+                    $details[0] = str_replace('googleapis/', '', $component->getRepoName());
+                    continue;
+                }
+                $settingsCheck = $packagistCheck = $webhookCheck = $teamCheck = true;
                 if (!$this->checkSettingsCompliance($details)) {
                     $settingsCheck = false;
                     $refreshDetails |= $this->askFixSettingsCompliance($input, $output, $details);
                 }
                 if (!$this->checkWebhookCompliance($details)) {
-                    $webhookCheck = false;
+                    $webhookCheck = $this->github->token ? ($isNewComponent ? 'skipped' : false) : null;
                     $refreshDetails |= $this->askFixWebhookCompliance($input, $output, $details);
                 }
                 if (!$this->checkPackagistCompliance($details)) {
-                    $packagistCheck = false;
-                    $refreshDetails |= $this->askFixPackagistCompliance($input, $output, $component->getRepoName());
+                    // New components don't have packagist config, so bypass for CI.
+                    $packagistCheck = $isNewComponent ? 'skipped' : false;
+                    $refreshDetails |= $this->askFixPackagistCompliance($input, $output, $details);
+                    $details['packagist_config'] ??= '**PACKAGE NOT FOUND**';
                 }
                 if (!$this->checkTeamCompliance($details)) {
                     $teamCheck = $this->github->token ? false : null;
                     $refreshDetails |= $this->askFixTeamCompliance($input, $output, $component->getRepoName());
                 }
             } while ($refreshDetails);
 
-            $emoji = fn (?bool $check) => match ($check) { null => '❓', true => '✅', false => '❌'};
             $details['compliant'] = implode("\n", [
                 sprintf('%s Issues, Projects, Wiki, Pages, and Discussion are disabled', $emoji($settingsCheck)),
                 sprintf('%s Packagist webhook is configured', $emoji($webhookCheck)),
                 sprintf('%s Packagist maintainer is "google-cloud"', $emoji($packagistCheck)),
                 sprintf('%s Github teams permissions are configured correctly', $emoji($teamCheck)),
                 '',
             ]);
-
             $isCompliant &= $settingsCheck && $webhookCheck && $packagistCheck && $teamCheck;
             if ($format == 'ci') {
                 unset($details['repo_config'], $details['packagist_config'], $details['teams']);
@@ -169,6 +178,10 @@ private function askFixSettingsCompliance(InputInterface $input, OutputInterface
 
     private function checkWebhookCompliance(array $details): bool
     {
+        if (!$this->github->token) {
+            return false;
+        }
+
         $repoName = 'googleapis/' . $details['name'];
         $webhookUrl = $this->packagist->getWebhookUrl();
 
@@ -208,15 +221,15 @@ private function askFixWebhookCompliance(InputInterface $input, OutputInterface
     private function checkPackagistCompliance(array $details)
     {
         return !empty(array_filter(
-            explode("\n", $details['packagist_config']),
+            explode("\n", (string) $details['packagist_config']),
             fn ($team) => $team === self::PACKAGIST_USERNAME
         ));
     }
 
     private function askFixPackagistCompliance(InputInterface $input, OutputInterface $output, array $details)
     {
-        if (!$this->github->token || $input->getOption('format') == 'ci') {
-            // without a token, or in CI mode, don't ask to fix compliance
+        if (!$this->github->token || $input->getOption('format') == 'ci' || $details['packagist_config'] === null) {
+            // cannot fix compliance without a token, or in CI mode, or without packagist config
             return false;
         }
         throw new \Exception('not implemented');
@@ -239,9 +252,16 @@ private function askFixTeamCompliance(InputInterface $input, OutputInterface $ou
         return false;
     }
 
-    private function getRepoDetails(Component $component): array
+    private function getRepoDetails(Component $component): array|null
     {
-        $repoDetails = (array) $this->github->getRepoDetails($component->getRepoName());
+        if (!$repoDetails = $this->github->getRepoDetails($component->getRepoName())) {
+            return null;
+        }
+
+        if (null !== $packagistDetails = $this->packagist->getMaintainers($component->getPackageName())) {
+            $packagistDetails = implode("\n", $packagistDetails);
+        }
+
         // use "array_intersect_key" to filter out fields that were not requested.
         $fields = array_map(
             fn ($field) => var_export($field, true),
@@ -258,7 +278,7 @@ private function getRepoDetails(Component $component): array
                 $fields,
                 array_keys($fields),
             )),
-            'packagist_config' => implode("\n", $this->packagist->getMaintainers($component->getPackageName())),
+            'packagist_config' => $packagistDetails,
             'teams' => $this->getRepoTeamDetails($component),
         ];
     }
diff --git a/dev/src/GitHub.php b/dev/src/GitHub.php
@@ -274,7 +274,9 @@ public function getRepoDetails($target)
 
             return json_decode((string) $res->getBody(), true);
         } catch (\Exception $e) {
-            $this->logException($e);
+            if ($e->getCode() !== 404) {
+                $this->logException($e);
+            }
             return null;
         }
     }
diff --git a/dev/src/Packagist.php b/dev/src/Packagist.php
@@ -91,9 +91,17 @@ public function getDownloads(string $packageName): int
         return $data['downloads']['total'] ?? 0;
     }
 
-    public function getMaintainers(string $packageName): array
+    public function getMaintainers(string $packageName): array|null
     {
-        $response = $this->client->get("https://packagist.org/packages/$packageName.json");
+        try {
+            $response = $this->client->get("https://packagist.org/packages/$packageName.json");
+        } catch (\Exception $e) {
+            if ($e->getCode() === 404) {
+                return null;
+            }
+            throw $e;
+        }
+
         $data = json_decode($response->getBody()->getContents(), true);
         return array_map(
             fn ($m) => $m['name'],

Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,9 @@ public function getRepoDetails($target)`
`274`	`274`
`275`	`275`	`return json_decode((string) $res->getBody(), true);`
`276`	`276`	`} catch (\Exception $e) {`
`277`		`- $this->logException($e);`
	`277`	`+ if ($e->getCode() !== 404) {`
	`278`	`+ $this->logException($e);`
	`279`	`+ }`
`278`	`280`	`return null;`
`279`	`281`	`}`
`280`	`282`	`}`