fix: rename api-route -> api-traefik-provider (#697)

## Changes
rivet-gg · Apr 17, 2024 · 3bf5a1f · 3bf5a1f
1 parent f25ffe4
commit 3bf5a1f
Show file tree

Hide file tree

Showing 51 changed files with 153 additions and 157 deletions.
diff --git a/infra/tf/k8s_infra/traefik.tf b/infra/tf/k8s_infra/traefik.tf
@@ -8,7 +8,7 @@ module "traefik_secrets" {
 	source = "../modules/secrets"
 
 	keys = [
-		"rivet/api_route/token",
+		"rivet/api_traefik_provider/token",
 	]
 }
 
@@ -64,7 +64,7 @@ resource "helm_release" "traefik" {
 		} : null
 
 		additionalArguments = [
-			"--providers.http.endpoint=http://rivet-api-internal-monolith.rivet-service.svc.cluster.local/route/traefik/config/core?token=${module.traefik_secrets.values["rivet/api_route/token"]}",
+			"--providers.http.endpoint=http://rivet-api-internal-monolith.rivet-service.svc.cluster.local/traefik-provider/config/core?token=${module.traefik_secrets.values["rivet/api_traefik_provider/token"]}",
 			"--providers.http.pollInterval=2.5s",
 			# See docs/infrastructure/TIMEOUTS.md
 			"--entryPoints.web.transport.lifeCycle.graceTimeOut=60s",

diff --git a/lib/bolt/core/src/tasks/config/generate.rs b/lib/bolt/core/src/tasks/config/generate.rs
@@ -214,7 +214,7 @@ pub async fn generate(project_path: &Path, ns_id: &str) -> Result<()> {
 		})
 		.await?;
 	generator
-		.generate_secret(&["rivet", "api_route", "token"], || async {
+		.generate_secret(&["rivet", "api_traefik_provider", "token"], || async {
 			Ok(value(generate_password(32)))
 		})
 		.await?;

diff --git a/...y-output/api-route/rust-server/Cargo.toml → ...i-traefik-provider/rust-server/Cargo.toml b/...y-output/api-route/rust-server/Cargo.toml → ...i-traefik-provider/rust-server/Cargo.toml
@@ -1,6 +1,6 @@
 # Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 [package]
-name = "rivet-route-server"
+name = "rivet-traefik-provider-server"
 version = "0.0.1"
 authors = ["Rivet <developer@rivet.gg>"]
 edition = "2021"

diff --git a/...-route/rust-server/rust-server/Cargo.toml → ...ovider/rust-server/rust-server/Cargo.toml b/...-route/rust-server/rust-server/Cargo.toml → ...ovider/rust-server/rust-server/Cargo.toml
@@ -1,6 +1,6 @@
 # Code generated by software.amazon.smithy.rust.codegen.smithy-rs. DO NOT EDIT.
 [package]
-name = "rivet-route-server"
+name = "rivet-traefik-provider-server"
 version = "0.0.1"
 authors = ["Rivet <developer@rivet.gg>"]
 edition = "2021"

diff --git a/...-route/rust-server/rust-server/src/lib.rs → ...ovider/rust-server/rust-server/src/lib.rs b/...-route/rust-server/rust-server/src/lib.rs → ...ovider/rust-server/rust-server/src/lib.rs
diff --git a/...ute/rust-server/rust-server/src/models.rs → ...der/rust-server/rust-server/src/models.rs b/...ute/rust-server/rust-server/src/models.rs → ...der/rust-server/rust-server/src/models.rs
diff --git a/...y-output/api-route/rust-server/src/lib.rs → ...i-traefik-provider/rust-server/src/lib.rs b/...y-output/api-route/rust-server/src/lib.rs → ...i-traefik-provider/rust-server/src/lib.rs
diff --git a/...utput/api-route/rust-server/src/models.rs → ...raefik-provider/rust-server/src/models.rs b/...utput/api-route/rust-server/src/models.rs → ...raefik-provider/rust-server/src/models.rs
diff --git a/lib/smithy-output/api-route/rust/Cargo.toml → ...tput/api-traefik-provider/rust/Cargo.toml b/lib/smithy-output/api-route/rust/Cargo.toml → ...tput/api-traefik-provider/rust/Cargo.toml
diff --git a/...thy-output/api-route/rust/rust/Cargo.toml → ...api-traefik-provider/rust/rust/Cargo.toml b/...thy-output/api-route/rust/rust/Cargo.toml → ...api-traefik-provider/rust/rust/Cargo.toml
diff --git a/...-output/api-route/rust/rust/src/client.rs → ...-traefik-provider/rust/rust/src/client.rs b/...-output/api-route/rust/rust/src/client.rs → ...-traefik-provider/rust/rust/src/client.rs
diff --git a/...-output/api-route/rust/rust/src/config.rs → ...-traefik-provider/rust/rust/src/config.rs b/...-output/api-route/rust/rust/src/config.rs → ...-traefik-provider/rust/rust/src/config.rs
diff --git a/...y-output/api-route/rust/rust/src/error.rs → ...i-traefik-provider/rust/rust/src/error.rs b/...y-output/api-route/rust/rust/src/error.rs → ...i-traefik-provider/rust/rust/src/error.rs
diff --git a/...put/api-route/rust/rust/src/error_meta.rs → ...efik-provider/rust/rust/src/error_meta.rs b/...put/api-route/rust/rust/src/error_meta.rs → ...efik-provider/rust/rust/src/error_meta.rs
diff --git a/...y-output/api-route/rust/rust/src/input.rs → ...i-traefik-provider/rust/rust/src/input.rs b/...y-output/api-route/rust/rust/src/input.rs → ...i-traefik-provider/rust/rust/src/input.rs
diff --git a/...put/api-route/rust/rust/src/json_deser.rs → ...efik-provider/rust/rust/src/json_deser.rs b/...put/api-route/rust/rust/src/json_deser.rs → ...efik-provider/rust/rust/src/json_deser.rs
diff --git a/...ut/api-route/rust/rust/src/json_errors.rs → ...fik-provider/rust/rust/src/json_errors.rs b/...ut/api-route/rust/rust/src/json_errors.rs → ...fik-provider/rust/rust/src/json_errors.rs
diff --git a/...thy-output/api-route/rust/rust/src/lib.rs → ...api-traefik-provider/rust/rust/src/lib.rs b/...thy-output/api-route/rust/rust/src/lib.rs → ...api-traefik-provider/rust/rust/src/lib.rs
diff --git a/...y-output/api-route/rust/rust/src/model.rs → ...i-traefik-provider/rust/rust/src/model.rs b/...y-output/api-route/rust/rust/src/model.rs → ...i-traefik-provider/rust/rust/src/model.rs
diff --git a/...tput/api-route/rust/rust/src/operation.rs → ...aefik-provider/rust/rust/src/operation.rs b/...tput/api-route/rust/rust/src/operation.rs → ...aefik-provider/rust/rust/src/operation.rs
diff --git a/...pi-route/rust/rust/src/operation_deser.rs → ...provider/rust/rust/src/operation_deser.rs b/...pi-route/rust/rust/src/operation_deser.rs → ...provider/rust/rust/src/operation_deser.rs
diff --git a/...-output/api-route/rust/rust/src/output.rs → ...-traefik-provider/rust/rust/src/output.rs b/...-output/api-route/rust/rust/src/output.rs → ...-traefik-provider/rust/rust/src/output.rs
diff --git a/...mithy-output/api-route/rust/src/client.rs → ...t/api-traefik-provider/rust/src/client.rs b/...mithy-output/api-route/rust/src/client.rs → ...t/api-traefik-provider/rust/src/client.rs
diff --git a/...mithy-output/api-route/rust/src/config.rs → ...t/api-traefik-provider/rust/src/config.rs b/...mithy-output/api-route/rust/src/config.rs → ...t/api-traefik-provider/rust/src/config.rs
diff --git a/...smithy-output/api-route/rust/src/error.rs → ...ut/api-traefik-provider/rust/src/error.rs b/...smithy-output/api-route/rust/src/error.rs → ...ut/api-traefik-provider/rust/src/error.rs
diff --git a/...y-output/api-route/rust/src/error_meta.rs → ...i-traefik-provider/rust/src/error_meta.rs b/...y-output/api-route/rust/src/error_meta.rs → ...i-traefik-provider/rust/src/error_meta.rs
diff --git a/...smithy-output/api-route/rust/src/input.rs → ...ut/api-traefik-provider/rust/src/input.rs b/...smithy-output/api-route/rust/src/input.rs → ...ut/api-traefik-provider/rust/src/input.rs
diff --git a/...y-output/api-route/rust/src/json_deser.rs → ...i-traefik-provider/rust/src/json_deser.rs b/...y-output/api-route/rust/src/json_deser.rs → ...i-traefik-provider/rust/src/json_deser.rs
diff --git a/...-output/api-route/rust/src/json_errors.rs → ...-traefik-provider/rust/src/json_errors.rs b/...-output/api-route/rust/src/json_errors.rs → ...-traefik-provider/rust/src/json_errors.rs
diff --git a/lib/smithy-output/api-route/rust/src/lib.rs → ...tput/api-traefik-provider/rust/src/lib.rs b/lib/smithy-output/api-route/rust/src/lib.rs → ...tput/api-traefik-provider/rust/src/lib.rs
diff --git a/...smithy-output/api-route/rust/src/model.rs → ...ut/api-traefik-provider/rust/src/model.rs b/...smithy-output/api-route/rust/src/model.rs → ...ut/api-traefik-provider/rust/src/model.rs
diff --git a/...hy-output/api-route/rust/src/operation.rs → ...pi-traefik-provider/rust/src/operation.rs b/...hy-output/api-route/rust/src/operation.rs → ...pi-traefik-provider/rust/src/operation.rs
diff --git a/...put/api-route/rust/src/operation_deser.rs → ...efik-provider/rust/src/operation_deser.rs b/...put/api-route/rust/src/operation_deser.rs → ...efik-provider/rust/src/operation_deser.rs
diff --git a/...mithy-output/api-route/rust/src/output.rs → ...t/api-traefik-provider/rust/src/output.rs b/...mithy-output/api-route/rust/src/output.rs → ...t/api-traefik-provider/rust/src/output.rs
diff --git a/svc/Cargo.lock b/svc/Cargo.lock
diff --git a/svc/Cargo.toml b/svc/Cargo.toml
@@ -17,8 +17,8 @@ members = [
 	"api/monolith",
 	"api/portal",
 	"api/provision",
-	"api/route",
 	"api/status",
+	"api/traefik-provider",
 	"pkg/build/ops/create",
 	"pkg/build/ops/get",
 	"pkg/build/ops/list-for-game",

diff --git a/svc/api/internal-monolith/Cargo.toml b/svc/api/internal-monolith/Cargo.toml
@@ -21,5 +21,5 @@ tracing-subscriber = { version = "0.3", default-features = false, features = [
 ] }
 url = "2.2.2"
 
-api-route = { path = "../route" }
+api-traefik-provider = { path = "../traefik-provider" }
 api-provision = { path = "../provision" }
diff --git a/svc/api/internal-monolith/src/route/mod.rs b/svc/api/internal-monolith/src/route/mod.rs
@@ -19,7 +19,7 @@ define_router! {
 	routes: {},
 	mounts: [
 		{
-			path: api_route::route::Router,
+			path: api_traefik_provider::route::Router,
 			prefix: "route",
 		},
 		{

diff --git a/svc/api/route/src/main.rs b/svc/api/route/src/main.rs
diff --git a/svc/api/route/Cargo.toml → svc/api/traefik-provider/Cargo.toml b/svc/api/route/Cargo.toml → svc/api/traefik-provider/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "api-route"
+name = "api-traefik-provider"
 version = "0.0.1"
 authors = ["Rivet Gaming, LLC <developer@rivet.gg>"]
 edition = "2021"
@@ -39,7 +39,7 @@ uuid = { version = "1", features = ["v4"] }
 
 [dev-dependencies]
 rivet-connection = { path = "../../../lib/connection" }
-rivet-route = { path = "../../../lib/smithy-output/api-route/rust" }
+rivet-route = { path = "../../../lib/smithy-output/api-traefik-provider/rust" }
 base64 = "0.13"
 reqwest = "0.11"
 

diff --git a/svc/api/route/Service.toml → svc/api/traefik-provider/Service.toml b/svc/api/route/Service.toml → svc/api/traefik-provider/Service.toml
@@ -1,13 +1,13 @@
 [service]
-name = "api-route"
+name = "api-traefik-provider"
 
 [runtime]
 kind = "rust"
 
 [api-routes]
 
 [secrets]
-"rivet/api_route/token" = {}
+"rivet/api_traefik_provider/token" = {}
 
 [databases]
 redis-job = {}

diff --git a/svc/api/route/src/auth.rs → svc/api/traefik-provider/src/auth.rs b/svc/api/route/src/auth.rs → svc/api/traefik-provider/src/auth.rs
@@ -27,7 +27,7 @@ impl Auth {
 	pub async fn token(&self, token: &str) -> GlobalResult<()> {
 		ensure_eq_with!(
 			token,
-			&util::env::read_secret(&["rivet", "api_route", "token"]).await?,
+			&util::env::read_secret(&["rivet", "api_traefik_provider", "token"]).await?,
 			API_FORBIDDEN,
 			reason = "Invalid token",
 		);

diff --git a/svc/api/route/src/lib.rs → svc/api/traefik-provider/src/lib.rs b/svc/api/route/src/lib.rs → svc/api/traefik-provider/src/lib.rs
@@ -1,2 +1,3 @@
 pub mod auth;
 pub mod route;
+pub mod types;
diff --git a/svc/api/traefik-provider/src/main.rs b/svc/api/traefik-provider/src/main.rs
@@ -0,0 +1,5 @@
+use api_helper::start;
+
+fn main() {
+	start(api_traefik_provider::route::handle);
+}