Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 0 additions & 12 deletions errors/module/error-status.md

This file was deleted.

10 changes: 0 additions & 10 deletions errors/module/instance-destroyed.md

This file was deleted.

10 changes: 0 additions & 10 deletions errors/module/instance-not-initiated.md

This file was deleted.

12 changes: 0 additions & 12 deletions errors/module/malformed-response.md

This file was deleted.

11 changes: 0 additions & 11 deletions errors/module/not-found.md

This file was deleted.

12 changes: 0 additions & 12 deletions errors/module/request-failed.md

This file was deleted.

11 changes: 0 additions & 11 deletions errors/module/script-not-found.md

This file was deleted.

28 changes: 0 additions & 28 deletions fern/definition/module/__package__.yml

This file was deleted.

14 changes: 3 additions & 11 deletions lib/bolt/cli/src/commands/ssh.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,25 +44,17 @@ impl SubCommand {
let ssh_key =
TempSshKey::new(&ctx, &ssh_key.map_or_else(|| "server".to_string(), |x| x))
.await?;
bolt_core::tasks::ssh::ip(
&ctx,
&ip,
&ssh_key,
command.as_deref(),
)
.await?;
bolt_core::tasks::ssh::ip(&ctx, &ip, &ssh_key, command.as_deref()).await?;
}
Self::Id { server_id, command } => {
bolt_core::tasks::ssh::id(&ctx, &server_id, command.as_deref())
.await?;
bolt_core::tasks::ssh::id(&ctx, &server_id, command.as_deref()).await?;
}
Self::Pool { pool, command, all } => {
if all {
let command = command.context("must provide command with --all")?;
bolt_core::tasks::ssh::pool_all(&ctx, &pool, &command).await?;
} else {
bolt_core::tasks::ssh::pool(&ctx, &pool, command.as_deref())
.await?;
bolt_core::tasks::ssh::pool(&ctx, &pool, command.as_deref()).await?;
}
}
}
Expand Down
5 changes: 4 additions & 1 deletion lib/bolt/core/src/dep/terraform/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,10 @@ pub async fn init_if_needed_quiet(ctx: &ProjectContext, plan_id: &str, quiet: bo
.read_secret(&["terraform", "pg_backend", "conn_str"])
.await
.unwrap();
vec![format!("-backend-config=conn_str={tf_conn_str}")]
vec![
format!("-backend-config=conn_str={tf_conn_str}"),
"-reconfigure".to_string(),
]
}
};

Expand Down
12 changes: 6 additions & 6 deletions lib/bolt/core/src/dep/terraform/gen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -43,19 +43,19 @@ pub async fn gen_bolt_tf(ctx: &ProjectContext, plan_id: &str) -> Result<()> {
// Configure the backend
let backend = match ctx.ns().terraform.backend {
ns::TerraformBackend::Local {} => indoc!(
"
r#"
terraform {
backend \"local\" {}
backend "local" {}
}
"
"#
)
.to_string(),
ns::TerraformBackend::Postgres {} => indoc!(
"
r#"
terraform {
backend \"pg\" {}
backend "pg" {}
}
"
"#
)
.to_string(),
};
Expand Down
2 changes: 0 additions & 2 deletions lib/convert/src/impls/cloud/version/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ pub async fn config_to_proto(
},
kv: value.kv.map(|_| backend::kv::VersionConfig {}),
identity: value.identity.map(|x| (*x).api_try_into()).transpose()?,
// TODO:
module: None,
})
}

Expand Down
7 changes: 4 additions & 3 deletions proto/backend/cloud.proto
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import "proto/backend/matchmaker.proto";
import "proto/backend/cdn.proto";
import "proto/backend/kv.proto";
import "proto/backend/identity.proto";
import "proto/backend/module.proto";

message Game {
rivet.common.Uuid game_id = 1;
Expand All @@ -19,11 +18,12 @@ message GameNamespace {
}

message NamespaceConfig {
reserved 105;

optional rivet.backend.cdn.NamespaceConfig cdn = 101;
optional rivet.backend.matchmaker.NamespaceConfig matchmaker = 102;
optional rivet.backend.kv.NamespaceConfig kv = 103;
optional rivet.backend.identity.NamespaceConfig identity = 104;
optional rivet.backend.module.GameNamespaceConfig module = 105;
}

message GameVersion {
Expand All @@ -34,9 +34,10 @@ message GameVersion {
// Represents how a game version will be published. This is a data type that will be used
// before the version is actually inserted in to the database.
message VersionConfig {
reserved 105;

optional rivet.backend.cdn.VersionConfig cdn = 101;
optional rivet.backend.matchmaker.VersionConfig matchmaker = 102;
optional rivet.backend.kv.VersionConfig kv = 103;
optional rivet.backend.identity.VersionConfig identity = 104;
optional rivet.backend.module.GameVersionConfig module = 105;
}
88 changes: 0 additions & 88 deletions proto/backend/module.proto

This file was deleted.

17 changes: 0 additions & 17 deletions proto/backend/module/script.proto

This file was deleted.

Loading