commit caaf17cf76877882230e1ed989ecffc6eedea4e4
author William Hesse <whesse@google.com> Mon Jan 03 16:36:15 2022 +0000
committer Commit Bot <commit-bot@chromium.org> Mon Jan 03 16:36:15 2022 +0000
tree 834a74d50d0c76fb7942f2741c35a4fba11702d8
parent bf4193734dbe3f639a3131c4157289d5f176191a

[appengine] Fix log server and source server to use default branch "main"

Improve help message on default web page.

Change-Id: Ie9c3665631846a600fa09cf7d545b686752694d8
Fixes: https://github.com/dart-lang/dart_ci/issues/121
Reviewed-on: https://dart-review.googlesource.com/c/dart_ci/+/225206
Reviewed-by: Jonas Termansen <sortie@google.com>
Commit-Queue: William Hesse <whesse@google.com>

appengine/bin/server.dart

diff --git a/appengine/bin/server.dart b/appengine/bin/server.dart
index 3074b63..efe8e7e 100644
--- a/appengine/bin/server.dart
+++ b/appengine/bin/server.dart
@@ -50,13 +50,13 @@
     <h1>Dart Test Logs</h1>
    URL formats:
    <ul>
-   <li>/logs/any/[configuration name]/latest/[test name]
-   <li>/logs/any/[configuration name]/[build number]/[test name]
-   <li>/logs/any/[configuration name]/latest/[test name prefix]*
-   <li>/logs/[builder]/[configuration name]/latest/[test name]
-   <li>/logs/[builder]/*/latest/[test name]
+   <li>/log/any/[configuration name]/latest/[test name]
+   <li>/log/any/[configuration name]/[build number]/[test name]
+   <li>/log/any/[configuration name]/latest/[test name prefix]*
+   <li>/log/[builder]/[configuration name]/latest/[test name]
+   <li>/log/[builder]/*/latest/[test name]
    </ul>
-   and all combinations of these except /logs/any/*/... .
+   and all combinations of these except /log/any/*/... .
     <h1>Dart Test Sources</h1>
     Redirects to the source of the test given by name and either SDK revision or CL/patchset
     reference.
@@ -68,8 +68,8 @@
     </p>
     <p>Examples:
     <ul>
-    <li><a href="test/master/corelib/apply2_test">
-      test/master/corelib/apply2_test</a>
+    <li><a href="test/main/corelib/apply2_test">
+      test/main/corelib/apply2_test</a>
     <li><a href="test/9094f7/co19/Language/Classes/Class_Member_Conflicts/static_member_and_instance_member_t04/none">
       test/9094f7/co19/Language/Classes/Class_Member_Conflicts/static_member_and_instance_member_t04/none
     <li><a href="test/cl/199421/3/pkg/test_runner/test/experiment_test">

appengine/bin/test_source.dart

diff --git a/appengine/bin/test_source.dart b/appengine/bin/test_source.dart
index 28314f4..814b2f7 100644
--- a/appengine/bin/test_source.dart
+++ b/appengine/bin/test_source.dart
@@ -10,11 +10,11 @@
   if (arguments.isEmpty || arguments.length > 2) {
     print('Finds the source of the given test. If a revision is provided,'
         'returns a link to the source at that revision, otherwise the latest'
-        'revision at master.\n\n'
+        'revision at main.\n\n'
         'Usage: test_source <full test name> [<revision>]');
     exit(1);
   }
   final testName = arguments.first;
-  final revision = arguments.length == 2 ? arguments[1] : 'master';
+  final revision = arguments.length == 2 ? arguments[1] : 'main';
   print(await computeTestSource(revision, testName, true));
 }

appengine/lib/src/get_log.dart

diff --git a/appengine/lib/src/get_log.dart b/appengine/lib/src/get_log.dart
index cb431ec..cf354ae 100644
--- a/appengine/lib/src/get_log.dart
+++ b/appengine/lib/src/get_log.dart
@@ -40,19 +40,7 @@
     getCloudFile(resultsBucket, "builders/$builder/latest");
 
 Future<String> getLatestConfigurationBuildNumber(String configuration) =>
-    getCloudFile(resultsBucket, 'configuration/master/$configuration/latest');
-
-Future<String> getApproval(String builder) async {
-  try {
-    final bucket = "dart-test-results";
-    String build = await getCloudFile(bucket, "builders/$builder/latest");
-    return await getCloudFile(
-        bucket, "builders/$builder/$build/approved_results.json");
-  } catch (e) {
-    print(e);
-    return null;
-  }
-}
+    getCloudFile(resultsBucket, 'configuration/main/$configuration/latest');
 
 /// Fetches a log or logs and formats them for output.
 Future<String> getLog(
@@ -78,7 +66,7 @@
   }
 
   final cloudFile = builder == 'any'
-      ? 'configuration/master/$configuration/$build/logs.json'
+      ? 'configuration/main/$configuration/$build/logs.json'
       : 'builders/$builder/$build/logs.json';
   final jsonLogs = await getCloudFile(resultsBucket, cloudFile);