feat: add hash to bootstrap

rivet-gg · Sep 25, 2024 · a9bee68 · a9bee68
1 parent f07b095
commit a9bee68
Show file tree

Hide file tree

Showing 45 changed files with 212 additions and 183 deletions.
diff --git a/fern/definition/cloud/__package__.yml b/fern/definition/cloud/__package__.yml
@@ -19,6 +19,7 @@ types:
       origins: BootstrapOrigins
       captcha: BootstrapCaptcha
       login_methods: BootstrapLoginMethods
+      deploy_hash: string
 
   BootstrapCluster:
     docs: The type of cluster that the backend is currently running.

diff --git a/lib/bolt/core/src/context/service.rs b/lib/bolt/core/src/context/service.rs
@@ -510,33 +510,35 @@ impl ServiceContextData {
 				);
 			}
 
-			let can_depend =
-				if self.is_monolith_worker() {
-					matches!(
-						dep.config().kind,
-						ServiceKind::Database { .. }
-							| ServiceKind::Cache { .. } | ServiceKind::Operation { .. }
-							| ServiceKind::Package { .. }
-							| ServiceKind::Consumer { .. }
-					)
-				} else if matches!(self.config().kind, ServiceKind::Api { .. }) {
-					matches!(
-						dep.config().kind,
-						ServiceKind::Database { .. }
-							| ServiceKind::Cache { .. } | ServiceKind::Operation { .. }
-							| ServiceKind::Package { .. }
-							| ServiceKind::ApiRoutes { .. }
-							| ServiceKind::Consumer { .. }
-					)
-				} else {
-					matches!(
-						dep.config().kind,
-						ServiceKind::Database { .. }
-							| ServiceKind::Cache { .. } | ServiceKind::Operation { .. }
-							| ServiceKind::Package { .. }
-							| ServiceKind::Consumer { .. }
-					)
-				};
+			let can_depend = if self.is_monolith_worker() {
+				matches!(
+					dep.config().kind,
+					ServiceKind::Database { .. }
+						| ServiceKind::Cache { .. }
+						| ServiceKind::Operation { .. }
+						| ServiceKind::Package { .. }
+						| ServiceKind::Consumer { .. }
+				)
+			} else if matches!(self.config().kind, ServiceKind::Api { .. }) {
+				matches!(
+					dep.config().kind,
+					ServiceKind::Database { .. }
+						| ServiceKind::Cache { .. }
+						| ServiceKind::Operation { .. }
+						| ServiceKind::Package { .. }
+						| ServiceKind::ApiRoutes { .. }
+						| ServiceKind::Consumer { .. }
+				)
+			} else {
+				matches!(
+					dep.config().kind,
+					ServiceKind::Database { .. }
+						| ServiceKind::Cache { .. }
+						| ServiceKind::Operation { .. }
+						| ServiceKind::Package { .. }
+						| ServiceKind::Consumer { .. }
+				)
+			};
 
 			if !can_depend {
 				panic!(
@@ -771,6 +773,11 @@ impl ServiceContextData {
 		let source_hash = self.source_hash_dev(&BuildOptimization::Debug).await?;
 		env.insert("RIVET_SOURCE_HASH".into(), source_hash.clone());
 
+		env.insert(
+			"RIVET_PROJECT_SOURCE_HASH".into(),
+			project_ctx.source_hash(),
+		);
+
 		let ns_service_config = self.ns_service_config().await;
 		env.insert(
 			"TOKIO_WORKER_THREADS".into(),

diff --git a/lib/convert/src/impls/admin.rs b/lib/convert/src/impls/admin.rs
@@ -96,7 +96,7 @@ impl ApiTryFrom<cluster::types::Datacenter> for models::AdminClustersDatacenter
 				.map(|p| {
 					Ok(models::AdminClustersPool {
 						desired_count: p.desired_count.try_into()?,
-						drain_timeout: p.drain_timeout.try_into()?,
+						drain_timeout_ms: p.drain_timeout.try_into()?,
 						hardware: p
 							.hardware
 							.iter()

diff --git a/sdks/full/go/admin/clusters/types.go b/sdks/full/go/admin/clusters/types.go
diff --git a/sdks/full/go/cloud/cloud.go b/sdks/full/go/cloud/cloud.go
diff --git a/sdks/full/go/servers/builds/client.go b/sdks/full/go/servers/builds/client.go
diff --git a/sdks/full/go/servers/datacenters/client.go b/sdks/full/go/servers/datacenters/client.go
diff --git a/sdks/full/go/servers/logs/client.go b/sdks/full/go/servers/logs/client.go
diff --git a/sdks/full/openapi/openapi.yml b/sdks/full/openapi/openapi.yml
diff --git a/sdks/full/openapi_compat/openapi.yml b/sdks/full/openapi_compat/openapi.yml
diff --git a/sdks/full/rust-cli/README.md b/sdks/full/rust-cli/README.md
diff --git a/sdks/full/rust-cli/docs/AdminClustersPool.md b/sdks/full/rust-cli/docs/AdminClustersPool.md
diff --git a/sdks/full/rust-cli/docs/CloudBootstrapResponse.md b/sdks/full/rust-cli/docs/CloudBootstrapResponse.md