only serve from artifacts/ if the directory exists

Author: devoncarew

.cloud_build/README.md

@@ -35,7 +35,6 @@ gcloud builds submit \
 
 The substitutions are a comma separated list of `SUBSITUTION=value`:
 - `_FLUTTER_CHANNEL` - The Flutter channel to use. (`stable`, `beta`, or `main`)
-- `_STORAGE_BUCKET` - The name of the Cloud Storage bucket to use (nnbd_artifacts)
 - `_SERVICE_NAME` - The name of the Cloud Run service (dart-services-cloud-run, flutter-beta-channel, or flutter-master-channel)
 - `_DEPLOY_REGION` - The region to deploy the Cloud Run service to (us-central1)
 - `_REDIS_ADDR` - the IP address of the Redis bucket (10.0.0.4:6379)

.cloud_build/dart_services.yaml

@@ -51,30 +51,6 @@ steps:
       - FLUTTER_CHANNEL=${_FLUTTER_CHANNEL}
     dir: pkgs/dart_services
 
-  # Upload storage artifacts
-  - name: gcr.io/google.com/cloudsdktool/cloud-sdk
-    id: Upload storage artifacts
-    entrypoint: bash
-    args:
-      - -c
-      - |
-          echo "Uploading storage artifact for version $(cat /workspace/dart_version.txt)" && gsutil -h "Cache-Control: public, max-age=604800, immutable" cp -z js artifacts/*.js* gs://${_STORAGE_BUCKET}/$(cat /workspace/dart_version.txt)/
-    env:
-      - FLUTTER_CHANNEL=${_FLUTTER_CHANNEL}
-    dir: pkgs/dart_services
-
-  # Validate storage artifacts
-  - name: gcr.io/$PROJECT_ID/flutter:${_FLUTTER_CHANNEL}
-    id: Validate storage artifacts
-    entrypoint: dart
-    args:
-      - tool/grind.dart
-      - validate-storage-artifacts
-      - --bucket=${_STORAGE_BUCKET}
-    env:
-      - FLUTTER_CHANNEL=${_FLUTTER_CHANNEL}
-    dir: pkgs/dart_services
-
   # Build the container image
   - name: 'gcr.io/cloud-builders/docker'
     args:
@@ -118,7 +94,7 @@ steps:
       - --cpu-boost
       - --max-instances=1000
       - --command=bin/server
-      - --args=--redis-url=redis://${_REDIS_ADDR},--storage-bucket=${_STORAGE_BUCKET}
+      - --args=--redis-url=redis://${_REDIS_ADDR}
     dir: pkgs/dart_services
 timeout: 1200s
 images:

pkgs/dart_services/.gitignore

@@ -19,9 +19,7 @@ pubspec.lock
 dump.rdb
 
 # compilation artifacts
-artifacts/*.dill
-artifacts/*.js
-artifacts/*.map
+artifacts/**
 project_templates/
 flutter-sdks/
 local_pub_cache/

pkgs/dart_services/artifacts/_placeholder.txt

@@ -27,12 +27,6 @@ Future<void> main(List<String> args) async {
   final parser = ArgParser()
     ..addOption('port', valueHelp: 'port', help: 'The port to listen on.')
     ..addOption('redis-url', valueHelp: 'url', help: 'The redis server url.')
-    ..addOption(
-      'storage-bucket',
-      valueHelp: 'name',
-      help: 'The name of the Cloud Storage bucket for compilation artifacts.',
-      defaultsTo: 'nnbd_artifacts',
-    )
     ..addFlag(
       'help',
       abbr: 'h',
@@ -68,8 +62,6 @@ Future<void> main(List<String> args) async {
   emitLogsToStdout();
 
   final redisServerUri = results['redis-url'] as String?;
-  final storageBucket =
-      results['storage-bucket'] as String? ?? 'nnbd_artifacts';
 
   final cloudRunEnvVars = Platform.environment.entries
       .where((entry) => entry.key.startsWith('K_'))
@@ -89,8 +81,7 @@ Starting dart-services:
   final server = await EndpointsServer.serve(
     port,
     sdk,
-    redisServerUri,
-    storageBucket,
+    redisServerUri: redisServerUri,
   );
 
   _logger.genericInfo('Listening on port ${server.port}');
@@ -99,15 +90,10 @@ Starting dart-services:
 class EndpointsServer {
   static Future<EndpointsServer> serve(
     int port,
-    Sdk sdk,
-    String? redisServerUri,
-    String storageBucket,
-  ) async {
-    final endpointsServer = EndpointsServer._(
-      sdk,
-      redisServerUri,
-      storageBucket,
-    );
+    Sdk sdk, {
+    required String? redisServerUri,
+  }) async {
+    final endpointsServer = EndpointsServer._(sdk, redisServerUri);
     await endpointsServer._init();
 
     endpointsServer.server = await shelf.serve(
@@ -125,7 +111,7 @@ class EndpointsServer {
 
   late final CommonServerApi commonServer;
 
-  EndpointsServer._(Sdk sdk, String? redisServerUri, String storageBucket) {
+  EndpointsServer._(Sdk sdk, String? redisServerUri) {
     // The name of the Cloud Run revision being run, for more detail please see:
     // https://cloud.google.com/run/docs/reference/container-contract#env-vars
     final serverVersion = Platform.environment['K_REVISION'];
@@ -134,9 +120,7 @@ class EndpointsServer {
         ? NoopCache()
         : RedisCache(redisServerUri, sdk, serverVersion);
 
-    commonServer = CommonServerApi(
-      CommonServerImpl(sdk, cache, storageBucket: storageBucket),
-    );
+    commonServer = CommonServerApi(CommonServerImpl(sdk, cache));
 
     final pipeline = const Pipeline()
         .addMiddleware(logRequestsToLogger(_logger))
@@ -196,7 +180,7 @@ class TestServerRunner {
 
     _started = Completer<void>();
     try {
-      await EndpointsServer.serve(_port, sdk, null, 'nnbd_artifacts');
+      await EndpointsServer.serve(_port, sdk, redisServerUri: null);
     } on SocketException {
       // This is expected if the server is already running.
     }

pkgs/dart_services/lib/server.dart

@@ -37,26 +37,21 @@ final log = DartPadLogger('common_server');
 class CommonServerImpl {
   final Sdk sdk;
   final ServerCache cache;
-  final String storageBucket;
 
   late Analyzer analyzer;
   late Compiler compiler;
   final ai = GenerativeAI();
   final GenUi genui = GenUi();
 
-  CommonServerImpl(
-    this.sdk,
-    this.cache, {
-    this.storageBucket = 'nnbd_artifacts',
-  });
+  CommonServerImpl(this.sdk, this.cache);
 
   Future<void> init() async {
     log.genericFine('initializing CommonServerImpl');
 
     analyzer = Analyzer(sdk);
     await analyzer.init();
 
-    compiler = Compiler(sdk, storageBucket: storageBucket);
+    compiler = Compiler(sdk);
   }
 
   Future<void> shutdown() async {
@@ -81,7 +76,10 @@ class CommonServerApi {
     router.get(r'/api/<apiVersion>/version', handleVersion);
 
     // serve the compiled artifacts
-    router.mount('/artifacts/', createStaticHandler('artifacts'));
+    final artifactsDir = Directory('artifacts');
+    if (artifactsDir.existsSync()) {
+      router.mount('/artifacts/', createStaticHandler(artifactsDir.path));
+    }
 
     // general requests (POST)
     router.post(r'/api/<apiVersion>/analyze', handleAnalyze);
@@ -103,6 +101,7 @@ class CommonServerApi {
     router.post(r'/api/<apiVersion>/generateCode', generateCode);
     router.post(r'/api/<apiVersion>/updateCode', updateCode);
     router.post(r'/api/<apiVersion>/suggestFix', suggestFix);
+
     return router;
   }();
 

pkgs/dart_services/lib/src/common_server.dart

@@ -27,8 +27,7 @@ class Compiler {
 
   final ProjectTemplates _projectTemplates;
 
-  Compiler(Sdk sdk, {required String storageBucket})
-    : this._(sdk, path.join(sdk.dartSdkPath, 'bin', 'dart'));
+  Compiler(Sdk sdk) : this._(sdk, path.join(sdk.dartSdkPath, 'bin', 'dart'));
 
   Compiler._(this._sdk, this._dartPath)
     : _ddcDriver = BazelWorkerDriver(

pkgs/dart_services/lib/src/compiling.dart

@@ -15,7 +15,7 @@ void main() {
     final sdk = Sdk.fromLocalFlutter();
 
     setUpAll(() async {
-      compiler = Compiler(sdk, storageBucket: 'nnbd_artifacts');
+      compiler = Compiler(sdk);
     });
 
     tearDownAll(() async {