update package:appengine to use a recent lint set (#228)

Author: devoncarew

pkgs/appengine/README.md

@@ -170,4 +170,6 @@ in the output of `gcloud app deploy` (as well as via the
 ## Regenerating protobuf
 
 You need to have protoc in `$PATH`.
-Run the `tool/fetch_protos_and_regenerate_dart.sh` script. It will fetch the latest protos and compile them for dart using the protoc_plugin in `dev_dependencies`.
+Run the `tool/fetch_protos_and_regenerate_dart.sh` script. It will fetch the
+latest protos and compile them for dart using the protoc_plugin in
+`dev_dependencies`.

pkgs/appengine/analysis_options.yaml

@@ -1,7 +1,10 @@
+include: package:lints/core.yaml
+
 analyzer:
   errors:
-    # This is triggered in generated code.
-    unnecessary_import: ignore
+    # TODO: We need to update the grpc generator to escape html entities in
+    # proto comments.
+    unintended_html_in_doc_comment: ignore
 
   exclude:
     - tmp/**

pkgs/appengine/example/pubspec.yaml

@@ -1,8 +1,9 @@
 name: hello_world
 publish_to: none
+
 environment:
-  sdk: '>=2.12.0 <3.0.0'
+  sdk: ^3.0.0
 
 dependencies:
   appengine: ^0.13.0
-  logging:
+  logging: ^1.3.0

pkgs/appengine/lib/appengine.dart

@@ -13,6 +13,7 @@ import 'src/appengine_internal.dart' as appengine_internal;
 import 'src/client_context.dart';
 
 export 'package:gcloud/http.dart';
+
 export 'src/appengine_context.dart';
 export 'src/client_context.dart';
 export 'src/errors.dart';
@@ -62,7 +63,7 @@ Future runAppEngine(
   bool shared = false,
   void onAcceptingConnections(InternetAddress address, int port)?,
 }) {
-  var errorHandler;
+  void Function(Object, StackTrace)? errorHandler;
   if (onError != null) {
     if (onError is ZoneUnaryCallback) {
       errorHandler = (error, stack) => onError(error);

pkgs/appengine/lib/src/grpc_api_impl/datastore_impl.dart

@@ -506,7 +506,7 @@ class _Codec {
     final keyElements = List<raw.KeyElement?>.filled(pb.path.length, null);
     for (int i = 0; i < pb.path.length; i++) {
       final part = pb.path[i];
-      var id;
+      Object id;
       if (part.hasName()) {
         id = part.name;
       } else if (part.hasId()) {
@@ -516,7 +516,7 @@ class _Codec {
       }
       keyElements[i] = raw.KeyElement(part.kind, id);
     }
-    var partition;
+    raw.Partition? partition;
     if (pb.hasPartitionId()) {
       final partitionId = pb.partitionId;
       if (partitionId.hasNamespaceId()) {

pkgs/appengine/lib/src/grpc_api_impl/logging_impl.dart

@@ -6,6 +6,7 @@ library grpc_logging;
 
 import 'dart:async';
 import 'dart:io';
+
 import 'package:grpc/grpc.dart' as grpc;
 import 'package:stack_trace/stack_trace.dart' show Trace;
 

pkgs/appengine/pubspec.yaml

@@ -11,7 +11,7 @@ topics:
   - gcp
 
 environment:
-  sdk: '>=2.19.0 <3.0.0'
+  sdk: ^3.0.0
 
 dependencies:
   fixnum: ^1.0.0
@@ -25,5 +25,6 @@ dependencies:
   stack_trace: ^1.10.0
 
 dev_dependencies:
+  lints: ^5.0.0
   protoc_plugin: ^21.1.2
   test: ^1.17.5

pkgs/appengine/test/integration/db/db_tests.dart

@@ -61,9 +61,10 @@ class Person extends db.Model {
   @db.ModelKeyProperty(propertyName: 'mangledWife')
   db.Key? wife;
 
-  operator ==(Object other) => sameAs(other);
+  @override
+  bool operator ==(Object other) => sameAs(other);
 
-  sameAs(Object other) {
+  bool sameAs(Object other) {
     return other is Person &&
         id == other.id &&
         parentKey == other.parentKey &&
@@ -72,6 +73,9 @@ class Person extends db.Model {
         wife == other.wife;
   }
 
+  @override
+  int get hashCode => Object.hash(name, age, wife);
+
   String toString() => 'Person(id: $id, name: $name, age: $age)';
 }
 
@@ -126,7 +130,8 @@ class ExpandoPerson extends db.ExpandoModel {
   @db.StringProperty(propertyName: 'NN')
   String? nickname;
 
-  operator ==(Object other) {
+  @override
+  bool operator ==(Object other) {
     if (other is ExpandoPerson && id == other.id && name == other.name) {
       if (additionalProperties.length != other.additionalProperties.length) {
         return false;
@@ -140,6 +145,9 @@ class ExpandoPerson extends db.ExpandoModel {
     }
     return false;
   }
+
+  @override
+  int get hashCode => Object.hash(name, nickname);
 }
 
 Future sleep(Duration duration) => Future.delayed(duration);
@@ -310,7 +318,9 @@ runTests(db.DatastoreDB store, String namespace) {
         persons[0].parentKey = users[0].key;
         users[1].parentKey = persons[1].key;
 
-        return testInsertLookupDelete([]..addAll(users)..addAll(persons));
+        return testInsertLookupDelete([]
+          ..addAll(users)
+          ..addAll(persons));
       });
 
       test('auto_ids', () {
@@ -420,7 +430,7 @@ runTests(db.DatastoreDB store, String namespace) {
         expandoPersons.add(expandoPerson);
       }
 
-      var LOWER_BOUND = 'user2';
+      const LOWER_BOUND = 'user2';
 
       var usersSortedNameDescNicknameAsc = List<User>.from(users);
       usersSortedNameDescNicknameAsc.sort((User a, User b) {
@@ -454,7 +464,9 @@ runTests(db.DatastoreDB store, String namespace) {
           .where((User u) => u.wife == root.append(User, id: 42 + 3))
           .toList();
 
-      var allInserts = <db.Model>[]..addAll(users)..addAll(expandoPersons);
+      var allInserts = <db.Model>[]
+        ..addAll(users)
+        ..addAll(expandoPersons);
       var allKeys = allInserts.map((model) => model.key).toList();
       List<db.Key> userKeys = users.map((model) => model.key).toList();
       List<db.Key> expandoPersonsKeys =

pkgs/appengine/test/integration/db/metamodel_tests.dart

@@ -9,7 +9,6 @@ import 'dart:async';
 import 'package:test/test.dart';
 
 import 'package:gcloud/datastore.dart';
-import 'package:gcloud/datastore.dart' show Key, Partition;
 import 'package:gcloud/db.dart' as db;
 import 'package:gcloud/db/metamodel.dart';
 

pkgs/appengine/test/integration/grpc_datastore_test.dart

@@ -11,45 +11,53 @@ import 'package:test/test.dart' as test;
 import 'db/db_tests.dart' as db_tests;
 import 'db/metamodel_tests.dart' as metamodel_tests;
 
-import 'common_e2e.dart' show onBot, withAuthenticator;
+import 'common_e2e.dart' show onBot, withAuthenticator, PROJECT_ENV;
 import 'raw_datastore_test_impl.dart' as datastore_tests;
 
-main() async {
-  final endpoint = 'datastore.googleapis.com';
-
-  final String nsPrefix = Platform.operatingSystem;
-
-  // Early exit if trying to run this integration test on the bot.
-
+String? shouldSkip() {
   if (onBot()) {
-    return;
+    return 'Skipping e2e tests on bot';
   }
 
-  await withAuthenticator(OAuth2Scopes,
-      (String project, grpc.HttpBasedAuthenticator authenticator) async {
-    test.group('grpc datastore', () {
-      final clientChannel = grpc.ClientChannel(endpoint);
-      final datastore =
-          GrpcDatastoreImpl(clientChannel, authenticator, project);
-      // ignore: unused_local_variable
-      final dbService = db.DatastoreDB(datastore);
-
-      // Once all tests are done we'll close the resources.
-      test.tearDownAll(() async {
-        await clientChannel.shutdown();
-      });
+  if (!Platform.environment.containsKey(PROJECT_ENV)) {
+    return '$PROJECT_ENV not set';
+  }
+
+  return null;
+}
 
-      // Run low-level datastore tests.
-      datastore_tests.runTests(
-          datastore, '${nsPrefix}${DateTime.now().millisecondsSinceEpoch}');
+void main() async {
+  final endpoint = 'datastore.googleapis.com';
 
-      // Run high-level db tests.
-      db_tests.runTests(
-          dbService, '${nsPrefix}${DateTime.now().millisecondsSinceEpoch}');
+  final String nsPrefix = Platform.operatingSystem;
 
-      // Run metamodel tests.
-      metamodel_tests.runTests(datastore, dbService,
-          '${nsPrefix}${DateTime.now().millisecondsSinceEpoch}');
-    }, skip: onBot());
-  });
+  test.group('grpc', () {
+    test.test('datastore', () async {
+      await withAuthenticator(OAuth2Scopes,
+          (String project, grpc.HttpBasedAuthenticator authenticator) async {
+        final clientChannel = grpc.ClientChannel(endpoint);
+        final datastore =
+            GrpcDatastoreImpl(clientChannel, authenticator, project);
+        // ignore: unused_local_variable
+        final dbService = db.DatastoreDB(datastore);
+
+        // Once all tests are done we'll close the resources.
+        test.tearDownAll(() async {
+          await clientChannel.shutdown();
+        });
+
+        // Run low-level datastore tests.
+        datastore_tests.runTests(
+            datastore, '${nsPrefix}${DateTime.now().millisecondsSinceEpoch}');
+
+        // Run high-level db tests.
+        db_tests.runTests(
+            dbService, '${nsPrefix}${DateTime.now().millisecondsSinceEpoch}');
+
+        // Run metamodel tests.
+        metamodel_tests.runTests(datastore, dbService,
+            '${nsPrefix}${DateTime.now().millisecondsSinceEpoch}');
+      });
+    });
+  }, skip: shouldSkip());
 }