fix: remove erronious dep on linode & cloudflare tokens

rivet-gg · Apr 11, 2024 · 9250559 · 9250559
1 parent 333fd7d
commit 9250559
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 8 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -7,4 +7,4 @@ kind = "rust"
 [operation]
 
 [secrets]
-"linode/token" = {}
+"linode/token" = { optional = true }