Merge the ImportSource implementations.

app/lib/fake/server/fake_server_entrypoint.dart

@@ -19,7 +19,6 @@ import 'package:pub_dev/shared/configuration.dart';
 import 'package:pub_dev/shared/handlers.dart';
 import 'package:pub_dev/shared/logging.dart';
 import 'package:pub_dev/task/cloudcompute/fakecloudcompute.dart';
-import 'package:pub_dev/tool/test_profile/import_source.dart';
 import 'package:pub_dev/tool/test_profile/importer.dart';
 import 'package:pub_dev/tool/test_profile/models.dart';
 import 'package:shelf/shelf.dart' as shelf;
@@ -173,10 +172,7 @@ Future<shelf.Response> _testProfile(shelf.Request rq) async {
   final profile =
       TestProfile.fromJson(map['testProfile'] as Map<String, dynamic>);
   // ignore: invalid_use_of_visible_for_testing_member
-  await importProfile(
-    profile: profile,
-    source: ImportSource.autoGenerated(),
-  );
+  await importProfile(profile: profile);
   final analysis = (map['analysis'] as String?) ?? 'fake';
   await apiExporter!.synchronizeExportedApi();
   await processTaskFakeLocalOrWorker(analysis);

app/lib/fake/tool/init_data_file.dart

@@ -29,12 +29,6 @@ class FakeInitDataFileCommand extends Command {
     argParser
       ..addOption('test-profile',
           help: 'The file to read the test profile from.')
-      ..addOption(
-        'source',
-        allowed: ['pub.dev', 'fake'],
-        help: 'Download package content from pub.dev or create fake sources.',
-        defaultsTo: 'pub.dev',
-      )
       ..addOption(
         'analysis',
         allowed: ['none', 'fake', 'local', 'worker'],
@@ -57,7 +51,6 @@ class FakeInitDataFileCommand extends Command {
     });
 
     final analysis = argResults!['analysis'] as String;
-    final source = argResults!['source'] as String;
     final dataFile = argResults!['data-file'] as String;
     final profile = TestProfile.fromYaml(
       await File(argResults!['test-profile'] as String).readAsString(),
@@ -79,11 +72,8 @@ class FakeInitDataFileCommand extends Command {
         fn: () async {
           // ignore: invalid_use_of_visible_for_testing_member
           await importProfile(
-            profile: profile,
-            source: source == 'pub.dev'
-                ? ImportSource.fromPubDev(archiveCachePath: archiveCachePath)
-                : ImportSource.autoGenerated(),
-          );
+              profile: profile,
+              source: ImportSource(pubDevArchiveCachePath: archiveCachePath));
 
           await processTaskFakeLocalOrWorker(analysis);
         });

app/lib/tool/test_profile/import_source.dart

@@ -20,36 +20,28 @@ import '../../shared/urls.dart' as urls;
 import 'models.dart';
 import 'resolver.dart' as resolver;
 
-final _autoGeneratedImportSource = _AutoGeneratedImportSource();
+/// Utility class for resolving and getting data for profiles.
+class ImportSource {
+  final _client = Client();
 
-/// Interface for resolving and getting data for profiles.
-abstract class ImportSource {
-  /// Resolve all the package-version required for the [profile].
-  Future<List<ResolvedVersion>> resolveVersions(TestProfile profile);
+  /// Cached archive bytes for generated packages (keys in `<package>/<version>` format).
+  final _archives = <String, List<int>>{};
 
-  /// Gets the archive bytes for [package]-[version].
-  Future<List<int>> getArchiveBytes(String package, String version);
+  late final String pubDevArchiveCachePath;
 
-  /// Close resources that were opened during the sourcing of data.
-  Future<void> close();
-
-  /// Creates a source that resolves and downloads data from pub.dev.
-  static ImportSource fromPubDev({
-    String? archiveCachePath,
+  ImportSource({
+    String? pubDevArchiveCachePath,
   }) {
-    archiveCachePath ??= p.join('.dart_tool', 'pub-test-profile', 'archives');
-    return _PubDevImportSource(archiveCachePath: archiveCachePath);
+    this.pubDevArchiveCachePath = pubDevArchiveCachePath ??
+        p.join('.dart_tool', 'pub-test-profile', 'archives');
   }
 
-  /// Creates a source that generates data based on random seed, without any
-  /// network (or file) access.
-  static ImportSource autoGenerated() => _autoGeneratedImportSource;
-}
-
-abstract class _ImportSource implements ImportSource {
-  final _client = Client();
+  /// Close resources that were opened during the sourcing of data.
+  Future<void> close() async {
+    _client.close();
+  }
 
-  @override
+  /// Resolve all the package-version required for the [profile].
   Future<List<ResolvedVersion>> resolveVersions(TestProfile profile) async {
     return <ResolvedVersion>[
       ...await resolver.resolveVersions(_client, profile),
@@ -91,24 +83,10 @@ abstract class _ImportSource implements ImportSource {
     return versions;
   }
 
-  @override
-  Future<void> close() async {
-    _client.close();
-  }
-}
-
-/// Resolves and downloads data from pub.dev.
-class _PubDevImportSource extends _ImportSource {
-  final String archiveCachePath;
-
-  _PubDevImportSource({
-    required this.archiveCachePath,
-  });
-
-  @override
-  Future<List<int>> getArchiveBytes(String package, String version) async {
+  Future<List<int>> getPubDevArchiveBytes(
+      String package, String version) async {
     final archiveName = '$package-$version.tar.gz';
-    final file = File(p.join(archiveCachePath, archiveName));
+    final file = File(p.join(pubDevArchiveCachePath, archiveName));
     // download package archive if not already in the cache
     if (!await file.exists()) {
       // TODO: Use archive_url from version-listing, that is stable!
@@ -120,14 +98,9 @@ class _PubDevImportSource extends _ImportSource {
     }
     return await file.readAsBytes();
   }
-}
 
-/// Generates data based on random seed, without any network (or file) access.
-class _AutoGeneratedImportSource extends _ImportSource {
-  final _archives = <String, List<int>>{};
-
-  @override
-  Future<List<int>> getArchiveBytes(String package, String version) async {
+  Future<List<int>> getGeneratedArchiveBytes(
+      String package, String version) async {
     final key = '$package/$version';
     final hasher = createHasher(key);
     if (_archives.containsKey(key)) {

app/lib/tool/test_profile/importer.dart

@@ -28,10 +28,11 @@ import 'normalizer.dart';
 @visibleForTesting
 Future<void> importProfile({
   required TestProfile profile,
-  required ImportSource source,
+  ImportSource? source,
   String? pubHostedUrl,
   String? adminUserEmail,
 }) async {
+  source ??= ImportSource();
   final resolvedVersions = await source.resolveVersions(profile);
   resolvedVersions.sort();
 
@@ -96,7 +97,9 @@ Future<void> importProfile({
       lastActiveUploaderEmails[rv.package] = uploaderEmail;
 
       var bytes = pendingBytes['${rv.package}/${rv.version}'] ??
-          await source.getArchiveBytes(rv.package, rv.version);
+          (profile.isGenerated(rv.package, rv.version)
+              ? await source.getGeneratedArchiveBytes(rv.package, rv.version)
+              : await source.getPubDevArchiveBytes(rv.package, rv.version));
       bytes = await _mayCleanupTarModeBits(bytes);
       try {
         await withRetryPubApiClient(

app/lib/tool/test_profile/models.dart

@@ -4,6 +4,7 @@
 
 import 'dart:convert';
 
+import 'package:collection/collection.dart';
 import 'package:json_annotation/json_annotation.dart';
 import 'package:yaml/yaml.dart' as yaml;
 
@@ -58,6 +59,13 @@ class TestProfile {
       defaultUser: email,
     );
   }
+
+  /// Returns whether the [package]/[version] is part of the generated packages list.
+  bool isGenerated(String package, String version) {
+    final p = generatedPackages.firstWhereOrNull((p) => p.name == package);
+    final v = p?.versions?.firstWhereOrNull((v) => v.version == version);
+    return v != null;
+  }
 }
 
 @JsonSerializable(explicitToJson: true, includeIfNull: false)

app/test/package/api_export/api_exporter_test.dart

@@ -16,7 +16,6 @@ import 'package:pub_dev/shared/datastore.dart';
 import 'package:pub_dev/shared/storage.dart';
 import 'package:pub_dev/shared/utils.dart';
 import 'package:pub_dev/shared/versions.dart';
-import 'package:pub_dev/tool/test_profile/import_source.dart';
 import 'package:pub_dev/tool/test_profile/importer.dart';
 import 'package:pub_dev/tool/test_profile/models.dart';
 import 'package:test/test.dart';
@@ -137,7 +136,6 @@ Future<void> _testExportedApiSynchronization(
   _log.info('## New package');
   {
     await importProfile(
-      source: ImportSource.autoGenerated(),
       profile: TestProfile(
         defaultUser: userAtPubDevEmail,
         generatedPackages: [
@@ -183,7 +181,6 @@ Future<void> _testExportedApiSynchronization(
   _log.info('## New package version');
   {
     await importProfile(
-      source: ImportSource.autoGenerated(),
       profile: TestProfile(
         defaultUser: userAtPubDevEmail,
         generatedPackages: [

app/test/package/preview_test.dart

@@ -226,20 +226,15 @@ void main() {
   });
 }
 
-class _ImportSource implements ImportSource {
+class _ImportSource extends ImportSource {
   final Version? Function() _currentSdkVersionFn;
   final Version? Function() _futureSdkVersionFn;
-  final _defaultSource = ImportSource.autoGenerated();
 
   _ImportSource(this._currentSdkVersionFn, this._futureSdkVersionFn);
 
   @override
-  Future<List<ResolvedVersion>> resolveVersions(TestProfile profile) async {
-    return await _defaultSource.resolveVersions(profile);
-  }
-
-  @override
-  Future<List<int>> getArchiveBytes(String package, String version) async {
+  Future<List<int>> getGeneratedArchiveBytes(
+      String package, String version) async {
     final archive = ArchiveBuilder();
 
     final minSdk =
@@ -263,9 +258,4 @@ class _ImportSource implements ImportSource {
 
     return archive.toTarGzBytes();
   }
-
-  @override
-  Future<void> close() async {
-    await _defaultSource.close();
-  }
 }

app/test/shared/test_services.dart

@@ -103,7 +103,7 @@ class FakeAppengineEnv {
           if (testProfile != null) {
             await importProfile(
               profile: testProfile,
-              source: importSource ?? ImportSource.autoGenerated(),
+              source: importSource,
             );
           }
           if (processJobsWithFakeRunners) {
@@ -208,7 +208,7 @@ void testWithFakeTime(
 
           await importProfile(
             profile: testProfile ?? defaultTestProfile,
-            source: importSource ?? ImportSource.autoGenerated(),
+            source: importSource,
           );
           await nameTracker.reloadFromDatastore();
           await generateFakeDownloadCountsInDatastore();

app/test/task/fallback_test.dart

@@ -6,7 +6,6 @@ import 'package:pub_dev/fake/backend/fake_pub_worker.dart';
 import 'package:pub_dev/scorecard/backend.dart';
 import 'package:pub_dev/shared/versions.dart';
 import 'package:pub_dev/task/backend.dart';
-import 'package:pub_dev/tool/test_profile/import_source.dart';
 import 'package:pub_dev/tool/test_profile/importer.dart';
 import 'package:pub_dev/tool/test_profile/models.dart';
 import 'package:test/test.dart';
@@ -104,7 +103,6 @@ void main() {
             ],
             defaultUser: adminAtPubDevEmail,
           ),
-          source: ImportSource.autoGenerated(),
         );
         expect(await taskBackend.latestFinishedVersion('oxygen'), '1.2.0');
         await processTasksWithFakePanaAndDartdoc();

app/test/task/task_test.dart

@@ -16,7 +16,6 @@ import 'package:pana/pana.dart';
 import 'package:pub_dev/task/backend.dart';
 import 'package:pub_dev/task/cloudcompute/fakecloudcompute.dart';
 import 'package:pub_dev/task/models.dart';
-import 'package:pub_dev/tool/test_profile/import_source.dart';
 import 'package:pub_dev/tool/test_profile/importer.dart';
 import 'package:pub_dev/tool/test_profile/models.dart';
 import 'package:test/test.dart';
@@ -314,7 +313,6 @@ void main() {
 
     // Create a package
     await importProfile(
-      source: ImportSource.autoGenerated(),
       profile: TestProfile(
         defaultUser: '[email protected]',
         generatedPackages: [
@@ -501,7 +499,6 @@ void main() {
 
     // Create a new version of existing package, this should trigger analysis
     await importProfile(
-      source: ImportSource.autoGenerated(),
       profile: TestProfile(
         defaultUser: '[email protected]',
         generatedPackages: [
@@ -638,7 +635,6 @@ void main() {
     // Create a new version of neon package, this should trigger analysis
     // of neon, but also of oxygen
     await importProfile(
-      source: ImportSource.autoGenerated(),
       profile: TestProfile(
         defaultUser: '[email protected]',
         generatedPackages: [
@@ -729,7 +725,6 @@ void main() {
 
         // Create new versions, removing the token from the first version
         await importProfile(
-          source: ImportSource.autoGenerated(),
           profile: TestProfile(
             defaultUser: '[email protected]',
             generatedPackages: [

app/test/tool/test_profile/importer_test.dart

@@ -8,7 +8,6 @@ import 'package:pub_dev/account/models.dart';
 import 'package:pub_dev/package/backend.dart';
 import 'package:pub_dev/package/models.dart';
 import 'package:pub_dev/publisher/models.dart';
-import 'package:pub_dev/tool/test_profile/import_source.dart';
 import 'package:pub_dev/tool/test_profile/models.dart';
 import 'package:test/test.dart';
 
@@ -28,7 +27,6 @@ void main() {
           )
         ],
       ),
-      importSource: ImportSource.fromPubDev(),
       fn: () async {
         final users = await dbService.query<User>().run().toList();
         expect(users.single.userId, hasLength(36));
@@ -59,7 +57,6 @@ void main() {
           TestPackage(name: 'http', uploaders: ['[email protected]']),
         ],
       ),
-      importSource: ImportSource.fromPubDev(),
       fn: () async {
         final users = await dbService.query<User>().run().toList();
         expect(users.single.userId, hasLength(36));