From e85302c60ada50e9f185b39de82b4ffae80923fc Mon Sep 17 00:00:00 2001 From: MasterPtato Date: Thu, 21 Nov 2024 23:53:19 +0000 Subject: [PATCH] fix: fix cargo tomls --- .dockerignore | 1 - Cargo.toml | 1126 ++++++++--------- .../infrastructure/rust/GIT_DEPENDENCIES.md | 13 - packages/api/actor/src/route/builds.rs | 8 +- packages/services/build/src/ops/create.rs | 3 - packages/services/build/src/ops/mod.rs | 1 - packages/services/build/tests/prewarm_ats.rs | 34 - .../ds/src/workflows/server/pegboard/mod.rs | 2 +- scripts/cargo/update_workspace.ts | 26 +- sdks/fern/definition/actor/builds.yml | 1 - sdks/full/go/actor/builds.go | 4 +- sdks/full/openapi/openapi.yml | 6 - sdks/full/openapi_compat/openapi.yml | 6 - .../rust-cli/docs/ActorCreateActorRequest.md | 8 - .../rust-cli/docs/ActorPrepareBuildRequest.md | 2 - sdks/full/rust-cli/docs/ProvisionPoolType.md | 4 - .../src/models/actor_prepare_build_request.rs | 8 +- .../rust/docs/ActorPrepareBuildRequest.md | 2 - sdks/full/rust/docs/ProvisionPoolType.md | 4 - sdks/full/rust/src/apis/actor_api.rs | 95 -- sdks/full/rust/src/apis/actor_builds_api.rs | 33 - .../src/apis/provision_datacenters_api.rs | 78 -- .../src/models/actor_create_actor_request.rs | 58 - .../actor_create_actor_runtime_request.rs | 32 - sdks/full/rust/src/models/actor_lifecycle.rs | 29 - .../src/models/actor_prepare_build_request.rs | 63 - .../src/api/resources/actor/client/Client.ts | 13 - .../actor/resources/builds/client/Client.ts | 6 +- .../requests/PrepareBuildRequestQuery.ts | 6 +- .../resources/common/types/PortRouting.ts | 12 - .../actor/types/CreateActorRequest.ts | 6 - .../api/resources/actor/client/Client.d.ts | 13 - .../actor/resources/builds/client/Client.d.ts | 6 +- .../resources/common/types/PortRouting.d.ts | 8 - .../actor/types/CreateActorRequest.d.ts | 3 - sdks/runtime/go/actor/actor.go | 9 - sdks/runtime/go/actor/builds.go | 12 - sdks/runtime/go/actor/client/client.go | 3 - sdks/runtime/go/actor/types.go | 32 - sdks/runtime/openapi/openapi.yml | 244 +--- sdks/runtime/openapi_compat/openapi.yml | 138 -- sdks/runtime/rust/.openapi-generator/FILES | 20 - sdks/runtime/rust/README.md | 13 - sdks/runtime/rust/docs/ActorApi.md | 6 - .../rust/docs/ActorBuildCompression.md | 4 - sdks/runtime/rust/docs/ActorBuildKind.md | 4 - .../rust/docs/ActorCreateActorRequest.md | 3 - .../docs/ActorCreateActorRuntimeRequest.md | 4 - .../rust/docs/ActorGameGuardRouting.md | 11 - sdks/runtime/rust/docs/ActorLifecycle.md | 3 - sdks/runtime/rust/docs/ActorPortRouting.md | 4 - .../rust/docs/ActorPrepareBuildRequest.md | 5 - .../rust/docs/ActorPrepareBuildResponse.md | 5 - sdks/runtime/rust/src/apis/actor_api.rs | 6 - .../src/models/actor_create_actor_request.rs | 6 - .../actor_create_actor_runtime_request.rs | 12 - .../src/models/actor_game_guard_routing.rs | 28 - .../rust/src/models/actor_lifecycle.rs | 6 - .../rust/src/models/actor_port_routing.rs | 9 - .../src/models/actor_prepare_build_request.rs | 16 - .../models/actor_prepare_build_response.rs | 15 - sdks/runtime/rust/src/models/mod.rs | 11 - .../src/api/resources/actor/client/Client.ts | 402 ------ .../requests/CreateActorRequestQuery.ts | 9 - .../resources/actor/client/requests/index.ts | 3 - .../actor/resources/builds/client/Client.ts | 477 +------ .../requests/PrepareBuildRequestQuery.ts | 9 +- 67 files changed, 595 insertions(+), 2654 deletions(-) delete mode 100644 docs-internal/infrastructure/rust/GIT_DEPENDENCIES.md delete mode 100644 packages/services/build/tests/prewarm_ats.rs delete mode 100644 sdks/runtime/rust/docs/ActorGameGuardRouting.md delete mode 100644 sdks/runtime/rust/src/models/actor_game_guard_routing.rs diff --git a/.dockerignore b/.dockerignore index caafd06a83..079814739b 100644 --- a/.dockerignore +++ b/.dockerignore @@ -6,7 +6,6 @@ !sdks/full/rust/src !packages !resources/legacy/proto -!externals/ sdks/runtime svc/**/*.md diff --git a/Cargo.toml b/Cargo.toml index 2ab8dad422..055f075eee 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [workspace] resolver = "2" -members = ["packages/infra/legacy/job-runner","packages/infra/server","packages/common/operation/core","packages/common/operation/macros","packages/common/metrics","packages/common/pools","packages/common/s3-util","packages/common/cache/result","packages/common/cache/build","packages/common/test","packages/common/connection","packages/common/util/core","packages/common/util/search","packages/common/util/macros","packages/common/config","packages/common/nomad-util","packages/common/health-checks","packages/common/chirp/metrics","packages/common/chirp/types","packages/common/chirp/worker","packages/common/chirp/perf","packages/common/chirp/worker-attributes","packages/common/chirp/client","packages/common/runtime","packages/common/redis-util","packages/common/env","packages/common/types-proto/core","packages/common/types-proto/build","packages/common/smithy-output/api-status/rust-server","packages/common/smithy-output/api-status/rust","packages/common/smithy-output/api-matchmaker/rust-server","packages/common/smithy-output/api-matchmaker/rust","packages/common/smithy-output/api-cloud/rust-server","packages/common/smithy-output/api-cloud/rust","packages/common/smithy-output/api-portal/rust-server","packages/common/smithy-output/api-portal/rust","packages/common/smithy-output/api-cf-verification/rust-server","packages/common/smithy-output/api-cf-verification/rust","packages/common/smithy-output/api-party/rust-server","packages/common/smithy-output/api-party/rust","packages/common/smithy-output/api-traefik-provider/rust-server","packages/common/smithy-output/api-traefik-provider/rust","packages/common/smithy-output/api-group/rust-server","packages/common/smithy-output/api-group/rust","packages/common/smithy-output/api-identity/rust-server","packages/common/smithy-output/api-identity/rust","packages/common/smithy-output/api-job/rust-server","packages/common/smithy-output/api-job/rust","packages/common/smithy-output/api-auth/rust-server","packages/common/smithy-output/api-auth/rust","packages/common/smithy-output/api-kv/rust-server","packages/common/smithy-output/api-kv/rust","packages/common/migrate","packages/common/api-helper/macros","packages/common/api-helper/build","packages/common/global-error","packages/common/formatted-error","packages/common/test-images","packages/common/hub-embed","packages/common/service-manager","packages/common/schemac","packages/common/convert","packages/common/chirp-workflow/core","packages/common/chirp-workflow/macros","packages/common/claims","packages/api/provision","packages/api/ui","packages/api/matchmaker","packages/api/portal","packages/api/traefik-provider","packages/api/identity","packages/api/auth","packages/api/group","packages/api/monolith-edge","packages/api/cf-verification","packages/api/status","packages/api/cloud","packages/api/job","packages/api/games","packages/api/actor","packages/api/monolith-public","packages/services/token/ops/exchange","packages/services/token/ops/revoke","packages/services/token/ops/get","packages/services/token/ops/create","packages/services/cluster","packages/services/cluster/standalone/datacenter-tls-renew","packages/services/cluster/standalone/default-update","packages/services/cluster/standalone/gc","packages/services/cluster/standalone/metrics-publish","packages/services/email-verification/ops/complete","packages/services/email-verification/ops/create","packages/services/user-identity/ops/delete","packages/services/user-identity/ops/get","packages/services/user-identity/ops/create","packages/services/pegboard","packages/services/pegboard/standalone/dc-init","packages/services/pegboard/standalone/gc","packages/services/pegboard/standalone/ws","packages/services/monolith/standalone/workflow-worker","packages/services/monolith/standalone/worker","packages/services/ds","packages/services/linode","packages/services/linode/standalone/gc","packages/services/load-test/standalone/api-cloud","packages/services/load-test/standalone/watch-requests","packages/services/load-test/standalone/sqlx","packages/services/load-test/standalone/mm","packages/services/load-test/standalone/mm-sustain","packages/services/faker/ops/job-template","packages/services/faker/ops/mm-player","packages/services/faker/ops/user","packages/services/faker/ops/game","packages/services/faker/ops/game-version","packages/services/faker/ops/region","packages/services/faker/ops/team","packages/services/faker/ops/job-run","packages/services/faker/ops/game-namespace","packages/services/faker/ops/mm-lobby-row","packages/services/faker/ops/build","packages/services/faker/ops/mm-lobby","packages/services/faker/ops/cdn-site","packages/services/user","packages/services/user/standalone/delete-pending","packages/services/user/ops/resolve-email","packages/services/user/ops/get","packages/services/user/ops/profile-validate","packages/services/user/ops/pending-delete-toggle","packages/services/user/ops/token-create","packages/services/user/ops/team-list","packages/services/user/ops/avatar-upload-complete","packages/services/user/worker","packages/services/game/ops/namespace-version-set","packages/services/game/ops/version-validate","packages/services/game/ops/validate","packages/services/game/ops/resolve-namespace-id","packages/services/game/ops/namespace-version-history-list","packages/services/game/ops/namespace-resolve-name-id","packages/services/game/ops/recommend","packages/services/game/ops/version-list","packages/services/game/ops/namespace-validate","packages/services/game/ops/list-for-team","packages/services/game/ops/namespace-get","packages/services/game/ops/get","packages/services/game/ops/version-get","packages/services/game/ops/list-all","packages/services/game/ops/logo-upload-complete","packages/services/game/ops/namespace-list","packages/services/game/ops/namespace-create","packages/services/game/ops/resolve-name-id","packages/services/game/ops/namespace-resolve-url","packages/services/game/ops/create","packages/services/game/ops/version-create","packages/services/game/ops/banner-upload-complete","packages/services/game/ops/token-development-validate","packages/services/team-invite/ops/get","packages/services/team-invite/worker","packages/services/captcha/util","packages/services/captcha/ops/hcaptcha-config-get","packages/services/captcha/ops/verify","packages/services/captcha/ops/turnstile-verify","packages/services/captcha/ops/turnstile-config-get","packages/services/captcha/ops/request","packages/services/captcha/ops/hcaptcha-verify","packages/services/mm-config/ops/namespace-config-validate","packages/services/mm-config/ops/version-publish","packages/services/mm-config/ops/lobby-group-get","packages/services/mm-config/ops/namespace-get","packages/services/mm-config/ops/lobby-group-resolve-version","packages/services/mm-config/ops/version-get","packages/services/mm-config/ops/version-prepare","packages/services/mm-config/ops/lobby-group-resolve-name-id","packages/services/mm-config/ops/namespace-create","packages/services/mm-config/ops/game-upsert","packages/services/mm-config/ops/game-get","packages/services/mm-config/ops/namespace-config-set","packages/services/region/ops/resolve","packages/services/region/ops/recommend","packages/services/region/ops/get","packages/services/region/ops/resolve-for-game","packages/services/region/ops/list-for-game","packages/services/region/ops/list","packages/services/nomad/standalone/monitor","packages/services/cdn/util","packages/services/cdn/ops/site-get","packages/services/cdn/ops/site-list-for-game","packages/services/cdn/ops/namespace-resolve-domain","packages/services/cdn/ops/version-publish","packages/services/cdn/ops/namespace-domain-create","packages/services/cdn/ops/namespace-auth-user-remove","packages/services/cdn/ops/namespace-get","packages/services/cdn/ops/ns-enable-domain-public-auth-set","packages/services/cdn/ops/ns-auth-type-set","packages/services/cdn/ops/site-create","packages/services/cdn/ops/version-get","packages/services/cdn/ops/namespace-auth-user-update","packages/services/cdn/ops/version-prepare","packages/services/cdn/ops/namespace-domain-remove","packages/services/cdn/ops/namespace-create","packages/services/cdn/worker","packages/services/team/util","packages/services/team/ops/validate","packages/services/team/ops/user-ban-list","packages/services/team/ops/recommend","packages/services/team/ops/resolve-display-name","packages/services/team/ops/member-list","packages/services/team/ops/get","packages/services/team/ops/member-count","packages/services/team/ops/member-relationship-get","packages/services/team/ops/member-get","packages/services/team/ops/profile-validate","packages/services/team/ops/user-ban-get","packages/services/team/ops/join-request-list","packages/services/team/ops/avatar-upload-complete","packages/services/team/worker","packages/services/ds-log/ops/read","packages/services/ds-log/ops/export","packages/services/job-run","packages/services/workflow/standalone/gc","packages/services/workflow/standalone/metrics-publish","packages/services/cloud/standalone/default-create","packages/services/cloud/ops/version-publish","packages/services/cloud/ops/game-config-get","packages/services/cloud/ops/namespace-token-public-create","packages/services/cloud/ops/game-config-create","packages/services/cloud/ops/namespace-get","packages/services/cloud/ops/version-get","packages/services/cloud/ops/game-token-create","packages/services/cloud/ops/device-link-create","packages/services/cloud/ops/namespace-create","packages/services/cloud/ops/namespace-token-development-create","packages/services/cloud/worker","packages/services/job/util","packages/services/job/standalone/gc","packages/services/mm/util","packages/services/mm/standalone/gc","packages/services/mm/ops/player-get","packages/services/mm/ops/dev-player-token-create","packages/services/mm/ops/lobby-idle-update","packages/services/mm/ops/lobby-find-lobby-query-list","packages/services/mm/ops/lobby-find-fail","packages/services/mm/ops/lobby-list-for-user-id","packages/services/mm/ops/lobby-history","packages/services/mm/ops/lobby-list-for-namespace","packages/services/mm/ops/lobby-state-get","packages/services/mm/ops/lobby-player-count","packages/services/mm/ops/lobby-find-try-complete","packages/services/mm/ops/lobby-for-run-id","packages/services/mm/ops/player-count-for-namespace","packages/services/mm/ops/lobby-runtime-aggregate","packages/services/mm/ops/lobby-get","packages/services/mm/worker","packages/services/telemetry/standalone/beacon","packages/services/external/ops/request-validate","packages/services/external/worker","packages/services/build","packages/services/build/util","packages/services/build/standalone/default-create","packages/services/build/ops/get","packages/services/build/ops/list-for-game","packages/services/build/ops/list-for-env","packages/services/build/ops/create","packages/services/server-spec","packages/services/cf-custom-hostname/ops/get","packages/services/cf-custom-hostname/ops/resolve-hostname","packages/services/cf-custom-hostname/ops/list-for-namespace-id","packages/services/cf-custom-hostname/worker","packages/services/ip/ops/info","packages/services/dynamic-config","packages/services/email/ops/send","packages/services/job-log/ops/read","packages/services/job-log/worker","packages/services/upload/ops/prepare","packages/services/upload/ops/complete","packages/services/upload/ops/get","packages/services/upload/ops/file-list","packages/services/upload/ops/list-for-user","packages/services/upload/worker","packages/services/custom-user-avatar/ops/list-for-game","packages/services/custom-user-avatar/ops/upload-complete","packages/services/debug/ops/email-res","packages/services/tier","sdks/full/rust"] +members = ["packages/infra/server","packages/infra/legacy/job-runner","packages/api/monolith-public","packages/api/cloud","packages/api/group","packages/api/traefik-provider","packages/api/ui","packages/api/portal","packages/api/monolith-edge","packages/api/job","packages/api/cf-verification","packages/api/actor","packages/api/identity","packages/api/games","packages/api/matchmaker","packages/api/status","packages/api/provision","packages/api/auth","packages/common/redis-util","packages/common/service-manager","packages/common/test","packages/common/nomad-util","packages/common/hub-embed","packages/common/claims","packages/common/env","packages/common/types-proto/build","packages/common/types-proto/core","packages/common/operation/macros","packages/common/operation/core","packages/common/smithy-output/api-traefik-provider/rust-server","packages/common/smithy-output/api-traefik-provider/rust","packages/common/smithy-output/api-identity/rust-server","packages/common/smithy-output/api-identity/rust","packages/common/smithy-output/api-portal/rust-server","packages/common/smithy-output/api-portal/rust","packages/common/smithy-output/api-matchmaker/rust-server","packages/common/smithy-output/api-matchmaker/rust","packages/common/smithy-output/api-cloud/rust-server","packages/common/smithy-output/api-cloud/rust","packages/common/smithy-output/api-cf-verification/rust-server","packages/common/smithy-output/api-cf-verification/rust","packages/common/smithy-output/api-group/rust-server","packages/common/smithy-output/api-group/rust","packages/common/smithy-output/api-job/rust-server","packages/common/smithy-output/api-job/rust","packages/common/smithy-output/api-party/rust-server","packages/common/smithy-output/api-party/rust","packages/common/smithy-output/api-auth/rust-server","packages/common/smithy-output/api-auth/rust","packages/common/smithy-output/api-kv/rust-server","packages/common/smithy-output/api-kv/rust","packages/common/smithy-output/api-status/rust-server","packages/common/smithy-output/api-status/rust","packages/common/connection","packages/common/chirp-workflow/macros","packages/common/chirp-workflow/core","packages/common/health-checks","packages/common/convert","packages/common/runtime","packages/common/formatted-error","packages/common/config","packages/common/migrate","packages/common/metrics","packages/common/api-helper/build","packages/common/api-helper/macros","packages/common/test-images","packages/common/pools","packages/common/util/search","packages/common/util/macros","packages/common/util/core","packages/common/schemac","packages/common/cache/result","packages/common/cache/build","packages/common/global-error","packages/common/chirp/worker","packages/common/chirp/client","packages/common/chirp/metrics","packages/common/chirp/worker-attributes","packages/common/chirp/perf","packages/common/chirp/types","packages/common/s3-util","packages/services/cdn/worker","packages/services/cdn/util","packages/services/cdn/ops/ns-enable-domain-public-auth-set","packages/services/cdn/ops/namespace-get","packages/services/cdn/ops/version-get","packages/services/cdn/ops/namespace-create","packages/services/cdn/ops/namespace-domain-remove","packages/services/cdn/ops/namespace-auth-user-update","packages/services/cdn/ops/site-get","packages/services/cdn/ops/namespace-resolve-domain","packages/services/cdn/ops/version-publish","packages/services/cdn/ops/namespace-auth-user-remove","packages/services/cdn/ops/namespace-domain-create","packages/services/cdn/ops/site-list-for-game","packages/services/cdn/ops/version-prepare","packages/services/cdn/ops/site-create","packages/services/cdn/ops/ns-auth-type-set","packages/services/nomad/standalone/monitor","packages/services/captcha/util","packages/services/captcha/ops/turnstile-verify","packages/services/captcha/ops/hcaptcha-verify","packages/services/captcha/ops/turnstile-config-get","packages/services/captcha/ops/verify","packages/services/captcha/ops/request","packages/services/captcha/ops/hcaptcha-config-get","packages/services/email-verification/ops/complete","packages/services/email-verification/ops/create","packages/services/team/worker","packages/services/team/util","packages/services/team/ops/member-get","packages/services/team/ops/member-relationship-get","packages/services/team/ops/resolve-display-name","packages/services/team/ops/profile-validate","packages/services/team/ops/user-ban-get","packages/services/team/ops/get","packages/services/team/ops/join-request-list","packages/services/team/ops/recommend","packages/services/team/ops/user-ban-list","packages/services/team/ops/avatar-upload-complete","packages/services/team/ops/validate","packages/services/team/ops/member-count","packages/services/team/ops/member-list","packages/services/cloud/worker","packages/services/cloud/standalone/default-create","packages/services/cloud/ops/namespace-token-development-create","packages/services/cloud/ops/game-config-get","packages/services/cloud/ops/namespace-get","packages/services/cloud/ops/version-get","packages/services/cloud/ops/namespace-create","packages/services/cloud/ops/namespace-token-public-create","packages/services/cloud/ops/version-publish","packages/services/cloud/ops/game-config-create","packages/services/cloud/ops/game-token-create","packages/services/cloud/ops/device-link-create","packages/services/external/worker","packages/services/external/ops/request-validate","packages/services/server-spec","packages/services/faker/ops/mm-player","packages/services/faker/ops/job-template","packages/services/faker/ops/team","packages/services/faker/ops/region","packages/services/faker/ops/game-version","packages/services/faker/ops/build","packages/services/faker/ops/cdn-site","packages/services/faker/ops/user","packages/services/faker/ops/mm-lobby","packages/services/faker/ops/game","packages/services/faker/ops/job-run","packages/services/faker/ops/game-namespace","packages/services/faker/ops/mm-lobby-row","packages/services/token/ops/get","packages/services/token/ops/exchange","packages/services/token/ops/create","packages/services/token/ops/revoke","packages/services/region/ops/get","packages/services/region/ops/resolve-for-game","packages/services/region/ops/recommend","packages/services/region/ops/list","packages/services/region/ops/list-for-game","packages/services/region/ops/resolve","packages/services/load-test/standalone/mm-sustain","packages/services/load-test/standalone/sqlx","packages/services/load-test/standalone/api-cloud","packages/services/load-test/standalone/mm","packages/services/load-test/standalone/watch-requests","packages/services/job-log/worker","packages/services/job-log/ops/read","packages/services/custom-user-avatar/ops/upload-complete","packages/services/custom-user-avatar/ops/list-for-game","packages/services/telemetry/standalone/beacon","packages/services/build","packages/services/build/standalone/default-create","packages/services/build/util","packages/services/build/ops/list-for-env","packages/services/build/ops/get","packages/services/build/ops/list-for-game","packages/services/build/ops/create","packages/services/job/standalone/gc","packages/services/job/util","packages/services/ds","packages/services/linode","packages/services/linode/standalone/gc","packages/services/team-invite/worker","packages/services/team-invite/ops/get","packages/services/email/ops/send","packages/services/user-identity/ops/delete","packages/services/user-identity/ops/get","packages/services/user-identity/ops/create","packages/services/pegboard","packages/services/pegboard/standalone/gc","packages/services/pegboard/standalone/dc-init","packages/services/pegboard/standalone/ws","packages/services/user","packages/services/user/worker","packages/services/user/standalone/delete-pending","packages/services/user/ops/pending-delete-toggle","packages/services/user/ops/profile-validate","packages/services/user/ops/get","packages/services/user/ops/resolve-email","packages/services/user/ops/token-create","packages/services/user/ops/avatar-upload-complete","packages/services/user/ops/team-list","packages/services/mm/worker","packages/services/mm/standalone/gc","packages/services/mm/util","packages/services/mm/ops/lobby-state-get","packages/services/mm/ops/lobby-for-run-id","packages/services/mm/ops/lobby-player-count","packages/services/mm/ops/lobby-idle-update","packages/services/mm/ops/player-count-for-namespace","packages/services/mm/ops/lobby-find-try-complete","packages/services/mm/ops/lobby-find-fail","packages/services/mm/ops/lobby-get","packages/services/mm/ops/player-get","packages/services/mm/ops/lobby-list-for-namespace","packages/services/mm/ops/lobby-find-lobby-query-list","packages/services/mm/ops/lobby-history","packages/services/mm/ops/lobby-runtime-aggregate","packages/services/mm/ops/dev-player-token-create","packages/services/mm/ops/lobby-list-for-user-id","packages/services/ip/ops/info","packages/services/mm-config/ops/game-upsert","packages/services/mm-config/ops/namespace-get","packages/services/mm-config/ops/version-get","packages/services/mm-config/ops/namespace-create","packages/services/mm-config/ops/lobby-group-resolve-version","packages/services/mm-config/ops/version-publish","packages/services/mm-config/ops/lobby-group-get","packages/services/mm-config/ops/game-get","packages/services/mm-config/ops/version-prepare","packages/services/mm-config/ops/lobby-group-resolve-name-id","packages/services/mm-config/ops/namespace-config-set","packages/services/mm-config/ops/namespace-config-validate","packages/services/workflow/standalone/gc","packages/services/workflow/standalone/metrics-publish","packages/services/game/ops/list-for-team","packages/services/game/ops/namespace-resolve-name-id","packages/services/game/ops/namespace-get","packages/services/game/ops/version-get","packages/services/game/ops/namespace-resolve-url","packages/services/game/ops/namespace-create","packages/services/game/ops/version-create","packages/services/game/ops/namespace-version-history-list","packages/services/game/ops/resolve-name-id","packages/services/game/ops/get","packages/services/game/ops/token-development-validate","packages/services/game/ops/version-validate","packages/services/game/ops/recommend","packages/services/game/ops/namespace-validate","packages/services/game/ops/banner-upload-complete","packages/services/game/ops/resolve-namespace-id","packages/services/game/ops/namespace-version-set","packages/services/game/ops/list-all","packages/services/game/ops/validate","packages/services/game/ops/namespace-list","packages/services/game/ops/create","packages/services/game/ops/logo-upload-complete","packages/services/game/ops/version-list","packages/services/dynamic-config","packages/services/cluster","packages/services/cluster/standalone/gc","packages/services/cluster/standalone/metrics-publish","packages/services/cluster/standalone/datacenter-tls-renew","packages/services/cluster/standalone/default-update","packages/services/job-run","packages/services/ds-log/ops/read","packages/services/ds-log/ops/export","packages/services/debug/ops/email-res","packages/services/cf-custom-hostname/worker","packages/services/cf-custom-hostname/ops/resolve-hostname","packages/services/cf-custom-hostname/ops/get","packages/services/cf-custom-hostname/ops/list-for-namespace-id","packages/services/upload/worker","packages/services/upload/ops/complete","packages/services/upload/ops/file-list","packages/services/upload/ops/get","packages/services/upload/ops/prepare","packages/services/upload/ops/list-for-user","packages/services/tier","packages/services/monolith/standalone/worker","packages/services/monolith/standalone/workflow-worker","sdks/full/rust"] [workspace.package] version = "0.0.1" @@ -42,103 +42,110 @@ rev = "ac3e27f" git = "https://github.com/rivet-gg/serde_array_query" rev = "b9f8bfa" -[workspace.dependencies.job-runner] -path = "packages/infra/legacy/job-runner" - [workspace.dependencies.rivet-server] path = "packages/infra/server" -[workspace.dependencies.rivet-operation] -path = "packages/common/operation/core" - -[workspace.dependencies.rivet-operation-macros] -path = "packages/common/operation/macros" - -[workspace.dependencies.rivet-metrics] -path = "packages/common/metrics" +[workspace.dependencies.job-runner] +path = "packages/infra/legacy/job-runner" -[workspace.dependencies.rivet-pools] -path = "packages/common/pools" +[workspace.dependencies.api-monolith-public] +path = "packages/api/monolith-public" -[workspace.dependencies.s3-util] -path = "packages/common/s3-util" +[workspace.dependencies.api-cloud] +path = "packages/api/cloud" -[workspace.dependencies.rivet-cache-result] -path = "packages/common/cache/result" +[workspace.dependencies.api-group] +path = "packages/api/group" -[workspace.dependencies.rivet-cache] -path = "packages/common/cache/build" +[workspace.dependencies.api-traefik-provider] +path = "packages/api/traefik-provider" -[workspace.dependencies.rivet-test] -path = "packages/common/test" +[workspace.dependencies.api-ui] +path = "packages/api/ui" -[workspace.dependencies.rivet-connection] -path = "packages/common/connection" +[workspace.dependencies.api-portal] +path = "packages/api/portal" -[workspace.dependencies.rivet-util] -path = "packages/common/util/core" +[workspace.dependencies.api-monolith-edge] +path = "packages/api/monolith-edge" -[workspace.dependencies.util] -package = "rivet-util" -path = "packages/common/util/core" +[workspace.dependencies.api-job] +path = "packages/api/job" -[workspace.dependencies.rivet-util-search] -path = "packages/common/util/search" +[workspace.dependencies.api-cf-verification] +path = "packages/api/cf-verification" -[workspace.dependencies.util-search] -package = "rivet-util-search" -path = "packages/common/util/search" +[workspace.dependencies.api-actor] +path = "packages/api/actor" -[workspace.dependencies.rivet-util-macros] -path = "packages/common/util/macros" +[workspace.dependencies.api-identity] +path = "packages/api/identity" -[workspace.dependencies.rivet-config] -path = "packages/common/config" +[workspace.dependencies.api-games] +path = "packages/api/games" -[workspace.dependencies.nomad-util] -path = "packages/common/nomad-util" +[workspace.dependencies.api-matchmaker] +path = "packages/api/matchmaker" -[workspace.dependencies.rivet-health-checks] -path = "packages/common/health-checks" +[workspace.dependencies.api-status] +path = "packages/api/status" -[workspace.dependencies.chirp-metrics] -path = "packages/common/chirp/metrics" +[workspace.dependencies.api-provision] +path = "packages/api/provision" -[workspace.dependencies.chirp-types] -path = "packages/common/chirp/types" +[workspace.dependencies.api-auth] +path = "packages/api/auth" -[workspace.dependencies.chirp-worker] -path = "packages/common/chirp/worker" +[workspace.dependencies.redis-util] +path = "packages/common/redis-util" -[workspace.dependencies.chirp-perf] -path = "packages/common/chirp/perf" +[workspace.dependencies.rivet-service-manager] +path = "packages/common/service-manager" -[workspace.dependencies.chirp-worker-attributes] -path = "packages/common/chirp/worker-attributes" +[workspace.dependencies.rivet-test] +path = "packages/common/test" -[workspace.dependencies.chirp-client] -path = "packages/common/chirp/client" +[workspace.dependencies.nomad-util] +path = "packages/common/nomad-util" -[workspace.dependencies.rivet-runtime] -path = "packages/common/runtime" +[workspace.dependencies.rivet-hub-embed] +path = "packages/common/hub-embed" -[workspace.dependencies.redis-util] -path = "packages/common/redis-util" +[workspace.dependencies.rivet-claims] +path = "packages/common/claims" [workspace.dependencies.rivet-env] path = "packages/common/env" +[workspace.dependencies.types-proto-build] +path = "packages/common/types-proto/build" + [workspace.dependencies.types-proto] path = "packages/common/types-proto/core" -[workspace.dependencies.types-proto-build] -path = "packages/common/types-proto/build" +[workspace.dependencies.rivet-operation-macros] +path = "packages/common/operation/macros" -[workspace.dependencies.rivet-status-server] -path = "packages/common/smithy-output/api-status/rust-server" +[workspace.dependencies.rivet-operation] +path = "packages/common/operation/core" -[workspace.dependencies.rivet-status] -path = "packages/common/smithy-output/api-status/rust" +[workspace.dependencies.rivet-traefik-provider-server] +path = "packages/common/smithy-output/api-traefik-provider/rust-server" + +[workspace.dependencies.rivet-route] +path = "packages/common/smithy-output/api-traefik-provider/rust" + +[workspace.dependencies.rivet-identity-server] +path = "packages/common/smithy-output/api-identity/rust-server" + +[workspace.dependencies.rivet-identity] +path = "packages/common/smithy-output/api-identity/rust" + +[workspace.dependencies.rivet-portal-server] +path = "packages/common/smithy-output/api-portal/rust-server" + +[workspace.dependencies.rivet-portal] +path = "packages/common/smithy-output/api-portal/rust" [workspace.dependencies.rivet-matchmaker-server] path = "packages/common/smithy-output/api-matchmaker/rust-server" @@ -152,48 +159,30 @@ path = "packages/common/smithy-output/api-cloud/rust-server" [workspace.dependencies.rivet-cloud] path = "packages/common/smithy-output/api-cloud/rust" -[workspace.dependencies.rivet-portal-server] -path = "packages/common/smithy-output/api-portal/rust-server" - -[workspace.dependencies.rivet-portal] -path = "packages/common/smithy-output/api-portal/rust" - [workspace.dependencies.rivet-cf-verification-server] path = "packages/common/smithy-output/api-cf-verification/rust-server" [workspace.dependencies.rivet-cf-verification] path = "packages/common/smithy-output/api-cf-verification/rust" -[workspace.dependencies.rivet-party-server] -path = "packages/common/smithy-output/api-party/rust-server" - -[workspace.dependencies.rivet-party] -path = "packages/common/smithy-output/api-party/rust" - -[workspace.dependencies.rivet-traefik-provider-server] -path = "packages/common/smithy-output/api-traefik-provider/rust-server" - -[workspace.dependencies.rivet-route] -path = "packages/common/smithy-output/api-traefik-provider/rust" - [workspace.dependencies.rivet-group-server] path = "packages/common/smithy-output/api-group/rust-server" [workspace.dependencies.rivet-group] path = "packages/common/smithy-output/api-group/rust" -[workspace.dependencies.rivet-identity-server] -path = "packages/common/smithy-output/api-identity/rust-server" - -[workspace.dependencies.rivet-identity] -path = "packages/common/smithy-output/api-identity/rust" - [workspace.dependencies.rivet-job-server] path = "packages/common/smithy-output/api-job/rust-server" [workspace.dependencies.rivet-job] path = "packages/common/smithy-output/api-job/rust" +[workspace.dependencies.rivet-party-server] +path = "packages/common/smithy-output/api-party/rust-server" + +[workspace.dependencies.rivet-party] +path = "packages/common/smithy-output/api-party/rust" + [workspace.dependencies.rivet-auth-server] path = "packages/common/smithy-output/api-auth/rust-server" @@ -206,720 +195,731 @@ path = "packages/common/smithy-output/api-kv/rust-server" [workspace.dependencies.rivet-kv] path = "packages/common/smithy-output/api-kv/rust" -[workspace.dependencies.rivet-migrate] -path = "packages/common/migrate" - -[workspace.dependencies.api-helper-macros] -path = "packages/common/api-helper/macros" - -[workspace.dependencies.api-helper] -path = "packages/common/api-helper/build" - -[workspace.dependencies.global-error] -path = "packages/common/global-error" +[workspace.dependencies.rivet-status-server] +path = "packages/common/smithy-output/api-status/rust-server" -[workspace.dependencies.formatted-error] -path = "packages/common/formatted-error" +[workspace.dependencies.rivet-status] +path = "packages/common/smithy-output/api-status/rust" -[workspace.dependencies.rivet-test-images] -path = "packages/common/test-images" +[workspace.dependencies.rivet-connection] +path = "packages/common/connection" -[workspace.dependencies.rivet-hub-embed] -path = "packages/common/hub-embed" +[workspace.dependencies.chirp-workflow-macros] +path = "packages/common/chirp-workflow/macros" -[workspace.dependencies.rivet-service-manager] -path = "packages/common/service-manager" +[workspace.dependencies.chirp-workflow] +path = "packages/common/chirp-workflow/core" -[workspace.dependencies.schemac] -path = "packages/common/schemac" +[workspace.dependencies.rivet-health-checks] +path = "packages/common/health-checks" [workspace.dependencies.rivet-convert] path = "packages/common/convert" -[workspace.dependencies.chirp-workflow] -path = "packages/common/chirp-workflow/core" +[workspace.dependencies.rivet-runtime] +path = "packages/common/runtime" -[workspace.dependencies.chirp-workflow-macros] -path = "packages/common/chirp-workflow/macros" +[workspace.dependencies.formatted-error] +path = "packages/common/formatted-error" -[workspace.dependencies.rivet-claims] -path = "packages/common/claims" +[workspace.dependencies.rivet-config] +path = "packages/common/config" -[workspace.dependencies.api-provision] -path = "packages/api/provision" +[workspace.dependencies.rivet-migrate] +path = "packages/common/migrate" -[workspace.dependencies.api-ui] -path = "packages/api/ui" +[workspace.dependencies.rivet-metrics] +path = "packages/common/metrics" -[workspace.dependencies.api-matchmaker] -path = "packages/api/matchmaker" +[workspace.dependencies.api-helper] +path = "packages/common/api-helper/build" -[workspace.dependencies.api-portal] -path = "packages/api/portal" +[workspace.dependencies.api-helper-macros] +path = "packages/common/api-helper/macros" -[workspace.dependencies.api-traefik-provider] -path = "packages/api/traefik-provider" +[workspace.dependencies.rivet-test-images] +path = "packages/common/test-images" -[workspace.dependencies.api-identity] -path = "packages/api/identity" +[workspace.dependencies.rivet-pools] +path = "packages/common/pools" -[workspace.dependencies.api-auth] -path = "packages/api/auth" +[workspace.dependencies.rivet-util-search] +path = "packages/common/util/search" -[workspace.dependencies.api-group] -path = "packages/api/group" +[workspace.dependencies.util-search] +package = "rivet-util-search" +path = "packages/common/util/search" -[workspace.dependencies.api-monolith-edge] -path = "packages/api/monolith-edge" +[workspace.dependencies.rivet-util-macros] +path = "packages/common/util/macros" -[workspace.dependencies.api-cf-verification] -path = "packages/api/cf-verification" +[workspace.dependencies.rivet-util] +path = "packages/common/util/core" -[workspace.dependencies.api-status] -path = "packages/api/status" +[workspace.dependencies.util] +package = "rivet-util" +path = "packages/common/util/core" -[workspace.dependencies.api-cloud] -path = "packages/api/cloud" +[workspace.dependencies.schemac] +path = "packages/common/schemac" -[workspace.dependencies.api-job] -path = "packages/api/job" +[workspace.dependencies.rivet-cache-result] +path = "packages/common/cache/result" -[workspace.dependencies.api-games] -path = "packages/api/games" +[workspace.dependencies.rivet-cache] +path = "packages/common/cache/build" -[workspace.dependencies.api-actor] -path = "packages/api/actor" +[workspace.dependencies.global-error] +path = "packages/common/global-error" -[workspace.dependencies.api-monolith-public] -path = "packages/api/monolith-public" +[workspace.dependencies.chirp-worker] +path = "packages/common/chirp/worker" -[workspace.dependencies.token-exchange] -path = "packages/services/token/ops/exchange" +[workspace.dependencies.chirp-client] +path = "packages/common/chirp/client" -[workspace.dependencies.token-revoke] -path = "packages/services/token/ops/revoke" +[workspace.dependencies.chirp-metrics] +path = "packages/common/chirp/metrics" -[workspace.dependencies.token-get] -path = "packages/services/token/ops/get" +[workspace.dependencies.chirp-worker-attributes] +path = "packages/common/chirp/worker-attributes" -[workspace.dependencies.token-create] -path = "packages/services/token/ops/create" +[workspace.dependencies.chirp-perf] +path = "packages/common/chirp/perf" -[workspace.dependencies.cluster] -path = "packages/services/cluster" +[workspace.dependencies.chirp-types] +path = "packages/common/chirp/types" -[workspace.dependencies.cluster-datacenter-tls-renew] -path = "packages/services/cluster/standalone/datacenter-tls-renew" +[workspace.dependencies.s3-util] +path = "packages/common/s3-util" -[workspace.dependencies.cluster-default-update] -path = "packages/services/cluster/standalone/default-update" +[workspace.dependencies.cdn-worker] +path = "packages/services/cdn/worker" -[workspace.dependencies.cluster-gc] -path = "packages/services/cluster/standalone/gc" +[workspace.dependencies.rivet-util-cdn] +path = "packages/services/cdn/util" -[workspace.dependencies.cluster-metrics-publish] -path = "packages/services/cluster/standalone/metrics-publish" +[workspace.dependencies.util-cdn] +package = "rivet-util-cdn" +path = "packages/services/cdn/util" -[workspace.dependencies.email-verification-complete] -path = "packages/services/email-verification/ops/complete" +[workspace.dependencies.cdn-ns-enable-domain-public-auth-set] +path = "packages/services/cdn/ops/ns-enable-domain-public-auth-set" -[workspace.dependencies.email-verification-create] -path = "packages/services/email-verification/ops/create" +[workspace.dependencies.cdn-namespace-get] +path = "packages/services/cdn/ops/namespace-get" -[workspace.dependencies.user-identity-delete] -path = "packages/services/user-identity/ops/delete" +[workspace.dependencies.cdn-version-get] +path = "packages/services/cdn/ops/version-get" -[workspace.dependencies.user-identity-get] -path = "packages/services/user-identity/ops/get" +[workspace.dependencies.cdn-namespace-create] +path = "packages/services/cdn/ops/namespace-create" -[workspace.dependencies.user-identity-create] -path = "packages/services/user-identity/ops/create" +[workspace.dependencies.cdn-namespace-domain-remove] +path = "packages/services/cdn/ops/namespace-domain-remove" -[workspace.dependencies.pegboard] -path = "packages/services/pegboard" +[workspace.dependencies.cdn-namespace-auth-user-update] +path = "packages/services/cdn/ops/namespace-auth-user-update" -[workspace.dependencies.pegboard-dc-init] -path = "packages/services/pegboard/standalone/dc-init" +[workspace.dependencies.cdn-site-get] +path = "packages/services/cdn/ops/site-get" -[workspace.dependencies.pegboard-gc] -path = "packages/services/pegboard/standalone/gc" +[workspace.dependencies.cdn-namespace-resolve-domain] +path = "packages/services/cdn/ops/namespace-resolve-domain" -[workspace.dependencies.pegboard-ws] -path = "packages/services/pegboard/standalone/ws" +[workspace.dependencies.cdn-version-publish] +path = "packages/services/cdn/ops/version-publish" -[workspace.dependencies.monolith-workflow-worker] -path = "packages/services/monolith/standalone/workflow-worker" +[workspace.dependencies.cdn-namespace-auth-user-remove] +path = "packages/services/cdn/ops/namespace-auth-user-remove" -[workspace.dependencies.monolith-worker] -path = "packages/services/monolith/standalone/worker" +[workspace.dependencies.cdn-namespace-domain-create] +path = "packages/services/cdn/ops/namespace-domain-create" -[workspace.dependencies.ds] -path = "packages/services/ds" +[workspace.dependencies.cdn-site-list-for-game] +path = "packages/services/cdn/ops/site-list-for-game" -[workspace.dependencies.linode] -path = "packages/services/linode" +[workspace.dependencies.cdn-version-prepare] +path = "packages/services/cdn/ops/version-prepare" -[workspace.dependencies.linode-gc] -path = "packages/services/linode/standalone/gc" +[workspace.dependencies.cdn-site-create] +path = "packages/services/cdn/ops/site-create" -[workspace.dependencies.load-test-api-cloud] -path = "packages/services/load-test/standalone/api-cloud" +[workspace.dependencies.cdn-ns-auth-type-set] +path = "packages/services/cdn/ops/ns-auth-type-set" -[workspace.dependencies.load-test-watch-requests] -path = "packages/services/load-test/standalone/watch-requests" +[workspace.dependencies.nomad-monitor] +path = "packages/services/nomad/standalone/monitor" -[workspace.dependencies.load-test-sqlx] -path = "packages/services/load-test/standalone/sqlx" +[workspace.dependencies.rivet-util-captcha] +path = "packages/services/captcha/util" -[workspace.dependencies.load-test-mm] -path = "packages/services/load-test/standalone/mm" +[workspace.dependencies.util-captcha] +package = "rivet-util-captcha" +path = "packages/services/captcha/util" -[workspace.dependencies.load-test-mm-sustain] -path = "packages/services/load-test/standalone/mm-sustain" +[workspace.dependencies.captcha-turnstile-verify] +path = "packages/services/captcha/ops/turnstile-verify" -[workspace.dependencies.faker-job-template] -path = "packages/services/faker/ops/job-template" +[workspace.dependencies.captcha-hcaptcha-verify] +path = "packages/services/captcha/ops/hcaptcha-verify" -[workspace.dependencies.faker-mm-player] -path = "packages/services/faker/ops/mm-player" +[workspace.dependencies.captcha-turnstile-config-get] +path = "packages/services/captcha/ops/turnstile-config-get" -[workspace.dependencies.faker-user] -path = "packages/services/faker/ops/user" +[workspace.dependencies.captcha-verify] +path = "packages/services/captcha/ops/verify" -[workspace.dependencies.faker-game] -path = "packages/services/faker/ops/game" +[workspace.dependencies.captcha-request] +path = "packages/services/captcha/ops/request" -[workspace.dependencies.faker-game-version] -path = "packages/services/faker/ops/game-version" +[workspace.dependencies.captcha-hcaptcha-config-get] +path = "packages/services/captcha/ops/hcaptcha-config-get" -[workspace.dependencies.faker-region] -path = "packages/services/faker/ops/region" +[workspace.dependencies.email-verification-complete] +path = "packages/services/email-verification/ops/complete" -[workspace.dependencies.faker-team] -path = "packages/services/faker/ops/team" +[workspace.dependencies.email-verification-create] +path = "packages/services/email-verification/ops/create" -[workspace.dependencies.faker-job-run] -path = "packages/services/faker/ops/job-run" +[workspace.dependencies.team-worker] +path = "packages/services/team/worker" -[workspace.dependencies.faker-game-namespace] -path = "packages/services/faker/ops/game-namespace" +[workspace.dependencies.rivet-util-team] +path = "packages/services/team/util" -[workspace.dependencies.faker-mm-lobby-row] -path = "packages/services/faker/ops/mm-lobby-row" +[workspace.dependencies.util-team] +package = "rivet-util-team" +path = "packages/services/team/util" -[workspace.dependencies.faker-build] -path = "packages/services/faker/ops/build" +[workspace.dependencies.team-member-get] +path = "packages/services/team/ops/member-get" -[workspace.dependencies.faker-mm-lobby] -path = "packages/services/faker/ops/mm-lobby" +[workspace.dependencies.team-member-relationship-get] +path = "packages/services/team/ops/member-relationship-get" -[workspace.dependencies.faker-cdn-site] -path = "packages/services/faker/ops/cdn-site" +[workspace.dependencies.team-resolve-display-name] +path = "packages/services/team/ops/resolve-display-name" -[workspace.dependencies.user] -path = "packages/services/user" +[workspace.dependencies.team-profile-validate] +path = "packages/services/team/ops/profile-validate" -[workspace.dependencies.user-delete-pending] -path = "packages/services/user/standalone/delete-pending" +[workspace.dependencies.team-user-ban-get] +path = "packages/services/team/ops/user-ban-get" -[workspace.dependencies.user-resolve-email] -path = "packages/services/user/ops/resolve-email" +[workspace.dependencies.team-get] +path = "packages/services/team/ops/get" -[workspace.dependencies.user-get] -path = "packages/services/user/ops/get" +[workspace.dependencies.team-join-request-list] +path = "packages/services/team/ops/join-request-list" -[workspace.dependencies.user-profile-validate] -path = "packages/services/user/ops/profile-validate" +[workspace.dependencies.team-recommend] +path = "packages/services/team/ops/recommend" -[workspace.dependencies.user-pending-delete-toggle] -path = "packages/services/user/ops/pending-delete-toggle" +[workspace.dependencies.team-user-ban-list] +path = "packages/services/team/ops/user-ban-list" -[workspace.dependencies.user-token-create] -path = "packages/services/user/ops/token-create" +[workspace.dependencies.team-avatar-upload-complete] +path = "packages/services/team/ops/avatar-upload-complete" -[workspace.dependencies.user-team-list] -path = "packages/services/user/ops/team-list" +[workspace.dependencies.team-validate] +path = "packages/services/team/ops/validate" -[workspace.dependencies.user-avatar-upload-complete] -path = "packages/services/user/ops/avatar-upload-complete" +[workspace.dependencies.team-member-count] +path = "packages/services/team/ops/member-count" -[workspace.dependencies.user-worker] -path = "packages/services/user/worker" +[workspace.dependencies.team-member-list] +path = "packages/services/team/ops/member-list" -[workspace.dependencies.game-namespace-version-set] -path = "packages/services/game/ops/namespace-version-set" +[workspace.dependencies.cloud-worker] +path = "packages/services/cloud/worker" -[workspace.dependencies.game-version-validate] -path = "packages/services/game/ops/version-validate" +[workspace.dependencies.cloud-default-create] +path = "packages/services/cloud/standalone/default-create" -[workspace.dependencies.game-validate] -path = "packages/services/game/ops/validate" +[workspace.dependencies.cloud-namespace-token-development-create] +path = "packages/services/cloud/ops/namespace-token-development-create" -[workspace.dependencies.game-resolve-namespace-id] -path = "packages/services/game/ops/resolve-namespace-id" +[workspace.dependencies.cloud-game-config-get] +path = "packages/services/cloud/ops/game-config-get" -[workspace.dependencies.game-namespace-version-history-list] -path = "packages/services/game/ops/namespace-version-history-list" +[workspace.dependencies.cloud-namespace-get] +path = "packages/services/cloud/ops/namespace-get" -[workspace.dependencies.game-namespace-resolve-name-id] -path = "packages/services/game/ops/namespace-resolve-name-id" +[workspace.dependencies.cloud-version-get] +path = "packages/services/cloud/ops/version-get" -[workspace.dependencies.game-recommend] -path = "packages/services/game/ops/recommend" +[workspace.dependencies.cloud-namespace-create] +path = "packages/services/cloud/ops/namespace-create" -[workspace.dependencies.game-version-list] -path = "packages/services/game/ops/version-list" +[workspace.dependencies.cloud-namespace-token-public-create] +path = "packages/services/cloud/ops/namespace-token-public-create" -[workspace.dependencies.game-namespace-validate] -path = "packages/services/game/ops/namespace-validate" +[workspace.dependencies.cloud-version-publish] +path = "packages/services/cloud/ops/version-publish" -[workspace.dependencies.game-list-for-team] -path = "packages/services/game/ops/list-for-team" +[workspace.dependencies.cloud-game-config-create] +path = "packages/services/cloud/ops/game-config-create" -[workspace.dependencies.game-namespace-get] -path = "packages/services/game/ops/namespace-get" +[workspace.dependencies.cloud-game-token-create] +path = "packages/services/cloud/ops/game-token-create" -[workspace.dependencies.game-get] -path = "packages/services/game/ops/get" +[workspace.dependencies.cloud-device-link-create] +path = "packages/services/cloud/ops/device-link-create" -[workspace.dependencies.game-version-get] -path = "packages/services/game/ops/version-get" +[workspace.dependencies.external-worker] +path = "packages/services/external/worker" -[workspace.dependencies.game-list-all] -path = "packages/services/game/ops/list-all" +[workspace.dependencies.external-request-validate] +path = "packages/services/external/ops/request-validate" -[workspace.dependencies.game-logo-upload-complete] -path = "packages/services/game/ops/logo-upload-complete" +[workspace.dependencies.server-spec] +path = "packages/services/server-spec" -[workspace.dependencies.game-namespace-list] -path = "packages/services/game/ops/namespace-list" +[workspace.dependencies.faker-mm-player] +path = "packages/services/faker/ops/mm-player" -[workspace.dependencies.game-namespace-create] -path = "packages/services/game/ops/namespace-create" +[workspace.dependencies.faker-job-template] +path = "packages/services/faker/ops/job-template" -[workspace.dependencies.game-resolve-name-id] -path = "packages/services/game/ops/resolve-name-id" +[workspace.dependencies.faker-team] +path = "packages/services/faker/ops/team" -[workspace.dependencies.game-namespace-resolve-url] -path = "packages/services/game/ops/namespace-resolve-url" +[workspace.dependencies.faker-region] +path = "packages/services/faker/ops/region" -[workspace.dependencies.game-create] -path = "packages/services/game/ops/create" +[workspace.dependencies.faker-game-version] +path = "packages/services/faker/ops/game-version" -[workspace.dependencies.game-version-create] -path = "packages/services/game/ops/version-create" +[workspace.dependencies.faker-build] +path = "packages/services/faker/ops/build" -[workspace.dependencies.game-banner-upload-complete] -path = "packages/services/game/ops/banner-upload-complete" +[workspace.dependencies.faker-cdn-site] +path = "packages/services/faker/ops/cdn-site" -[workspace.dependencies.game-token-development-validate] -path = "packages/services/game/ops/token-development-validate" +[workspace.dependencies.faker-user] +path = "packages/services/faker/ops/user" -[workspace.dependencies.team-invite-get] -path = "packages/services/team-invite/ops/get" +[workspace.dependencies.faker-mm-lobby] +path = "packages/services/faker/ops/mm-lobby" -[workspace.dependencies.team-invite-worker] -path = "packages/services/team-invite/worker" +[workspace.dependencies.faker-game] +path = "packages/services/faker/ops/game" -[workspace.dependencies.rivet-util-captcha] -path = "packages/services/captcha/util" +[workspace.dependencies.faker-job-run] +path = "packages/services/faker/ops/job-run" + +[workspace.dependencies.faker-game-namespace] +path = "packages/services/faker/ops/game-namespace" + +[workspace.dependencies.faker-mm-lobby-row] +path = "packages/services/faker/ops/mm-lobby-row" + +[workspace.dependencies.token-get] +path = "packages/services/token/ops/get" + +[workspace.dependencies.token-exchange] +path = "packages/services/token/ops/exchange" + +[workspace.dependencies.token-create] +path = "packages/services/token/ops/create" + +[workspace.dependencies.token-revoke] +path = "packages/services/token/ops/revoke" + +[workspace.dependencies.region-get] +path = "packages/services/region/ops/get" + +[workspace.dependencies.region-resolve-for-game] +path = "packages/services/region/ops/resolve-for-game" + +[workspace.dependencies.region-recommend] +path = "packages/services/region/ops/recommend" -[workspace.dependencies.util-captcha] -package = "rivet-util-captcha" -path = "packages/services/captcha/util" +[workspace.dependencies.region-list] +path = "packages/services/region/ops/list" -[workspace.dependencies.captcha-hcaptcha-config-get] -path = "packages/services/captcha/ops/hcaptcha-config-get" +[workspace.dependencies.region-list-for-game] +path = "packages/services/region/ops/list-for-game" -[workspace.dependencies.captcha-verify] -path = "packages/services/captcha/ops/verify" +[workspace.dependencies.region-resolve] +path = "packages/services/region/ops/resolve" -[workspace.dependencies.captcha-turnstile-verify] -path = "packages/services/captcha/ops/turnstile-verify" +[workspace.dependencies.load-test-mm-sustain] +path = "packages/services/load-test/standalone/mm-sustain" -[workspace.dependencies.captcha-turnstile-config-get] -path = "packages/services/captcha/ops/turnstile-config-get" +[workspace.dependencies.load-test-sqlx] +path = "packages/services/load-test/standalone/sqlx" -[workspace.dependencies.captcha-request] -path = "packages/services/captcha/ops/request" +[workspace.dependencies.load-test-api-cloud] +path = "packages/services/load-test/standalone/api-cloud" -[workspace.dependencies.captcha-hcaptcha-verify] -path = "packages/services/captcha/ops/hcaptcha-verify" +[workspace.dependencies.load-test-mm] +path = "packages/services/load-test/standalone/mm" -[workspace.dependencies.mm-config-namespace-config-validate] -path = "packages/services/mm-config/ops/namespace-config-validate" +[workspace.dependencies.load-test-watch-requests] +path = "packages/services/load-test/standalone/watch-requests" -[workspace.dependencies.mm-config-version-publish] -path = "packages/services/mm-config/ops/version-publish" +[workspace.dependencies.job-log-worker] +path = "packages/services/job-log/worker" -[workspace.dependencies.mm-config-lobby-group-get] -path = "packages/services/mm-config/ops/lobby-group-get" +[workspace.dependencies.job-log-read] +path = "packages/services/job-log/ops/read" -[workspace.dependencies.mm-config-namespace-get] -path = "packages/services/mm-config/ops/namespace-get" +[workspace.dependencies.custom-user-avatar-upload-complete] +path = "packages/services/custom-user-avatar/ops/upload-complete" -[workspace.dependencies.mm-config-lobby-group-resolve-version] -path = "packages/services/mm-config/ops/lobby-group-resolve-version" +[workspace.dependencies.custom-user-avatar-list-for-game] +path = "packages/services/custom-user-avatar/ops/list-for-game" -[workspace.dependencies.mm-config-version-get] -path = "packages/services/mm-config/ops/version-get" +[workspace.dependencies.telemetry-beacon] +path = "packages/services/telemetry/standalone/beacon" -[workspace.dependencies.mm-config-version-prepare] -path = "packages/services/mm-config/ops/version-prepare" +[workspace.dependencies.build] +path = "packages/services/build" -[workspace.dependencies.mm-config-lobby-group-resolve-name-id] -path = "packages/services/mm-config/ops/lobby-group-resolve-name-id" +[workspace.dependencies.build-default-create] +path = "packages/services/build/standalone/default-create" -[workspace.dependencies.mm-config-namespace-create] -path = "packages/services/mm-config/ops/namespace-create" +[workspace.dependencies.rivet-util-build] +path = "packages/services/build/util" -[workspace.dependencies.mm-config-game-upsert] -path = "packages/services/mm-config/ops/game-upsert" +[workspace.dependencies.util-build] +package = "rivet-util-build" +path = "packages/services/build/util" -[workspace.dependencies.mm-config-game-get] -path = "packages/services/mm-config/ops/game-get" +[workspace.dependencies.build-list-for-env] +path = "packages/services/build/ops/list-for-env" -[workspace.dependencies.mm-config-namespace-config-set] -path = "packages/services/mm-config/ops/namespace-config-set" +[workspace.dependencies.build-get] +path = "packages/services/build/ops/get" -[workspace.dependencies.region-resolve] -path = "packages/services/region/ops/resolve" +[workspace.dependencies.build-list-for-game] +path = "packages/services/build/ops/list-for-game" -[workspace.dependencies.region-recommend] -path = "packages/services/region/ops/recommend" +[workspace.dependencies.build-create] +path = "packages/services/build/ops/create" -[workspace.dependencies.region-get] -path = "packages/services/region/ops/get" +[workspace.dependencies.job-gc] +path = "packages/services/job/standalone/gc" -[workspace.dependencies.region-resolve-for-game] -path = "packages/services/region/ops/resolve-for-game" +[workspace.dependencies.rivet-util-job] +path = "packages/services/job/util" -[workspace.dependencies.region-list-for-game] -path = "packages/services/region/ops/list-for-game" +[workspace.dependencies.util-job] +package = "rivet-util-job" +path = "packages/services/job/util" -[workspace.dependencies.region-list] -path = "packages/services/region/ops/list" +[workspace.dependencies.ds] +path = "packages/services/ds" -[workspace.dependencies.nomad-monitor] -path = "packages/services/nomad/standalone/monitor" +[workspace.dependencies.linode] +path = "packages/services/linode" -[workspace.dependencies.rivet-util-cdn] -path = "packages/services/cdn/util" +[workspace.dependencies.linode-gc] +path = "packages/services/linode/standalone/gc" -[workspace.dependencies.util-cdn] -package = "rivet-util-cdn" -path = "packages/services/cdn/util" +[workspace.dependencies.team-invite-worker] +path = "packages/services/team-invite/worker" -[workspace.dependencies.cdn-site-get] -path = "packages/services/cdn/ops/site-get" +[workspace.dependencies.team-invite-get] +path = "packages/services/team-invite/ops/get" -[workspace.dependencies.cdn-site-list-for-game] -path = "packages/services/cdn/ops/site-list-for-game" +[workspace.dependencies.email-send] +path = "packages/services/email/ops/send" -[workspace.dependencies.cdn-namespace-resolve-domain] -path = "packages/services/cdn/ops/namespace-resolve-domain" +[workspace.dependencies.user-identity-delete] +path = "packages/services/user-identity/ops/delete" -[workspace.dependencies.cdn-version-publish] -path = "packages/services/cdn/ops/version-publish" +[workspace.dependencies.user-identity-get] +path = "packages/services/user-identity/ops/get" -[workspace.dependencies.cdn-namespace-domain-create] -path = "packages/services/cdn/ops/namespace-domain-create" +[workspace.dependencies.user-identity-create] +path = "packages/services/user-identity/ops/create" -[workspace.dependencies.cdn-namespace-auth-user-remove] -path = "packages/services/cdn/ops/namespace-auth-user-remove" +[workspace.dependencies.pegboard] +path = "packages/services/pegboard" -[workspace.dependencies.cdn-namespace-get] -path = "packages/services/cdn/ops/namespace-get" +[workspace.dependencies.pegboard-gc] +path = "packages/services/pegboard/standalone/gc" -[workspace.dependencies.cdn-ns-enable-domain-public-auth-set] -path = "packages/services/cdn/ops/ns-enable-domain-public-auth-set" +[workspace.dependencies.pegboard-dc-init] +path = "packages/services/pegboard/standalone/dc-init" -[workspace.dependencies.cdn-ns-auth-type-set] -path = "packages/services/cdn/ops/ns-auth-type-set" +[workspace.dependencies.pegboard-ws] +path = "packages/services/pegboard/standalone/ws" -[workspace.dependencies.cdn-site-create] -path = "packages/services/cdn/ops/site-create" +[workspace.dependencies.user] +path = "packages/services/user" -[workspace.dependencies.cdn-version-get] -path = "packages/services/cdn/ops/version-get" +[workspace.dependencies.user-worker] +path = "packages/services/user/worker" -[workspace.dependencies.cdn-namespace-auth-user-update] -path = "packages/services/cdn/ops/namespace-auth-user-update" +[workspace.dependencies.user-delete-pending] +path = "packages/services/user/standalone/delete-pending" -[workspace.dependencies.cdn-version-prepare] -path = "packages/services/cdn/ops/version-prepare" +[workspace.dependencies.user-pending-delete-toggle] +path = "packages/services/user/ops/pending-delete-toggle" -[workspace.dependencies.cdn-namespace-domain-remove] -path = "packages/services/cdn/ops/namespace-domain-remove" +[workspace.dependencies.user-profile-validate] +path = "packages/services/user/ops/profile-validate" -[workspace.dependencies.cdn-namespace-create] -path = "packages/services/cdn/ops/namespace-create" +[workspace.dependencies.user-get] +path = "packages/services/user/ops/get" -[workspace.dependencies.cdn-worker] -path = "packages/services/cdn/worker" +[workspace.dependencies.user-resolve-email] +path = "packages/services/user/ops/resolve-email" -[workspace.dependencies.rivet-util-team] -path = "packages/services/team/util" +[workspace.dependencies.user-token-create] +path = "packages/services/user/ops/token-create" -[workspace.dependencies.util-team] -package = "rivet-util-team" -path = "packages/services/team/util" +[workspace.dependencies.user-avatar-upload-complete] +path = "packages/services/user/ops/avatar-upload-complete" -[workspace.dependencies.team-validate] -path = "packages/services/team/ops/validate" +[workspace.dependencies.user-team-list] +path = "packages/services/user/ops/team-list" -[workspace.dependencies.team-user-ban-list] -path = "packages/services/team/ops/user-ban-list" +[workspace.dependencies.mm-worker] +path = "packages/services/mm/worker" -[workspace.dependencies.team-recommend] -path = "packages/services/team/ops/recommend" +[workspace.dependencies.mm-gc] +path = "packages/services/mm/standalone/gc" -[workspace.dependencies.team-resolve-display-name] -path = "packages/services/team/ops/resolve-display-name" +[workspace.dependencies.rivet-util-mm] +path = "packages/services/mm/util" -[workspace.dependencies.team-member-list] -path = "packages/services/team/ops/member-list" +[workspace.dependencies.util-mm] +package = "rivet-util-mm" +path = "packages/services/mm/util" -[workspace.dependencies.team-get] -path = "packages/services/team/ops/get" +[workspace.dependencies.mm-lobby-state-get] +path = "packages/services/mm/ops/lobby-state-get" -[workspace.dependencies.team-member-count] -path = "packages/services/team/ops/member-count" +[workspace.dependencies.mm-lobby-for-run-id] +path = "packages/services/mm/ops/lobby-for-run-id" -[workspace.dependencies.team-member-relationship-get] -path = "packages/services/team/ops/member-relationship-get" +[workspace.dependencies.mm-lobby-player-count] +path = "packages/services/mm/ops/lobby-player-count" -[workspace.dependencies.team-member-get] -path = "packages/services/team/ops/member-get" +[workspace.dependencies.mm-lobby-idle-update] +path = "packages/services/mm/ops/lobby-idle-update" -[workspace.dependencies.team-profile-validate] -path = "packages/services/team/ops/profile-validate" +[workspace.dependencies.mm-player-count-for-namespace] +path = "packages/services/mm/ops/player-count-for-namespace" -[workspace.dependencies.team-user-ban-get] -path = "packages/services/team/ops/user-ban-get" +[workspace.dependencies.mm-lobby-find-try-complete] +path = "packages/services/mm/ops/lobby-find-try-complete" -[workspace.dependencies.team-join-request-list] -path = "packages/services/team/ops/join-request-list" +[workspace.dependencies.mm-lobby-find-fail] +path = "packages/services/mm/ops/lobby-find-fail" -[workspace.dependencies.team-avatar-upload-complete] -path = "packages/services/team/ops/avatar-upload-complete" +[workspace.dependencies.mm-lobby-get] +path = "packages/services/mm/ops/lobby-get" -[workspace.dependencies.team-worker] -path = "packages/services/team/worker" +[workspace.dependencies.mm-player-get] +path = "packages/services/mm/ops/player-get" -[workspace.dependencies.ds-log-read] -path = "packages/services/ds-log/ops/read" +[workspace.dependencies.mm-lobby-list-for-namespace] +path = "packages/services/mm/ops/lobby-list-for-namespace" -[workspace.dependencies.ds-log-export] -path = "packages/services/ds-log/ops/export" +[workspace.dependencies.mm-lobby-find-lobby-query-list] +path = "packages/services/mm/ops/lobby-find-lobby-query-list" -[workspace.dependencies.job-run] -path = "packages/services/job-run" +[workspace.dependencies.mm-lobby-history] +path = "packages/services/mm/ops/lobby-history" -[workspace.dependencies.workflow-gc] -path = "packages/services/workflow/standalone/gc" +[workspace.dependencies.mm-lobby-runtime-aggregate] +path = "packages/services/mm/ops/lobby-runtime-aggregate" -[workspace.dependencies.workflow-metrics-publish] -path = "packages/services/workflow/standalone/metrics-publish" +[workspace.dependencies.mm-dev-player-token-create] +path = "packages/services/mm/ops/dev-player-token-create" -[workspace.dependencies.cloud-default-create] -path = "packages/services/cloud/standalone/default-create" +[workspace.dependencies.mm-lobby-list-for-user-id] +path = "packages/services/mm/ops/lobby-list-for-user-id" -[workspace.dependencies.cloud-version-publish] -path = "packages/services/cloud/ops/version-publish" +[workspace.dependencies.ip-info] +path = "packages/services/ip/ops/info" -[workspace.dependencies.cloud-game-config-get] -path = "packages/services/cloud/ops/game-config-get" +[workspace.dependencies.mm-config-game-upsert] +path = "packages/services/mm-config/ops/game-upsert" -[workspace.dependencies.cloud-namespace-token-public-create] -path = "packages/services/cloud/ops/namespace-token-public-create" +[workspace.dependencies.mm-config-namespace-get] +path = "packages/services/mm-config/ops/namespace-get" -[workspace.dependencies.cloud-game-config-create] -path = "packages/services/cloud/ops/game-config-create" +[workspace.dependencies.mm-config-version-get] +path = "packages/services/mm-config/ops/version-get" -[workspace.dependencies.cloud-namespace-get] -path = "packages/services/cloud/ops/namespace-get" +[workspace.dependencies.mm-config-namespace-create] +path = "packages/services/mm-config/ops/namespace-create" -[workspace.dependencies.cloud-version-get] -path = "packages/services/cloud/ops/version-get" +[workspace.dependencies.mm-config-lobby-group-resolve-version] +path = "packages/services/mm-config/ops/lobby-group-resolve-version" -[workspace.dependencies.cloud-game-token-create] -path = "packages/services/cloud/ops/game-token-create" +[workspace.dependencies.mm-config-version-publish] +path = "packages/services/mm-config/ops/version-publish" -[workspace.dependencies.cloud-device-link-create] -path = "packages/services/cloud/ops/device-link-create" +[workspace.dependencies.mm-config-lobby-group-get] +path = "packages/services/mm-config/ops/lobby-group-get" -[workspace.dependencies.cloud-namespace-create] -path = "packages/services/cloud/ops/namespace-create" +[workspace.dependencies.mm-config-game-get] +path = "packages/services/mm-config/ops/game-get" -[workspace.dependencies.cloud-namespace-token-development-create] -path = "packages/services/cloud/ops/namespace-token-development-create" +[workspace.dependencies.mm-config-version-prepare] +path = "packages/services/mm-config/ops/version-prepare" -[workspace.dependencies.cloud-worker] -path = "packages/services/cloud/worker" +[workspace.dependencies.mm-config-lobby-group-resolve-name-id] +path = "packages/services/mm-config/ops/lobby-group-resolve-name-id" -[workspace.dependencies.rivet-util-job] -path = "packages/services/job/util" +[workspace.dependencies.mm-config-namespace-config-set] +path = "packages/services/mm-config/ops/namespace-config-set" -[workspace.dependencies.util-job] -package = "rivet-util-job" -path = "packages/services/job/util" +[workspace.dependencies.mm-config-namespace-config-validate] +path = "packages/services/mm-config/ops/namespace-config-validate" -[workspace.dependencies.job-gc] -path = "packages/services/job/standalone/gc" +[workspace.dependencies.workflow-gc] +path = "packages/services/workflow/standalone/gc" -[workspace.dependencies.rivet-util-mm] -path = "packages/services/mm/util" +[workspace.dependencies.workflow-metrics-publish] +path = "packages/services/workflow/standalone/metrics-publish" -[workspace.dependencies.util-mm] -package = "rivet-util-mm" -path = "packages/services/mm/util" +[workspace.dependencies.game-list-for-team] +path = "packages/services/game/ops/list-for-team" -[workspace.dependencies.mm-gc] -path = "packages/services/mm/standalone/gc" +[workspace.dependencies.game-namespace-resolve-name-id] +path = "packages/services/game/ops/namespace-resolve-name-id" -[workspace.dependencies.mm-player-get] -path = "packages/services/mm/ops/player-get" +[workspace.dependencies.game-namespace-get] +path = "packages/services/game/ops/namespace-get" -[workspace.dependencies.mm-dev-player-token-create] -path = "packages/services/mm/ops/dev-player-token-create" +[workspace.dependencies.game-version-get] +path = "packages/services/game/ops/version-get" -[workspace.dependencies.mm-lobby-idle-update] -path = "packages/services/mm/ops/lobby-idle-update" +[workspace.dependencies.game-namespace-resolve-url] +path = "packages/services/game/ops/namespace-resolve-url" -[workspace.dependencies.mm-lobby-find-lobby-query-list] -path = "packages/services/mm/ops/lobby-find-lobby-query-list" +[workspace.dependencies.game-namespace-create] +path = "packages/services/game/ops/namespace-create" -[workspace.dependencies.mm-lobby-find-fail] -path = "packages/services/mm/ops/lobby-find-fail" +[workspace.dependencies.game-version-create] +path = "packages/services/game/ops/version-create" -[workspace.dependencies.mm-lobby-list-for-user-id] -path = "packages/services/mm/ops/lobby-list-for-user-id" +[workspace.dependencies.game-namespace-version-history-list] +path = "packages/services/game/ops/namespace-version-history-list" -[workspace.dependencies.mm-lobby-history] -path = "packages/services/mm/ops/lobby-history" +[workspace.dependencies.game-resolve-name-id] +path = "packages/services/game/ops/resolve-name-id" -[workspace.dependencies.mm-lobby-list-for-namespace] -path = "packages/services/mm/ops/lobby-list-for-namespace" +[workspace.dependencies.game-get] +path = "packages/services/game/ops/get" -[workspace.dependencies.mm-lobby-state-get] -path = "packages/services/mm/ops/lobby-state-get" +[workspace.dependencies.game-token-development-validate] +path = "packages/services/game/ops/token-development-validate" -[workspace.dependencies.mm-lobby-player-count] -path = "packages/services/mm/ops/lobby-player-count" +[workspace.dependencies.game-version-validate] +path = "packages/services/game/ops/version-validate" -[workspace.dependencies.mm-lobby-find-try-complete] -path = "packages/services/mm/ops/lobby-find-try-complete" +[workspace.dependencies.game-recommend] +path = "packages/services/game/ops/recommend" -[workspace.dependencies.mm-lobby-for-run-id] -path = "packages/services/mm/ops/lobby-for-run-id" +[workspace.dependencies.game-namespace-validate] +path = "packages/services/game/ops/namespace-validate" -[workspace.dependencies.mm-player-count-for-namespace] -path = "packages/services/mm/ops/player-count-for-namespace" +[workspace.dependencies.game-banner-upload-complete] +path = "packages/services/game/ops/banner-upload-complete" -[workspace.dependencies.mm-lobby-runtime-aggregate] -path = "packages/services/mm/ops/lobby-runtime-aggregate" +[workspace.dependencies.game-resolve-namespace-id] +path = "packages/services/game/ops/resolve-namespace-id" -[workspace.dependencies.mm-lobby-get] -path = "packages/services/mm/ops/lobby-get" +[workspace.dependencies.game-namespace-version-set] +path = "packages/services/game/ops/namespace-version-set" -[workspace.dependencies.mm-worker] -path = "packages/services/mm/worker" +[workspace.dependencies.game-list-all] +path = "packages/services/game/ops/list-all" -[workspace.dependencies.telemetry-beacon] -path = "packages/services/telemetry/standalone/beacon" +[workspace.dependencies.game-validate] +path = "packages/services/game/ops/validate" -[workspace.dependencies.external-request-validate] -path = "packages/services/external/ops/request-validate" +[workspace.dependencies.game-namespace-list] +path = "packages/services/game/ops/namespace-list" -[workspace.dependencies.external-worker] -path = "packages/services/external/worker" +[workspace.dependencies.game-create] +path = "packages/services/game/ops/create" -[workspace.dependencies.build] -path = "packages/services/build" +[workspace.dependencies.game-logo-upload-complete] +path = "packages/services/game/ops/logo-upload-complete" -[workspace.dependencies.rivet-util-build] -path = "packages/services/build/util" +[workspace.dependencies.game-version-list] +path = "packages/services/game/ops/version-list" -[workspace.dependencies.util-build] -package = "rivet-util-build" -path = "packages/services/build/util" +[workspace.dependencies.dynamic-config] +path = "packages/services/dynamic-config" -[workspace.dependencies.build-default-create] -path = "packages/services/build/standalone/default-create" +[workspace.dependencies.cluster] +path = "packages/services/cluster" -[workspace.dependencies.build-get] -path = "packages/services/build/ops/get" +[workspace.dependencies.cluster-gc] +path = "packages/services/cluster/standalone/gc" -[workspace.dependencies.build-list-for-game] -path = "packages/services/build/ops/list-for-game" +[workspace.dependencies.cluster-metrics-publish] +path = "packages/services/cluster/standalone/metrics-publish" -[workspace.dependencies.build-list-for-env] -path = "packages/services/build/ops/list-for-env" +[workspace.dependencies.cluster-datacenter-tls-renew] +path = "packages/services/cluster/standalone/datacenter-tls-renew" -[workspace.dependencies.build-create] -path = "packages/services/build/ops/create" +[workspace.dependencies.cluster-default-update] +path = "packages/services/cluster/standalone/default-update" -[workspace.dependencies.server-spec] -path = "packages/services/server-spec" +[workspace.dependencies.job-run] +path = "packages/services/job-run" -[workspace.dependencies.cf-custom-hostname-get] -path = "packages/services/cf-custom-hostname/ops/get" +[workspace.dependencies.ds-log-read] +path = "packages/services/ds-log/ops/read" -[workspace.dependencies.cf-custom-hostname-resolve-hostname] -path = "packages/services/cf-custom-hostname/ops/resolve-hostname" +[workspace.dependencies.ds-log-export] +path = "packages/services/ds-log/ops/export" -[workspace.dependencies.cf-custom-hostname-list-for-namespace-id] -path = "packages/services/cf-custom-hostname/ops/list-for-namespace-id" +[workspace.dependencies.debug-email-res] +path = "packages/services/debug/ops/email-res" [workspace.dependencies.cf-custom-hostname-worker] path = "packages/services/cf-custom-hostname/worker" -[workspace.dependencies.ip-info] -path = "packages/services/ip/ops/info" - -[workspace.dependencies.dynamic-config] -path = "packages/services/dynamic-config" - -[workspace.dependencies.email-send] -path = "packages/services/email/ops/send" +[workspace.dependencies.cf-custom-hostname-resolve-hostname] +path = "packages/services/cf-custom-hostname/ops/resolve-hostname" -[workspace.dependencies.job-log-read] -path = "packages/services/job-log/ops/read" +[workspace.dependencies.cf-custom-hostname-get] +path = "packages/services/cf-custom-hostname/ops/get" -[workspace.dependencies.job-log-worker] -path = "packages/services/job-log/worker" +[workspace.dependencies.cf-custom-hostname-list-for-namespace-id] +path = "packages/services/cf-custom-hostname/ops/list-for-namespace-id" -[workspace.dependencies.upload-prepare] -path = "packages/services/upload/ops/prepare" +[workspace.dependencies.upload-worker] +path = "packages/services/upload/worker" [workspace.dependencies.upload-complete] path = "packages/services/upload/ops/complete" +[workspace.dependencies.upload-file-list] +path = "packages/services/upload/ops/file-list" + [workspace.dependencies.upload-get] path = "packages/services/upload/ops/get" -[workspace.dependencies.upload-file-list] -path = "packages/services/upload/ops/file-list" +[workspace.dependencies.upload-prepare] +path = "packages/services/upload/ops/prepare" [workspace.dependencies.upload-list-for-user] path = "packages/services/upload/ops/list-for-user" -[workspace.dependencies.upload-worker] -path = "packages/services/upload/worker" - -[workspace.dependencies.custom-user-avatar-list-for-game] -path = "packages/services/custom-user-avatar/ops/list-for-game" - -[workspace.dependencies.custom-user-avatar-upload-complete] -path = "packages/services/custom-user-avatar/ops/upload-complete" - -[workspace.dependencies.debug-email-res] -path = "packages/services/debug/ops/email-res" - [workspace.dependencies.tier] path = "packages/services/tier" +[workspace.dependencies.monolith-worker] +path = "packages/services/monolith/standalone/worker" + +[workspace.dependencies.monolith-workflow-worker] +path = "packages/services/monolith/standalone/workflow-worker" + [workspace.dependencies.rivet-api] path = "sdks/full/rust" diff --git a/docs-internal/infrastructure/rust/GIT_DEPENDENCIES.md b/docs-internal/infrastructure/rust/GIT_DEPENDENCIES.md deleted file mode 100644 index d1c57cf46d..0000000000 --- a/docs-internal/infrastructure/rust/GIT_DEPENDENCIES.md +++ /dev/null @@ -1,13 +0,0 @@ -# Git Dependencies - -We opt to use submodules instead of Git dependencies because of complications with building: - -- Primariy, there are bugs with the Cargo git fetcher that cause it to not be - able to pull from GitHub Actions -- Development on externals is easier when developing in-place with a Git - submodule instead of having to push & update the ref every iteration -- Authenticating Git inside of a Docker build step is dangerous process that - can lead to accidentally leaking credentials - - Currently, we support mounting a netrc secret which is safe, but this - doesn't seem to solve the bugs with the Cargo git fetcher - diff --git a/packages/api/actor/src/route/builds.rs b/packages/api/actor/src/route/builds.rs index cdd4f8201c..bb6dff5a33 100644 --- a/packages/api/actor/src/route/builds.rs +++ b/packages/api/actor/src/route/builds.rs @@ -189,7 +189,6 @@ pub async fn patch_tags( let CheckOutput { env_id, .. } = ctx.auth().check(ctx.op_ctx(), &query, false).await?; let tags = unwrap_with!(body.tags, API_BAD_BODY, error = "missing field `tags`"); - let tags = serde_json::from_value(tags).map_err(|err| err_code!(API_BAD_BODY, error = err))?; ensure_with!( tags.as_object().map(|x| x.len()).unwrap_or_default() <= 64, @@ -197,6 +196,8 @@ pub async fn patch_tags( error = "Too many tags (max 64)." ); + let tags = serde_json::from_value(tags).map_err(|err| err_code!(API_BAD_BODY, error = err))?; + let build_res = ctx .op(build::ops::get::Input { build_ids: vec![build_id], @@ -275,11 +276,6 @@ pub async fn create_build( .op(build::ops::create::Input { game_id: None, env_id: Some(env_id), - tags: body - .tags - .map(serde_json::from_value) - .transpose()? - .unwrap_or_default(), display_name: body.name, content: build::ops::create::Content::New { image_file: (*body.image_file).api_try_into()?, diff --git a/packages/services/build/src/ops/create.rs b/packages/services/build/src/ops/create.rs index fed424d326..d900749661 100644 --- a/packages/services/build/src/ops/create.rs +++ b/packages/services/build/src/ops/create.rs @@ -1,5 +1,3 @@ -use std::collections::HashMap; - use chirp_workflow::prelude::*; use rivet_operation::prelude::proto::backend; @@ -17,7 +15,6 @@ pub struct Input { pub content: Content, pub kind: BuildKind, pub compression: BuildCompression, - pub tags: HashMap, } #[derive(Debug)] diff --git a/packages/services/build/src/ops/mod.rs b/packages/services/build/src/ops/mod.rs index 3c2a1b3687..e4c708af58 100644 --- a/packages/services/build/src/ops/mod.rs +++ b/packages/services/build/src/ops/mod.rs @@ -1,5 +1,4 @@ pub mod create; pub mod get; pub mod patch_tags; -pub mod prewarm_ats; pub mod resolve_for_tags; diff --git a/packages/services/build/tests/prewarm_ats.rs b/packages/services/build/tests/prewarm_ats.rs deleted file mode 100644 index c59b08c49d..0000000000 --- a/packages/services/build/tests/prewarm_ats.rs +++ /dev/null @@ -1,34 +0,0 @@ -use chirp_workflow::prelude::*; -use rivet_operation::prelude::proto::backend; - -#[workflow_test] -async fn prewarm_ats(ctx: TestCtx) { - let game_res = op!([ctx] faker_game { - ..Default::default() - }) - .await - .unwrap(); - - let build_res = op!([ctx] faker_build { - game_id: game_res.game_id, - image: backend::faker::Image::MmLobbyAutoReady as i32, - }) - .await - .unwrap(); - let build_id = build_res.build_id.as_ref().unwrap().as_uuid(); - - let region_res = op!([ctx] faker_region { - ..Default::default() - }) - .await - .unwrap(); - - ctx.op(build::ops::prewarm_ats::Input { - datacenter_ids: vec![region_res.region_id.unwrap().as_uuid()], - build_ids: vec![build_id], - }) - .await - .unwrap(); - - // TODO: -} diff --git a/packages/services/ds/src/workflows/server/pegboard/mod.rs b/packages/services/ds/src/workflows/server/pegboard/mod.rs index 1b8d5711f1..ace6024817 100644 --- a/packages/services/ds/src/workflows/server/pegboard/mod.rs +++ b/packages/services/ds/src/workflows/server/pegboard/mod.rs @@ -369,7 +369,7 @@ async fn setup( }, routing: pp::PortRouting::GameGuard, }, - )), + ), Routing::Host { protocol } => ( crate::util::pegboard_normalize_port_label(port_label), pp::Port { diff --git a/scripts/cargo/update_workspace.ts b/scripts/cargo/update_workspace.ts index cf1f38d370..e776017c6c 100755 --- a/scripts/cargo/update_workspace.ts +++ b/scripts/cargo/update_workspace.ts @@ -1,7 +1,7 @@ #!/usr/bin/env -S deno run --allow-net --allow-env --allow-read --allow-write import { parse, stringify } from "@std/toml"; -import { walk } from "@std/fs"; +import { walk, exists } from "@std/fs"; import { join, relative } from "@std/path"; const rootDir = join(import.meta.dirname, "../.."); @@ -11,13 +11,29 @@ async function updateCargoToml() { const workspaceTomlContent = await Deno.readTextFile(workspaceTomlPath); const workspaceToml = parse(workspaceTomlContent); + const entries = async function*() { + for await (const entry of walk(join(rootDir, "packages"), { + includeDirs: false, + exts: ["toml"], + })) { + yield entry; + } + + // Yield from OSS + if (await exists(join(rootDir, "oss"))) { + for await (const entry of walk(join(rootDir, "oss", "packages"), { + includeDirs: false, + exts: ["toml"], + })) { + yield entry; + } + } + }(); + // Find all workspace members const members: string[] = []; for await ( - const entry of walk(join(rootDir, "packages"), { - includeDirs: false, - exts: ["toml"], - }) + const entry of entries ) { // Exclude infra packages if ( diff --git a/sdks/fern/definition/actor/builds.yml b/sdks/fern/definition/actor/builds.yml index 490a3bbf38..e3cb268976 100644 --- a/sdks/fern/definition/actor/builds.yml +++ b/sdks/fern/definition/actor/builds.yml @@ -100,7 +100,6 @@ types: PrepareBuildRequest: properties: name: string - tags: unknown image_tag: docs: A tag given to the project build. type: optional diff --git a/sdks/full/go/actor/builds.go b/sdks/full/go/actor/builds.go index 17855761a9..fd1604c864 100644 --- a/sdks/full/go/actor/builds.go +++ b/sdks/full/go/actor/builds.go @@ -182,15 +182,13 @@ func (p *PatchBuildTagsResponse) String() string { } type PrepareBuildRequest struct { - Name string `json:"name"` - Tags interface{} `json:"tags,omitempty"` + Name string `json:"name"` // A tag given to the project build. ImageTag *string `json:"image_tag,omitempty"` ImageFile *upload.PrepareFile `json:"image_file,omitempty"` MultipartUpload *bool `json:"multipart_upload,omitempty"` Kind *BuildKind `json:"kind,omitempty"` Compression *BuildCompression `json:"compression,omitempty"` - PrewarmRegions []string `json:"prewarm_regions,omitempty"` _rawJSON json.RawMessage } diff --git a/sdks/full/openapi/openapi.yml b/sdks/full/openapi/openapi.yml index c5c8d8a001..0159c7cd92 100644 --- a/sdks/full/openapi/openapi.yml +++ b/sdks/full/openapi/openapi.yml @@ -9784,7 +9784,6 @@ components: properties: name: type: string - tags: {} image_tag: type: string description: A tag given to the project build. @@ -9796,13 +9795,8 @@ components: $ref: '#/components/schemas/ActorBuildKind' compression: $ref: '#/components/schemas/ActorBuildCompression' - prewarm_regions: - type: array - items: - type: string required: - name - - tags - image_file ActorPrepareBuildResponse: type: object diff --git a/sdks/full/openapi_compat/openapi.yml b/sdks/full/openapi_compat/openapi.yml index 548ade849e..cbba7fb0c1 100644 --- a/sdks/full/openapi_compat/openapi.yml +++ b/sdks/full/openapi_compat/openapi.yml @@ -321,14 +321,8 @@ components: type: boolean name: type: string - prewarm_regions: - items: - type: string - type: array - tags: {} required: - name - - tags - image_file type: object ActorPrepareBuildResponse: diff --git a/sdks/full/rust-cli/docs/ActorCreateActorRequest.md b/sdks/full/rust-cli/docs/ActorCreateActorRequest.md index 769c6c7802..1c11d36f28 100644 --- a/sdks/full/rust-cli/docs/ActorCreateActorRequest.md +++ b/sdks/full/rust-cli/docs/ActorCreateActorRequest.md @@ -4,16 +4,8 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -<<<<<<< HEAD **build** | Option<[**uuid::Uuid**](uuid::Uuid.md)> | | [optional] **build_tags** | Option<[**serde_json::Value**](.md)> | | [optional] -======= -<<<<<<< HEAD -======= -**build** | Option<[**uuid::Uuid**](uuid::Uuid.md)> | | [optional] -**build_tags** | Option<[**serde_json::Value**](.md)> | | [optional] ->>>>>>> 5f749cb07 (feat: ds input validation) ->>>>>>> 16ffc975b (feat: ds input validation) **lifecycle** | Option<[**crate::models::ActorLifecycle**](ActorLifecycle.md)> | | [optional] **network** | Option<[**crate::models::ActorCreateActorNetworkRequest**](ActorCreateActorNetworkRequest.md)> | | [optional] **region** | **String** | | diff --git a/sdks/full/rust-cli/docs/ActorPrepareBuildRequest.md b/sdks/full/rust-cli/docs/ActorPrepareBuildRequest.md index 21d06e19ea..24c1803acf 100644 --- a/sdks/full/rust-cli/docs/ActorPrepareBuildRequest.md +++ b/sdks/full/rust-cli/docs/ActorPrepareBuildRequest.md @@ -10,8 +10,6 @@ Name | Type | Description | Notes **kind** | Option<[**crate::models::ActorBuildKind**](ActorBuildKind.md)> | | [optional] **multipart_upload** | Option<**bool**> | | [optional] **name** | **String** | | -**prewarm_regions** | Option<**Vec**> | | [optional] -**tags** | Option<[**serde_json::Value**](.md)> | | [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/sdks/full/rust-cli/docs/ProvisionPoolType.md b/sdks/full/rust-cli/docs/ProvisionPoolType.md index 75c2232f32..8f7fcd14e5 100644 --- a/sdks/full/rust-cli/docs/ProvisionPoolType.md +++ b/sdks/full/rust-cli/docs/ProvisionPoolType.md @@ -1,8 +1,4 @@ -<<<<<<<< HEAD:sdks/full/rust-cli/docs/ProvisionPoolType.md # ProvisionPoolType -======== -# ActorBuildCompression ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/rust/docs/ActorBuildCompression.md ## Properties diff --git a/sdks/full/rust-cli/src/models/actor_prepare_build_request.rs b/sdks/full/rust-cli/src/models/actor_prepare_build_request.rs index 905362175d..911a040f32 100644 --- a/sdks/full/rust-cli/src/models/actor_prepare_build_request.rs +++ b/sdks/full/rust-cli/src/models/actor_prepare_build_request.rs @@ -26,14 +26,10 @@ pub struct ActorPrepareBuildRequest { pub multipart_upload: Option, #[serde(rename = "name")] pub name: String, - #[serde(rename = "prewarm_regions", skip_serializing_if = "Option::is_none")] - pub prewarm_regions: Option>, - #[serde(rename = "tags", deserialize_with = "Option::deserialize")] - pub tags: Option, } impl ActorPrepareBuildRequest { - pub fn new(image_file: crate::models::UploadPrepareFile, name: String, tags: Option) -> ActorPrepareBuildRequest { + pub fn new(image_file: crate::models::UploadPrepareFile, name: String) -> ActorPrepareBuildRequest { ActorPrepareBuildRequest { compression: None, image_file: Box::new(image_file), @@ -41,8 +37,6 @@ impl ActorPrepareBuildRequest { kind: None, multipart_upload: None, name, - prewarm_regions: None, - tags, } } } diff --git a/sdks/full/rust/docs/ActorPrepareBuildRequest.md b/sdks/full/rust/docs/ActorPrepareBuildRequest.md index 21d06e19ea..24c1803acf 100644 --- a/sdks/full/rust/docs/ActorPrepareBuildRequest.md +++ b/sdks/full/rust/docs/ActorPrepareBuildRequest.md @@ -10,8 +10,6 @@ Name | Type | Description | Notes **kind** | Option<[**crate::models::ActorBuildKind**](ActorBuildKind.md)> | | [optional] **multipart_upload** | Option<**bool**> | | [optional] **name** | **String** | | -**prewarm_regions** | Option<**Vec**> | | [optional] -**tags** | Option<[**serde_json::Value**](.md)> | | [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/sdks/full/rust/docs/ProvisionPoolType.md b/sdks/full/rust/docs/ProvisionPoolType.md index ca9926fa8a..8f7fcd14e5 100644 --- a/sdks/full/rust/docs/ProvisionPoolType.md +++ b/sdks/full/rust/docs/ProvisionPoolType.md @@ -1,8 +1,4 @@ -<<<<<<<< HEAD:sdks/full/rust/docs/ProvisionPoolType.md # ProvisionPoolType -======== -# ActorBuildKind ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/rust/docs/ActorBuildKind.md ## Properties diff --git a/sdks/full/rust/src/apis/actor_api.rs b/sdks/full/rust/src/apis/actor_api.rs index 1b63558267..9565c1b95b 100644 --- a/sdks/full/rust/src/apis/actor_api.rs +++ b/sdks/full/rust/src/apis/actor_api.rs @@ -56,18 +56,6 @@ pub enum ActorGetError { #[derive(Debug, Clone, Serialize, Deserialize)] #[serde(untagged)] pub enum ActorListError { -<<<<<<< HEAD -======= -<<<<<<< HEAD - Status400(crate::models::ErrorBody), - Status403(crate::models::ErrorBody), - Status404(crate::models::ErrorBody), - Status408(crate::models::ErrorBody), - Status429(crate::models::ErrorBody), - Status500(crate::models::ErrorBody), - UnknownValue(serde_json::Value), -======= ->>>>>>> 16ffc975b (feat: ds input validation) Status400(crate::models::ErrorBody), Status403(crate::models::ErrorBody), Status404(crate::models::ErrorBody), @@ -88,10 +76,6 @@ pub enum ActorUpgradeError { Status429(crate::models::ErrorBody), Status500(crate::models::ErrorBody), UnknownValue(serde_json::Value), -<<<<<<< HEAD -======= ->>>>>>> 5f749cb07 (feat: ds input validation) ->>>>>>> 16ffc975b (feat: ds input validation) } /// Create a new dynamic actor. @@ -305,13 +289,6 @@ pub async fn actor_list( local_var_req_builder = local_var_req_builder.bearer_auth(local_var_token.to_owned()); }; -<<<<<<< HEAD -======= -<<<<<<< HEAD - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; -======= ->>>>>>> 16ffc975b (feat: ds input validation) let local_var_req = local_var_req_builder.build()?; let local_var_resp = local_var_client.execute(local_var_req).await?; @@ -330,7 +307,6 @@ pub async fn actor_list( }; Err(Error::ResponseError(local_var_error)) } -<<<<<<< HEAD } /// Upgrades a dynamic actor. @@ -389,74 +365,3 @@ pub async fn actor_upgrade( Err(Error::ResponseError(local_var_error)) } } -======= -} - -/// Upgrades a dynamic actor. -pub async fn actor_upgrade( - configuration: &configuration::Configuration, - actor: &str, - actor_upgrade_actor_request: crate::models::ActorUpgradeActorRequest, - project: Option<&str>, - environment: Option<&str>, -) -> Result> { - let local_var_configuration = configuration; - - let local_var_client = &local_var_configuration.client; - - let local_var_uri_str = format!( - "{}/actors/{actor}/upgrade", - local_var_configuration.base_path, - actor = crate::apis::urlencode(actor) - ); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::POST, local_var_uri_str.as_str()); - - if let Some(ref local_var_str) = project { - local_var_req_builder = - local_var_req_builder.query(&[("project", &local_var_str.to_string())]); - } - if let Some(ref local_var_str) = environment { - local_var_req_builder = - local_var_req_builder.query(&[("environment", &local_var_str.to_string())]); - } - if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); - } - if let Some(ref local_var_token) = local_var_configuration.bearer_access_token { - local_var_req_builder = local_var_req_builder.bearer_auth(local_var_token.to_owned()); - }; - local_var_req_builder = local_var_req_builder.json(&actor_upgrade_actor_request); - - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; ->>>>>>> 5f749cb07 (feat: ds input validation) - - let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; - -<<<<<<< HEAD - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { - serde_json::from_str(&local_var_content).map_err(Error::from) - } else { - let local_var_entity: Option = serde_json::from_str(&local_var_content).ok(); - let local_var_error = ResponseContent { status: local_var_status, content: local_var_content, entity: local_var_entity }; - Err(Error::ResponseError(local_var_error)) - } -======= - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { - serde_json::from_str(&local_var_content).map_err(Error::from) - } else { - let local_var_entity: Option = - serde_json::from_str(&local_var_content).ok(); - let local_var_error = ResponseContent { - status: local_var_status, - content: local_var_content, - entity: local_var_entity, - }; - Err(Error::ResponseError(local_var_error)) - } ->>>>>>> 5f749cb07 (feat: ds input validation) -} ->>>>>>> 16ffc975b (feat: ds input validation) diff --git a/sdks/full/rust/src/apis/actor_builds_api.rs b/sdks/full/rust/src/apis/actor_builds_api.rs index cba2e02120..0efffc1bb2 100644 --- a/sdks/full/rust/src/apis/actor_builds_api.rs +++ b/sdks/full/rust/src/apis/actor_builds_api.rs @@ -189,13 +189,6 @@ pub async fn actor_builds_get( } /// Lists all builds of the project associated with the token used. Can be filtered by tags in the query string. -<<<<<<< HEAD -======= -<<<<<<< HEAD -pub async fn actor_builds_list(configuration: &configuration::Configuration, project: Option<&str>, environment: Option<&str>, tags_json: Option<&str>) -> Result> { - let local_var_configuration = configuration; -======= ->>>>>>> 16ffc975b (feat: ds input validation) pub async fn actor_builds_list( configuration: &configuration::Configuration, project: Option<&str>, @@ -203,27 +196,12 @@ pub async fn actor_builds_list( tags_json: Option<&str>, ) -> Result> { let local_var_configuration = configuration; -<<<<<<< HEAD -======= ->>>>>>> 5f749cb07 (feat: ds input validation) ->>>>>>> 16ffc975b (feat: ds input validation) let local_var_client = &local_var_configuration.client; -<<<<<<< HEAD let local_var_uri_str = format!("{}/builds", local_var_configuration.base_path); let mut local_var_req_builder = local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); -======= -<<<<<<< HEAD - let local_var_uri_str = format!("{}/builds", local_var_configuration.base_path); - let mut local_var_req_builder = local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); -======= - let local_var_uri_str = format!("{}/builds", local_var_configuration.base_path); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); ->>>>>>> 5f749cb07 (feat: ds input validation) ->>>>>>> 16ffc975b (feat: ds input validation) if let Some(ref local_var_str) = project { local_var_req_builder = @@ -248,13 +226,6 @@ pub async fn actor_builds_list( let local_var_req = local_var_req_builder.build()?; let local_var_resp = local_var_client.execute(local_var_req).await?; -<<<<<<< HEAD -======= -<<<<<<< HEAD - let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; -======= ->>>>>>> 16ffc975b (feat: ds input validation) let local_var_status = local_var_resp.status(); let local_var_content = local_var_resp.text().await?; @@ -313,10 +284,6 @@ pub async fn actor_builds_patch_tags( let local_var_status = local_var_resp.status(); let local_var_content = local_var_resp.text().await?; -<<<<<<< HEAD -======= ->>>>>>> 5f749cb07 (feat: ds input validation) ->>>>>>> 16ffc975b (feat: ds input validation) if !local_var_status.is_client_error() && !local_var_status.is_server_error() { serde_json::from_str(&local_var_content).map_err(Error::from) diff --git a/sdks/full/rust/src/apis/provision_datacenters_api.rs b/sdks/full/rust/src/apis/provision_datacenters_api.rs index a9c1bc6b57..cdf691e6df 100644 --- a/sdks/full/rust/src/apis/provision_datacenters_api.rs +++ b/sdks/full/rust/src/apis/provision_datacenters_api.rs @@ -29,20 +29,7 @@ pub enum ProvisionDatacentersGetServersError { /// struct for typed errors of method [`provision_datacenters_get_tls`] #[derive(Debug, Clone, Serialize, Deserialize)] #[serde(untagged)] -<<<<<<< HEAD pub enum ProvisionDatacentersGetTlsError { -<<<<<<< HEAD -======= - Status400(crate::models::ErrorBody), - Status403(crate::models::ErrorBody), - Status404(crate::models::ErrorBody), - Status408(crate::models::ErrorBody), - Status429(crate::models::ErrorBody), - Status500(crate::models::ErrorBody), - UnknownValue(serde_json::Value), -======= -pub enum ProvisionDatacentersGetServersError { ->>>>>>> 16ffc975b (feat: ds input validation) Status400(crate::models::ErrorBody), Status403(crate::models::ErrorBody), Status404(crate::models::ErrorBody), @@ -50,68 +37,8 @@ pub enum ProvisionDatacentersGetServersError { Status429(crate::models::ErrorBody), Status500(crate::models::ErrorBody), UnknownValue(serde_json::Value), -<<<<<<< HEAD -======= ->>>>>>> 5f749cb07 (feat: ds input validation) ->>>>>>> 16ffc975b (feat: ds input validation) -} - -pub async fn provision_datacenters_get_servers( - configuration: &configuration::Configuration, - datacenter_id: &str, -) -> Result< - crate::models::ProvisionDatacentersGetServersResponse, - Error, -> { - let local_var_configuration = configuration; - -<<<<<<< HEAD - let local_var_client = &local_var_configuration.client; -======= -<<<<<<< HEAD -pub async fn provision_datacenters_get_tls(configuration: &configuration::Configuration, datacenter_id: &str) -> Result> { - let local_var_configuration = configuration; ->>>>>>> 16ffc975b (feat: ds input validation) - - let local_var_uri_str = format!( - "{}/datacenters/{datacenter_id}/servers", - local_var_configuration.base_path, - datacenter_id = crate::apis::urlencode(datacenter_id) - ); - let mut local_var_req_builder = - local_var_client.request(reqwest::Method::GET, local_var_uri_str.as_str()); - - if let Some(ref local_var_user_agent) = local_var_configuration.user_agent { - local_var_req_builder = - local_var_req_builder.header(reqwest::header::USER_AGENT, local_var_user_agent.clone()); - } - if let Some(ref local_var_token) = local_var_configuration.bearer_access_token { - local_var_req_builder = local_var_req_builder.bearer_auth(local_var_token.to_owned()); - }; - - let local_var_req = local_var_req_builder.build()?; - let local_var_resp = local_var_client.execute(local_var_req).await?; - - let local_var_status = local_var_resp.status(); - let local_var_content = local_var_resp.text().await?; - - if !local_var_status.is_client_error() && !local_var_status.is_server_error() { - serde_json::from_str(&local_var_content).map_err(Error::from) - } else { - let local_var_entity: Option = - serde_json::from_str(&local_var_content).ok(); - let local_var_error = ResponseContent { - status: local_var_status, - content: local_var_content, - entity: local_var_entity, - }; - Err(Error::ResponseError(local_var_error)) - } } -<<<<<<< HEAD -======= -======= pub async fn provision_datacenters_get_servers( configuration: &configuration::Configuration, datacenter_id: &str, @@ -159,7 +86,6 @@ pub async fn provision_datacenters_get_servers( } } ->>>>>>> 16ffc975b (feat: ds input validation) pub async fn provision_datacenters_get_tls( configuration: &configuration::Configuration, datacenter_id: &str, @@ -204,7 +130,3 @@ pub async fn provision_datacenters_get_tls( Err(Error::ResponseError(local_var_error)) } } -<<<<<<< HEAD -======= ->>>>>>> 5f749cb07 (feat: ds input validation) ->>>>>>> 16ffc975b (feat: ds input validation) diff --git a/sdks/full/rust/src/models/actor_create_actor_request.rs b/sdks/full/rust/src/models/actor_create_actor_request.rs index 64e2d6d73d..1c5873c147 100644 --- a/sdks/full/rust/src/models/actor_create_actor_request.rs +++ b/sdks/full/rust/src/models/actor_create_actor_request.rs @@ -10,7 +10,6 @@ #[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize)] pub struct ActorCreateActorRequest { -<<<<<<< HEAD #[serde(rename = "build", skip_serializing_if = "Option::is_none")] pub build: Option, #[serde( @@ -35,59 +34,6 @@ pub struct ActorCreateActorRequest { } impl ActorCreateActorRequest { -======= -<<<<<<< HEAD - #[serde(rename = "lifecycle", skip_serializing_if = "Option::is_none")] - pub lifecycle: Option>, - #[serde(rename = "network", skip_serializing_if = "Option::is_none")] - pub network: Option>, - #[serde(rename = "region")] - pub region: String, - #[serde(rename = "resources")] - pub resources: Box, - #[serde(rename = "runtime")] - pub runtime: Box, - #[serde(rename = "tags", deserialize_with = "Option::deserialize")] - pub tags: Option, -} - -impl ActorCreateActorRequest { - pub fn new(region: String, resources: crate::models::ActorResources, runtime: crate::models::ActorCreateActorRuntimeRequest, tags: Option) -> ActorCreateActorRequest { - ActorCreateActorRequest { - lifecycle: None, - network: None, - region, - resources: Box::new(resources), - runtime: Box::new(runtime), - tags, - } - } -======= - #[serde(rename = "build", skip_serializing_if = "Option::is_none")] - pub build: Option, - #[serde( - rename = "buildTags", - default, - with = "::serde_with::rust::double_option", - skip_serializing_if = "Option::is_none" - )] - pub build_tags: Option>, - #[serde(rename = "lifecycle", skip_serializing_if = "Option::is_none")] - pub lifecycle: Option>, - #[serde(rename = "network", skip_serializing_if = "Option::is_none")] - pub network: Option>, - #[serde(rename = "region")] - pub region: String, - #[serde(rename = "resources")] - pub resources: Box, - #[serde(rename = "runtime")] - pub runtime: Box, - #[serde(rename = "tags", deserialize_with = "Option::deserialize")] - pub tags: Option, -} - -impl ActorCreateActorRequest { ->>>>>>> 16ffc975b (feat: ds input validation) pub fn new( region: String, resources: crate::models::ActorResources, @@ -105,8 +51,4 @@ impl ActorCreateActorRequest { tags, } } -<<<<<<< HEAD -======= ->>>>>>> 5f749cb07 (feat: ds input validation) ->>>>>>> 16ffc975b (feat: ds input validation) } diff --git a/sdks/full/rust/src/models/actor_create_actor_runtime_request.rs b/sdks/full/rust/src/models/actor_create_actor_runtime_request.rs index a44e1e1397..bc1fee2989 100644 --- a/sdks/full/rust/src/models/actor_create_actor_runtime_request.rs +++ b/sdks/full/rust/src/models/actor_create_actor_runtime_request.rs @@ -10,7 +10,6 @@ #[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize)] pub struct ActorCreateActorRuntimeRequest { -<<<<<<< HEAD #[serde(rename = "arguments", skip_serializing_if = "Option::is_none")] pub arguments: Option>, #[serde(rename = "environment", skip_serializing_if = "Option::is_none")] @@ -18,41 +17,10 @@ pub struct ActorCreateActorRuntimeRequest { } impl ActorCreateActorRuntimeRequest { -======= -<<<<<<< HEAD - #[serde(rename = "arguments", skip_serializing_if = "Option::is_none")] - pub arguments: Option>, - #[serde(rename = "build")] - pub build: uuid::Uuid, - #[serde(rename = "environment", skip_serializing_if = "Option::is_none")] - pub environment: Option<::std::collections::HashMap>, -} - -impl ActorCreateActorRuntimeRequest { - pub fn new(build: uuid::Uuid) -> ActorCreateActorRuntimeRequest { - ActorCreateActorRuntimeRequest { - arguments: None, - build, - environment: None, - } - } -======= - #[serde(rename = "arguments", skip_serializing_if = "Option::is_none")] - pub arguments: Option>, - #[serde(rename = "environment", skip_serializing_if = "Option::is_none")] - pub environment: Option<::std::collections::HashMap>, -} - -impl ActorCreateActorRuntimeRequest { ->>>>>>> 16ffc975b (feat: ds input validation) pub fn new() -> ActorCreateActorRuntimeRequest { ActorCreateActorRuntimeRequest { arguments: None, environment: None, } } -<<<<<<< HEAD -======= ->>>>>>> 5f749cb07 (feat: ds input validation) ->>>>>>> 16ffc975b (feat: ds input validation) } diff --git a/sdks/full/rust/src/models/actor_lifecycle.rs b/sdks/full/rust/src/models/actor_lifecycle.rs index a0df842b3a..64f0ffd74c 100644 --- a/sdks/full/rust/src/models/actor_lifecycle.rs +++ b/sdks/full/rust/src/models/actor_lifecycle.rs @@ -10,7 +10,6 @@ #[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize)] pub struct ActorLifecycle { -<<<<<<< HEAD /// If true, the actor will try to reschedule itself automatically in the event of a crash or a datacenter failover. The actor will not reschedule if it exits successfully. #[serde(rename = "durable", skip_serializing_if = "Option::is_none")] pub durable: Option, @@ -20,38 +19,10 @@ pub struct ActorLifecycle { } impl ActorLifecycle { -======= -<<<<<<< HEAD - /// The duration to wait for in milliseconds before killing the actor. This should be set to a safe default, and can be overridden during a DELETE request if needed. - #[serde(rename = "kill_timeout", skip_serializing_if = "Option::is_none")] - pub kill_timeout: Option, -} - -impl ActorLifecycle { - pub fn new() -> ActorLifecycle { - ActorLifecycle { - kill_timeout: None, - } - } -======= - /// If true, the actor will try to reschedule itself automatically in the event of a crash or a datacenter failover. The actor will not reschedule if it exits successfully. - #[serde(rename = "durable", skip_serializing_if = "Option::is_none")] - pub durable: Option, - /// The duration to wait for in milliseconds before killing the actor. This should be set to a safe default, and can be overridden during a DELETE request if needed. - #[serde(rename = "kill_timeout", skip_serializing_if = "Option::is_none")] - pub kill_timeout: Option, -} - -impl ActorLifecycle { ->>>>>>> 16ffc975b (feat: ds input validation) pub fn new() -> ActorLifecycle { ActorLifecycle { durable: None, kill_timeout: None, } } -<<<<<<< HEAD -======= ->>>>>>> 5f749cb07 (feat: ds input validation) ->>>>>>> 16ffc975b (feat: ds input validation) } diff --git a/sdks/full/rust/src/models/actor_prepare_build_request.rs b/sdks/full/rust/src/models/actor_prepare_build_request.rs index 14ad9f211f..fa84e3884b 100644 --- a/sdks/full/rust/src/models/actor_prepare_build_request.rs +++ b/sdks/full/rust/src/models/actor_prepare_build_request.rs @@ -10,7 +10,6 @@ #[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize)] pub struct ActorPrepareBuildRequest { -<<<<<<< HEAD #[serde(rename = "compression", skip_serializing_if = "Option::is_none")] pub compression: Option, #[serde(rename = "image_file")] @@ -24,68 +23,12 @@ pub struct ActorPrepareBuildRequest { pub multipart_upload: Option, #[serde(rename = "name")] pub name: String, - #[serde(rename = "prewarm_regions", skip_serializing_if = "Option::is_none")] - pub prewarm_regions: Option>, - #[serde(rename = "tags", deserialize_with = "Option::deserialize")] - pub tags: Option, } impl ActorPrepareBuildRequest { -======= -<<<<<<< HEAD - #[serde(rename = "compression", skip_serializing_if = "Option::is_none")] - pub compression: Option, - #[serde(rename = "image_file")] - pub image_file: Box, - /// A tag given to the project build. - #[serde(rename = "image_tag", skip_serializing_if = "Option::is_none")] - pub image_tag: Option, - #[serde(rename = "kind", skip_serializing_if = "Option::is_none")] - pub kind: Option, - #[serde(rename = "multipart_upload", skip_serializing_if = "Option::is_none")] - pub multipart_upload: Option, - #[serde(rename = "name")] - pub name: String, - #[serde(rename = "prewarm_regions", skip_serializing_if = "Option::is_none")] - pub prewarm_regions: Option>, -} - -impl ActorPrepareBuildRequest { - pub fn new(image_file: crate::models::UploadPrepareFile, name: String) -> ActorPrepareBuildRequest { - ActorPrepareBuildRequest { - compression: None, - image_file: Box::new(image_file), - image_tag: None, - kind: None, - multipart_upload: None, - name, - prewarm_regions: None, - } - } -======= - #[serde(rename = "compression", skip_serializing_if = "Option::is_none")] - pub compression: Option, - #[serde(rename = "image_file")] - pub image_file: Box, - /// A tag given to the project build. - #[serde(rename = "image_tag", skip_serializing_if = "Option::is_none")] - pub image_tag: Option, - #[serde(rename = "kind", skip_serializing_if = "Option::is_none")] - pub kind: Option, - #[serde(rename = "multipart_upload", skip_serializing_if = "Option::is_none")] - pub multipart_upload: Option, - #[serde(rename = "name")] - pub name: String, - #[serde(rename = "prewarm_regions", skip_serializing_if = "Option::is_none")] - pub prewarm_regions: Option>, -} - -impl ActorPrepareBuildRequest { ->>>>>>> 16ffc975b (feat: ds input validation) pub fn new( image_file: crate::models::UploadPrepareFile, name: String, - tags: Option, ) -> ActorPrepareBuildRequest { ActorPrepareBuildRequest { compression: None, @@ -94,12 +37,6 @@ impl ActorPrepareBuildRequest { kind: None, multipart_upload: None, name, - prewarm_regions: None, - tags, } } -<<<<<<< HEAD -======= ->>>>>>> 5f749cb07 (feat: ds input validation) ->>>>>>> 16ffc975b (feat: ds input validation) } diff --git a/sdks/full/typescript/src/api/resources/actor/client/Client.ts b/sdks/full/typescript/src/api/resources/actor/client/Client.ts index f9b5d8d57b..bef157c77a 100644 --- a/sdks/full/typescript/src/api/resources/actor/client/Client.ts +++ b/sdks/full/typescript/src/api/resources/actor/client/Client.ts @@ -365,24 +365,11 @@ export class Actor { * tags: { * "key": "value" * }, -<<<<<<< HEAD * build: "d5e9c84f-c2b2-4bf4-b4b0-7ffd7a9ffc32", * buildTags: { * "key": "value" * }, * runtime: { -======= -<<<<<<< HEAD - * runtime: { - * build: "d5e9c84f-c2b2-4bf4-b4b0-7ffd7a9ffc32", -======= - * build: "d5e9c84f-c2b2-4bf4-b4b0-7ffd7a9ffc32", - * buildTags: { - * "key": "value" - * }, - * runtime: { ->>>>>>> 5f749cb07 (feat: ds input validation) ->>>>>>> 16ffc975b (feat: ds input validation) * arguments: ["string"], * environment: { * "string": "string" diff --git a/sdks/full/typescript/src/api/resources/actor/resources/builds/client/Client.ts b/sdks/full/typescript/src/api/resources/actor/resources/builds/client/Client.ts index 15581402e1..494ecf1ce4 100644 --- a/sdks/full/typescript/src/api/resources/actor/resources/builds/client/Client.ts +++ b/sdks/full/typescript/src/api/resources/actor/resources/builds/client/Client.ts @@ -503,9 +503,6 @@ export class Builds { * environment: "string", * body: { * name: "string", - * tags: { - * "key": "value" - * }, * imageTag: "string", * imageFile: { * path: "string", @@ -514,8 +511,7 @@ export class Builds { * }, * multipartUpload: true, * kind: "docker_image", - * compression: "none", - * prewarmRegions: ["string"] + * compression: "none" * } * }) */ diff --git a/sdks/full/typescript/src/api/resources/actor/resources/builds/client/requests/PrepareBuildRequestQuery.ts b/sdks/full/typescript/src/api/resources/actor/resources/builds/client/requests/PrepareBuildRequestQuery.ts index b2325792e4..4456cfb0e7 100644 --- a/sdks/full/typescript/src/api/resources/actor/resources/builds/client/requests/PrepareBuildRequestQuery.ts +++ b/sdks/full/typescript/src/api/resources/actor/resources/builds/client/requests/PrepareBuildRequestQuery.ts @@ -11,9 +11,6 @@ import * as Rivet from "../../../../../../index"; * environment: "string", * body: { * name: "string", - * tags: { - * "key": "value" - * }, * imageTag: "string", * imageFile: { * path: "string", @@ -22,8 +19,7 @@ import * as Rivet from "../../../../../../index"; * }, * multipartUpload: true, * kind: "docker_image", - * compression: "none", - * prewarmRegions: ["string"] + * compression: "none" * } * } */ diff --git a/sdks/full/typescript/src/serialization/resources/actor/resources/common/types/PortRouting.ts b/sdks/full/typescript/src/serialization/resources/actor/resources/common/types/PortRouting.ts index ac4e3f27d2..1dfd5201c0 100644 --- a/sdks/full/typescript/src/serialization/resources/actor/resources/common/types/PortRouting.ts +++ b/sdks/full/typescript/src/serialization/resources/actor/resources/common/types/PortRouting.ts @@ -5,30 +5,18 @@ import * as serializers from "../../../../../index"; import * as Rivet from "../../../../../../api/index"; import * as core from "../../../../../../core"; -<<<<<<< HEAD import { GuardRouting } from "./GuardRouting"; -======= -import { GameGuardRouting } from "./GameGuardRouting"; ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) import { HostRouting } from "./HostRouting"; export const PortRouting: core.serialization.ObjectSchema = core.serialization.object({ -<<<<<<< HEAD guard: GuardRouting.optional(), -======= - gameGuard: core.serialization.property("game_guard", GameGuardRouting.optional()), ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) host: HostRouting.optional(), }); export declare namespace PortRouting { interface Raw { -<<<<<<< HEAD guard?: GuardRouting.Raw | null; -======= - game_guard?: GameGuardRouting.Raw | null; ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) host?: HostRouting.Raw | null; } } diff --git a/sdks/full/typescript/src/serialization/resources/actor/types/CreateActorRequest.ts b/sdks/full/typescript/src/serialization/resources/actor/types/CreateActorRequest.ts index 7d79721f6b..fc8ae1ec56 100644 --- a/sdks/full/typescript/src/serialization/resources/actor/types/CreateActorRequest.ts +++ b/sdks/full/typescript/src/serialization/resources/actor/types/CreateActorRequest.ts @@ -16,11 +16,8 @@ export const CreateActorRequest: core.serialization.ObjectSchema< > = core.serialization.object({ region: core.serialization.string(), tags: core.serialization.unknown(), -<<<<<<< HEAD build: core.serialization.string().optional(), buildTags: core.serialization.unknown().optional(), -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) runtime: CreateActorRuntimeRequest, network: CreateActorNetworkRequest.optional(), resources: Resources, @@ -31,11 +28,8 @@ export declare namespace CreateActorRequest { interface Raw { region: string; tags?: unknown; -<<<<<<< HEAD build?: string | null; buildTags?: unknown | null; -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) runtime: CreateActorRuntimeRequest.Raw; network?: CreateActorNetworkRequest.Raw | null; resources: Resources.Raw; diff --git a/sdks/full/typescript/types/api/resources/actor/client/Client.d.ts b/sdks/full/typescript/types/api/resources/actor/client/Client.d.ts index 17aaefd1a6..d595d774ca 100644 --- a/sdks/full/typescript/types/api/resources/actor/client/Client.d.ts +++ b/sdks/full/typescript/types/api/resources/actor/client/Client.d.ts @@ -91,24 +91,11 @@ export declare class Actor { * tags: { * "key": "value" * }, -<<<<<<< HEAD * build: "d5e9c84f-c2b2-4bf4-b4b0-7ffd7a9ffc32", * buildTags: { * "key": "value" * }, * runtime: { -======= -<<<<<<< HEAD - * runtime: { - * build: "d5e9c84f-c2b2-4bf4-b4b0-7ffd7a9ffc32", -======= - * build: "d5e9c84f-c2b2-4bf4-b4b0-7ffd7a9ffc32", - * buildTags: { - * "key": "value" - * }, - * runtime: { ->>>>>>> 5f749cb07 (feat: ds input validation) ->>>>>>> 16ffc975b (feat: ds input validation) * arguments: ["string"], * environment: { * "string": "string" diff --git a/sdks/full/typescript/types/api/resources/actor/resources/builds/client/Client.d.ts b/sdks/full/typescript/types/api/resources/actor/resources/builds/client/Client.d.ts index f733fe8b38..157f92496a 100644 --- a/sdks/full/typescript/types/api/resources/actor/resources/builds/client/Client.d.ts +++ b/sdks/full/typescript/types/api/resources/actor/resources/builds/client/Client.d.ts @@ -108,9 +108,6 @@ export declare class Builds { * environment: "string", * body: { * name: "string", - * tags: { - * "key": "value" - * }, * imageTag: "string", * imageFile: { * path: "string", @@ -119,8 +116,7 @@ export declare class Builds { * }, * multipartUpload: true, * kind: "docker_image", - * compression: "none", - * prewarmRegions: ["string"] + * compression: "none" * } * }) */ diff --git a/sdks/full/typescript/types/serialization/resources/actor/resources/common/types/PortRouting.d.ts b/sdks/full/typescript/types/serialization/resources/actor/resources/common/types/PortRouting.d.ts index 77d4837603..564c220e1c 100644 --- a/sdks/full/typescript/types/serialization/resources/actor/resources/common/types/PortRouting.d.ts +++ b/sdks/full/typescript/types/serialization/resources/actor/resources/common/types/PortRouting.d.ts @@ -4,20 +4,12 @@ import * as serializers from "../../../../../index"; import * as Rivet from "../../../../../../api/index"; import * as core from "../../../../../../core"; -<<<<<<< HEAD import { GuardRouting } from "./GuardRouting"; -======= -import { GameGuardRouting } from "./GameGuardRouting"; ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) import { HostRouting } from "./HostRouting"; export declare const PortRouting: core.serialization.ObjectSchema; export declare namespace PortRouting { interface Raw { -<<<<<<< HEAD guard?: GuardRouting.Raw | null; -======= - game_guard?: GameGuardRouting.Raw | null; ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) host?: HostRouting.Raw | null; } } diff --git a/sdks/full/typescript/types/serialization/resources/actor/types/CreateActorRequest.d.ts b/sdks/full/typescript/types/serialization/resources/actor/types/CreateActorRequest.d.ts index 5a58285448..bf6d4076ef 100644 --- a/sdks/full/typescript/types/serialization/resources/actor/types/CreateActorRequest.d.ts +++ b/sdks/full/typescript/types/serialization/resources/actor/types/CreateActorRequest.d.ts @@ -13,11 +13,8 @@ export declare namespace CreateActorRequest { interface Raw { region: string; tags?: unknown; -<<<<<<< HEAD build?: string | null; buildTags?: unknown | null; -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) runtime: CreateActorRuntimeRequest.Raw; network?: CreateActorNetworkRequest.Raw | null; resources: Resources.Raw; diff --git a/sdks/runtime/go/actor/actor.go b/sdks/runtime/go/actor/actor.go index 5a81806424..44b0d289d6 100644 --- a/sdks/runtime/go/actor/actor.go +++ b/sdks/runtime/go/actor/actor.go @@ -5,21 +5,15 @@ package actor import ( json "encoding/json" fmt "fmt" -<<<<<<< HEAD uuid "github.com/google/uuid" -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) core "sdk/core" ) type CreateActorRequest struct { Region string `json:"region"` Tags interface{} `json:"tags,omitempty"` -<<<<<<< HEAD Build *uuid.UUID `json:"build,omitempty"` BuildTags interface{} `json:"buildTags,omitempty"` -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) Runtime *CreateActorRuntimeRequest `json:"runtime,omitempty"` Network *CreateActorNetworkRequest `json:"network,omitempty"` Resources *Resources `json:"resources,omitempty"` @@ -166,7 +160,6 @@ func (l *ListActorsResponse) String() string { } return fmt.Sprintf("%#v", l) } -<<<<<<< HEAD type UpgradeActorRequest struct { Build *uuid.UUID `json:"build,omitempty"` @@ -224,5 +217,3 @@ func (u *UpgradeActorResponse) String() string { } return fmt.Sprintf("%#v", u) } -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) diff --git a/sdks/runtime/go/actor/builds.go b/sdks/runtime/go/actor/builds.go index e841391065..fd1604c864 100644 --- a/sdks/runtime/go/actor/builds.go +++ b/sdks/runtime/go/actor/builds.go @@ -182,19 +182,13 @@ func (p *PatchBuildTagsResponse) String() string { } type PrepareBuildRequest struct { -<<<<<<< HEAD Name string `json:"name"` -======= - Name string `json:"name"` - Tags interface{} `json:"tags,omitempty"` ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) // A tag given to the project build. ImageTag *string `json:"image_tag,omitempty"` ImageFile *upload.PrepareFile `json:"image_file,omitempty"` MultipartUpload *bool `json:"multipart_upload,omitempty"` Kind *BuildKind `json:"kind,omitempty"` Compression *BuildCompression `json:"compression,omitempty"` - PrewarmRegions []string `json:"prewarm_regions,omitempty"` _rawJSON json.RawMessage } @@ -223,14 +217,8 @@ func (p *PrepareBuildRequest) String() string { } type PrepareBuildResponse struct { -<<<<<<< HEAD - Build uuid.UUID `json:"build"` - ImagePresignedRequest *upload.PresignedRequest `json:"image_presigned_request,omitempty"` - ImagePresignedRequests []*upload.PresignedRequest `json:"image_presigned_requests,omitempty"` -======= Build uuid.UUID `json:"build"` PresignedRequests []*upload.PresignedRequest `json:"presigned_requests,omitempty"` ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) _rawJSON json.RawMessage } diff --git a/sdks/runtime/go/actor/client/client.go b/sdks/runtime/go/actor/client/client.go index 42604b4a27..e5adae2d60 100644 --- a/sdks/runtime/go/actor/client/client.go +++ b/sdks/runtime/go/actor/client/client.go @@ -417,7 +417,6 @@ func (c *Client) Destroy(ctx context.Context, actor uuid.UUID, request *sdkactor } return response, nil } -<<<<<<< HEAD // Upgrades a dynamic actor. // @@ -510,5 +509,3 @@ func (c *Client) Upgrade(ctx context.Context, actor uuid.UUID, request *sdkactor } return response, nil } -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) diff --git a/sdks/runtime/go/actor/types.go b/sdks/runtime/go/actor/types.go index e1cc3f122a..02cee2e820 100644 --- a/sdks/runtime/go/actor/types.go +++ b/sdks/runtime/go/actor/types.go @@ -174,41 +174,24 @@ func (b *Build) String() string { return fmt.Sprintf("%#v", b) } -<<<<<<< HEAD type GuardRouting struct { -======= -type GameGuardRouting struct { ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) Authorization *PortAuthorization `json:"authorization,omitempty"` _rawJSON json.RawMessage } -<<<<<<< HEAD func (g *GuardRouting) UnmarshalJSON(data []byte) error { type unmarshaler GuardRouting -======= -func (g *GameGuardRouting) UnmarshalJSON(data []byte) error { - type unmarshaler GameGuardRouting ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) var value unmarshaler if err := json.Unmarshal(data, &value); err != nil { return err } -<<<<<<< HEAD *g = GuardRouting(value) -======= - *g = GameGuardRouting(value) ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) g._rawJSON = json.RawMessage(data) return nil } -<<<<<<< HEAD func (g *GuardRouting) String() string { -======= -func (g *GameGuardRouting) String() string { ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) if len(g._rawJSON) > 0 { if value, err := core.StringifyJSON(g._rawJSON); err == nil { return value @@ -250,11 +233,8 @@ func (h *HostRouting) String() string { type Lifecycle struct { // The duration to wait for in milliseconds before killing the actor. This should be set to a safe default, and can be overridden during a DELETE request if needed. KillTimeout *int64 `json:"kill_timeout,omitempty"` -<<<<<<< HEAD // If true, the actor will try to reschedule itself automatically in the event of a crash or a datacenter failover. The actor will not reschedule if it exits successfully. Durable *bool `json:"durable,omitempty"` -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) _rawJSON json.RawMessage } @@ -459,13 +439,8 @@ func (p *PortQueryAuthorization) String() string { } type PortRouting struct { -<<<<<<< HEAD Guard *GuardRouting `json:"guard,omitempty"` Host *HostRouting `json:"host,omitempty"` -======= - GameGuard *GameGuardRouting `json:"game_guard,omitempty"` - Host *HostRouting `json:"host,omitempty"` ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) _rawJSON json.RawMessage } @@ -650,10 +625,6 @@ func (c *CreateActorPortRequest) String() string { } type CreateActorRuntimeRequest struct { -<<<<<<< HEAD -======= - Build uuid.UUID `json:"build"` ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) Arguments []string `json:"arguments,omitempty"` Environment map[string]string `json:"environment,omitempty"` @@ -682,7 +653,6 @@ func (c *CreateActorRuntimeRequest) String() string { } return fmt.Sprintf("%#v", c) } -<<<<<<< HEAD type UpgradeActorRequestQuery struct { Project *string `json:"-"` @@ -702,5 +672,3 @@ func (u *UpgradeActorRequestQuery) UnmarshalJSON(data []byte) error { func (u *UpgradeActorRequestQuery) MarshalJSON() ([]byte, error) { return json.Marshal(u.Body) } -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) diff --git a/sdks/runtime/openapi/openapi.yml b/sdks/runtime/openapi/openapi.yml index 7359de3e3a..67183f50d6 100644 --- a/sdks/runtime/openapi/openapi.yml +++ b/sdks/runtime/openapi/openapi.yml @@ -294,7 +294,6 @@ paths: application/json: schema: $ref: '#/components/schemas/ActorCreateActorRequest' -<<<<<<< HEAD /actors/{actor}/upgrade: post: description: Upgrades a dynamic actor. @@ -305,17 +304,6 @@ paths: - name: actor in: path description: The id of the actor to upgrade -======= - /builds/{build}: - get: - description: Get a build. - operationId: actor_builds_get - tags: - - ActorBuilds - parameters: - - name: build - in: path ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) required: true schema: type: string @@ -336,145 +324,7 @@ paths: content: application/json: schema: -<<<<<<< HEAD $ref: '#/components/schemas/ActorUpgradeActorResponse' -======= - $ref: '#/components/schemas/ActorGetBuildResponse' - '400': - description: '' - content: - application/json: - schema: - $ref: '#/components/schemas/ErrorBody' - '403': - description: '' - content: - application/json: - schema: - $ref: '#/components/schemas/ErrorBody' - '404': - description: '' - content: - application/json: - schema: - $ref: '#/components/schemas/ErrorBody' - '408': - description: '' - content: - application/json: - schema: - $ref: '#/components/schemas/ErrorBody' - '429': - description: '' - content: - application/json: - schema: - $ref: '#/components/schemas/ErrorBody' - '500': - description: '' - content: - application/json: - schema: - $ref: '#/components/schemas/ErrorBody' - security: *ref_0 - /builds: - get: - description: >- - Lists all builds of the project associated with the token used. Can be - filtered by tags in the query string. - operationId: actor_builds_list - tags: - - ActorBuilds - parameters: - - name: project - in: query - required: false - schema: - type: string - - name: environment - in: query - required: false - schema: - type: string - - name: tags_json - in: query - required: false - schema: - type: string - responses: - '200': - description: '' - content: - application/json: - schema: - $ref: '#/components/schemas/ActorListBuildsResponse' - '400': - description: '' - content: - application/json: - schema: - $ref: '#/components/schemas/ErrorBody' - '403': - description: '' - content: - application/json: - schema: - $ref: '#/components/schemas/ErrorBody' - '404': - description: '' - content: - application/json: - schema: - $ref: '#/components/schemas/ErrorBody' - '408': - description: '' - content: - application/json: - schema: - $ref: '#/components/schemas/ErrorBody' - '429': - description: '' - content: - application/json: - schema: - $ref: '#/components/schemas/ErrorBody' - '500': - description: '' - content: - application/json: - schema: - $ref: '#/components/schemas/ErrorBody' - security: *ref_0 - /builds/{build}/tags: - patch: - operationId: actor_builds_patchTags - tags: - - ActorBuilds - parameters: - - name: build - in: path - required: true - schema: - type: string - format: uuid - - name: project - in: query - required: false - schema: - type: string - - name: environment - in: query - required: false - schema: - type: string - responses: - '200': - description: '' - content: - application/json: - schema: - $ref: '#/components/schemas/ActorPatchBuildTagsResponse' ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) '400': description: '' content: @@ -517,7 +367,6 @@ paths: content: application/json: schema: -<<<<<<< HEAD $ref: '#/components/schemas/ActorUpgradeActorRequest' /builds/{build}: get: @@ -532,16 +381,6 @@ paths: schema: type: string format: uuid -======= - $ref: '#/components/schemas/ActorPatchBuildTagsRequest' - /builds/prepare: - post: - description: Creates a new project build for the given project. - operationId: actor_builds_prepare - tags: - - ActorBuilds - parameters: ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) - name: project in: query required: false @@ -558,7 +397,6 @@ paths: content: application/json: schema: -<<<<<<< HEAD $ref: '#/components/schemas/ActorGetBuildResponse' '400': description: '' @@ -694,9 +532,6 @@ paths: application/json: schema: $ref: '#/components/schemas/ActorPatchBuildTagsResponse' -======= - $ref: '#/components/schemas/ActorPrepareBuildResponse' ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) '400': description: '' content: @@ -739,7 +574,6 @@ paths: content: application/json: schema: -<<<<<<< HEAD $ref: '#/components/schemas/ActorPatchBuildTagsRequest' /builds/prepare: post: @@ -748,22 +582,6 @@ paths: tags: - ActorBuilds parameters: -======= - $ref: '#/components/schemas/ActorPrepareBuildRequest' - /builds/{build}/complete: - post: - description: Marks an upload as complete. - operationId: actor_builds_complete - tags: - - ActorBuilds - parameters: - - name: build - in: path - required: true - schema: - type: string - format: uuid ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) - name: project in: query required: false @@ -775,15 +593,12 @@ paths: schema: type: string responses: - '204': + '200': description: '' -<<<<<<< HEAD content: application/json: schema: $ref: '#/components/schemas/ActorPrepareBuildResponse' -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) '400': description: '' content: @@ -821,7 +636,6 @@ paths: schema: $ref: '#/components/schemas/ErrorBody' security: *ref_0 -<<<<<<< HEAD requestBody: required: true content: @@ -896,13 +710,6 @@ paths: description: Returns the logs for a given actor. operationId: actor_logs_get tags: -======= - /actors/{actor}/logs: - get: - description: Returns the logs for a given actor. - operationId: actor_logs_get - tags: ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) - ActorLogs parameters: - name: actor @@ -1051,13 +858,10 @@ components: region: type: string tags: {} -<<<<<<< HEAD build: type: string format: uuid buildTags: {} -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) runtime: $ref: '#/components/schemas/ActorCreateActorRuntimeRequest' network: @@ -1074,12 +878,6 @@ components: ActorCreateActorRuntimeRequest: type: object properties: -<<<<<<< HEAD -======= - build: - type: string - format: uuid ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) arguments: type: array items: @@ -1088,11 +886,6 @@ components: type: object additionalProperties: type: string -<<<<<<< HEAD -======= - required: - - build ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) ActorCreateActorNetworkRequest: type: object properties: @@ -1124,7 +917,6 @@ components: ActorDestroyActorResponse: type: object properties: {} -<<<<<<< HEAD ActorUpgradeActorRequest: type: object properties: @@ -1135,8 +927,6 @@ components: ActorUpgradeActorResponse: type: object properties: {} -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) ActorListActorsResponse: type: object properties: @@ -1183,10 +973,6 @@ components: properties: name: type: string -<<<<<<< HEAD -======= - tags: {} ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) image_tag: type: string description: A tag given to the project build. @@ -1198,16 +984,8 @@ components: $ref: '#/components/schemas/ActorBuildKind' compression: $ref: '#/components/schemas/ActorBuildCompression' - prewarm_regions: - type: array - items: - type: string required: - name -<<<<<<< HEAD -======= - - tags ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) - image_file ActorPrepareBuildResponse: type: object @@ -1215,22 +993,13 @@ components: build: type: string format: uuid -<<<<<<< HEAD - image_presigned_request: - $ref: '#/components/schemas/UploadPresignedRequest' - image_presigned_requests: -======= presigned_requests: ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) type: array items: $ref: '#/components/schemas/UploadPresignedRequest' required: - build -<<<<<<< HEAD -======= - presigned_requests ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) ActorBuildKind: type: string enum: @@ -1303,15 +1072,12 @@ components: The duration to wait for in milliseconds before killing the actor. This should be set to a safe default, and can be overridden during a DELETE request if needed. -<<<<<<< HEAD durable: type: boolean description: >- If true, the actor will try to reschedule itself automatically in the event of a crash or a datacenter failover. The actor will not reschedule if it exits successfully. -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) ActorResources: type: object properties: @@ -1374,19 +1140,11 @@ components: ActorPortRouting: type: object properties: -<<<<<<< HEAD guard: $ref: '#/components/schemas/ActorGuardRouting' host: $ref: '#/components/schemas/ActorHostRouting' ActorGuardRouting: -======= - game_guard: - $ref: '#/components/schemas/ActorGameGuardRouting' - host: - $ref: '#/components/schemas/ActorHostRouting' - ActorGameGuardRouting: ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) type: object properties: authorization: diff --git a/sdks/runtime/openapi_compat/openapi.yml b/sdks/runtime/openapi_compat/openapi.yml index 14b4c130a4..ca3f03bc65 100644 --- a/sdks/runtime/openapi_compat/openapi.yml +++ b/sdks/runtime/openapi_compat/openapi.yml @@ -93,13 +93,10 @@ components: type: object ActorCreateActorRequest: properties: -<<<<<<< HEAD build: format: uuid type: string buildTags: {} -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) lifecycle: $ref: '#/components/schemas/ActorLifecycle' network: @@ -131,33 +128,14 @@ components: items: type: string type: array -<<<<<<< HEAD -======= - build: - format: uuid - type: string ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) environment: additionalProperties: type: string type: object -<<<<<<< HEAD -======= - required: - - build ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) type: object ActorDestroyActorResponse: properties: {} type: object -<<<<<<< HEAD -======= - ActorGameGuardRouting: - properties: - authorization: - $ref: '#/components/schemas/ActorPortAuthorization' - type: object ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) ActorGetActorLogsResponse: properties: lines: @@ -191,27 +169,21 @@ components: required: - build type: object -<<<<<<< HEAD ActorGuardRouting: properties: authorization: $ref: '#/components/schemas/ActorPortAuthorization' type: object -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) ActorHostRouting: properties: {} type: object ActorLifecycle: properties: -<<<<<<< HEAD durable: description: If true, the actor will try to reschedule itself automatically in the event of a crash or a datacenter failover. The actor will not reschedule if it exits successfully. type: boolean -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) kill_timeout: description: The duration to wait for in milliseconds before killing the actor. This should be set to a safe default, and can be overridden during @@ -327,13 +299,8 @@ components: type: object ActorPortRouting: properties: -<<<<<<< HEAD guard: $ref: '#/components/schemas/ActorGuardRouting' -======= - game_guard: - $ref: '#/components/schemas/ActorGameGuardRouting' ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) host: $ref: '#/components/schemas/ActorHostRouting' type: object @@ -352,19 +319,8 @@ components: type: boolean name: type: string - prewarm_regions: - items: - type: string - type: array -<<<<<<< HEAD required: - name -======= - tags: {} - required: - - name - - tags ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) - image_file type: object ActorPrepareBuildResponse: @@ -372,22 +328,13 @@ components: build: format: uuid type: string -<<<<<<< HEAD - image_presigned_request: - $ref: '#/components/schemas/UploadPresignedRequest' - image_presigned_requests: -======= presigned_requests: ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) items: $ref: '#/components/schemas/UploadPresignedRequest' type: array required: - build -<<<<<<< HEAD -======= - presigned_requests ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) type: object ActorRegion: properties: @@ -432,7 +379,6 @@ components: required: - build type: object -<<<<<<< HEAD ActorUpgradeActorRequest: properties: build: @@ -443,8 +389,6 @@ components: ActorUpgradeActorResponse: properties: {} type: object -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) ErrorBody: properties: code: @@ -899,7 +843,6 @@ paths: security: *id001 tags: - ActorLogs -<<<<<<< HEAD /actors/{actor}/upgrade: post: description: Upgrades a dynamic actor. @@ -912,80 +855,6 @@ paths: schema: format: uuid type: string -======= - /builds: - get: - description: Lists all builds of the project associated with the token used. - Can be filtered by tags in the query string. - operationId: actor_builds_list - parameters: - - in: query - name: project - required: false - schema: - type: string - - in: query - name: environment - required: false - schema: - type: string - - in: query - name: tags_json - required: false - schema: - type: string - responses: - '200': - content: - application/json: - schema: - $ref: '#/components/schemas/ActorListBuildsResponse' - description: '' - '400': - content: - application/json: - schema: - $ref: '#/components/schemas/ErrorBody' - description: '' - '403': - content: - application/json: - schema: - $ref: '#/components/schemas/ErrorBody' - description: '' - '404': - content: - application/json: - schema: - $ref: '#/components/schemas/ErrorBody' - description: '' - '408': - content: - application/json: - schema: - $ref: '#/components/schemas/ErrorBody' - description: '' - '429': - content: - application/json: - schema: - $ref: '#/components/schemas/ErrorBody' - description: '' - '500': - content: - application/json: - schema: - $ref: '#/components/schemas/ErrorBody' - description: '' - security: *id001 - tags: - - ActorBuilds - /builds/prepare: - post: - description: Creates a new project build for the given project. - operationId: actor_builds_prepare - parameters: ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) - in: query name: project required: false @@ -1000,18 +869,13 @@ paths: content: application/json: schema: -<<<<<<< HEAD $ref: '#/components/schemas/ActorUpgradeActorRequest' -======= - $ref: '#/components/schemas/ActorPrepareBuildRequest' ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) required: true responses: '200': content: application/json: schema: -<<<<<<< HEAD $ref: '#/components/schemas/ActorUpgradeActorResponse' description: '' '400': @@ -1146,8 +1010,6 @@ paths: content: application/json: schema: -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) $ref: '#/components/schemas/ActorPrepareBuildResponse' description: '' '400': diff --git a/sdks/runtime/rust/.openapi-generator/FILES b/sdks/runtime/rust/.openapi-generator/FILES index d84259817e..831c1a632e 100644 --- a/sdks/runtime/rust/.openapi-generator/FILES +++ b/sdks/runtime/rust/.openapi-generator/FILES @@ -14,17 +14,10 @@ docs/ActorCreateActorPortRequest.md docs/ActorCreateActorRequest.md docs/ActorCreateActorResponse.md docs/ActorCreateActorRuntimeRequest.md -<<<<<<< HEAD docs/ActorGetActorLogsResponse.md docs/ActorGetActorResponse.md docs/ActorGetBuildResponse.md docs/ActorGuardRouting.md -======= -docs/ActorGameGuardRouting.md -docs/ActorGetActorLogsResponse.md -docs/ActorGetActorResponse.md -docs/ActorGetBuildResponse.md ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) docs/ActorLifecycle.md docs/ActorListActorsResponse.md docs/ActorListBuildsResponse.md @@ -45,10 +38,7 @@ docs/ActorRegion.md docs/ActorRegionsApi.md docs/ActorResources.md docs/ActorRuntime.md -<<<<<<< HEAD docs/ActorUpgradeActorRequest.md -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) docs/ErrorBody.md docs/UploadPrepareFile.md docs/UploadPresignedRequest.md @@ -70,17 +60,10 @@ src/models/actor_create_actor_port_request.rs src/models/actor_create_actor_request.rs src/models/actor_create_actor_response.rs src/models/actor_create_actor_runtime_request.rs -<<<<<<< HEAD src/models/actor_get_actor_logs_response.rs src/models/actor_get_actor_response.rs src/models/actor_get_build_response.rs src/models/actor_guard_routing.rs -======= -src/models/actor_game_guard_routing.rs -src/models/actor_get_actor_logs_response.rs -src/models/actor_get_actor_response.rs -src/models/actor_get_build_response.rs ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) src/models/actor_lifecycle.rs src/models/actor_list_actors_response.rs src/models/actor_list_builds_response.rs @@ -99,10 +82,7 @@ src/models/actor_prepare_build_response.rs src/models/actor_region.rs src/models/actor_resources.rs src/models/actor_runtime.rs -<<<<<<< HEAD src/models/actor_upgrade_actor_request.rs -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) src/models/error_body.rs src/models/mod.rs src/models/upload_prepare_file.rs diff --git a/sdks/runtime/rust/README.md b/sdks/runtime/rust/README.md index c9a8867ad0..b7c8118dac 100644 --- a/sdks/runtime/rust/README.md +++ b/sdks/runtime/rust/README.md @@ -29,10 +29,7 @@ Class | Method | HTTP request | Description *ActorApi* | [**actor_destroy**](docs/ActorApi.md#actor_destroy) | **DELETE** /actors/{actor} | *ActorApi* | [**actor_get**](docs/ActorApi.md#actor_get) | **GET** /actors/{actor} | *ActorApi* | [**actor_list**](docs/ActorApi.md#actor_list) | **GET** /actors | -<<<<<<< HEAD *ActorApi* | [**actor_upgrade**](docs/ActorApi.md#actor_upgrade) | **POST** /actors/{actor}/upgrade | -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) *ActorBuildsApi* | [**actor_builds_complete**](docs/ActorBuildsApi.md#actor_builds_complete) | **POST** /builds/{build}/complete | *ActorBuildsApi* | [**actor_builds_get**](docs/ActorBuildsApi.md#actor_builds_get) | **GET** /builds/{build} | *ActorBuildsApi* | [**actor_builds_list**](docs/ActorBuildsApi.md#actor_builds_list) | **GET** /builds | @@ -53,17 +50,10 @@ Class | Method | HTTP request | Description - [ActorCreateActorRequest](docs/ActorCreateActorRequest.md) - [ActorCreateActorResponse](docs/ActorCreateActorResponse.md) - [ActorCreateActorRuntimeRequest](docs/ActorCreateActorRuntimeRequest.md) -<<<<<<< HEAD - [ActorGetActorLogsResponse](docs/ActorGetActorLogsResponse.md) - [ActorGetActorResponse](docs/ActorGetActorResponse.md) - [ActorGetBuildResponse](docs/ActorGetBuildResponse.md) - [ActorGuardRouting](docs/ActorGuardRouting.md) -======= - - [ActorGameGuardRouting](docs/ActorGameGuardRouting.md) - - [ActorGetActorLogsResponse](docs/ActorGetActorLogsResponse.md) - - [ActorGetActorResponse](docs/ActorGetActorResponse.md) - - [ActorGetBuildResponse](docs/ActorGetBuildResponse.md) ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) - [ActorLifecycle](docs/ActorLifecycle.md) - [ActorListActorsResponse](docs/ActorListActorsResponse.md) - [ActorListBuildsResponse](docs/ActorListBuildsResponse.md) @@ -82,10 +72,7 @@ Class | Method | HTTP request | Description - [ActorRegion](docs/ActorRegion.md) - [ActorResources](docs/ActorResources.md) - [ActorRuntime](docs/ActorRuntime.md) -<<<<<<< HEAD - [ActorUpgradeActorRequest](docs/ActorUpgradeActorRequest.md) -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) - [ErrorBody](docs/ErrorBody.md) - [UploadPrepareFile](docs/UploadPrepareFile.md) - [UploadPresignedRequest](docs/UploadPresignedRequest.md) diff --git a/sdks/runtime/rust/docs/ActorApi.md b/sdks/runtime/rust/docs/ActorApi.md index a46114ec90..6c5e8a3821 100644 --- a/sdks/runtime/rust/docs/ActorApi.md +++ b/sdks/runtime/rust/docs/ActorApi.md @@ -8,10 +8,7 @@ Method | HTTP request | Description [**actor_destroy**](ActorApi.md#actor_destroy) | **DELETE** /actors/{actor} | [**actor_get**](ActorApi.md#actor_get) | **GET** /actors/{actor} | [**actor_list**](ActorApi.md#actor_list) | **GET** /actors | -<<<<<<< HEAD [**actor_upgrade**](ActorApi.md#actor_upgrade) | **POST** /actors/{actor}/upgrade | -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) @@ -145,7 +142,6 @@ Name | Type | Description | Required | Notes [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) -<<<<<<< HEAD ## actor_upgrade @@ -179,5 +175,3 @@ Name | Type | Description | Required | Notes [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md) -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) diff --git a/sdks/runtime/rust/docs/ActorBuildCompression.md b/sdks/runtime/rust/docs/ActorBuildCompression.md index 1b195e3611..2903bf515f 100644 --- a/sdks/runtime/rust/docs/ActorBuildCompression.md +++ b/sdks/runtime/rust/docs/ActorBuildCompression.md @@ -1,8 +1,4 @@ -<<<<<<<< HEAD:sdks/runtime/rust/docs/ActorBuildCompression.md # ActorBuildCompression -======== -# ActorLogStream ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/rust/docs/ActorLogStream.md ## Properties diff --git a/sdks/runtime/rust/docs/ActorBuildKind.md b/sdks/runtime/rust/docs/ActorBuildKind.md index be3c6041b1..da74c36245 100644 --- a/sdks/runtime/rust/docs/ActorBuildKind.md +++ b/sdks/runtime/rust/docs/ActorBuildKind.md @@ -1,8 +1,4 @@ -<<<<<<<< HEAD:sdks/runtime/rust/docs/ActorBuildKind.md # ActorBuildKind -======== -# ActorNetworkMode ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/rust/docs/ActorNetworkMode.md ## Properties diff --git a/sdks/runtime/rust/docs/ActorCreateActorRequest.md b/sdks/runtime/rust/docs/ActorCreateActorRequest.md index d1acb1689c..1c11d36f28 100644 --- a/sdks/runtime/rust/docs/ActorCreateActorRequest.md +++ b/sdks/runtime/rust/docs/ActorCreateActorRequest.md @@ -4,11 +4,8 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -<<<<<<< HEAD **build** | Option<[**uuid::Uuid**](uuid::Uuid.md)> | | [optional] **build_tags** | Option<[**serde_json::Value**](.md)> | | [optional] -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) **lifecycle** | Option<[**crate::models::ActorLifecycle**](ActorLifecycle.md)> | | [optional] **network** | Option<[**crate::models::ActorCreateActorNetworkRequest**](ActorCreateActorNetworkRequest.md)> | | [optional] **region** | **String** | | diff --git a/sdks/runtime/rust/docs/ActorCreateActorRuntimeRequest.md b/sdks/runtime/rust/docs/ActorCreateActorRuntimeRequest.md index 52a21fb0ec..463a6a7e7d 100644 --- a/sdks/runtime/rust/docs/ActorCreateActorRuntimeRequest.md +++ b/sdks/runtime/rust/docs/ActorCreateActorRuntimeRequest.md @@ -5,10 +5,6 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **arguments** | Option<**Vec**> | | [optional] -<<<<<<< HEAD -======= -**build** | [**uuid::Uuid**](uuid::Uuid.md) | | ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) **environment** | Option<**::std::collections::HashMap**> | | [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) diff --git a/sdks/runtime/rust/docs/ActorGameGuardRouting.md b/sdks/runtime/rust/docs/ActorGameGuardRouting.md deleted file mode 100644 index 4e97cd2ecd..0000000000 --- a/sdks/runtime/rust/docs/ActorGameGuardRouting.md +++ /dev/null @@ -1,11 +0,0 @@ -# ActorGameGuardRouting - -## Properties - -Name | Type | Description | Notes ------------- | ------------- | ------------- | ------------- -**authorization** | Option<[**crate::models::ActorPortAuthorization**](ActorPortAuthorization.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) - - diff --git a/sdks/runtime/rust/docs/ActorLifecycle.md b/sdks/runtime/rust/docs/ActorLifecycle.md index 27a74fa1f3..7564972c54 100644 --- a/sdks/runtime/rust/docs/ActorLifecycle.md +++ b/sdks/runtime/rust/docs/ActorLifecycle.md @@ -4,10 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -<<<<<<< HEAD **durable** | Option<**bool**> | If true, the actor will try to reschedule itself automatically in the event of a crash or a datacenter failover. The actor will not reschedule if it exits successfully. | [optional] -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) **kill_timeout** | Option<**i64**> | The duration to wait for in milliseconds before killing the actor. This should be set to a safe default, and can be overridden during a DELETE request if needed. | [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) diff --git a/sdks/runtime/rust/docs/ActorPortRouting.md b/sdks/runtime/rust/docs/ActorPortRouting.md index 4e958d1966..72921d39ac 100644 --- a/sdks/runtime/rust/docs/ActorPortRouting.md +++ b/sdks/runtime/rust/docs/ActorPortRouting.md @@ -4,11 +4,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -<<<<<<< HEAD **guard** | Option<[**crate::models::ActorGuardRouting**](ActorGuardRouting.md)> | | [optional] -======= -**game_guard** | Option<[**crate::models::ActorGameGuardRouting**](ActorGameGuardRouting.md)> | | [optional] ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) **host** | Option<[**serde_json::Value**](.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) diff --git a/sdks/runtime/rust/docs/ActorPrepareBuildRequest.md b/sdks/runtime/rust/docs/ActorPrepareBuildRequest.md index 4ff6d5a018..24c1803acf 100644 --- a/sdks/runtime/rust/docs/ActorPrepareBuildRequest.md +++ b/sdks/runtime/rust/docs/ActorPrepareBuildRequest.md @@ -10,11 +10,6 @@ Name | Type | Description | Notes **kind** | Option<[**crate::models::ActorBuildKind**](ActorBuildKind.md)> | | [optional] **multipart_upload** | Option<**bool**> | | [optional] **name** | **String** | | -**prewarm_regions** | Option<**Vec**> | | [optional] -<<<<<<< HEAD -======= -**tags** | Option<[**serde_json::Value**](.md)> | | ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/sdks/runtime/rust/docs/ActorPrepareBuildResponse.md b/sdks/runtime/rust/docs/ActorPrepareBuildResponse.md index 2ac75897cb..a9a76163d6 100644 --- a/sdks/runtime/rust/docs/ActorPrepareBuildResponse.md +++ b/sdks/runtime/rust/docs/ActorPrepareBuildResponse.md @@ -5,12 +5,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **build** | [**uuid::Uuid**](uuid::Uuid.md) | | -<<<<<<< HEAD -**image_presigned_request** | Option<[**crate::models::UploadPresignedRequest**](UploadPresignedRequest.md)> | | [optional] -**image_presigned_requests** | Option<[**Vec**](UploadPresignedRequest.md)> | | [optional] -======= **presigned_requests** | [**Vec**](UploadPresignedRequest.md) | | ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/sdks/runtime/rust/src/apis/actor_api.rs b/sdks/runtime/rust/src/apis/actor_api.rs index 72a8c9638f..f5130a4de6 100644 --- a/sdks/runtime/rust/src/apis/actor_api.rs +++ b/sdks/runtime/rust/src/apis/actor_api.rs @@ -67,7 +67,6 @@ pub enum ActorListError { UnknownValue(serde_json::Value), } -<<<<<<< HEAD /// struct for typed errors of method [`actor_upgrade`] #[derive(Debug, Clone, Serialize, Deserialize)] #[serde(untagged)] @@ -81,8 +80,6 @@ pub enum ActorUpgradeError { UnknownValue(serde_json::Value), } -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) /// Create a new dynamic actor. pub async fn actor_create(configuration: &configuration::Configuration, actor_create_actor_request: crate::models::ActorCreateActorRequest, project: Option<&str>, environment: Option<&str>) -> Result> { @@ -245,7 +242,6 @@ pub async fn actor_list(configuration: &configuration::Configuration, project: O } } -<<<<<<< HEAD /// Upgrades a dynamic actor. pub async fn actor_upgrade(configuration: &configuration::Configuration, actor: &str, actor_upgrade_actor_request: crate::models::ActorUpgradeActorRequest, project: Option<&str>, environment: Option<&str>) -> Result> { let local_var_configuration = configuration; @@ -284,5 +280,3 @@ pub async fn actor_upgrade(configuration: &configuration::Configuration, actor: } } -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) diff --git a/sdks/runtime/rust/src/models/actor_create_actor_request.rs b/sdks/runtime/rust/src/models/actor_create_actor_request.rs index 110f964916..0ace9f2c7b 100644 --- a/sdks/runtime/rust/src/models/actor_create_actor_request.rs +++ b/sdks/runtime/rust/src/models/actor_create_actor_request.rs @@ -13,13 +13,10 @@ #[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize)] pub struct ActorCreateActorRequest { -<<<<<<< HEAD #[serde(rename = "build", skip_serializing_if = "Option::is_none")] pub build: Option, #[serde(rename = "buildTags", default, with = "::serde_with::rust::double_option", skip_serializing_if = "Option::is_none")] pub build_tags: Option>, -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) #[serde(rename = "lifecycle", skip_serializing_if = "Option::is_none")] pub lifecycle: Option>, #[serde(rename = "network", skip_serializing_if = "Option::is_none")] @@ -37,11 +34,8 @@ pub struct ActorCreateActorRequest { impl ActorCreateActorRequest { pub fn new(region: String, resources: crate::models::ActorResources, runtime: crate::models::ActorCreateActorRuntimeRequest, tags: Option) -> ActorCreateActorRequest { ActorCreateActorRequest { -<<<<<<< HEAD build: None, build_tags: None, -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) lifecycle: None, network: None, region, diff --git a/sdks/runtime/rust/src/models/actor_create_actor_runtime_request.rs b/sdks/runtime/rust/src/models/actor_create_actor_runtime_request.rs index ac20d01b6c..47181d7ec9 100644 --- a/sdks/runtime/rust/src/models/actor_create_actor_runtime_request.rs +++ b/sdks/runtime/rust/src/models/actor_create_actor_runtime_request.rs @@ -15,26 +15,14 @@ pub struct ActorCreateActorRuntimeRequest { #[serde(rename = "arguments", skip_serializing_if = "Option::is_none")] pub arguments: Option>, -<<<<<<< HEAD -======= - #[serde(rename = "build")] - pub build: uuid::Uuid, ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) #[serde(rename = "environment", skip_serializing_if = "Option::is_none")] pub environment: Option<::std::collections::HashMap>, } impl ActorCreateActorRuntimeRequest { -<<<<<<< HEAD pub fn new() -> ActorCreateActorRuntimeRequest { ActorCreateActorRuntimeRequest { arguments: None, -======= - pub fn new(build: uuid::Uuid) -> ActorCreateActorRuntimeRequest { - ActorCreateActorRuntimeRequest { - arguments: None, - build, ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) environment: None, } } diff --git a/sdks/runtime/rust/src/models/actor_game_guard_routing.rs b/sdks/runtime/rust/src/models/actor_game_guard_routing.rs deleted file mode 100644 index b1a29406e2..0000000000 --- a/sdks/runtime/rust/src/models/actor_game_guard_routing.rs +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Rivet API - * - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.0.1 - * - * Generated by: https://openapi-generator.tech - */ - - - - -#[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize)] -pub struct ActorGameGuardRouting { - #[serde(rename = "authorization", skip_serializing_if = "Option::is_none")] - pub authorization: Option>, -} - -impl ActorGameGuardRouting { - pub fn new() -> ActorGameGuardRouting { - ActorGameGuardRouting { - authorization: None, - } - } -} - - diff --git a/sdks/runtime/rust/src/models/actor_lifecycle.rs b/sdks/runtime/rust/src/models/actor_lifecycle.rs index 668702e715..cfcf65fe31 100644 --- a/sdks/runtime/rust/src/models/actor_lifecycle.rs +++ b/sdks/runtime/rust/src/models/actor_lifecycle.rs @@ -13,12 +13,9 @@ #[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize)] pub struct ActorLifecycle { -<<<<<<< HEAD /// If true, the actor will try to reschedule itself automatically in the event of a crash or a datacenter failover. The actor will not reschedule if it exits successfully. #[serde(rename = "durable", skip_serializing_if = "Option::is_none")] pub durable: Option, -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) /// The duration to wait for in milliseconds before killing the actor. This should be set to a safe default, and can be overridden during a DELETE request if needed. #[serde(rename = "kill_timeout", skip_serializing_if = "Option::is_none")] pub kill_timeout: Option, @@ -27,10 +24,7 @@ pub struct ActorLifecycle { impl ActorLifecycle { pub fn new() -> ActorLifecycle { ActorLifecycle { -<<<<<<< HEAD durable: None, -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) kill_timeout: None, } } diff --git a/sdks/runtime/rust/src/models/actor_port_routing.rs b/sdks/runtime/rust/src/models/actor_port_routing.rs index 87727f878e..d360b659fe 100644 --- a/sdks/runtime/rust/src/models/actor_port_routing.rs +++ b/sdks/runtime/rust/src/models/actor_port_routing.rs @@ -13,13 +13,8 @@ #[derive(Clone, Debug, PartialEq, Default, Serialize, Deserialize)] pub struct ActorPortRouting { -<<<<<<< HEAD #[serde(rename = "guard", skip_serializing_if = "Option::is_none")] pub guard: Option>, -======= - #[serde(rename = "game_guard", skip_serializing_if = "Option::is_none")] - pub game_guard: Option>, ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) #[serde(rename = "host", skip_serializing_if = "Option::is_none")] pub host: Option, } @@ -27,11 +22,7 @@ pub struct ActorPortRouting { impl ActorPortRouting { pub fn new() -> ActorPortRouting { ActorPortRouting { -<<<<<<< HEAD guard: None, -======= - game_guard: None, ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) host: None, } } diff --git a/sdks/runtime/rust/src/models/actor_prepare_build_request.rs b/sdks/runtime/rust/src/models/actor_prepare_build_request.rs index fb8c760950..911a040f32 100644 --- a/sdks/runtime/rust/src/models/actor_prepare_build_request.rs +++ b/sdks/runtime/rust/src/models/actor_prepare_build_request.rs @@ -26,21 +26,10 @@ pub struct ActorPrepareBuildRequest { pub multipart_upload: Option, #[serde(rename = "name")] pub name: String, - #[serde(rename = "prewarm_regions", skip_serializing_if = "Option::is_none")] - pub prewarm_regions: Option>, -<<<<<<< HEAD } impl ActorPrepareBuildRequest { pub fn new(image_file: crate::models::UploadPrepareFile, name: String) -> ActorPrepareBuildRequest { -======= - #[serde(rename = "tags", deserialize_with = "Option::deserialize")] - pub tags: Option, -} - -impl ActorPrepareBuildRequest { - pub fn new(image_file: crate::models::UploadPrepareFile, name: String, tags: Option) -> ActorPrepareBuildRequest { ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) ActorPrepareBuildRequest { compression: None, image_file: Box::new(image_file), @@ -48,11 +37,6 @@ impl ActorPrepareBuildRequest { kind: None, multipart_upload: None, name, - prewarm_regions: None, -<<<<<<< HEAD -======= - tags, ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) } } } diff --git a/sdks/runtime/rust/src/models/actor_prepare_build_response.rs b/sdks/runtime/rust/src/models/actor_prepare_build_response.rs index 7aede118c5..0a33e1e63a 100644 --- a/sdks/runtime/rust/src/models/actor_prepare_build_response.rs +++ b/sdks/runtime/rust/src/models/actor_prepare_build_response.rs @@ -15,20 +15,6 @@ pub struct ActorPrepareBuildResponse { #[serde(rename = "build")] pub build: uuid::Uuid, -<<<<<<< HEAD - #[serde(rename = "image_presigned_request", skip_serializing_if = "Option::is_none")] - pub image_presigned_request: Option>, - #[serde(rename = "image_presigned_requests", skip_serializing_if = "Option::is_none")] - pub image_presigned_requests: Option>, -} - -impl ActorPrepareBuildResponse { - pub fn new(build: uuid::Uuid) -> ActorPrepareBuildResponse { - ActorPrepareBuildResponse { - build, - image_presigned_request: None, - image_presigned_requests: None, -======= #[serde(rename = "presigned_requests")] pub presigned_requests: Vec, } @@ -38,7 +24,6 @@ impl ActorPrepareBuildResponse { ActorPrepareBuildResponse { build, presigned_requests, ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) } } } diff --git a/sdks/runtime/rust/src/models/mod.rs b/sdks/runtime/rust/src/models/mod.rs index d1c8289c3f..a893c21add 100644 --- a/sdks/runtime/rust/src/models/mod.rs +++ b/sdks/runtime/rust/src/models/mod.rs @@ -16,22 +16,14 @@ pub mod actor_create_actor_response; pub use self::actor_create_actor_response::ActorCreateActorResponse; pub mod actor_create_actor_runtime_request; pub use self::actor_create_actor_runtime_request::ActorCreateActorRuntimeRequest; -<<<<<<< HEAD -======= -pub mod actor_game_guard_routing; -pub use self::actor_game_guard_routing::ActorGameGuardRouting; ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) pub mod actor_get_actor_logs_response; pub use self::actor_get_actor_logs_response::ActorGetActorLogsResponse; pub mod actor_get_actor_response; pub use self::actor_get_actor_response::ActorGetActorResponse; pub mod actor_get_build_response; pub use self::actor_get_build_response::ActorGetBuildResponse; -<<<<<<< HEAD pub mod actor_guard_routing; pub use self::actor_guard_routing::ActorGuardRouting; -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) pub mod actor_lifecycle; pub use self::actor_lifecycle::ActorLifecycle; pub mod actor_list_actors_response; @@ -68,11 +60,8 @@ pub mod actor_resources; pub use self::actor_resources::ActorResources; pub mod actor_runtime; pub use self::actor_runtime::ActorRuntime; -<<<<<<< HEAD pub mod actor_upgrade_actor_request; pub use self::actor_upgrade_actor_request::ActorUpgradeActorRequest; -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) pub mod error_body; pub use self::error_body::ErrorBody; pub mod upload_prepare_file; diff --git a/sdks/runtime/typescript/src/api/resources/actor/client/Client.ts b/sdks/runtime/typescript/src/api/resources/actor/client/Client.ts index 8db96fa80e..096d8ab016 100644 --- a/sdks/runtime/typescript/src/api/resources/actor/client/Client.ts +++ b/sdks/runtime/typescript/src/api/resources/actor/client/Client.ts @@ -6,10 +6,6 @@ import * as environments from "../../../../environments"; import * as core from "../../../../core"; import * as Rivet from "../../../index"; import urlJoin from "url-join"; -<<<<<<< HEAD -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) import * as serializers from "../../../../serialization/index"; import * as errors from "../../../../errors/index"; import { Builds } from "../resources/builds/client/Client"; @@ -17,15 +13,6 @@ import { Logs } from "../resources/logs/client/Client"; import { Regions } from "../resources/regions/client/Client"; export declare namespace Actor { -<<<<<<< HEAD -======== -import * as serializers from "../../../../../../serialization/index"; -import * as errors from "../../../../../../errors/index"; - -export declare namespace Builds { ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) interface Options { environment?: core.Supplier; token: core.Supplier; @@ -42,10 +29,6 @@ export declare namespace Builds { } } -<<<<<<< HEAD -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) export class Actor { constructor(protected readonly _options: Actor.Options) {} @@ -55,20 +38,6 @@ export class Actor { * @param {string} actor - The id of the actor to destroy * @param {Rivet.actor.ListActorsRequestQuery} request * @param {Actor.RequestOptions} requestOptions - Request-specific configuration. -<<<<<<< HEAD -======== -export class Builds { - constructor(protected readonly _options: Builds.Options) {} - - /** - * Get a build. - * - * @param {string} build - * @param {Rivet.actor.GetBuildRequestQuery} request - * @param {Builds.RequestOptions} requestOptions - Request-specific configuration. ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) * * @throws {@link Rivet.InternalError} * @throws {@link Rivet.RateLimitError} @@ -78,37 +47,16 @@ export class Builds { * @throws {@link Rivet.BadRequestError} * * @example -<<<<<<< HEAD -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts - * await client.actor.get("d5e9c84f-c2b2-4bf4-b4b0-7ffd7a9ffc32", { -======== - * await client.actor.builds.get("d5e9c84f-c2b2-4bf4-b4b0-7ffd7a9ffc32", { ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts -======= * await client.actor.get("d5e9c84f-c2b2-4bf4-b4b0-7ffd7a9ffc32", { ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) * project: "string", * environment: "string" * }) */ public async get( -<<<<<<< HEAD -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) actor: string, request: Rivet.actor.ListActorsRequestQuery = {}, requestOptions?: Actor.RequestOptions ): Promise { -<<<<<<< HEAD -======== - build: string, - request: Rivet.actor.GetBuildRequestQuery = {}, - requestOptions?: Builds.RequestOptions - ): Promise { ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) const { project, environment } = request; const _queryParams: Record = {}; if (project != null) { @@ -122,15 +70,7 @@ export class Builds { const _response = await (this._options.fetcher ?? core.fetcher)({ url: urlJoin( (await core.Supplier.get(this._options.environment)) ?? environments.RivetEnvironment.Production, -<<<<<<< HEAD -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts - `/actors/${encodeURIComponent(actor)}` -======== - `/builds/${encodeURIComponent(build)}` ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts -======= `/actors/${encodeURIComponent(actor)}` ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) ), method: "GET", headers: { @@ -147,15 +87,7 @@ export class Builds { abortSignal: requestOptions?.abortSignal, }); if (_response.ok) { -<<<<<<< HEAD -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts return serializers.actor.GetActorResponse.parseOrThrow(_response.body, { -======== - return serializers.actor.GetBuildResponse.parseOrThrow(_response.body, { ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts -======= - return serializers.actor.GetActorResponse.parseOrThrow(_response.body, { ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) unrecognizedObjectKeys: "passthrough", allowUnrecognizedUnionMembers: true, allowUnrecognizedEnumValues: true, @@ -250,23 +182,10 @@ export class Builds { } /** -<<<<<<< HEAD -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) * Lists all actors associated with the token used. Can be filtered by tags in the query string. * * @param {Rivet.actor.GetActorsRequestQuery} request * @param {Actor.RequestOptions} requestOptions - Request-specific configuration. -<<<<<<< HEAD -======== - * Lists all builds of the project associated with the token used. Can be filtered by tags in the query string. - * - * @param {Rivet.actor.ListBuildsRequestQuery} request - * @param {Builds.RequestOptions} requestOptions - Request-specific configuration. ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) * * @throws {@link Rivet.InternalError} * @throws {@link Rivet.RateLimitError} @@ -276,10 +195,6 @@ export class Builds { * @throws {@link Rivet.BadRequestError} * * @example -<<<<<<< HEAD -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) * await client.actor.list({ * project: "string", * environment: "string", @@ -293,22 +208,6 @@ export class Builds { requestOptions?: Actor.RequestOptions ): Promise { const { project, environment, tagsJson, includeDestroyed, cursor } = request; -<<<<<<< HEAD -======== - * await client.actor.builds.list({ - * project: "string", - * environment: "string", - * tagsJson: "string" - * }) - */ - public async list( - request: Rivet.actor.ListBuildsRequestQuery = {}, - requestOptions?: Builds.RequestOptions - ): Promise { - const { project, environment, tagsJson } = request; ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) const _queryParams: Record = {}; if (project != null) { _queryParams["project"] = project; @@ -322,10 +221,6 @@ export class Builds { _queryParams["tags_json"] = tagsJson; } -<<<<<<< HEAD -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) if (includeDestroyed != null) { _queryParams["include_destroyed"] = includeDestroyed.toString(); } @@ -338,15 +233,6 @@ export class Builds { url: urlJoin( (await core.Supplier.get(this._options.environment)) ?? environments.RivetEnvironment.Production, "/actors" -<<<<<<< HEAD -======== - const _response = await (this._options.fetcher ?? core.fetcher)({ - url: urlJoin( - (await core.Supplier.get(this._options.environment)) ?? environments.RivetEnvironment.Production, - "/builds" ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) ), method: "GET", headers: { @@ -363,15 +249,7 @@ export class Builds { abortSignal: requestOptions?.abortSignal, }); if (_response.ok) { -<<<<<<< HEAD -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts - return serializers.actor.ListActorsResponse.parseOrThrow(_response.body, { -======== - return serializers.actor.ListBuildsResponse.parseOrThrow(_response.body, { ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts -======= return serializers.actor.ListActorsResponse.parseOrThrow(_response.body, { ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) unrecognizedObjectKeys: "passthrough", allowUnrecognizedUnionMembers: true, allowUnrecognizedEnumValues: true, @@ -466,22 +344,10 @@ export class Builds { } /** -<<<<<<< HEAD -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) * Create a new dynamic actor. * * @param {Rivet.actor.CreateActorRequestQuery} request * @param {Actor.RequestOptions} requestOptions - Request-specific configuration. -<<<<<<< HEAD -======== - * @param {string} build - * @param {Rivet.actor.PatchBuildTagsRequestQuery} request - * @param {Builds.RequestOptions} requestOptions - Request-specific configuration. ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) * * @throws {@link Rivet.InternalError} * @throws {@link Rivet.RateLimitError} @@ -491,10 +357,6 @@ export class Builds { * @throws {@link Rivet.BadRequestError} * * @example -<<<<<<< HEAD -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) * await client.actor.create({ * project: "string", * environment: "string", @@ -503,16 +365,11 @@ export class Builds { * tags: { * "key": "value" * }, -<<<<<<< HEAD * build: "d5e9c84f-c2b2-4bf4-b4b0-7ffd7a9ffc32", * buildTags: { * "key": "value" * }, * runtime: { -======= - * runtime: { - * build: "d5e9c84f-c2b2-4bf4-b4b0-7ffd7a9ffc32", ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) * arguments: ["string"], * environment: { * "string": "string" @@ -527,12 +384,8 @@ export class Builds { * memory: 1 * }, * lifecycle: { -<<<<<<< HEAD * killTimeout: 1000000, * durable: true -======= - * killTimeout: 1000000 ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) * } * } * }) @@ -541,27 +394,6 @@ export class Builds { request: Rivet.actor.CreateActorRequestQuery, requestOptions?: Actor.RequestOptions ): Promise { -<<<<<<< HEAD -======== - * await client.actor.builds.patchTags("d5e9c84f-c2b2-4bf4-b4b0-7ffd7a9ffc32", { - * project: "string", - * environment: "string", - * body: { - * tags: { - * "key": "value" - * }, - * exclusiveTags: ["string"] - * } - * }) - */ - public async patchTags( - build: string, - request: Rivet.actor.PatchBuildTagsRequestQuery, - requestOptions?: Builds.RequestOptions - ): Promise { ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) const { project, environment, body: _body } = request; const _queryParams: Record = {}; if (project != null) { @@ -575,21 +407,9 @@ export class Builds { const _response = await (this._options.fetcher ?? core.fetcher)({ url: urlJoin( (await core.Supplier.get(this._options.environment)) ?? environments.RivetEnvironment.Production, -<<<<<<< HEAD -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts "/actors" ), method: "POST", -======== - `/builds/${encodeURIComponent(build)}/tags` - ), - method: "PATCH", ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts -======= - "/actors" - ), - method: "POST", ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) headers: { Authorization: await this._getAuthorizationHeader(), "X-Fern-Language": "JavaScript", @@ -599,29 +419,13 @@ export class Builds { contentType: "application/json", queryParameters: _queryParams, requestType: "json", -<<<<<<< HEAD -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts body: serializers.actor.CreateActorRequest.jsonOrThrow(_body, { unrecognizedObjectKeys: "strip" }), -======== - body: serializers.actor.PatchBuildTagsRequest.jsonOrThrow(_body, { unrecognizedObjectKeys: "strip" }), ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts -======= - body: serializers.actor.CreateActorRequest.jsonOrThrow(_body, { unrecognizedObjectKeys: "strip" }), ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 180000, maxRetries: requestOptions?.maxRetries, abortSignal: requestOptions?.abortSignal, }); if (_response.ok) { -<<<<<<< HEAD -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts - return serializers.actor.CreateActorResponse.parseOrThrow(_response.body, { -======== - return serializers.actor.PatchBuildTagsResponse.parseOrThrow(_response.body, { ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts -======= return serializers.actor.CreateActorResponse.parseOrThrow(_response.body, { ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) unrecognizedObjectKeys: "passthrough", allowUnrecognizedUnionMembers: true, allowUnrecognizedEnumValues: true, @@ -716,24 +520,11 @@ export class Builds { } /** -<<<<<<< HEAD -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) * Destroy a dynamic actor. * * @param {string} actor - The id of the actor to destroy * @param {Rivet.actor.DestroyActorRequestQuery} request * @param {Actor.RequestOptions} requestOptions - Request-specific configuration. -<<<<<<< HEAD -======== - * Creates a new project build for the given project. - * - * @param {Rivet.actor.PrepareBuildRequestQuery} request - * @param {Builds.RequestOptions} requestOptions - Request-specific configuration. ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) * * @throws {@link Rivet.InternalError} * @throws {@link Rivet.RateLimitError} @@ -743,10 +534,6 @@ export class Builds { * @throws {@link Rivet.BadRequestError} * * @example -<<<<<<< HEAD -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) * await client.actor.destroy("d5e9c84f-c2b2-4bf4-b4b0-7ffd7a9ffc32", { * project: "string", * environment: "string", @@ -886,7 +673,6 @@ export class Builds { } } -<<<<<<< HEAD /** * Upgrades a dynamic actor. * @@ -918,33 +704,6 @@ export class Builds { request: Rivet.actor.UpgradeActorRequestQuery, requestOptions?: Actor.RequestOptions ): Promise { -======== - * await client.actor.builds.prepare({ - * project: "string", - * environment: "string", - * body: { - * name: "string", - * tags: { - * "key": "value" - * }, - * imageTag: "string", - * imageFile: { - * path: "string", - * contentType: "string", - * contentLength: 1000000 - * }, - * multipartUpload: true, - * kind: "docker_image", - * compression: "none", - * prewarmRegions: ["string"] - * } - * }) - */ - public async prepare( - request: Rivet.actor.PrepareBuildRequestQuery, - requestOptions?: Builds.RequestOptions - ): Promise { ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts const { project, environment, body: _body } = request; const _queryParams: Record = {}; if (project != null) { @@ -958,11 +717,7 @@ export class Builds { const _response = await (this._options.fetcher ?? core.fetcher)({ url: urlJoin( (await core.Supplier.get(this._options.environment)) ?? environments.RivetEnvironment.Production, -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts `/actors/${encodeURIComponent(actor)}/upgrade` -======== - "/builds/prepare" ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts ), method: "POST", headers: { @@ -974,21 +729,13 @@ export class Builds { contentType: "application/json", queryParameters: _queryParams, requestType: "json", -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts body: serializers.actor.UpgradeActorRequest.jsonOrThrow(_body, { unrecognizedObjectKeys: "strip" }), -======== - body: serializers.actor.PrepareBuildRequest.jsonOrThrow(_body, { unrecognizedObjectKeys: "strip" }), ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 180000, maxRetries: requestOptions?.maxRetries, abortSignal: requestOptions?.abortSignal, }); if (_response.ok) { -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts return serializers.actor.UpgradeActorResponse.parseOrThrow(_response.body, { -======== - return serializers.actor.PrepareBuildResponse.parseOrThrow(_response.body, { ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts unrecognizedObjectKeys: "passthrough", allowUnrecognizedUnionMembers: true, allowUnrecognizedEnumValues: true, @@ -1082,9 +829,6 @@ export class Builds { } } -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) protected _builds: Builds | undefined; public get builds(): Builds { @@ -1101,152 +845,6 @@ export class Builds { public get regions(): Regions { return (this._regions ??= new Regions(this._options)); -<<<<<<< HEAD -======== - /** - * Marks an upload as complete. - * - * @param {string} build - * @param {Rivet.actor.CompleteBuildRequestQuery} request - * @param {Builds.RequestOptions} requestOptions - Request-specific configuration. - * - * @throws {@link Rivet.InternalError} - * @throws {@link Rivet.RateLimitError} - * @throws {@link Rivet.ForbiddenError} - * @throws {@link Rivet.UnauthorizedError} - * @throws {@link Rivet.NotFoundError} - * @throws {@link Rivet.BadRequestError} - * - * @example - * await client.actor.builds.complete("d5e9c84f-c2b2-4bf4-b4b0-7ffd7a9ffc32", { - * project: "string", - * environment: "string" - * }) - */ - public async complete( - build: string, - request: Rivet.actor.CompleteBuildRequestQuery = {}, - requestOptions?: Builds.RequestOptions - ): Promise { - const { project, environment } = request; - const _queryParams: Record = {}; - if (project != null) { - _queryParams["project"] = project; - } - - if (environment != null) { - _queryParams["environment"] = environment; - } - - const _response = await (this._options.fetcher ?? core.fetcher)({ - url: urlJoin( - (await core.Supplier.get(this._options.environment)) ?? environments.RivetEnvironment.Production, - `/builds/${encodeURIComponent(build)}/complete` - ), - method: "POST", - headers: { - Authorization: await this._getAuthorizationHeader(), - "X-Fern-Language": "JavaScript", - "X-Fern-Runtime": core.RUNTIME.type, - "X-Fern-Runtime-Version": core.RUNTIME.version, - }, - contentType: "application/json", - queryParameters: _queryParams, - requestType: "json", - timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 180000, - maxRetries: requestOptions?.maxRetries, - abortSignal: requestOptions?.abortSignal, - }); - if (_response.ok) { - return; - } - - if (_response.error.reason === "status-code") { - switch (_response.error.statusCode) { - case 500: - throw new Rivet.InternalError( - serializers.ErrorBody.parseOrThrow(_response.error.body, { - unrecognizedObjectKeys: "passthrough", - allowUnrecognizedUnionMembers: true, - allowUnrecognizedEnumValues: true, - skipValidation: true, - breadcrumbsPrefix: ["response"], - }) - ); - case 429: - throw new Rivet.RateLimitError( - serializers.ErrorBody.parseOrThrow(_response.error.body, { - unrecognizedObjectKeys: "passthrough", - allowUnrecognizedUnionMembers: true, - allowUnrecognizedEnumValues: true, - skipValidation: true, - breadcrumbsPrefix: ["response"], - }) - ); - case 403: - throw new Rivet.ForbiddenError( - serializers.ErrorBody.parseOrThrow(_response.error.body, { - unrecognizedObjectKeys: "passthrough", - allowUnrecognizedUnionMembers: true, - allowUnrecognizedEnumValues: true, - skipValidation: true, - breadcrumbsPrefix: ["response"], - }) - ); - case 408: - throw new Rivet.UnauthorizedError( - serializers.ErrorBody.parseOrThrow(_response.error.body, { - unrecognizedObjectKeys: "passthrough", - allowUnrecognizedUnionMembers: true, - allowUnrecognizedEnumValues: true, - skipValidation: true, - breadcrumbsPrefix: ["response"], - }) - ); - case 404: - throw new Rivet.NotFoundError( - serializers.ErrorBody.parseOrThrow(_response.error.body, { - unrecognizedObjectKeys: "passthrough", - allowUnrecognizedUnionMembers: true, - allowUnrecognizedEnumValues: true, - skipValidation: true, - breadcrumbsPrefix: ["response"], - }) - ); - case 400: - throw new Rivet.BadRequestError( - serializers.ErrorBody.parseOrThrow(_response.error.body, { - unrecognizedObjectKeys: "passthrough", - allowUnrecognizedUnionMembers: true, - allowUnrecognizedEnumValues: true, - skipValidation: true, - breadcrumbsPrefix: ["response"], - }) - ); - default: - throw new errors.RivetError({ - statusCode: _response.error.statusCode, - body: _response.error.body, - }); - } - } - - switch (_response.error.reason) { - case "non-json": - throw new errors.RivetError({ - statusCode: _response.error.statusCode, - body: _response.error.rawBody, - }); - case "timeout": - throw new errors.RivetTimeoutError(); - case "unknown": - throw new errors.RivetError({ - message: _response.error.errorMessage, - }); - } ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) } protected async _getAuthorizationHeader(): Promise { diff --git a/sdks/runtime/typescript/src/api/resources/actor/client/requests/CreateActorRequestQuery.ts b/sdks/runtime/typescript/src/api/resources/actor/client/requests/CreateActorRequestQuery.ts index 8f3cb86bf4..d1ada8be5b 100644 --- a/sdks/runtime/typescript/src/api/resources/actor/client/requests/CreateActorRequestQuery.ts +++ b/sdks/runtime/typescript/src/api/resources/actor/client/requests/CreateActorRequestQuery.ts @@ -14,16 +14,11 @@ import * as Rivet from "../../../../index"; * tags: { * "key": "value" * }, -<<<<<<< HEAD * build: "d5e9c84f-c2b2-4bf4-b4b0-7ffd7a9ffc32", * buildTags: { * "key": "value" * }, * runtime: { -======= - * runtime: { - * build: "d5e9c84f-c2b2-4bf4-b4b0-7ffd7a9ffc32", ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) * arguments: ["string"], * environment: { * "string": "string" @@ -38,12 +33,8 @@ import * as Rivet from "../../../../index"; * memory: 1 * }, * lifecycle: { -<<<<<<< HEAD * killTimeout: 1000000, * durable: true -======= - * killTimeout: 1000000 ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) * } * } * } diff --git a/sdks/runtime/typescript/src/api/resources/actor/client/requests/index.ts b/sdks/runtime/typescript/src/api/resources/actor/client/requests/index.ts index d038f7c01a..16cd8d026c 100644 --- a/sdks/runtime/typescript/src/api/resources/actor/client/requests/index.ts +++ b/sdks/runtime/typescript/src/api/resources/actor/client/requests/index.ts @@ -2,7 +2,4 @@ export { type ListActorsRequestQuery } from "./ListActorsRequestQuery"; export { type GetActorsRequestQuery } from "./GetActorsRequestQuery"; export { type CreateActorRequestQuery } from "./CreateActorRequestQuery"; export { type DestroyActorRequestQuery } from "./DestroyActorRequestQuery"; -<<<<<<< HEAD export { type UpgradeActorRequestQuery } from "./UpgradeActorRequestQuery"; -======= ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) diff --git a/sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts b/sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts index ca395a7c59..590103347f 100644 --- a/sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts +++ b/sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts @@ -2,34 +2,14 @@ * This file was auto-generated by Fern from our API Definition. */ -<<<<<<< HEAD import * as environments from "../../../../../../environments"; import * as core from "../../../../../../core"; import * as Rivet from "../../../../../index"; import urlJoin from "url-join"; -======= -import * as environments from "../../../../environments"; -import * as core from "../../../../core"; -import * as Rivet from "../../../index"; -import urlJoin from "url-join"; -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts -import * as serializers from "../../../../serialization/index"; -import * as errors from "../../../../errors/index"; -import { Builds } from "../resources/builds/client/Client"; -import { Logs } from "../resources/logs/client/Client"; -import { Regions } from "../resources/regions/client/Client"; - -export declare namespace Actor { -======== ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) import * as serializers from "../../../../../../serialization/index"; import * as errors from "../../../../../../errors/index"; export declare namespace Builds { -<<<<<<< HEAD -======= ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) interface Options { environment?: core.Supplier; token: core.Supplier; @@ -46,20 +26,6 @@ export declare namespace Builds { } } -<<<<<<< HEAD -======= -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts -export class Actor { - constructor(protected readonly _options: Actor.Options) {} - - /** - * Gets a dynamic actor. - * - * @param {string} actor - The id of the actor to destroy - * @param {Rivet.actor.ListActorsRequestQuery} request - * @param {Actor.RequestOptions} requestOptions - Request-specific configuration. -======== ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) export class Builds { constructor(protected readonly _options: Builds.Options) {} @@ -69,10 +35,6 @@ export class Builds { * @param {string} build * @param {Rivet.actor.GetBuildRequestQuery} request * @param {Builds.RequestOptions} requestOptions - Request-specific configuration. -<<<<<<< HEAD -======= ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) * * @throws {@link Rivet.InternalError} * @throws {@link Rivet.RateLimitError} @@ -82,37 +44,16 @@ export class Builds { * @throws {@link Rivet.BadRequestError} * * @example -<<<<<<< HEAD - * await client.actor.builds.get("d5e9c84f-c2b2-4bf4-b4b0-7ffd7a9ffc32", { -======= -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts - * await client.actor.get("d5e9c84f-c2b2-4bf4-b4b0-7ffd7a9ffc32", { -======== * await client.actor.builds.get("d5e9c84f-c2b2-4bf4-b4b0-7ffd7a9ffc32", { ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) * project: "string", * environment: "string" * }) */ public async get( -<<<<<<< HEAD -======= -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts - actor: string, - request: Rivet.actor.ListActorsRequestQuery = {}, - requestOptions?: Actor.RequestOptions - ): Promise { -======== ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) build: string, request: Rivet.actor.GetBuildRequestQuery = {}, requestOptions?: Builds.RequestOptions ): Promise { -<<<<<<< HEAD -======= ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) const { project, environment } = request; const _queryParams: Record = {}; if (project != null) { @@ -126,15 +67,7 @@ export class Builds { const _response = await (this._options.fetcher ?? core.fetcher)({ url: urlJoin( (await core.Supplier.get(this._options.environment)) ?? environments.RivetEnvironment.Production, -<<<<<<< HEAD - `/builds/${encodeURIComponent(build)}` -======= -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts - `/actors/${encodeURIComponent(actor)}` -======== `/builds/${encodeURIComponent(build)}` ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) ), method: "GET", headers: { @@ -151,15 +84,7 @@ export class Builds { abortSignal: requestOptions?.abortSignal, }); if (_response.ok) { -<<<<<<< HEAD return serializers.actor.GetBuildResponse.parseOrThrow(_response.body, { -======= -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts - return serializers.actor.GetActorResponse.parseOrThrow(_response.body, { -======== - return serializers.actor.GetBuildResponse.parseOrThrow(_response.body, { ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) unrecognizedObjectKeys: "passthrough", allowUnrecognizedUnionMembers: true, allowUnrecognizedEnumValues: true, @@ -254,23 +179,10 @@ export class Builds { } /** -<<<<<<< HEAD -======= -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts - * Lists all actors associated with the token used. Can be filtered by tags in the query string. - * - * @param {Rivet.actor.GetActorsRequestQuery} request - * @param {Actor.RequestOptions} requestOptions - Request-specific configuration. -======== ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) * Lists all builds of the project associated with the token used. Can be filtered by tags in the query string. * * @param {Rivet.actor.ListBuildsRequestQuery} request * @param {Builds.RequestOptions} requestOptions - Request-specific configuration. -<<<<<<< HEAD -======= ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) * * @throws {@link Rivet.InternalError} * @throws {@link Rivet.RateLimitError} @@ -280,24 +192,6 @@ export class Builds { * @throws {@link Rivet.BadRequestError} * * @example -<<<<<<< HEAD -======= -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts - * await client.actor.list({ - * project: "string", - * environment: "string", - * tagsJson: "string", - * includeDestroyed: true, - * cursor: "d5e9c84f-c2b2-4bf4-b4b0-7ffd7a9ffc32" - * }) - */ - public async list( - request: Rivet.actor.GetActorsRequestQuery = {}, - requestOptions?: Actor.RequestOptions - ): Promise { - const { project, environment, tagsJson, includeDestroyed, cursor } = request; -======== ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) * await client.actor.builds.list({ * project: "string", * environment: "string", @@ -309,10 +203,6 @@ export class Builds { requestOptions?: Builds.RequestOptions ): Promise { const { project, environment, tagsJson } = request; -<<<<<<< HEAD -======= ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) const _queryParams: Record = {}; if (project != null) { _queryParams["project"] = project; @@ -326,31 +216,10 @@ export class Builds { _queryParams["tags_json"] = tagsJson; } -<<<<<<< HEAD -======= -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts - if (includeDestroyed != null) { - _queryParams["include_destroyed"] = includeDestroyed.toString(); - } - - if (cursor != null) { - _queryParams["cursor"] = cursor; - } - - const _response = await (this._options.fetcher ?? core.fetcher)({ - url: urlJoin( - (await core.Supplier.get(this._options.environment)) ?? environments.RivetEnvironment.Production, - "/actors" -======== ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) const _response = await (this._options.fetcher ?? core.fetcher)({ url: urlJoin( (await core.Supplier.get(this._options.environment)) ?? environments.RivetEnvironment.Production, "/builds" -<<<<<<< HEAD -======= ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) ), method: "GET", headers: { @@ -367,15 +236,7 @@ export class Builds { abortSignal: requestOptions?.abortSignal, }); if (_response.ok) { -<<<<<<< HEAD - return serializers.actor.ListBuildsResponse.parseOrThrow(_response.body, { -======= -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts - return serializers.actor.ListActorsResponse.parseOrThrow(_response.body, { -======== return serializers.actor.ListBuildsResponse.parseOrThrow(_response.body, { ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) unrecognizedObjectKeys: "passthrough", allowUnrecognizedUnionMembers: true, allowUnrecognizedEnumValues: true, @@ -470,22 +331,9 @@ export class Builds { } /** -<<<<<<< HEAD - * @param {string} build - * @param {Rivet.actor.PatchBuildTagsRequestQuery} request - * @param {Builds.RequestOptions} requestOptions - Request-specific configuration. -======= -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts - * Create a new dynamic actor. - * - * @param {Rivet.actor.CreateActorRequestQuery} request - * @param {Actor.RequestOptions} requestOptions - Request-specific configuration. -======== * @param {string} build * @param {Rivet.actor.PatchBuildTagsRequestQuery} request * @param {Builds.RequestOptions} requestOptions - Request-specific configuration. ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) * * @throws {@link Rivet.InternalError} * @throws {@link Rivet.RateLimitError} @@ -495,48 +343,6 @@ export class Builds { * @throws {@link Rivet.BadRequestError} * * @example -<<<<<<< HEAD -======= -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts - * await client.actor.create({ - * project: "string", - * environment: "string", - * body: { - * region: "string", - * tags: { - * "key": "value" - * }, - * build: "d5e9c84f-c2b2-4bf4-b4b0-7ffd7a9ffc32", - * buildTags: { - * "key": "value" - * }, - * runtime: { - * arguments: ["string"], - * environment: { - * "string": "string" - * } - * }, - * network: { - * mode: "bridge", - * ports: {} - * }, - * resources: { - * cpu: 1, - * memory: 1 - * }, - * lifecycle: { - * killTimeout: 1000000, - * durable: true - * } - * } - * }) - */ - public async create( - request: Rivet.actor.CreateActorRequestQuery, - requestOptions?: Actor.RequestOptions - ): Promise { -======== ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) * await client.actor.builds.patchTags("d5e9c84f-c2b2-4bf4-b4b0-7ffd7a9ffc32", { * project: "string", * environment: "string", @@ -553,10 +359,6 @@ export class Builds { request: Rivet.actor.PatchBuildTagsRequestQuery, requestOptions?: Builds.RequestOptions ): Promise { -<<<<<<< HEAD -======= ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) const { project, environment, body: _body } = request; const _queryParams: Record = {}; if (project != null) { @@ -570,21 +372,9 @@ export class Builds { const _response = await (this._options.fetcher ?? core.fetcher)({ url: urlJoin( (await core.Supplier.get(this._options.environment)) ?? environments.RivetEnvironment.Production, -<<<<<<< HEAD `/builds/${encodeURIComponent(build)}/tags` ), method: "PATCH", -======= -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts - "/actors" - ), - method: "POST", -======== - `/builds/${encodeURIComponent(build)}/tags` - ), - method: "PATCH", ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) headers: { Authorization: await this._getAuthorizationHeader(), "X-Fern-Language": "JavaScript", @@ -594,29 +384,13 @@ export class Builds { contentType: "application/json", queryParameters: _queryParams, requestType: "json", -<<<<<<< HEAD - body: serializers.actor.PatchBuildTagsRequest.jsonOrThrow(_body, { unrecognizedObjectKeys: "strip" }), -======= -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts - body: serializers.actor.CreateActorRequest.jsonOrThrow(_body, { unrecognizedObjectKeys: "strip" }), -======== body: serializers.actor.PatchBuildTagsRequest.jsonOrThrow(_body, { unrecognizedObjectKeys: "strip" }), ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 180000, maxRetries: requestOptions?.maxRetries, abortSignal: requestOptions?.abortSignal, }); if (_response.ok) { -<<<<<<< HEAD return serializers.actor.PatchBuildTagsResponse.parseOrThrow(_response.body, { -======= -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts - return serializers.actor.CreateActorResponse.parseOrThrow(_response.body, { -======== - return serializers.actor.PatchBuildTagsResponse.parseOrThrow(_response.body, { ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) unrecognizedObjectKeys: "passthrough", allowUnrecognizedUnionMembers: true, allowUnrecognizedEnumValues: true, @@ -711,24 +485,10 @@ export class Builds { } /** -<<<<<<< HEAD -======= -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts - * Destroy a dynamic actor. - * - * @param {string} actor - The id of the actor to destroy - * @param {Rivet.actor.DestroyActorRequestQuery} request - * @param {Actor.RequestOptions} requestOptions - Request-specific configuration. -======== ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) * Creates a new project build for the given project. * * @param {Rivet.actor.PrepareBuildRequestQuery} request * @param {Builds.RequestOptions} requestOptions - Request-specific configuration. -<<<<<<< HEAD -======= ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) * * @throws {@link Rivet.InternalError} * @throws {@link Rivet.RateLimitError} @@ -738,192 +498,11 @@ export class Builds { * @throws {@link Rivet.BadRequestError} * * @example -<<<<<<< HEAD -======= -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts - * await client.actor.destroy("d5e9c84f-c2b2-4bf4-b4b0-7ffd7a9ffc32", { - * project: "string", - * environment: "string", - * overrideKillTimeout: 1000000 - * }) - */ - public async destroy( - actor: string, - request: Rivet.actor.DestroyActorRequestQuery = {}, - requestOptions?: Actor.RequestOptions - ): Promise { - const { project, environment, overrideKillTimeout } = request; - const _queryParams: Record = {}; - if (project != null) { - _queryParams["project"] = project; - } - - if (environment != null) { - _queryParams["environment"] = environment; - } - - if (overrideKillTimeout != null) { - _queryParams["override_kill_timeout"] = overrideKillTimeout.toString(); - } - - const _response = await (this._options.fetcher ?? core.fetcher)({ - url: urlJoin( - (await core.Supplier.get(this._options.environment)) ?? environments.RivetEnvironment.Production, - `/actors/${encodeURIComponent(actor)}` - ), - method: "DELETE", - headers: { - Authorization: await this._getAuthorizationHeader(), - "X-Fern-Language": "JavaScript", - "X-Fern-Runtime": core.RUNTIME.type, - "X-Fern-Runtime-Version": core.RUNTIME.version, - }, - contentType: "application/json", - queryParameters: _queryParams, - requestType: "json", - timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 180000, - maxRetries: requestOptions?.maxRetries, - abortSignal: requestOptions?.abortSignal, - }); - if (_response.ok) { - return serializers.actor.DestroyActorResponse.parseOrThrow(_response.body, { - unrecognizedObjectKeys: "passthrough", - allowUnrecognizedUnionMembers: true, - allowUnrecognizedEnumValues: true, - skipValidation: true, - breadcrumbsPrefix: ["response"], - }); - } - - if (_response.error.reason === "status-code") { - switch (_response.error.statusCode) { - case 500: - throw new Rivet.InternalError( - serializers.ErrorBody.parseOrThrow(_response.error.body, { - unrecognizedObjectKeys: "passthrough", - allowUnrecognizedUnionMembers: true, - allowUnrecognizedEnumValues: true, - skipValidation: true, - breadcrumbsPrefix: ["response"], - }) - ); - case 429: - throw new Rivet.RateLimitError( - serializers.ErrorBody.parseOrThrow(_response.error.body, { - unrecognizedObjectKeys: "passthrough", - allowUnrecognizedUnionMembers: true, - allowUnrecognizedEnumValues: true, - skipValidation: true, - breadcrumbsPrefix: ["response"], - }) - ); - case 403: - throw new Rivet.ForbiddenError( - serializers.ErrorBody.parseOrThrow(_response.error.body, { - unrecognizedObjectKeys: "passthrough", - allowUnrecognizedUnionMembers: true, - allowUnrecognizedEnumValues: true, - skipValidation: true, - breadcrumbsPrefix: ["response"], - }) - ); - case 408: - throw new Rivet.UnauthorizedError( - serializers.ErrorBody.parseOrThrow(_response.error.body, { - unrecognizedObjectKeys: "passthrough", - allowUnrecognizedUnionMembers: true, - allowUnrecognizedEnumValues: true, - skipValidation: true, - breadcrumbsPrefix: ["response"], - }) - ); - case 404: - throw new Rivet.NotFoundError( - serializers.ErrorBody.parseOrThrow(_response.error.body, { - unrecognizedObjectKeys: "passthrough", - allowUnrecognizedUnionMembers: true, - allowUnrecognizedEnumValues: true, - skipValidation: true, - breadcrumbsPrefix: ["response"], - }) - ); - case 400: - throw new Rivet.BadRequestError( - serializers.ErrorBody.parseOrThrow(_response.error.body, { - unrecognizedObjectKeys: "passthrough", - allowUnrecognizedUnionMembers: true, - allowUnrecognizedEnumValues: true, - skipValidation: true, - breadcrumbsPrefix: ["response"], - }) - ); - default: - throw new errors.RivetError({ - statusCode: _response.error.statusCode, - body: _response.error.body, - }); - } - } - - switch (_response.error.reason) { - case "non-json": - throw new errors.RivetError({ - statusCode: _response.error.statusCode, - body: _response.error.rawBody, - }); - case "timeout": - throw new errors.RivetTimeoutError(); - case "unknown": - throw new errors.RivetError({ - message: _response.error.errorMessage, - }); - } - } - - /** - * Upgrades a dynamic actor. - * - * @param {string} actor - The id of the actor to upgrade - * @param {Rivet.actor.UpgradeActorRequestQuery} request - * @param {Actor.RequestOptions} requestOptions - Request-specific configuration. - * - * @throws {@link Rivet.InternalError} - * @throws {@link Rivet.RateLimitError} - * @throws {@link Rivet.ForbiddenError} - * @throws {@link Rivet.UnauthorizedError} - * @throws {@link Rivet.NotFoundError} - * @throws {@link Rivet.BadRequestError} - * - * @example - * await client.actor.upgrade("d5e9c84f-c2b2-4bf4-b4b0-7ffd7a9ffc32", { - * project: "string", - * environment: "string", - * body: { - * build: "d5e9c84f-c2b2-4bf4-b4b0-7ffd7a9ffc32", - * buildTags: { - * "key": "value" - * } - * } - * }) - */ - public async upgrade( - actor: string, - request: Rivet.actor.UpgradeActorRequestQuery, - requestOptions?: Actor.RequestOptions - ): Promise { -======== ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) * await client.actor.builds.prepare({ * project: "string", * environment: "string", * body: { * name: "string", -<<<<<<< HEAD -======= - * tags: { - * "key": "value" - * }, ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) * imageTag: "string", * imageFile: { * path: "string", @@ -932,8 +511,7 @@ export class Builds { * }, * multipartUpload: true, * kind: "docker_image", - * compression: "none", - * prewarmRegions: ["string"] + * compression: "none" * } * }) */ @@ -941,10 +519,6 @@ export class Builds { request: Rivet.actor.PrepareBuildRequestQuery, requestOptions?: Builds.RequestOptions ): Promise { -<<<<<<< HEAD -======= ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) const { project, environment, body: _body } = request; const _queryParams: Record = {}; if (project != null) { @@ -958,15 +532,7 @@ export class Builds { const _response = await (this._options.fetcher ?? core.fetcher)({ url: urlJoin( (await core.Supplier.get(this._options.environment)) ?? environments.RivetEnvironment.Production, -<<<<<<< HEAD - "/builds/prepare" -======= -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts - `/actors/${encodeURIComponent(actor)}/upgrade` -======== "/builds/prepare" ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) ), method: "POST", headers: { @@ -978,29 +544,13 @@ export class Builds { contentType: "application/json", queryParameters: _queryParams, requestType: "json", -<<<<<<< HEAD body: serializers.actor.PrepareBuildRequest.jsonOrThrow(_body, { unrecognizedObjectKeys: "strip" }), -======= -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts - body: serializers.actor.UpgradeActorRequest.jsonOrThrow(_body, { unrecognizedObjectKeys: "strip" }), -======== - body: serializers.actor.PrepareBuildRequest.jsonOrThrow(_body, { unrecognizedObjectKeys: "strip" }), ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) timeoutMs: requestOptions?.timeoutInSeconds != null ? requestOptions.timeoutInSeconds * 1000 : 180000, maxRetries: requestOptions?.maxRetries, abortSignal: requestOptions?.abortSignal, }); if (_response.ok) { -<<<<<<< HEAD - return serializers.actor.PrepareBuildResponse.parseOrThrow(_response.body, { -======= -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts - return serializers.actor.UpgradeActorResponse.parseOrThrow(_response.body, { -======== return serializers.actor.PrepareBuildResponse.parseOrThrow(_response.body, { ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) unrecognizedObjectKeys: "passthrough", allowUnrecognizedUnionMembers: true, allowUnrecognizedEnumValues: true, @@ -1094,27 +644,6 @@ export class Builds { } } -<<<<<<< HEAD -======= -<<<<<<<< HEAD:sdks/runtime/typescript/src/api/resources/actor/client/Client.ts - protected _builds: Builds | undefined; - - public get builds(): Builds { - return (this._builds ??= new Builds(this._options)); - } - - protected _logs: Logs | undefined; - - public get logs(): Logs { - return (this._logs ??= new Logs(this._options)); - } - - protected _regions: Regions | undefined; - - public get regions(): Regions { - return (this._regions ??= new Regions(this._options)); -======== ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) /** * Marks an upload as complete. * @@ -1256,10 +785,6 @@ export class Builds { message: _response.error.errorMessage, }); } -<<<<<<< HEAD -======= ->>>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar):sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/Client.ts ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) } protected async _getAuthorizationHeader(): Promise { diff --git a/sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/requests/PrepareBuildRequestQuery.ts b/sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/requests/PrepareBuildRequestQuery.ts index d75573a489..4456cfb0e7 100644 --- a/sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/requests/PrepareBuildRequestQuery.ts +++ b/sdks/runtime/typescript/src/api/resources/actor/resources/builds/client/requests/PrepareBuildRequestQuery.ts @@ -11,12 +11,6 @@ import * as Rivet from "../../../../../../index"; * environment: "string", * body: { * name: "string", -<<<<<<< HEAD -======= - * tags: { - * "key": "value" - * }, ->>>>>>> 73a068837 (feat: revamp actor build endpoint, js builds -> tar) * imageTag: "string", * imageFile: { * path: "string", @@ -25,8 +19,7 @@ import * as Rivet from "../../../../../../index"; * }, * multipartUpload: true, * kind: "docker_image", - * compression: "none", - * prewarmRegions: ["string"] + * compression: "none" * } * } */