diff --git a/lib/bolt/core/src/context/service.rs b/lib/bolt/core/src/context/service.rs index 9405de4e4..79dc7ed23 100644 --- a/lib/bolt/core/src/context/service.rs +++ b/lib/bolt/core/src/context/service.rs @@ -1241,7 +1241,7 @@ impl ServiceContextData { )); } - if self.depends_on_infra() { + if self.depends_on_infra() && project_ctx.tls_enabled() { let tls = terraform::output::read_tls(&project_ctx).await; let k8s_infra = terraform::output::read_k8s_infra(&project_ctx).await; diff --git a/svc/Cargo.lock b/svc/Cargo.lock index 99b1f26aa..1a5fa15a4 100644 --- a/svc/Cargo.lock +++ b/svc/Cargo.lock @@ -7386,7 +7386,9 @@ version = "0.1.0" name = "rivet-util-cluster" version = "0.1.0" dependencies = [ + "hex", "rivet-util", + "sha2", "tokio", "types", "uuid", diff --git a/svc/pkg/cluster/worker/Service.toml b/svc/pkg/cluster/worker/Service.toml index e4296c0ca..3901c621e 100644 --- a/svc/pkg/cluster/worker/Service.toml +++ b/svc/pkg/cluster/worker/Service.toml @@ -8,7 +8,7 @@ kind = "rust" [secrets] "rivet/api_route/token" = {} -"cloudflare/terraform/auth_token" = {} +"cloudflare/terraform/auth_token" = { optional = true } "ssh/server/private_key_openssh" = {} [databases] diff --git a/svc/pkg/linode/ops/instance-type-get/Service.toml b/svc/pkg/linode/ops/instance-type-get/Service.toml index 182cee993..1d9736733 100644 --- a/svc/pkg/linode/ops/instance-type-get/Service.toml +++ b/svc/pkg/linode/ops/instance-type-get/Service.toml @@ -7,4 +7,4 @@ kind = "rust" [operation] [secrets] -"linode/token" = {} +"linode/token" = { optional = true } diff --git a/svc/pkg/linode/ops/server-destroy/Service.toml b/svc/pkg/linode/ops/server-destroy/Service.toml index ddc07bf2d..be0e245fc 100644 --- a/svc/pkg/linode/ops/server-destroy/Service.toml +++ b/svc/pkg/linode/ops/server-destroy/Service.toml @@ -7,4 +7,4 @@ kind = "rust" [operation] [secrets] -"linode/token" = {} +"linode/token" = { optional = true } diff --git a/svc/pkg/linode/ops/server-provision/Service.toml b/svc/pkg/linode/ops/server-provision/Service.toml index a0c82d827..40485ec54 100644 --- a/svc/pkg/linode/ops/server-provision/Service.toml +++ b/svc/pkg/linode/ops/server-provision/Service.toml @@ -7,5 +7,5 @@ kind = "rust" [operation] [secrets] -"linode/token" = {} +"linode/token" = { optional = true } "ssh/server/private_key_openssh" = {} diff --git a/svc/pkg/linode/standalone/gc/Service.toml b/svc/pkg/linode/standalone/gc/Service.toml index b4beedb88..031f26951 100644 --- a/svc/pkg/linode/standalone/gc/Service.toml +++ b/svc/pkg/linode/standalone/gc/Service.toml @@ -8,4 +8,4 @@ kind = "rust" singleton = true [secrets] -"linode/token" = {} +"linode/token" = { optional = true } diff --git a/svc/pkg/linode/worker/Service.toml b/svc/pkg/linode/worker/Service.toml index 5671569f1..8c99c8e86 100644 --- a/svc/pkg/linode/worker/Service.toml +++ b/svc/pkg/linode/worker/Service.toml @@ -7,5 +7,5 @@ kind = "rust" [consumer] [secrets] -"linode/token" = {} +"linode/token" = { optional = true } "ssh/server/private_key_openssh" = {} diff --git a/svc/pkg/tier/ops/list/Service.toml b/svc/pkg/tier/ops/list/Service.toml index 0c163e632..64e9ee68f 100644 --- a/svc/pkg/tier/ops/list/Service.toml +++ b/svc/pkg/tier/ops/list/Service.toml @@ -7,4 +7,4 @@ kind = "rust" [operation] [secrets] -"linode/token" = {} +"linode/token" = { optional = true }