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
16 changes: 16 additions & 0 deletions infra/tf/pools/server_gc.tf
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
resource "null_resource" "server_gc" {
depends_on = [
module.servers,
]

triggers = {
servers = var.servers
}

master_host = var.deploy_method_cluster ? data.terraform_remote_state.master_cluster[0].outputs.salt_master_host : null

provisioner "local-exec" {
interpreter = ["/usr/bin/env", "-i", "bash", "-c"]
command = "salt-key -L | grep -v ':' | grep -vx \"${join(keys(var.servers), "\\|")}\" | xargs -L 1 salt-key -d"
}
}
2 changes: 1 addition & 1 deletion infra/tf/pools/servers.tf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module "servers" {
source = "../modules/generic_server"
source = "../modules/generic_server"

for_each = var.servers

Expand Down
4 changes: 2 additions & 2 deletions svc/pkg/mm/worker/src/workers/lobby_create/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -730,9 +730,9 @@ async fn resolve_image_artifact_url(
// TODO: Auto-generate password for this & encode in to infra/salt/salt/traffic_server/files/consul/traffic_server.hcl.j2
// See tf/svc/traefik/main.tf
// let http_auth = "job_run_image:XXXX";
let http_auth = todo!("need to auto-generate password");
let http_auth: String = todo!("need to auto-generate password");

// TODO: Unproxied storage endopint was removed. Replace with Nebula address. We can't
// TODO: Unproxied storage endpoint was removed. Replace with Nebula address. We can't
// use Consul to resolve this though, since Consul is not installed on the edge nodes.
// Pull the image from the CDN region instead of the default region for
// faster boot times.
Expand Down
4 changes: 2 additions & 2 deletions svc/pkg/user/ops/search/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ async fn handle(
.ok_or(Error::ExtractRegexCapture)?
.as_str();

let digit_count = number_raw.len();
let digit_count = number_raw.len() as u32;
let number = number_raw.parse::<u16>()?; // Must be unsigned so we don't parse a negative sign

let shift = 10i64.pow(4u32 - digit_count as u32);
let shift = 10i64.pow(4u32 - digit_count);
let lower = (number as i64) * shift;
let upper = lower + shift;

Expand Down