chore(cli): Pass etag to backend during deploy (#353)

Author: dnys1

apps/cli/lib/src/frontend/celest_frontend.dart

@@ -33,6 +33,7 @@ import 'package:celest_cli/src/utils/process.dart';
 import 'package:celest_cli/src/utils/recase.dart';
 import 'package:celest_cli/src/utils/run.dart';
 import 'package:celest_cloud/src/proto.dart' as pb;
+import 'package:crypto/crypto.dart';
 import 'package:logging/logging.dart';
 import 'package:mason_logger/mason_logger.dart' show Progress;
 import 'package:stream_transform/stream_transform.dart';
@@ -1002,7 +1003,7 @@ final class CelestFrontend {
     return cloudEnvironment;
   }
 
-  Future<Uint8List> _tarGzDirectory(String path) async {
+  Future<(Uint8List, String)> _tarGzDirectory(String path) async {
     final encoder = TarFileEncoder();
     final tarFile = fileSystem.file(
       p.join(projectPaths.projectCacheDir, '${p.basename(path)}.tar'),
@@ -1013,7 +1014,8 @@ final class CelestFrontend {
       filename: tarFile.path,
     );
     final tarStream = tarFile.openRead();
-    return collectBytes(tarStream.transform(gzip.encoder));
+    final bytes = await collectBytes(tarStream.transform(gzip.encoder));
+    return (bytes, md5.convert(bytes).toString());
   }
 
   Future<(ast.ResolvedProject, Uri)> _deployProject({
@@ -1026,26 +1028,26 @@ final class CelestFrontend {
           resolvedProject: resolvedProject,
           environmentId: environmentId,
         );
-        final (kernelBytes, flutterAssetBytes) = (
-          output.outputDill,
-          await switch (resolvedProject.sdkConfig.targetSdk) {
-            ast.SdkType.flutter => _tarGzDirectory(
-                p.join(projectPaths.buildDir, 'flutter_assets'),
-              ),
-            _ => Future.value(Uint8List(0)),
-          },
-        );
+        final (flutterAssetBytes, flutterAssetsEtag) =
+            switch (resolvedProject.sdkConfig.targetSdk) {
+          ast.SdkType.flutter => await _tarGzDirectory(
+              p.join(projectPaths.buildDir, 'flutter_assets'),
+            ),
+          _ => (Uint8List(0), ''),
+        };
         final assets = [
           pb.ProjectAsset(
             type: output.type,
             filename: '${p.basenameWithoutExtension(output.outputDillPath)}.gz',
-            inline: gzip.encode(kernelBytes),
+            inline: gzip.encode(output.outputDill),
+            etag: output.outputDillDigest.toString(),
           ),
           if (resolvedProject.sdkConfig.targetSdk == ast.SdkType.flutter)
             pb.ProjectAsset(
               type: pb.ProjectAsset_Type.FLUTTER_ASSETS,
               filename: 'flutter_assets.tar.gz',
               inline: flutterAssetBytes,
+              etag: flutterAssetsEtag,
             ),
         ];
         final operation = cloud.projects.environments.deploy(

examples/gemini/celest/.gitignore

@@ -3,3 +3,4 @@
 
 # Celest
 **/.env
+build/

services/celest_cloud_hub/lib/src/deploy/fly/fly_deployment_engine.dart

@@ -34,7 +34,7 @@ typedef ProjectAsset =
       pb.ProjectAsset_Type type,
       String filename,
       Uint8List inline,
-      String etag,
+      String? etag,
     });
 
 final class FlyDeploymentEngine {
@@ -263,8 +263,10 @@ final class FlyDeploymentEngine {
 
     // Deploy using `flyctl deploy`
     await _withTempDirectory((dir) async {
-      if (kernelAsset.etag != md5.convert(kernelAsset.inline).toString()) {
-        throw GrpcError.failedPrecondition('Kernel asset has been modified');
+      if (kernelAsset.etag case final etag?) {
+        if (etag != md5.convert(kernelAsset.inline).toString()) {
+          throw GrpcError.failedPrecondition('Kernel asset has been modified');
+        }
       }
 
       // Write the kernel file to disk
@@ -281,11 +283,12 @@ final class FlyDeploymentEngine {
       await kernelFile.writeAsBytes(kernelAssetData);
 
       if (flutterAssetsBundle case final flutterAssetsBundle?) {
-        if (flutterAssetsBundle.etag !=
-            md5.convert(flutterAssetsBundle.inline).toString()) {
-          throw GrpcError.failedPrecondition(
-            'Flutter assets bundle has been modified',
-          );
+        if (flutterAssetsBundle.etag case final etag?) {
+          if (etag != md5.convert(flutterAssetsBundle.inline).toString()) {
+            throw GrpcError.failedPrecondition(
+              'Flutter assets bundle has been modified',
+            );
+          }
         }
         // Write the Flutter assets bundle to disk
         final flutterAssetsFile = dir.childFile(flutterAssetsBundle.filename);

services/celest_cloud_hub/lib/src/services/project_environments_service.dart

@@ -453,13 +453,7 @@ final class ProjectEnvironmentsService extends ProjectEnvironmentsServiceBase
     if (kernelAsset == null) {
       throw GrpcError.invalidArgument('Missing Dart kernel asset');
     }
-    if (!kernelAsset.hasEtag()) {
-      throw GrpcError.invalidArgument('Missing ETag for kernel asset');
-    }
     final flutterAssetsBundle = assets[pb.ProjectAsset_Type.FLUTTER_ASSETS];
-    if (flutterAssetsBundle != null && !flutterAssetsBundle.hasEtag()) {
-      throw GrpcError.invalidArgument('Missing ETag for Flutter asset');
-    }
 
     final operationId = typeId('op');
     final operation =
@@ -481,14 +475,14 @@ final class ProjectEnvironmentsService extends ProjectEnvironmentsServiceBase
         filename: kernelAsset.filename,
         inline: Uint8List.fromList(kernelAsset.inline).asUnmodifiableView(),
         type: kernelAsset.type,
-        etag: kernelAsset.etag,
+        etag: kernelAsset.hasEtag() ? kernelAsset.etag : null,
       ),
       flutterAssetsBundle: switch (flutterAssetsBundle) {
         final asset? => (
           filename: asset.filename,
           inline: Uint8List.fromList(asset.inline).asUnmodifiableView(),
           type: asset.type,
-          etag: asset.etag,
+          etag: asset.hasEtag() ? asset.etag : null,
         ),
         _ => null,
       },