Rebase on main

Author: sigurdm

.github/workflows/dart.yml

@@ -25,8 +25,6 @@ jobs:
     steps:
       - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
       - uses: dart-lang/setup-dart@f0ead981b4d9a35b37f30d36160575d60931ec30
-        with:
-          sdk: dev
       - name: Install dependencies
         run: dart pub get
         working-directory: app

.github/workflows/token-test.yml

@@ -2,8 +2,69 @@ Important changes to data models, configuration, and migrations between each
 AppEngine version, listed here to ease deployment and troubleshooting.
 
 ## Next Release (replace with git tag when deployed)
- * Upgraded runtime Dart SDK to `3.5.0-196.0.dev`.
- * Upgraded runtimeVersion to `2024.06.11`
+ * Bumped runtimeVersion to `2024.09.04`.
+ * Upgraded stable Dart analysis SDK to `3.5.2`
+ * Upgraded dartdoc to `8.1.0`.
+ * Note: `Package.latest*` fields are recalculated with a full list of `PackageVersion` entities.
+
+## `20240829t084400-all`
+ * Bumped runtimeVersion to `2024.08.27`.
+ * Upgraded stable Flutter analysis SDK to `3.24.1`.
+ * Upgraded pana to `0.22.12`.
+ * Upgraded dartdoc to `8.0.14`.
+ * Note: the `report` experiment is enabled by default.
+
+## `20240821t093600-all`
+ * Bumped runtimeVersion to `2024.08.20`.
+ * Upgraded stable Dart analysis SDK to `3.5.1`
+ * Upgraded pana to `0.22.11`.
+
+## `20240815t121700-all`
+ * Bumped runtimeVersion to `2024.08.09`.
+ * Upgraded runtime Dart SDK to `3.5.0`.
+ * Upgraded dependencies including `mailer` and `googleapis`.
+ * Additional memory to search instances.
+
+## `20240808t114400-all`
+ * Bumped runtimeVersion to `2024.08.08`.
+ * Upgraded pana to `0.22.10`.
+
+## `20240808t081100-all`
+ * Bumped runtimeVersion to `2024.08.06`.
+ * Upgraded stable Flutter analysis SDK to `3.24.0`.
+ * Upgraded dartdoc to `8.0.13`.
+
+## `20240805t095700-all`
+ * Bumped runtimeVersion to `2024.08.05`.
+ * Upgraded stable Dart analysis SDK to `3.5.0`
+ * Upgraded stable Flutter analysis SDK to `3.22.3`.
+
+## `20240718t101100-all`
+ * Bumped runtimeVersion to `2024.07.18`.
+ * Upgraded pana to `0.22.9`.
+
+## `20240711t102500-all`
+ * Bumped runtimeVersion to `2024.07.09`.
+ * Upgraded pana to `0.22.8`.
+ * Upgraded dartdoc to `8.0.10`.
+ * Note: `setup-flutter.sh` uses http archives for stable/beta channel.
+ * Note: started to use `Summary.result.licenses`.
+ * Note: starting to check `hook/` files for new package uploads.
+
+## `20240627t084200-all`
+ * Bumped runtimeVersion to `2024.06.25`.
+ * Upgraded stable Dart analysis SDK to `3.4.4`
+
+## `20240620t083100-all`
+ * Bumped runtimeVersion to `2024.06.19`.
+ * Upgraded pana to `0.22.7`.
+
+## `20240613t092600-all`
+ * Bumped runtimeVersion to `2024.06.12`.
+ * Upgraded stable Dart analysis SDK to `3.4.3`
+ * Upgraded stable Flutter analysis SDK to `3.22.2`.
+ * Upgraded pana to `0.22.6`.
+ * Note: `Consent.fromUserId` and `Consent.createdBySiteAdmin` may be removed once this release gets stable. 
 
 ## `20240606t114600-all`
  * Bumped runtimeVersion to `2024.05.30`.

CHANGELOG.md

@@ -1,5 +1,5 @@
 # Keep version in-sync with .mono_repo.yml and app/lib/shared/versions.dart
-FROM dart:3.5.0-196.0.dev
+FROM dart:3.5.0
 
 # After install we remove the apt-index again to keep the docker image diff small.
 RUN apt-get update && \
@@ -17,17 +17,18 @@ COPY static /project/static
 COPY doc /project/doc
 COPY third_party /project/third_party
 COPY tool /project/tool
-COPY pubspec.yaml /project/pubspec.yaml
-
-WORKDIR /project/
-RUN dart /project/tool/pub_get_offline.dart
 
 WORKDIR /project/pkg/web_app
+RUN dart /project/tool/pub_get_offline.dart /project/pkg/web_app
 RUN ./build.sh
 
 WORKDIR /project/pkg/web_css
+RUN dart /project/tool/pub_get_offline.dart /project/pkg/web_css
 RUN ./build.sh
 
+WORKDIR /project/app
+RUN dart /project/tool/pub_get_offline.dart /project/app
+
 RUN /project/tool/setup-webp.sh /usr/local/bin
 
 # Clear out any arguments the base images might have set

Dockerfile.app

@@ -2,11 +2,12 @@ FROM gcr.io/google-containers/debian-base-amd64:v2.0.0
 
 RUN apt-get update && \
   apt-get upgrade -y && \
-  apt-get install -y unzip ca-certificates curl bash git && \
+  apt-get install -y unzip ca-certificates curl bash git xz-utils && \
   rm -rf /var/lib/apt/lists/*
 
 ENV PUB_ENVIRONMENT="bot.pub_dev.pub_worker"
 ENV CI="true"
+ENV NO_COLOR="true"
 
 # Configure a 'worker' user, to avoid running processes as root when this is not
 # necessary (this is just docker hardening).
@@ -18,18 +19,14 @@ COPY --chown=worker:worker . /home/worker/pub-dev
 WORKDIR /home/worker/pub-dev
 
 # A config directory for preview SDKs.
-RUN mkdir -p /home/worker/config/dart-dev
 RUN mkdir -p /home/worker/config/dart-stable
 RUN mkdir -p /home/worker/config/flutter-stable
 
-# Setup Dart SDK as stable analysis sdk into /home/worker/dart/{stable,preview}/
-RUN XDG_CONFIG_HOME=/home/worker/config/dart-stable tool/setup-dart.sh /home/worker/dart/stable 3.4.1
-
-# Setup Dart SDK for running pana into /home/worker/dart/runtime/
-RUN XDG_CONFIG_HOME=/home/worker/config/dart-stable tool/setup-dart.sh /home/worker/dart/runtime 3.5.0-196.0.dev
+# Setup Dart SDK into /home/worker/dart/{stable,preview}/
+RUN XDG_CONFIG_HOME=/home/worker/config/dart-stable tool/setup-dart.sh /home/worker/dart/stable 3.5.2
 
 # Setup Flutter SDK into /home/worker/flutter/{stable,preview}/
-RUN XDG_CONFIG_HOME=/home/worker/config/flutter-stable tool/setup-flutter.sh /home/worker/flutter/stable 3.22.1
+RUN XDG_CONFIG_HOME=/home/worker/config/flutter-stable tool/setup-flutter.sh /home/worker/flutter/stable 3.24.1
 
 # Setup webp
 RUN tool/setup-webp.sh /home/worker/bin
@@ -38,8 +35,8 @@ RUN tool/setup-webp.sh /home/worker/bin
 ENV DART_SDK="/home/worker/dart/stable"
 ENV FLUTTER_ROOT="/home/worker/flutter/stable"
 
-# Use runtime Dart-SDK in PATH
-ENV PATH="/home/worker/bin:/home/worker/dart/runtime/bin:${PATH}"
+# Use stable Dart-SDK in PATH
+ENV PATH="/home/worker/bin:/home/worker/dart/stable/bin:${PATH}"
 
 # Install dependencies for pub_worker
 WORKDIR /home/worker/pub-dev/pkg/pub_worker

Dockerfile.worker

@@ -20,6 +20,7 @@ cosImage: projects/cos-cloud/global/images/family/cos-105-lts
 taskWorkerServiceAccount: [email protected]
 imageBucketName: dartlang-pub-dev--pub-images
 reportsBucketName: dartlang-pub-dev-reports
+downloadCountsBucketName: dartlang-pub-download-counts
 storageBaseUrl: https://storage.googleapis.com
 pubClientAudience: 818368855108-8grd2eg9tj9f38os6f1urbcvsq399u8n.apps.googleusercontent.com
 pubServerAudience: 621485135717-082tj8o9vu32lbmquftsolqngk2o13lp.apps.googleusercontent.com

app/config/dartlang-pub-dev.yaml

@@ -23,6 +23,7 @@ cosImage: projects/cos-cloud/global/images/family/cos-105-lts
 taskWorkerServiceAccount: [email protected]
 imageBucketName: dartlang-pub--pub-images
 reportsBucketName: dartlang-pub-reports
+downloadCountsBucketName: dartlang-pub-download-counts
 storageBaseUrl: https://storage.googleapis.com
 pubClientAudience: 818368855108-8grd2eg9tj9f38os6f1urbcvsq399u8n.apps.googleusercontent.com
 pubServerAudience: 818368855108-ulq5tn5t51ga21hg8jkcavbooaljiasp.apps.googleusercontent.com

app/config/dartlang-pub.yaml

@@ -14,3 +14,15 @@ tags:
     presets:
       sanity:
         skip: false # Don't skip these tests.
+  build:
+    skip: 'Build tests are run separately, always in a single thread.'
+    presets:
+      build-only:
+        skip: false # Don't skip these tests.
+
+presets:
+  build-only:
+    skip: 'Only build tests are run' # Skip all tests, as they are run separately
+  tags:
+    build:
+      skip: false # Run only build tags

app/dart_test.yaml

@@ -84,7 +84,7 @@ Future<AuthenticatedUser> requireAuthenticatedWebUser() async {
 /// the given [permission].
 ///
 /// Throws [AuthorizationException] if it doesn't have the permission.
-Future<AuthenticatedGcpServiceAccount> requireAuthenticatedAdmin(
+Future<SupportAgent> requireAuthenticatedAdmin(
     AdminPermission permission) async {
   final agent = await _requireAuthenticatedAgent();
   if (agent is AuthenticatedGcpServiceAccount) {
@@ -96,7 +96,7 @@ Future<AuthenticatedGcpServiceAccount> requireAuthenticatedAdmin(
           'Authenticated user (${agent.displayId}) is trying to access unauthorized admin APIs.');
       throw AuthorizationException.userIsNotAdminForPubSite();
     }
-    return agent;
+    return SupportAgent();
   } else {
     throw AuthenticationException.tokenInvalid('not a GCP service account');
   }
@@ -639,22 +639,26 @@ class AccountBackend {
     String userId,
     bool isModerated, {
     required Key? refCaseKey,
-    required String? message,
+    required String? moderatedReason,
+    required String? note,
   }) async {
     await withRetryTransaction(_db, (tx) async {
       final user =
           await tx.lookupOrNull<User>(_db.emptyKey.append(User, id: userId));
       if (user == null) throw NotFoundException.resource('User:$userId');
 
-      user.updateIsModerated(isModerated: isModerated);
+      user.updateIsModerated(
+        isModerated: isModerated,
+        moderatedReason: moderatedReason,
+      );
       tx.insert(user);
 
       if (refCaseKey != null) {
         final mc = await tx.lookupValue<ModerationCase>(refCaseKey);
         mc.addActionLogEntry(
           ModerationSubject.user(user.email!).fqn,
           isModerated ? ModerationAction.apply : ModerationAction.revert,
-          message,
+          note,
         );
         tx.insert(mc);
       }

app/lib/account/backend.dart

@@ -106,7 +106,6 @@ class ConsentBackend {
   /// - if it was sent recently, do nothing.
   Future<api.InviteStatus> _invite({
     required AuthenticatedAgent activeAgent,
-    required User activeUser,
     required String email,
     required String kind,
     required List<String> args,
@@ -129,7 +128,7 @@ class ConsentBackend {
           await _delete(old, (a) => a.onExpire(old));
         } else if (old.shouldNotify()) {
           // non-expired entries just re-send the notification
-          return await _sendNotification(activeUser.email!, old);
+          return await _sendNotification(activeAgent.displayId, old);
         } else {
           return api.InviteStatus(
               emailSent: false, nextNotification: old.nextNotification);
@@ -138,30 +137,26 @@ class ConsentBackend {
       // Create a new entry.
       final consent = Consent.init(
         fromAgent: activeAgent.agentId,
-        fromUserId: activeUser.userId,
         email: email,
         kind: kind,
         args: args,
-        createdBySiteAdmin: activeAgent is SupportAgent,
       );
       await _db.commit(inserts: [
         consent,
         auditLogRecord,
       ]);
-      return await _sendNotification(activeUser.email!, consent);
+      return await _sendNotification(activeAgent.displayId, consent);
     });
   }
 
   /// Invites a new uploader to the package.
   Future<api.InviteStatus> invitePackageUploader({
     required AuthenticatedAgent agent,
-    required User activeUser,
     required String packageName,
     required String uploaderEmail,
   }) async {
     return await _invite(
       activeAgent: agent,
-      activeUser: activeUser,
       email: uploaderEmail,
       kind: ConsentKind.packageUploader,
       args: [packageName],
@@ -182,7 +177,6 @@ class ConsentBackend {
     final user = authenticatedUser.user;
     return await _invite(
       activeAgent: authenticatedUser,
-      activeUser: user,
       email: contactEmail,
       kind: ConsentKind.publisherContact,
       args: [publisherId, contactEmail],
@@ -194,13 +188,11 @@ class ConsentBackend {
   /// Invites a new member for the publisher.
   Future<api.InviteStatus> invitePublisherMember({
     required AuthenticatedAgent authenticatedAgent,
-    required User activeUser,
     required String publisherId,
     required String invitedUserEmail,
   }) async {
     return await _invite(
       activeAgent: authenticatedAgent,
-      activeUser: activeUser,
       email: invitedUserEmail,
       kind: ConsentKind.publisherMember,
       args: [publisherId],
@@ -328,7 +320,6 @@ class _PackageUploaderAction extends ConsentAction {
   @override
   Future<void> onAccept(Consent consent) async {
     final packageName = consent.args![0];
-    final createdBySiteAdmin = consent.createdBySiteAdmin ?? false;
     final currentUser = await requireAuthenticatedWebUser();
     if (currentUser.email?.toLowerCase() != consent.email?.toLowerCase()) {
       throw NotAcceptableException(
@@ -339,7 +330,6 @@ class _PackageUploaderAction extends ConsentAction {
       packageName,
       currentUser.user,
       consentRequestFromAgent: consent.fromAgent!,
-      consentRequestCreatedBySiteAdmin: createdBySiteAdmin,
     );
   }
 
@@ -405,7 +395,6 @@ class _PublisherContactAction extends ConsentAction {
       publisherId,
       contactEmail,
       consentRequestFromAgent: consent.fromAgent!,
-      consentRequestCreatedBySiteAdmin: consent.createdBySiteAdmin ?? false,
     );
   }
 
@@ -485,7 +474,6 @@ class _PublisherMemberAction extends ConsentAction {
       publisherId,
       currentUser.userId,
       consentRequestFromAgent: consent.fromAgent!,
-      consentRequestCreatedBySiteAdmin: consent.createdBySiteAdmin ?? false,
     );
   }