From d1c87c72e0fb3c6631d84c67004e870c149885fe Mon Sep 17 00:00:00 2001 From: MasterPtato Date: Fri, 4 Aug 2023 17:09:48 +0000 Subject: [PATCH 1/3] Fix terraform config --- infra/tf/pools/server_gc.tf | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/infra/tf/pools/server_gc.tf b/infra/tf/pools/server_gc.tf index 6d61821ccc..f06ef94853 100644 --- a/infra/tf/pools/server_gc.tf +++ b/infra/tf/pools/server_gc.tf @@ -4,13 +4,11 @@ resource "null_resource" "server_gc" { ] triggers = { - servers = var.servers + servers = join(",", keys(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" + command = "salt-key -L | grep -v ':' | grep -vx \"${join("\\|", keys(var.servers))}\" | xargs -L 1 salt-key -d" } } From fe09a335802cd6181660f5dd7099f09fc5451450 Mon Sep 17 00:00:00 2001 From: Nathan Flurry Date: Tue, 27 Jun 2023 19:34:45 +0000 Subject: [PATCH 2/3] Fix formatting error in Salt --- infra/salt/salt/cockroach/init.sls | 2 +- infra/salt/salt/common/init.sls | 2 +- infra/salt/salt/dnsmasq/init.sls | 2 +- infra/salt/salt/docker/init.sls | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/infra/salt/salt/cockroach/init.sls b/infra/salt/salt/cockroach/init.sls index ca1b7b3142..3cb87d973f 100644 --- a/infra/salt/salt/cockroach/init.sls +++ b/infra/salt/salt/cockroach/init.sls @@ -27,7 +27,7 @@ disk_mount_cockroach: # # See https://www.cockroachlabs.com/docs/v22.2/deploy-cockroachdb-on-premises#step-1-synchronize-clocks sync_clocks_crdb: - ed: + pkg.installed: - name: ntp file.managed: - name: /etc/ntp.conf diff --git a/infra/salt/salt/common/init.sls b/infra/salt/salt/common/init.sls index c1d3574d6f..b7a26a304b 100644 --- a/infra/salt/salt/common/init.sls +++ b/infra/salt/salt/common/init.sls @@ -2,7 +2,7 @@ update_pkgs: pkg.uptodate: [] install_common_pkgs: - ed: + pkg.installed: - pkgs: - apt-transport-https - ca-certificates diff --git a/infra/salt/salt/dnsmasq/init.sls b/infra/salt/salt/dnsmasq/init.sls index 819ea6edb2..03f31ecc32 100644 --- a/infra/salt/salt/dnsmasq/init.sls +++ b/infra/salt/salt/dnsmasq/init.sls @@ -1,5 +1,5 @@ install_dnsmasq: - ed: + pkg.installed: - name: dnsmasq push_etc_resolv_conf: diff --git a/infra/salt/salt/docker/init.sls b/infra/salt/salt/docker/init.sls index 874ff935a9..1a57bc7ee5 100644 --- a/infra/salt/salt/docker/init.sls +++ b/infra/salt/salt/docker/init.sls @@ -1,5 +1,5 @@ install_docker_core_dependencies: - ed: + pkg.installed: - pkgs: - apt-transport-https - ca-certificates @@ -24,7 +24,7 @@ add_docker_repository: - cmd: add_docker_gpg install_docker: - ed: + pkg.installed: - pkgs: - docker-ce - docker-ce-cli From cba6c8dd43102ab0645c3a2c6f953e163c8d33c6 Mon Sep 17 00:00:00 2001 From: MasterPtato Date: Fri, 4 Aug 2023 17:21:04 +0000 Subject: [PATCH 3/3] Small fixes --- infra/tf/pools/servers.tf | 2 +- svc/pkg/mm/worker/src/workers/lobby_create/mod.rs | 2 +- svc/pkg/user/ops/search/src/lib.rs | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/infra/tf/pools/servers.tf b/infra/tf/pools/servers.tf index 79781fb86b..15ae49030c 100644 --- a/infra/tf/pools/servers.tf +++ b/infra/tf/pools/servers.tf @@ -1,5 +1,5 @@ module "servers" { - source = "../modules/generic_server" + source = "../modules/generic_server" for_each = var.servers diff --git a/svc/pkg/mm/worker/src/workers/lobby_create/mod.rs b/svc/pkg/mm/worker/src/workers/lobby_create/mod.rs index 4a26ff9f5b..d161a0088c 100644 --- a/svc/pkg/mm/worker/src/workers/lobby_create/mod.rs +++ b/svc/pkg/mm/worker/src/workers/lobby_create/mod.rs @@ -732,7 +732,7 @@ async fn resolve_image_artifact_url( // let http_auth = "job_run_image:XXXX"; 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. diff --git a/svc/pkg/user/ops/search/src/lib.rs b/svc/pkg/user/ops/search/src/lib.rs index 6ff0e06426..5b936ccadd 100644 --- a/svc/pkg/user/ops/search/src/lib.rs +++ b/svc/pkg/user/ops/search/src/lib.rs @@ -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::()?; // 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;