Merge branch 'flutter:main' into main

yusuf-goog · web-flow · commit c89443c2c115 · 2023-09-29T11:08:50.000-07:00
diff --git a/CODEOWNERS b/CODEOWNERS
@@ -4,7 +4,37 @@
 # These names are just suggestions. It is fine to have your changes
 # reviewed by someone else.
 
-auto_submit                                        @ricardoamador
-cipd_packages/codesign/**                          @XilaiZhang
-cipd_packages/device_doctor/**                     @yusuf-goog
-cipd_packages/doxygen/**                           @gspencergoog
+## app_dart APIs
+app_dart/lib/src/request_handlers/check_flaky_builders.dart                 @keyonghan
+app_dart/lib/src/request_handlers/create_branch.dart                        @CaseyHillers
+app_dart/lib/src/request_handlers/dart_internal_subscription.dart           @drewroengoogle
+app_dart/lib/src/request_handlers/file_flaky_issue_and_pr.dart              @keyonghan
+app_dart/lib/src/request_handlers/flush_cache.dart                          @keyonghan
+app_dart/lib/src/request_handlers/get_build_status.dart                     @keyonghan
+app_dart/lib/src/request_handlers/get_release_branches.dart                 @CaseyHillers
+app_dart/lib/src/request_handlers/get_repos.dart                            @keyonghan
+app_dart/lib/src/request_handlers/get_status.dart                           @keyonghan
+app_dart/lib/src/request_handlers/get_green_commits.dart                    @XilaiZhang
+app_dart/lib/src/request_handlers/github_rate_limit_status.dart             @keyonghan
+app_dart/lib/src/request_handlers/github_webhook.dart                       @keyonghan
+app_dart/lib/src/request_handlers/github/webhook_subscription.dart          @keyonghan
+app_dart/lib/src/request_handlers/presubmit_luci_subscription.dart          @keyonghan
+app_dart/lib/src/request_handlers/postsubmit_luci_subscription.dart         @keyonghan
+app_dart/lib/src/request_handlers/push_build_status_to_github.dart          @keyonghan
+app_dart/lib/src/request_handlers/push_gold_status_to_github.dart           @Piinks
+app_dart/lib/src/request_handlers/reset_prod_task.dart                      @keyonghan
+app_dart/lib/src/request_handlers/reset_try_task.dart                       @keyonghan
+app_dart/lib/src/request_handlers/scheduler/batch_backfiller.dart           @keyonghan
+app_dart/lib/src/request_handlers/scheduler/request_subscription.dart       @keyonghan
+app_dart/lib/src/request_handlers/scheduler/vacuum_stale_tasks.dart         @keyonghan
+app_dart/lib/src/request_handlers/update_existing_flaky_issues.dart         @keyonghan
+app_dart/lib/src/request_handlers/update_task_status.dart                   @keyonghan
+app_dart/lib/src/request_handlers/vacuum_github_commits.dart                @keyonghan
+
+## auto_submit app
+auto_submit                                                                 @ricardoamador
+
+## cipd packages
+cipd_packages/codesign/**                                                   @XilaiZhang
+cipd_packages/device_doctor/**                                              @yusuf-goog
+cipd_packages/doxygen/**                                                    @gspencergoog
diff --git a/app_dart/Dockerfile b/app_dart/Dockerfile
@@ -4,7 +4,7 @@
 
 
 # Dart Docker official images can be found here: https://hub.docker.com/_/dart
-FROM dart:beta@sha256:581ddbe030111ce2d564c94a8a8a73ce29291d3b8305316ffa4d849d6c35395f
+FROM dart:beta@sha256:f07d175c1d56a41b61d6ed099a6a79221ddc747eeccdbecd1e59dd324a371142
 
 WORKDIR /app
 
diff --git a/app_dart/bin/server.dart b/app_dart/bin/server.dart
@@ -82,10 +82,6 @@ Future<void> main() async {
         authenticationProvider: authProvider,
         cache: cache,
       ),
-      '/api/get-authentication-status': GetAuthenticationStatus(
-        config: config,
-        authenticationProvider: authProvider,
-      ),
       '/api/github-webhook-pullrequest': GithubWebhook(
         config: config,
         pubsub: const PubSub(),
@@ -107,13 +103,6 @@ Future<void> main() async {
         scheduler: scheduler,
         commitService: commitService,
       ),
-
-      /// API to run authenticated graphql queries. It requires to pass the graphql query as the body
-      /// of a POST request.
-      '/api/query-github-graphql': QueryGithubGraphql(
-        config: config,
-        authenticationProvider: authProvider,
-      ),
       '/api/presubmit-luci-subscription': PresubmitLuciSubscription(
         cache: cache,
         config: config,
diff --git a/app_dart/lib/cocoon_service.dart b/app_dart/lib/cocoon_service.dart
@@ -9,7 +9,6 @@ export 'src/request_handlers/create_branch.dart';
 export 'src/request_handlers/dart_internal_subscription.dart';
 export 'src/request_handlers/file_flaky_issue_and_pr.dart';
 export 'src/request_handlers/flush_cache.dart';
-export 'src/request_handlers/get_authentication_status.dart';
 export 'src/request_handlers/get_build_status.dart';
 export 'src/request_handlers/get_release_branches.dart';
 export 'src/request_handlers/get_repos.dart';
@@ -22,7 +21,6 @@ export 'src/request_handlers/postsubmit_luci_subscription.dart';
 export 'src/request_handlers/presubmit_luci_subscription.dart';
 export 'src/request_handlers/push_build_status_to_github.dart';
 export 'src/request_handlers/push_gold_status_to_github.dart';
-export 'src/request_handlers/query_github_graphql.dart';
 export 'src/request_handlers/readiness_check.dart';
 export 'src/request_handlers/reset_prod_task.dart';
 export 'src/request_handlers/reset_try_task.dart';
diff --git a/app_dart/lib/src/request_handlers/get_authentication_status.dart b/app_dart/lib/src/request_handlers/get_authentication_status.dart
diff --git a/app_dart/lib/src/request_handlers/presubmit_luci_subscription.dart b/app_dart/lib/src/request_handlers/presubmit_luci_subscription.dart
@@ -119,6 +119,16 @@ class PresubmitLuciSubscription extends SubscriptionHandler {
     } else {
       ciYaml = await scheduler.getCiYaml(commit);
     }
+
+    // Do not block on the target not found.
+    if (!ciYaml.presubmitTargets.any((element) => element.value.name == builderName)) {
+      // do not reschedule
+      log.warning('Did not find builder with name: $builderName in ciYaml for ${commit.sha}');
+      final List<String> availableBuilderList = ciYaml.presubmitTargets.map((Target e) => e.value.name).toList();
+      log.warning('ciYaml presubmit targets found: $availableBuilderList');
+      return 1;
+    }
+
     final Target target = ciYaml.presubmitTargets.where((element) => element.value.name == builderName).single;
     final Map<String, Object> properties = target.getProperties();
     if (!properties.containsKey('presubmit_max_attempts')) {
diff --git a/app_dart/lib/src/request_handlers/query_github_graphql.dart b/app_dart/lib/src/request_handlers/query_github_graphql.dart
diff --git a/app_dart/test/request_handlers/presubmit_luci_subscription_test.dart b/app_dart/test/request_handlers/presubmit_luci_subscription_test.dart
@@ -158,4 +158,29 @@ void main() {
     );
     verify(mockGithubChecksService.updateCheckStatus(any, any, any, rescheduled: true)).called(1);
   });
+
+  test('Build not rescheduled if not found in ciYaml list.', () async {
+    when(mockGithubChecksService.updateCheckStatus(any, any, any, rescheduled: false)).thenAnswer((_) async => true);
+    when(mockGithubChecksService.taskFailed(any)).thenAnswer((_) => true);
+    when(mockGithubChecksService.currentAttempt(any)).thenAnswer((_) => 1);
+    tester.message = createBuildbucketPushMessage(
+      'COMPLETED',
+      result: 'SUCCESS',
+      // This builder will not be present.
+      builderName: 'Linux C',
+      userData: '{\\"repo_owner\\": \\"flutter\\",'
+          '\\"commit_branch\\": \\"main\\",'
+          '\\"commit_sha\\": \\"abc\\",'
+          '\\"repo_name\\": \\"flutter\\"}',
+    );
+    await tester.post(handler);
+    verifyNever(
+      mockLuciBuildService.rescheduleBuild(
+        builderName: 'Linux C',
+        buildPushMessage: BuildPushMessage.fromPushMessage(tester.message),
+        rescheduleAttempt: 1,
+      ),
+    );
+    verify(mockGithubChecksService.updateCheckStatus(any, any, any, rescheduled: false)).called(1);
+  });
 }
diff --git a/app_dart/test/request_handlers/query_github_graphql_test.dart b/app_dart/test/request_handlers/query_github_graphql_test.dart
diff --git a/auto_submit/Dockerfile b/auto_submit/Dockerfile
@@ -4,7 +4,7 @@
 
 
 # Dart Docker official images can be found here: https://hub.docker.com/_/dart
-FROM dart:beta@sha256:581ddbe030111ce2d564c94a8a8a73ce29291d3b8305316ffa4d849d6c35395f
+FROM dart:beta@sha256:f07d175c1d56a41b61d6ed099a6a79221ddc747eeccdbecd1e59dd324a371142
 
 WORKDIR /app
 
diff --git a/auto_submit/lib/configuration/repository_configuration.dart b/auto_submit/lib/configuration/repository_configuration.dart
@@ -20,15 +20,7 @@ class RepositoryConfiguration {
   static const String supportNoReviewRevertKey = 'support_no_review_revert';
   static const String requiredCheckRunsOnRevertKey = 'required_checkruns_on_revert';
 
-  // Default values
-  static const bool allowConfigOverrideDefault = false;
-  static const String defaultBranchDefault = 'main';
-  static const Set<String> autoApprovalAccountsDefault = <String>{};
-  static const int approvingReviewsDefault = 2;
-  static const String approvalGroupDefault = 'flutter-hackers';
-  static const bool runCiDefault = true;
-  static const bool supportNoReviewRevertsDefault = true;
-  static const Set<String> requiredCheckRunsOnRevertDefault = <String>{};
+  static const String defaultBranchStr = 'default';
 
   RepositoryConfiguration({
     allowConfigOverride,
@@ -40,7 +32,7 @@ class RepositoryConfiguration {
     supportNoReviewReverts,
     requiredCheckRunsOnRevert,
   })  : allowConfigOverride = allowConfigOverride ?? false,
-        defaultBranch = defaultBranch ?? 'main',
+        defaultBranch = defaultBranch ?? defaultBranchStr,
         autoApprovalAccounts = autoApprovalAccounts ?? <String>{},
         approvingReviews = approvingReviews ?? 2,
         approvalGroup = approvalGroup ?? 'flutter-hackers',
diff --git a/auto_submit/lib/configuration/repository_configuration_manager.dart b/auto_submit/lib/configuration/repository_configuration_manager.dart
@@ -69,7 +69,7 @@ class RepositoryConfigurationManager {
     final RepositoryConfiguration globalRepositoryConfiguration = RepositoryConfiguration.fromYaml(orgLevelConfig);
 
     // Collect the default branch if it was not supplied.
-    if (globalRepositoryConfiguration.defaultBranch.isEmpty) {
+    if (globalRepositoryConfiguration.defaultBranch == RepositoryConfiguration.defaultBranchStr) {
       globalRepositoryConfiguration.defaultBranch = await githubService.getDefaultBranch(slug);
     }
     log.info('Default branch was found to be ${globalRepositoryConfiguration.defaultBranch} for ${slug.fullName}.');
diff --git a/auto_submit/lib/git/git_repository_manager.dart b/auto_submit/lib/git/git_repository_manager.dart
@@ -66,6 +66,7 @@ class GitRepositoryManager {
   Future<void> revertCommit(String baseBranchName, String commitSha, RepositorySlug slug, String token) async {
     final GitRevertBranchName revertBranchName = GitRevertBranchName(commitSha);
     // Working directory for these must be repo checkout directory.
+    // Check out the baseBranchName before doing anything.
     await gitCli.createBranch(
       newBranchName: revertBranchName.branch,
       workingDirectory: targetCloneDirectory,
diff --git a/auto_submit/test/configuration/repository_configuration_manager_test.dart b/auto_submit/test/configuration/repository_configuration_manager_test.dart
