Skip to content

Commit

Permalink
feat: add ready_ts to servers endpoint (#1006)
Browse files Browse the repository at this point in the history
This will close RVTEE-316
  • Loading branch information
AngelOnFira committed Aug 8, 2024
1 parent a23073b commit 8b44a7c
Show file tree
Hide file tree
Showing 13 changed files with 29 additions and 7 deletions.
1 change: 1 addition & 0 deletions fern/definition/servers/common.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ types:
DELETE request if needed.
type: optional<long>
create_ts: long
start_ts: optional<long>
destroy_ts: optional<long>

Resources:
Expand Down
1 change: 1 addition & 0 deletions lib/convert/src/impls/ds.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ impl ApiTryFrom<backend::ds::Server> for models::ServersServer {
Ok(models::ServersServer {
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(),
Expand Down
14 changes: 7 additions & 7 deletions proto/backend/ds.proto
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ message Server {
int64 kill_timeout_ms = 7;
optional string webhook_url = 8;
int64 create_ts = 9;
optional int64 destroy_ts = 10;
rivet.common.Uuid image_id = 11;
repeated string args = 12;
NetworkMode network_mode = 13;
map<string, string> environment = 14;
map<string, Port> network_ports = 15;

optional int64 start_ts = 10;
optional int64 destroy_ts = 11;
rivet.common.Uuid image_id = 12;
repeated string args = 13;
NetworkMode network_mode = 14;
map<string, string> environment = 15;
map<string, Port> network_ports = 16;
}

message ServerResources {
Expand Down
1 change: 1 addition & 0 deletions sdks/full/go/servers/types.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions sdks/full/openapi/openapi.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions sdks/full/openapi_compat/openapi.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions sdks/full/rust-cli/docs/ServersServer.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions sdks/full/rust-cli/src/models/servers_server.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions sdks/full/rust/docs/ServersServer.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions sdks/full/rust/src/models/servers_server.rs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ CREATE TABLE servers (
webhook_url STRING,

create_ts INT NOT NULL,
start_ts INT,
stop_ts INT,
finish_ts INT,
cleanup_ts INT,
Expand Down
1 change: 1 addition & 0 deletions svc/pkg/ds/ops/server-create/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1402,6 +1402,7 @@ pub async fn handle(
kill_timeout_ms: ctx.kill_timeout_ms,
webhook_url: ctx.webhook_url.clone(),
create_ts,
start_ts: None,
destroy_ts: None,
args: ctx.args.clone(),
environment: ctx.environment.clone(),
Expand Down
3 changes: 3 additions & 0 deletions svc/pkg/ds/ops/server-get/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ struct Server {
kill_timeout_ms: i64,
webhook_url: Option<String>,
create_ts: i64,
start_ts: Option<i64>,
destroy_ts: Option<i64>,
image_id: Uuid,
args: Vec<String>,
Expand Down Expand Up @@ -84,6 +85,7 @@ pub async fn handle(
kill_timeout_ms,
webhook_url,
create_ts,
start_ts,
destroy_ts,
image_id,
args,
Expand Down Expand Up @@ -223,6 +225,7 @@ pub async fn handle(
network_mode: server.network_mode.try_into()?,
network_ports: ports,
create_ts: server.create_ts,
start_ts: server.start_ts,
destroy_ts: server.destroy_ts,
};

Expand Down

0 comments on commit 8b44a7c

Please sign in to comment.