Skip to content

fix: remove erronious dep on linode & cloudflare tokens #649

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 12, 2024
Merged

fix: remove erronious dep on linode & cloudflare tokens #649

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/bolt/core/src/context/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 2 additions & 0 deletions svc/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion svc/pkg/cluster/worker/Service.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion svc/pkg/linode/ops/instance-type-get/Service.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ kind = "rust"
[operation]

[secrets]
"linode/token" = {}
"linode/token" = { optional = true }
2 changes: 1 addition & 1 deletion svc/pkg/linode/ops/server-destroy/Service.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ kind = "rust"
[operation]

[secrets]
"linode/token" = {}
"linode/token" = { optional = true }
2 changes: 1 addition & 1 deletion svc/pkg/linode/ops/server-provision/Service.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ kind = "rust"
[operation]

[secrets]
"linode/token" = {}
"linode/token" = { optional = true }
"ssh/server/private_key_openssh" = {}
2 changes: 1 addition & 1 deletion svc/pkg/linode/standalone/gc/Service.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ kind = "rust"
singleton = true

[secrets]
"linode/token" = {}
"linode/token" = { optional = true }
2 changes: 1 addition & 1 deletion svc/pkg/linode/worker/Service.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ kind = "rust"
[consumer]

[secrets]
"linode/token" = {}
"linode/token" = { optional = true }
"ssh/server/private_key_openssh" = {}
2 changes: 1 addition & 1 deletion svc/pkg/tier/ops/list/Service.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ kind = "rust"
[operation]

[secrets]
"linode/token" = {}
"linode/token" = { optional = true }