appengine: update dependencies, use latest lints (#243)

kevmoo · web-flow · commit f838595ec999 · 2025-06-04T03:07:53.000-05:00
diff --git a/pkgs/appengine/CHANGELOG.md b/pkgs/appengine/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.13.11
+
+* Update dependency on `googleapis_auth` and `http`.
+
 ## 0.13.10
 
 * Upgrade `package:grpc` to `^4.0.1`.
diff --git a/pkgs/appengine/analysis_options.yaml b/pkgs/appengine/analysis_options.yaml
@@ -1,10 +1,18 @@
-include: package:lints/core.yaml
+include: package:lints/recommended.yaml
 
 analyzer:
   errors:
     # TODO: We need to update the grpc generator to escape html entities in
     # proto comments.
     unintended_html_in_doc_comment: ignore
+    # proto files import these
+    implementation_imports: ignore
+    # Breaking change to fix
+    constant_identifier_names: ignore
 
   exclude:
     - tmp/**
+
+linter:
+  rules:
+    - unnecessary_library_directive
diff --git a/pkgs/appengine/lib/appengine.dart b/pkgs/appengine/lib/appengine.dart
@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library appengine;
-
 import 'dart:async';
 import 'dart:io';
 
@@ -57,11 +55,11 @@ const Symbol _APPENGINE_CONTEXT = #appengine.context;
 /// The returned `Future` will complete when the HTTP server has been shutdown
 /// and is no longer serving requests.
 Future runAppEngine(
-  void handler(HttpRequest request), {
+  void Function(HttpRequest request) handler, {
   Function? onError,
   int port = 8080,
   bool shared = false,
-  void onAcceptingConnections(InternetAddress address, int port)?,
+  void Function(InternetAddress address, int port)? onAcceptingConnections,
 }) {
   void Function(Object, StackTrace)? errorHandler;
   if (onError != null) {
@@ -147,7 +145,7 @@ bool isCronJobRequest(HttpRequest request) {
 ///         ]);
 ///       });
 ///     }
-Future withAppEngineServices(Future callback()) {
+Future withAppEngineServices(Future Function() callback) {
   return appengine_internal.withAppEngineServices(callback);
 }
 
diff --git a/pkgs/appengine/lib/src/api_impl/stderr_logging_impl.dart b/pkgs/appengine/lib/src/api_impl/stderr_logging_impl.dart
@@ -2,7 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library stderr_logging;
 
 import 'dart:async';
 import 'dart:io' as io;
diff --git a/pkgs/appengine/lib/src/appengine_context.dart b/pkgs/appengine/lib/src/appengine_context.dart
@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library appengine.appengine_context;
-
 class AppEngineContext {
   final String applicationID;
   final String partition;
diff --git a/pkgs/appengine/lib/src/appengine_internal.dart b/pkgs/appengine/lib/src/appengine_internal.dart
@@ -2,7 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library appengine.internal;
 
 import 'dart:async';
 import 'dart:io';
@@ -33,7 +32,7 @@ bool _loggingPackageEnabled = false;
 
 /// Runs the given [callback] inside a new service scope and makes AppEngine
 /// services available within that scope.
-Future withAppEngineServices(Future callback()) =>
+Future withAppEngineServices(Future Function() callback) =>
     _withAppEngineServicesInternal((_) => callback());
 
 /// Runs the AppEngine http server and uses the given request [handler] to
@@ -42,11 +41,11 @@ Future withAppEngineServices(Future callback()) =>
 /// The given request [handler] is run inside a new service scope and has all
 /// AppEngine services available within that scope.
 Future runAppEngine(
-  void handler(HttpRequest request, ClientContext context),
-  void onError(Object e, StackTrace s)?, {
+  void Function(HttpRequest request, ClientContext context) handler,
+  void Function(Object e, StackTrace s)? onError, {
   int port = 8080,
   bool shared = false,
-  void onAcceptingConnections(InternetAddress address, int port)?,
+  void Function(InternetAddress address, int port)? onAcceptingConnections,
 }) {
   return _withAppEngineServicesInternal((ContextRegistry contextRegistry) {
     final appengineServer = AppEngineHttpServer(contextRegistry,
@@ -97,7 +96,7 @@ Future runAppEngine(
 }
 
 Future _withAppEngineServicesInternal(
-    Future callback(ContextRegistry contextRegistry)) {
+    Future Function(ContextRegistry contextRegistry) callback) {
   return ss.fork(() async {
     final ContextRegistry contextRegistry = await _initializeAppEngine();
     final bgServices = contextRegistry.newBackgroundServices();
@@ -130,7 +129,7 @@ Future<ContextRegistry> _initializeAppEngine() async {
   zoneId ??= 'dev-machine';
   final bool isProdEnvironment = !isDevEnvironment;
 
-  String? _findEnvironmentVariable(String name,
+  String? findEnvironmentVariable(String name,
       {bool onlyInProd = false, bool onlyInDev = false, bool needed = true}) {
     if (onlyInProd && !isProdEnvironment) return null;
     if (onlyInDev && !isDevEnvironment) return null;
@@ -142,23 +141,23 @@ Future<ContextRegistry> _initializeAppEngine() async {
     return value;
   }
 
-  final projectId = _findEnvironmentVariable(
+  final projectId = findEnvironmentVariable(
     'GOOGLE_CLOUD_PROJECT',
     needed: true,
   )!;
 
   // For local testing the gcloud sdk brings now a gRPC-ready datastore
   // emulator which will tell the user to use this environment variable.
-  final dbEmulatorHost = _findEnvironmentVariable('DATASTORE_EMULATOR_HOST',
+  final dbEmulatorHost = findEnvironmentVariable('DATASTORE_EMULATOR_HOST',
       onlyInDev: false, needed: false);
 
   final serviceId =
-      _findEnvironmentVariable('GAE_SERVICE', onlyInProd: true, needed: true) ??
+      findEnvironmentVariable('GAE_SERVICE', onlyInProd: true, needed: true) ??
           'dummy-service';
   final versionId =
-      _findEnvironmentVariable('GAE_VERSION', onlyInProd: true, needed: true) ??
+      findEnvironmentVariable('GAE_VERSION', onlyInProd: true, needed: true) ??
           'dummy-version';
-  final instance = _findEnvironmentVariable('GAE_INSTANCE',
+  final instance = findEnvironmentVariable('GAE_INSTANCE',
           onlyInProd: true, needed: true) ??
       'dummy-instance';
 
diff --git a/pkgs/appengine/lib/src/client_context.dart b/pkgs/appengine/lib/src/client_context.dart
@@ -2,7 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library appengine.client_context;
 
 import 'package:gcloud/db.dart';
 import 'package:gcloud/storage.dart';
diff --git a/pkgs/appengine/lib/src/errors.dart b/pkgs/appengine/lib/src/errors.dart
@@ -2,7 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library appengine.api.errors;
 
 import 'dart:io';
 
@@ -16,7 +15,7 @@ class AppEngineError implements Exception {
 }
 
 class NetworkError extends AppEngineError implements IOException {
-  NetworkError(String message) : super(message);
+  NetworkError(super.message);
 
   @override
   String toString() => 'NetworkError: $message';
@@ -26,7 +25,7 @@ class ProtocolError extends AppEngineError implements IOException {
   static const ProtocolError INVALID_RESPONSE =
       ProtocolError('Invalid response');
 
-  const ProtocolError(String message) : super(message);
+  const ProtocolError(super.message);
 
   @override
   String toString() => 'ProtocolError: $message';
@@ -35,15 +34,14 @@ class ProtocolError extends AppEngineError implements IOException {
 class ServiceError extends AppEngineError {
   final String serviceName;
 
-  ServiceError(String message, {this.serviceName = 'ServiceError'})
-      : super(message);
+  ServiceError(super.message, {this.serviceName = 'ServiceError'});
 
   @override
   String toString() => '$serviceName: $message';
 }
 
 class ApplicationError extends AppEngineError {
-  ApplicationError(String message) : super(message);
+  ApplicationError(super.message);
 
   @override
   String toString() => 'ApplicationError: $message';
diff --git a/pkgs/appengine/lib/src/grpc_api/datastore_api.dart b/pkgs/appengine/lib/src/grpc_api/datastore_api.dart
@@ -2,7 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library grpc_api;
 
 export 'package:fixnum/fixnum.dart' show Int32, Int64;
 
diff --git a/pkgs/appengine/lib/src/grpc_api/logging_api.dart b/pkgs/appengine/lib/src/grpc_api/logging_api.dart
@@ -2,7 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library logging_api;
 
 export 'package:fixnum/fixnum.dart' show Int64;
 
diff --git a/pkgs/appengine/lib/src/grpc_api_impl/auth_utils.dart b/pkgs/appengine/lib/src/grpc_api_impl/auth_utils.dart
@@ -4,7 +4,6 @@
 
 // TODO(kustermann): At some point we should integrate this library
 // into `package:googleapis_auth`.
-library auth_utils;
 
 import 'dart:async';
 
diff --git a/pkgs/appengine/lib/src/grpc_api_impl/datastore_impl.dart b/pkgs/appengine/lib/src/grpc_api_impl/datastore_impl.dart
@@ -2,7 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library grpc_datastore;
 
 import 'dart:async';
 
diff --git a/pkgs/appengine/lib/src/grpc_api_impl/logging_impl.dart b/pkgs/appengine/lib/src/grpc_api_impl/logging_impl.dart
@@ -2,7 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library grpc_logging;
 
 import 'dart:async';
 import 'dart:io';
@@ -451,8 +450,7 @@ api.LogSeverity _severityFromLogLevel(LogLevel level) {
 ///
 /// See: https://cloud.google.com/error-reporting/docs/formatting-error-messages
 String _formatStackTrace(Object error, StackTrace stackTrace) =>
-    'Error: $error\n' +
-    Trace.from(stackTrace).frames.map((f) {
+    'Error: $error\n${Trace.from(stackTrace).frames.map((f) {
       // Find member
       String? member = f.member;
       if (member == '<fn>') {
@@ -468,4 +466,4 @@ String _formatStackTrace(Object error, StackTrace stackTrace) =>
       }
 
       return '    at $member ($loc)\n';
-    }).join('');
+    }).join('')}';
diff --git a/pkgs/appengine/lib/src/logging.dart b/pkgs/appengine/lib/src/logging.dart
@@ -2,8 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library appengine.api.logging;
-
 import 'dart:async';
 
 import 'package:gcloud/service_scope.dart' as ss;
diff --git a/pkgs/appengine/lib/src/server/context_registry.dart b/pkgs/appengine/lib/src/server/context_registry.dart
@@ -2,7 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library appengine.context_registry;
 
 import 'dart:async';
 import 'dart:io';
diff --git a/pkgs/appengine/lib/src/server/logging_package_adaptor.dart b/pkgs/appengine/lib/src/server/logging_package_adaptor.dart
@@ -2,7 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library appengine.server.logging_package_adaptor;
 
 import 'package:logging/logging.dart';
 
diff --git a/pkgs/appengine/lib/src/server/server.dart b/pkgs/appengine/lib/src/server/server.dart
@@ -2,7 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library application;
 
 import 'dart:async';
 import 'dart:convert' show utf8;
@@ -37,8 +36,8 @@ class AppEngineHttpServer {
   Future get done => _shutdownCompleter.future;
 
   void run(
-    applicationHandler(HttpRequest request, ClientContext context), {
-    void onAcceptingConnections(InternetAddress address, int port)?,
+    Function(HttpRequest request, ClientContext context) applicationHandler, {
+    void Function(InternetAddress address, int port)? onAcceptingConnections,
   }) {
     final serviceHandlers = {
       '/_ah/start': _start,
diff --git a/pkgs/appengine/pubspec.yaml b/pkgs/appengine/pubspec.yaml
@@ -1,5 +1,5 @@
 name: appengine
-version: 0.13.10
+version: 0.13.11
 description: >-
   Support for using Dart as a custom runtime on Google App Engine Flexible
   Environment.
@@ -16,9 +16,9 @@ environment:
 dependencies:
   fixnum: ^1.0.0
   gcloud: ^0.8.10
-  googleapis_auth: ^1.1.0
+  googleapis_auth: ^2.0.0
   grpc: ^4.0.1
-  http: '>=0.13.3 <2.0.0'
+  http: ^1.0.0
   logging: ^1.0.1
   path: ^1.8.0
   protobuf: ^3.1.0
diff --git a/pkgs/appengine/test/enable_logging_package_test.dart b/pkgs/appengine/test/enable_logging_package_test.dart
@@ -17,10 +17,12 @@ class LoggingMock extends LoggingBase {
 
   LoggingMock();
 
+  @override
   void log(LogLevel level, String message, {DateTime? timestamp}) {
     _logFunctionMock(level, message, timestamp);
   }
 
+  @override
   void reportError(LogLevel level, Object error, StackTrace stackTrace,
       {DateTime? timestamp}) {
     _reportErrorFunctionMock(
@@ -32,8 +34,8 @@ class LoggingMock extends LoggingBase {
   }
 
   void expectReportError(
-      void func(
-          LogLevel level, Object error, StackTrace stackTrace, DateTime c)) {
+      void Function(
+          LogLevel level, Object error, StackTrace stackTrace, DateTime c) func) {
     _reportErrorFunctionMock = expectAsync4(func);
   }
 
@@ -43,7 +45,7 @@ class LoggingMock extends LoggingBase {
     };
   }
 
-  void expectLog(void func(LogLevel a, String b, DateTime c)) {
+  void expectLog(void Function(LogLevel a, String b, DateTime c) func) {
     _logFunctionMock = expectAsync3(func);
   }
 
@@ -53,12 +55,14 @@ class LoggingMock extends LoggingBase {
     };
   }
 
+  @override
   Future flush() {
     throw "Unexpected method call";
   }
 }
 
 class CustomStackTrace implements StackTrace {
+  @override
   String toString() => 'custom-stack-trace';
 }
 
diff --git a/pkgs/appengine/test/integration/common_e2e.dart b/pkgs/appengine/test/integration/common_e2e.dart
@@ -2,7 +2,6 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-library test.integration.common_e2e;
 
 import 'dart:async';
 import 'dart:io';
@@ -32,7 +31,7 @@ bool onBot() {
 
 Future<dynamic> withAuthenticator(
   List<String> scopes,
-  Future callback(String project, grpc.HttpBasedAuthenticator authenticator),
+  Future Function(String project, grpc.HttpBasedAuthenticator authenticator) callback,
 ) async {
   var project = Platform.environment[PROJECT_ENV];
 
diff --git a/pkgs/appengine/test/integration/db/db_tests.dart b/pkgs/appengine/test/integration/db/db_tests.dart
diff --git a/pkgs/appengine/test/integration/db/metamodel_tests.dart b/pkgs/appengine/test/integration/db/metamodel_tests.dart
diff --git a/pkgs/appengine/test/integration/grpc_datastore_test.dart b/pkgs/appengine/test/integration/grpc_datastore_test.dart
diff --git a/pkgs/appengine/test/integration/raw_datastore_test_impl.dart b/pkgs/appengine/test/integration/raw_datastore_test_impl.dart
diff --git a/pkgs/appengine/test/utils/error_matchers.dart b/pkgs/appengine/test/utils/error_matchers.dart
diff --git a/pkgs/appengine/test/utils/raw_datastore_test_utils.dart b/pkgs/appengine/test/utils/raw_datastore_test_utils.dart
