Upgrade pana to 0.22.0 (dart-lang#7472)

CHANGELOG.md

@@ -2,6 +2,8 @@ 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)
+ * Bumped runtimeVersion to `2024.02.09`.
+ * Upgraded pana to `0.22.0`.
  * Note: applied rate limit on search endpoints.
 
 ## `20240206t104500-all`

app/lib/frontend/static_files.dart

@@ -10,7 +10,7 @@ import 'package:crypto/crypto.dart' as crypto;
 import 'package:logging/logging.dart';
 import 'package:meta/meta.dart';
 import 'package:mime/mime.dart' as mime;
-import 'package:pana/pana.dart' show runProc;
+import 'package:pana/pana.dart' show runConstrained;
 import 'package:path/path.dart' as path;
 
 final _logger = Logger('pub.static_files');
@@ -297,7 +297,7 @@ Future<DateTime> _detectLastModified(Directory dir) async {
 }
 
 Future _runPubGet(Directory dir) async {
-  final pr = await runProc(
+  final pr = await runConstrained(
     ['dart', 'pub', 'get'],
     workingDirectory: dir.path,
     timeout: Duration(minutes: 2),
@@ -346,7 +346,7 @@ Future<void> updateWebAppBuild() async {
   final webAppDir = Directory(resolveWebAppDirPath());
 
   await _runPubGet(webAppDir);
-  final pr = await runProc(
+  final pr = await runConstrained(
     ['/bin/sh', 'build.sh'],
     workingDirectory: webAppDir.path,
     timeout: const Duration(minutes: 2),
@@ -364,7 +364,7 @@ Future<void> updateWebAppBuild() async {
 Future<void> updateWebCssBuild() async {
   final webCssDir = Directory(resolveWebCssDirPath());
   await _runPubGet(webCssDir);
-  final pr = await runProc(
+  final pr = await runConstrained(
     ['/bin/sh', 'build.sh'],
     workingDirectory: webCssDir.path,
     timeout: const Duration(minutes: 2),

app/lib/service/openid/openssl_commands.dart

@@ -57,7 +57,7 @@ Future<bool> verifyTextWithRsaSignature({
     await signatureFile.writeAsBytes(signature);
     final publicKeyFile = File(p.join(dir.path, 'public.pem'));
     await publicKeyFile.writeAsString(publicKey.asPemString);
-    final pr = await runProc(
+    final pr = await runConstrained(
       [
         'openssl',
         'dgst',

app/lib/shared/versions.dart

@@ -24,10 +24,10 @@ final RegExp runtimeVersionPattern = RegExp(r'^\d{4}\.\d{2}\.\d{2}$');
 /// when the version switch happens.
 const _acceptedRuntimeVersions = <String>[
   // The current [runtimeVersion].
-  '2024.02.05',
+  '2024.02.09',
   // Fallback runtime versions.
+  '2024.02.05',
   '2024.01.30',
-  '2024.01.22',
 ];
 
 /// Sets the current runtime versions.

app/lib/tool/test_profile/resolver.dart

@@ -8,7 +8,7 @@ import 'dart:io';
 import 'package:_pub_shared/data/package_api.dart' as package_api;
 import 'package:basics/basics.dart';
 import 'package:http/http.dart' as http;
-import 'package:pana/pana.dart' show ToolEnvironment;
+import 'package:pana/pana.dart' show SdkConfig, ToolEnvironment;
 import 'package:path/path.dart' as p;
 
 import '../../shared/configuration.dart';
@@ -29,10 +29,14 @@ Future<List<ResolvedVersion>> resolveVersions(
     await pubCacheDir.create();
 
     final toolEnv = await ToolEnvironment.create(
-      dartSdkDir: activeConfiguration.tools?.previewDartSdkPath ??
-          activeConfiguration.tools?.stableDartSdkPath,
-      flutterSdkDir: activeConfiguration.tools?.previewFlutterSdkPath ??
-          activeConfiguration.tools?.stableFlutterSdkPath,
+      dartSdkConfig: SdkConfig(
+        rootPath: activeConfiguration.tools?.previewDartSdkPath ??
+            activeConfiguration.tools?.stableDartSdkPath,
+      ),
+      flutterSdkConfig: SdkConfig(
+        rootPath: activeConfiguration.tools?.previewFlutterSdkPath ??
+            activeConfiguration.tools?.stableFlutterSdkPath,
+      ),
       pubCacheDir: pubCacheDir.path,
     );
 

app/pubspec.lock

@@ -544,10 +544,10 @@ packages:
     dependency: "direct main"
     description:
       name: pana
-      sha256: "3fc3fe8e7a9fd4827fa4d625a423eec95d305b2bc3538a3adf7fd6c49217af97"
+      sha256: "7112322f009656dbc3a71653bd981c55f3ed9a5625b8b4edec9b07e47564e073"
       url: "https://pub.dev"
     source: hosted
-    version: "0.21.45"
+    version: "0.22.0"
   path:
     dependency: "direct main"
     description:

app/pubspec.yaml

@@ -51,7 +51,7 @@ dependencies:
   watcher: ^1.0.0
   yaml: '^3.0.0'
   # pana version to be pinned
-  pana: '0.21.45'
+  pana: '0.22.0'
   # 3rd-party packages with pinned versions
   mailer: '6.0.1'
   ulid: '2.0.0'

app/test/dartdoc/dartdoc_page_test.dart

@@ -49,7 +49,7 @@ void main() {
       }
       await Directory(pubCacheDir).create(recursive: true);
       toolEnv = await ToolEnvironment.create(
-        globalDartdocVersion: dartdocVersion,
+        dartdocVersion: dartdocVersion,
         pubCacheDir: pubCacheDir,
       );
       await toolEnv.runUpgrade(pkgDir, false);

app/test/service/openid/openssl_utils.dart

@@ -29,7 +29,7 @@ Future<RsaKeyPair> generateRsaKeyPair({
   return withTempDirectory((dir) async {
     final privateKeyPath = p.join(dir.path, 'private-$uuid.pem');
     final publicKeyPath = p.join(dir.path, 'public-$uuid.pem');
-    final pr1 = await runProc(
+    final pr1 = await runConstrained(
       [
         'openssl',
         'genrsa',
@@ -47,7 +47,7 @@ Future<RsaKeyPair> generateRsaKeyPair({
             privateContent.replaceAll(' RSA PRIVATE KEY', ' PRIVATE KEY'))
         .single;
 
-    final pr2 = await runProc(
+    final pr2 = await runConstrained(
       [
         'openssl',
         'rsa',
@@ -86,7 +86,7 @@ Future<Uint8List> signTextWithRsa({
     await privateKeyFile.writeAsString(
         encodePemBlock(PemLabel.privateKey, privateKey)
             .replaceAll(' PRIVATE KEY', ' RSA PRIVATE KEY'));
-    final pr = await runProc(
+    final pr = await runConstrained(
       [
         'openssl',
         'dgst',

app/test/shared/versions_test.dart

@@ -144,7 +144,7 @@ and do not format to also bump the runtimeVersion.''',
     final content =
         await File('../pkg/pub_worker/lib/src/bin/pana_wrapper.dart')
             .readAsString();
-    expect(content, contains("globalDartdocVersion: '$dartdocVersion'"));
+    expect(content, contains("dartdocVersion: '$dartdocVersion'"));
   });
 
   scopedTest('GC is not deleting currently accepted versions', () {

app/test/task/testdata/goldens/packages/oxygen/score.html

@@ -426,7 +426,7 @@ <h3>
                               ,
                               <strong>Windows</strong>
                               ,
-                              <strong>MacOS</strong>
+                              <strong>macOS</strong>
                               ,
                               <strong>Linux</strong>
                               )
@@ -436,7 +436,7 @@ <h3>
                               <li>✓ iOS</li>
                               <li>✓ Windows</li>
                               <li>✓ Linux</li>
-                              <li>✓ MacOS</li>
+                              <li>✓ macOS</li>
                               <li>✓ Web</li>
                             </ul>
                           </div>

app/test/task/testdata/goldens/packages/oxygen/versions/1.0.0/score.html

@@ -430,7 +430,7 @@ <h3>
                               ,
                               <strong>Windows</strong>
                               ,
-                              <strong>MacOS</strong>
+                              <strong>macOS</strong>
                               ,
                               <strong>Linux</strong>
                               )
@@ -440,7 +440,7 @@ <h3>
                               <li>✓ iOS</li>
                               <li>✓ Windows</li>
                               <li>✓ Linux</li>
-                              <li>✓ MacOS</li>
+                              <li>✓ macOS</li>
                               <li>✓ Web</li>
                             </ul>
                           </div>

pkg/pub_worker/lib/src/bin/pana_wrapper.dart

@@ -107,17 +107,18 @@ Future<void> main(List<String> args) async {
   }
 
   final toolEnv = await ToolEnvironment.create(
-    dartSdkDir: dartSdk?.path,
-    flutterSdkDir: flutterSdk?.path,
+    dartSdkConfig: SdkConfig(
+      rootPath: dartSdk?.path,
+      configHomePath: configDir,
+    ),
+    flutterSdkConfig: SdkConfig(
+      rootPath: flutterSdk?.path,
+      configHomePath: configDir,
+    ),
     pubCacheDir: pubCache,
     panaCacheDir: Platform.environment['PANA_CACHE'],
-    environment: {
-      'CI': 'true',
-      if (configDir != null) 'XDG_CONFIG_HOME': configDir,
-    },
-    useGlobalDartdoc: true,
     // keep in-sync with app/lib/shared/versions.dart
-    globalDartdocVersion: '8.0.4',
+    dartdocVersion: '8.0.4',
   );
 
   //final dartdocOutputDir =
@@ -132,16 +133,12 @@ Future<void> main(List<String> args) async {
     version: version,
     options: InspectOptions(
       pubHostedUrl: Platform.environment['PUB_HOSTED_URL']!,
-      checkRemoteRepository: true,
       dartdocTimeout: _dartdocTimeout,
       dartdocOutputDir: rawDartdocOutputFolder.path,
+      resourcesOutputDir: resourcesOutputDir.path,
+      totalTimeout: _dartdocTimeout,
     ),
     logger: _log,
-    storeResource: (filename, data) async {
-      final file = File(p.join(resourcesOutputDir.path, filename));
-      await file.parent.create(recursive: true);
-      await file.writeAsBytes(data);
-    },
   );
 
   await postPorcessDartdoc(

pkg/pub_worker/pubspec.lock

@@ -458,10 +458,10 @@ packages:
     dependency: "direct main"
     description:
       name: pana
-      sha256: "3fc3fe8e7a9fd4827fa4d625a423eec95d305b2bc3538a3adf7fd6c49217af97"
+      sha256: "7112322f009656dbc3a71653bd981c55f3ed9a5625b8b4edec9b07e47564e073"
       url: "https://pub.dev"
     source: hosted
-    version: "0.21.45"
+    version: "0.22.0"
   path:
     dependency: transitive
     description:

pkg/pub_worker/pubspec.yaml

@@ -9,7 +9,7 @@ dependencies:
   appengine: ^0.13.6
   json_annotation: ^4.3.0
   jsontool: ^1.1.0
-  pana: ^0.21.45
+  pana: ^0.22.0
   lints: ^3.0.0 # required for pana
   meta: ^1.7.0
   api_builder: