Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into max/SVC-3454
Browse files Browse the repository at this point in the history
  • Loading branch information
MasterPtato committed Jan 5, 2024
2 parents 32405ca + 1b09cb4 commit 09bc1bf
Show file tree
Hide file tree
Showing 61 changed files with 544 additions and 83 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- **Matchmaker** Allow excluding `matchmaker.regions` in order to enable all regions
- **Matchmaker** Lowered internal overhead of log shipping for lobbies
- **Matchmaker** Game mode names are now more lenient to include capital letters & underscores
- **API** Return `API_REQUEST_TIMEOUT` error after 50s (see `docs/infrastructure/API_TIMEOUTS.md` for context)
- Lower long poll timeout from 60s -> 40s

Expand All @@ -25,8 +26,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed

- **Infra** runc rootfs is now a writable file system
- **Matchmaker** Fix logs not shipping if lobby exits immediately
- **Matchmaker** Logs not shipping if lobby exits immediately
- **Matchmaker** Returning `lnd-atl` instead of `dev-lcl` as the mocked mocked region ID in the region list
- **API** 520 error when long polling
- **api-cloud** Returning wrong domain for `domains.cdn`

## [23.2.0-rc.1] - 2023-12-01

Expand Down
10 changes: 10 additions & 0 deletions errors/chirp/recursive-request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
name = "CHIRP_RECURSIVE_REQUEST"
description = "Recursive request: {worker_name}"
description_basic = "Recursive request."
http_status = 500
---

# Recursive Request

A chirp request tried to call a request of the same operation type.
9 changes: 9 additions & 0 deletions errors/chirp/request-timeout.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
name = "CHIRP_REQUEST_TIMEOUT"
description = "Request timed out."
http_status = 500
---

# Requested Timeout

Chirp request took too long.
9 changes: 9 additions & 0 deletions errors/cli/script-not-found.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
name = "CLI_SCRIPT_NOT_FOUND"
description = "The given script was not found."
http_status = 400
---

# Script Not Found

Add the script under the `scripts` config in rivet.yaml.
1 change: 1 addition & 0 deletions errors/game-user/link-failed.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
name = "GAME_USER_LINK_FAILED"
description = "Failed to link game user to identity."
http_status = 400
deprecated = true
---

# Game User Link Failed
Expand Down
1 change: 1 addition & 0 deletions errors/module/instance-destroyed.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
name = "MODULE_INSTANCE_DESTROYED"
description = "Module instance destroyed."
http_status = 500
experimental = true
---

# Module Instance Destroyed
Expand Down
1 change: 1 addition & 0 deletions errors/module/instance-not-initiated.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
name = "MODULE_INSTANCE_STARTING"
description = "Module instance is still started."
http_status = 500
experimental = true
---

# Module Instance Still Starting
Expand Down
1 change: 1 addition & 0 deletions errors/module/malformed-response.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
name = "MODULE_MALFORMED_RESPONSE"
description = "Module returned malformed response."
http_status = 500
experimental = true
---

# Module Malformed Response
Expand Down
1 change: 1 addition & 0 deletions errors/module/not-found.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name = "MODULE_KEY_NOT_FOUND"
description = "Module not found for key: {key}"
description_basic = "Module not found."
http_status = 400
experimental = true
---

# Module Not Found
Expand Down
1 change: 1 addition & 0 deletions errors/module/request-failed.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
name = "MODULE_REQUEST_FAILED"
description = "Failed to make request to module."
http_status = 500
experimental = true
---

# Module Request Failed
Expand Down
1 change: 1 addition & 0 deletions errors/module/script-not-found.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ name = "MODULE_SCRIPT_NOT_FOUND"
description = "Module script not found: {script}"
description_basic = "Module script not found: {}"
http_status = 400
experimental = true
---

# Module Script Not Found
Expand Down
1 change: 1 addition & 0 deletions fern/definition/cloud/version/__package__.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ types:
Config:
docs: Cloud configuration for a given version.
properties:
scripts: optional<map<string, string>>
engine: optional<engine.Config>
cdn: optional<cdn.Config>
matchmaker: optional<matchmaker.Config>
Expand Down
3 changes: 3 additions & 0 deletions fern/definition/cloud/version/cdn/__package__.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ types:
build_output:
docs: _Configures Rivet CLI behavior. Has no effect on server behavior._
type: optional<string>
build_env:
docs: _Configures Rivet CLI behavior. Has no effect on server behavior._
type: optional<map<string, string>>
site_id:
type: optional<uuid>
routes:
Expand Down
15 changes: 12 additions & 3 deletions fern/definition/cloud/version/identity/__package__.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,19 @@ imports:

types:
Config:
docs: Identity configuration for a given version.
docs: >-
**Deprecated**
Identity configuration for a given version.
properties:
display_names: optional<list<string>>
avatars: optional<list<uuid>>
display_names:
docs: >-
**Deprecated**
type: optional<list<string>>
avatars:
docs: >-
**Deprecated**
type: optional<list<uuid>>

custom_display_names:
docs: >-
Expand Down
11 changes: 10 additions & 1 deletion fern/definition/cloud/version/matchmaker/game_mode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ types:
dockerfile:
docs: _Configures Rivet CLI behavior. Has no effect on server behavior._
type: optional<string>
build_args:
docs: _Configures Rivet CLI behavior. Has no effect on server behavior._
type: optional<map<string, string>>
image:
docs: _Configures Rivet CLI behavior. Has no effect on server behavior._
type: optional<string>
Expand Down Expand Up @@ -95,6 +98,8 @@ types:

GameModeIdentityRequirement:
docs: >-
**Deprecated**
The registration requirement for a user when joining/finding/creating a
lobby. "None" allows for connections without an identity.
enum:
Expand Down Expand Up @@ -153,4 +158,8 @@ types:
enable_private:
docs: Defaults to true when unset.
type: optional<boolean>
max_lobbies_per_identity: optional<integer>
max_lobbies_per_identity:
docs: >-
**Deprecated**
type: optional<integer>
23 changes: 22 additions & 1 deletion gen/openapi/external/spec/openapi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7905,6 +7905,10 @@ components:
type: object
description: Cloud configuration for a given version.
properties:
scripts:
type: object
additionalProperties:
type: string
engine:
$ref: '#/components/schemas/CloudVersionEngineConfig'
cdn:
Expand Down Expand Up @@ -7964,6 +7968,11 @@ components:
build_output:
type: string
description: _Configures Rivet CLI behavior. Has no effect on server behavior._
build_env:
type: object
additionalProperties:
type: string
description: _Configures Rivet CLI behavior. Has no effect on server behavior._
site_id:
type: string
format: uuid
Expand Down Expand Up @@ -8035,17 +8044,21 @@ components:
$ref: '#/components/schemas/CloudVersionEngineCustomConfig'
CloudVersionIdentityConfig:
type: object
description: Identity configuration for a given version.
description: |-
**Deprecated**
Identity configuration for a given version.
properties:
display_names:
type: array
items:
type: string
description: '**Deprecated**'
avatars:
type: array
items:
type: string
format: uuid
description: '**Deprecated**'
custom_display_names:
type: array
items:
Expand Down Expand Up @@ -9949,6 +9962,11 @@ components:
dockerfile:
type: string
description: _Configures Rivet CLI behavior. Has no effect on server behavior._
build_args:
type: object
additionalProperties:
type: string
description: _Configures Rivet CLI behavior. Has no effect on server behavior._
image:
type: string
description: _Configures Rivet CLI behavior. Has no effect on server behavior._
Expand Down Expand Up @@ -10021,6 +10039,8 @@ components:
- guest
- registered
description: >-
**Deprecated**
The registration requirement for a user when joining/finding/creating a
lobby. "None" allows for connections without an identity.
CloudVersionMatchmakerGameModeVerificationConfig:
Expand Down Expand Up @@ -10102,6 +10122,7 @@ components:
description: Defaults to true when unset.
max_lobbies_per_identity:
type: integer
description: '**Deprecated**'
required:
- enabled
CloudVersionMatchmakerLobbyGroup:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**build_command** | Option<**String**> | _Configures Rivet CLI behavior. Has no effect on server behavior._ | [optional]
**build_env** | Option<**::std::collections::HashMap<String, String>**> | _Configures Rivet CLI behavior. Has no effect on server behavior._ | [optional]
**build_output** | Option<**String**> | _Configures Rivet CLI behavior. Has no effect on server behavior._ | [optional]
**routes** | Option<[**Vec<crate::models::CloudVersionCdnRoute>**](CloudVersionCdnRoute.md)> | Multiple CDN version routes. | [optional]
**site_id** | Option<[**uuid::Uuid**](uuid::Uuid.md)> | | [optional]
Expand Down
1 change: 1 addition & 0 deletions gen/openapi/internal/rust-cli/docs/CloudVersionConfig.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ Name | Type | Description | Notes
**identity** | Option<[**crate::models::CloudVersionIdentityConfig**](CloudVersionIdentityConfig.md)> | | [optional]
**kv** | Option<[**serde_json::Value**](.md)> | KV configuration for a given version. | [optional]
**matchmaker** | Option<[**crate::models::CloudVersionMatchmakerConfig**](CloudVersionMatchmakerConfig.md)> | | [optional]
**scripts** | Option<**::std::collections::HashMap<String, String>**> | | [optional]

[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**avatars** | Option<[**Vec<uuid::Uuid>**](uuid::Uuid.md)> | | [optional]
**avatars** | Option<[**Vec<uuid::Uuid>**](uuid::Uuid.md)> | **Deprecated** | [optional]
**custom_avatars** | Option<[**Vec<crate::models::CloudVersionIdentityCustomAvatar>**](CloudVersionIdentityCustomAvatar.md)> | **Deprecated** | [optional]
**custom_display_names** | Option<[**Vec<crate::models::CloudVersionIdentityCustomDisplayName>**](CloudVersionIdentityCustomDisplayName.md)> | **Deprecated** | [optional]
**display_names** | Option<**Vec<String>**> | | [optional]
**display_names** | Option<**Vec<String>**> | **Deprecated** | [optional]

[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Name | Type | Description | Notes
**enable_public** | Option<**bool**> | Defaults to false when unset. | [optional]
**enabled** | **bool** | Sets whether or not the /create endpoint is enabled. |
**identity_requirement** | Option<[**crate::models::CloudVersionMatchmakerGameModeIdentityRequirement**](CloudVersionMatchmakerGameModeIdentityRequirement.md)> | | [optional]
**max_lobbies_per_identity** | Option<**i32**> | | [optional]
**max_lobbies_per_identity** | Option<**i32**> | **Deprecated** | [optional]
**verification** | Option<[**crate::models::CloudVersionMatchmakerGameModeVerificationConfig**](CloudVersionMatchmakerGameModeVerificationConfig.md)> | | [optional]

[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
Name | Type | Description | Notes
------------ | ------------- | ------------- | -------------
**args** | Option<**Vec<String>**> | | [optional]
**build_args** | Option<**::std::collections::HashMap<String, String>**> | _Configures Rivet CLI behavior. Has no effect on server behavior._ | [optional]
**dockerfile** | Option<**String**> | _Configures Rivet CLI behavior. Has no effect on server behavior._ | [optional]
**env** | Option<**::std::collections::HashMap<String, String>**> | | [optional]
**image** | Option<**String**> | _Configures Rivet CLI behavior. Has no effect on server behavior._ | [optional]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@ pub struct CloudVersionCdnConfig {
#[serde(rename = "build_command", skip_serializing_if = "Option::is_none")]
pub build_command: Option<String>,
/// _Configures Rivet CLI behavior. Has no effect on server behavior._
#[serde(rename = "build_env", skip_serializing_if = "Option::is_none")]
pub build_env: Option<::std::collections::HashMap<String, String>>,
/// _Configures Rivet CLI behavior. Has no effect on server behavior._
#[serde(rename = "build_output", skip_serializing_if = "Option::is_none")]
pub build_output: Option<String>,
/// Multiple CDN version routes.
Expand All @@ -33,6 +36,7 @@ impl CloudVersionCdnConfig {
pub fn new() -> CloudVersionCdnConfig {
CloudVersionCdnConfig {
build_command: None,
build_env: None,
build_output: None,
routes: None,
site_id: None,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ pub struct CloudVersionConfig {
pub kv: Option<serde_json::Value>,
#[serde(rename = "matchmaker", skip_serializing_if = "Option::is_none")]
pub matchmaker: Option<Box<crate::models::CloudVersionMatchmakerConfig>>,
#[serde(rename = "scripts", skip_serializing_if = "Option::is_none")]
pub scripts: Option<::std::collections::HashMap<String, String>>,
}

impl CloudVersionConfig {
Expand All @@ -37,6 +39,7 @@ impl CloudVersionConfig {
identity: None,
kv: None,
matchmaker: None,
scripts: None,
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,14 @@
* Generated by: https://openapi-generator.tech
*/

/// CloudVersionIdentityConfig : Identity configuration for a given version.
/// CloudVersionIdentityConfig : **Deprecated** Identity configuration for a given version.


#[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize)]
#[serde(deny_unknown_fields)]
pub struct CloudVersionIdentityConfig {
/// **Deprecated**
#[serde(rename = "avatars", skip_serializing_if = "Option::is_none")]
pub avatars: Option<Vec<uuid::Uuid>>,
/// **Deprecated**
Expand All @@ -23,12 +24,13 @@ pub struct CloudVersionIdentityConfig {
/// **Deprecated**
#[serde(rename = "custom_display_names", skip_serializing_if = "Option::is_none")]
pub custom_display_names: Option<Vec<crate::models::CloudVersionIdentityCustomDisplayName>>,
/// **Deprecated**
#[serde(rename = "display_names", skip_serializing_if = "Option::is_none")]
pub display_names: Option<Vec<String>>,
}

impl CloudVersionIdentityConfig {
/// Identity configuration for a given version.
/// **Deprecated** Identity configuration for a given version.
pub fn new() -> CloudVersionIdentityConfig {
CloudVersionIdentityConfig {
avatars: None,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ pub struct CloudVersionMatchmakerGameModeCreateConfig {
pub enabled: bool,
#[serde(rename = "identity_requirement", skip_serializing_if = "Option::is_none")]
pub identity_requirement: Option<crate::models::CloudVersionMatchmakerGameModeIdentityRequirement>,
/// **Deprecated**
#[serde(rename = "max_lobbies_per_identity", skip_serializing_if = "Option::is_none")]
pub max_lobbies_per_identity: Option<i32>,
#[serde(rename = "verification", skip_serializing_if = "Option::is_none")]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
* Generated by: https://openapi-generator.tech
*/

/// CloudVersionMatchmakerGameModeIdentityRequirement : The registration requirement for a user when joining/finding/creating a lobby. \"None\" allows for connections without an identity.
/// CloudVersionMatchmakerGameModeIdentityRequirement : **Deprecated** The registration requirement for a user when joining/finding/creating a lobby. \"None\" allows for connections without an identity.
/// The registration requirement for a user when joining/finding/creating a lobby. \"None\" allows for connections without an identity.
/// **Deprecated** The registration requirement for a user when joining/finding/creating a lobby. \"None\" allows for connections without an identity.
#[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)]
#[serde(deny_unknown_fields)]
pub enum CloudVersionMatchmakerGameModeIdentityRequirement {
Expand Down
Loading

0 comments on commit 09bc1bf

Please sign in to comment.