diff options
| author | Florian Klink <flokli@flokli.de> | 2023-11-11T10·43+0200 |
|---|---|---|
| committer | flokli <flokli@flokli.de> | 2023-11-11T12·24+0000 |
| commit | aaf53614b35aeec2cf707bdc63457ff0dac42b84 (patch) | |
| tree | 0f8427f16088a7c1587c7985c79f19236894cc3e | |
| parent | 7075aacc9cd04caaec7d3a504f49424aa2cc374f (diff) | |
fix(users/flokli/archeology): make clickhouse use ambient AWS creds r/6992
Rather than picking up from clickhouse-specific config files, this gets it to pick up from the ambient environment, which is closer to (but not the same as) the AWS default credentials chain. Change-Id: I9c498c231974ed345c3e3d354ec230052b4d0ff2 Reviewed-on: https://cl.tvl.fyi/c/depot/+/10006 Tested-by: BuildkiteCI Reviewed-by: raitobezarius <tvl@lahfa.xyz>
| -rw-r--r-- | users/flokli/archeology/default.nix | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/users/flokli/archeology/default.nix b/users/flokli/archeology/default.nix index d2e3ddc0143d..0c875ce3a898 100644 --- a/users/flokli/archeology/default.nix +++ b/users/flokli/archeology/default.nix @@ -1,13 +1,34 @@ { depot, pkgs, ... }: +let + clickhouseConfigAWS = builtins.toFile "clickhouse-local.xml" '' + <clickhouse> + <s3> + <use_environment_credentials>true</use_environment_credentials> + </s3> + </clickhouse> + ''; + # clickhouse has a very odd AWS config concept. + # Configure it to be a bit more sane. + clickhoseLocalFixedAWS = pkgs.runCommand "clickhouse-local-fixed" + { + nativeBuildInputs = [ pkgs.makeWrapper ]; + } '' + mkdir -p $out/bin + makeWrapper ${pkgs.clickhouse}/bin/clickhouse-local $out/bin/clickhouse-local \ + --append-flags "-C ${clickhouseConfigAWS}" + ''; +in + depot.nix.readTree.drvTargets { + inherit clickhoseLocalFixedAWS; parse-bucket-logs = pkgs.runCommand "archeology-parse-bucket-logs" { nativeBuildInputs = [ pkgs.makeWrapper ]; } '' mkdir -p $out/bin makeWrapper ${(pkgs.writers.writeRust "parse-bucket-logs-unwrapped" {} ./parse_bucket_logs.rs)} $out/bin/archeology-parse-bucket-logs \ - --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.clickhouse ]} + --prefix PATH : ${pkgs.lib.makeBinPath [ clickhoseLocalFixedAWS ]} ''; shell = pkgs.mkShell { |