chore: clean up fern naming

fern/definition/games/servers/__package__.yml → fern/definition/servers/__package__.yml

@@ -29,7 +29,7 @@ service:
         name: GetServersRequest
         query-parameters:
           tags: optional<string>
-          game_id: optional<uuid>
+          game: optional<uuid>
       response: ListServersResponse
 
     create:
@@ -70,7 +70,7 @@ types:
         docs: The name ID of the datacenter
         type: string
       tags: unknown
-      image_id: uuid
+      image: uuid
       arguments: optional<list<string>>
       environment: optional<map<string, string>>
       network: CreateServerNetworkRequest

fern/definition/games/servers/builds.yml → fern/definition/servers/builds.yml

@@ -1,9 +1,9 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/fern-api/fern/main/fern.schema.json
 
 imports:
-  commons: ../../common.yml
-  uploadCommons: ../../upload/common.yml
-  cloudCommons: ../../cloud/common.yml
+  commons: ../common.yml
+  localCommons: common.yml
+  uploadCommons: ../upload/common.yml
 
 service:
   auth: true
@@ -45,11 +45,11 @@ types:
     properties:
       builds:
         docs: A list of builds for the game associated with the token.
-        type: list<cloudCommons.BuildSummary>
+        type: list<localCommons.Build>
 
   CreateBuildRequest:
     properties:
-      display_name: commons.DisplayName
+      name: string
       tags: unknown
       image_tag:
         docs: A tag given to the game build.
@@ -62,9 +62,9 @@ types:
 
   CreateBuildResponse:
     properties:
-      build_id:
+      build:
         type: uuid
-      upload_id:
+      upload:
         type: uuid
       image_presigned_request: optional<uploadCommons.PresignedRequest>
       image_presigned_requests: optional<list<uploadCommons.PresignedRequest>>

fern/definition/games/servers/common.yml → fern/definition/servers/common.yml

@@ -1,14 +1,17 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/fern-api/fern/main/fern.schema.json
 
+imports:
+  commons: ../common.yml
+
 types:
   Server:
     properties:
-      server_id: uuid
-      game_id: uuid
-      datacenter_id: uuid
-      cluster_id: uuid
+      id: uuid
+      game: uuid
+      datacenter: string
+      cluster: uuid
       tags: unknown
-      image_id: uuid
+      image: uuid
       arguments: optional<list<string>>
       environment: optional<map<string, string>>
       network: Network
@@ -19,9 +22,9 @@ types:
           This should be set to a safe default, and can be overridden during a
           DELETE request if needed.
         type: optional<long>
-      create_ts: long
-      start_ts: optional<long>
-      destroy_ts: optional<long>
+      created_at: long
+      started_at: optional<long>
+      destroyed_at: optional<long>
 
   Resources:
     properties:
@@ -72,3 +75,18 @@ types:
   HostRouting:
     properties: {}
 
+  Build:
+    properties:
+      id: uuid
+      upload: uuid
+      name: string
+      created_at: commons.Timestamp
+      content_length:
+        docs: Unsigned 64 bit integer.
+        type: long
+      completed_at:
+        docs: Whether or not this build has completely been uploaded.
+        type: optional<commons.Timestamp>
+      tags:
+        docs: Tags of this build
+        type: map<string, string>

fern/definition/games/servers/logs.yml → fern/definition/servers/logs.yml

@@ -1,7 +1,7 @@
 # yaml-language-server: $schema=https://raw.githubusercontent.com/fern-api/fern/main/fern.schema.json
 
 imports:
-  commons: ../../common.yml
+  commons: ../common.yml
 
 service:
   auth: true
@@ -21,7 +21,7 @@ service:
         name: GetServerLogsRequest
         query-parameters:
           stream: LogStream
-          game_id: optional<uuid>
+          game: optional<uuid>
           watch_index:
             docs: A query parameter denoting the requests watch index.
             type: optional<string>

lib/convert/src/impls/ds.rs

@@ -7,23 +7,37 @@ use rivet_operation::prelude::*;
 use crate::{ApiFrom, ApiInto, ApiTryFrom, ApiTryInto};
 use serde_json::{json, to_value};
 
+impl ApiTryFrom<backend::build::Build> for models::GamesServersBuild {
+	type Error = GlobalError;
+	fn api_try_from(value: backend::build::Build) -> GlobalResult<models::GamesServersBuild> {
+		Ok(models::GamesServersBuild {
+			id: unwrap!(value.build_id).as_uuid(),
+			upload: unwrap!(value.upload_id).as_uuid(),
+			created_at: timestamp::to_string(value.create_ts)?,
+			content_length: value.content_length,
+			completed_at: value.completed_at.map(timestamp::to_string).transpose()?,
+			tags: value.tags,
+		})
+	}
+}
+
 impl ApiTryFrom<backend::ds::Server> for models::GamesServersServer {
 	type Error = GlobalError;
 	fn api_try_from(value: backend::ds::Server) -> GlobalResult<models::GamesServersServer> {
 		Ok(models::GamesServersServer {
-			cluster_id: unwrap!(value.cluster_id).as_uuid(),
-			create_ts: value.create_ts,
-			start_ts: value.start_ts,
-			datacenter_id: unwrap!(value.datacenter_id).as_uuid(),
-			destroy_ts: value.destroy_ts,
-			game_id: unwrap!(value.game_id).as_uuid(),
+			id: unwrap!(value.server_id).as_uuid(),
+			cluster: unwrap!(value.cluster_id).as_uuid(),
+			created_at: value.create_ts,
+			started_at: value.start_ts,
+			datacenter: unwrap!(value.datacenter_id).as_uuid(),
+			destroyed_at: value.destroy_ts,
+			game: unwrap!(value.game_id).as_uuid(),
 			kill_timeout: Some(value.kill_timeout_ms),
 			tags: Some(to_value(value.tags).unwrap()),
 			resources: Box::new(unwrap!(value.resources).api_into()),
-			server_id: unwrap!(value.server_id).as_uuid(),
 			arguments: Some(value.args),
 			environment: Some(value.environment),
-			image_id: unwrap!(value.image_id).as_uuid(),
+			image: unwrap!(value.image_id).as_uuid(),
 			network: Box::new(models::GamesServersNetwork {
 				mode: Some(
 					unwrap!(backend::ds::NetworkMode::from_i32(value.network_mode)).api_into(),