fix tests

Author: mafredri

registry/coder/modules/archive/main.test.ts

@@ -25,11 +25,15 @@ const installScriptInContainer = async (
     "mkdir -p /tmp/coder-script-data/bin /tmp/coder-script-data",
   ]);
 
-  await execContainer(id, ["sh", "-c", "apk add --no-cache tar gzip zstd"]);
+  await execContainer(id, [
+    "sh",
+    "-c",
+    "apk add --no-cache bash tar gzip zstd",
+  ]);
 
   const resp = await execContainer(
     id,
-    ["sh", "-c", instance.script],
+    ["bash", "-c", instance.script],
     [
       "--env",
       "CODER_SCRIPT_BIN_DIR=/tmp/coder-script-data/bin",
@@ -40,10 +44,12 @@ const installScriptInContainer = async (
   );
 
   const stdout = resp.stdout.trim().split("\n");
+  const stderr = resp.stderr.trim().split("\n");
   return {
     id,
     exitCode: resp.exitCode,
     stdout,
+    stderr,
   };
 };
 
@@ -66,9 +72,11 @@ describe("archive", async () => {
     );
     const result = await installScriptInContainer(state, "alpine");
     expect(result.exitCode).toBe(0);
-    expect(result.stdout[result.stdout.length - 1]).toEqual(
-      "Installed extract script to: /tmp/coder-script-data/bin/coder-archive-create",
-    );
+    expect(result.stdout).toEqual([
+      "Installed archive library to: /tmp/coder-script-data/archive-lib.sh",
+      "Installed create script to:   /tmp/coder-script-data/bin/coder-archive-create",
+      "Installed extract script to:  /tmp/coder-script-data/bin/coder-archive-extract",
+    ]);
 
     // Verify the script is executable
     const execCheck = await execContainer(result.id, [
@@ -79,33 +87,26 @@ describe("archive", async () => {
     expect(execCheck.stdout.trim()).toEqual("ok");
   });
 
-  return;
-
   it("creates a gzip archive and prints the archive path", async () => {
     const state = await runTerraformApply(import.meta.dir, {
       agent_id: "agent-123",
+      directory: "$HOME",
       paths: `["/etc/hostname"]`,
       compression: "gzip",
     });
 
-    expect(state.outputs.archive_path.value).toEqual("");
     const result = await installScriptInContainer(state, "alpine");
 
-    // Install bash to run the script
-    await execContainer(result.id, ["sh", "-c", "apk add --no-cache bash"]);
-
     // Run the archiver with explicit name and output dir
     const run = await execContainer(result.id, [
       "sh",
       "-c",
-      "/bin/bash /tmp/coder-script-data/bin/coder-archive-create -n test-archive -o /tmp/backup /etc/hosts",
+      "/tmp/coder-script-data/bin/coder-archive-create -f /tmp/backup/test-archive.tar.gz /etc/hosts",
     ]);
 
-    const out = run.stdout.trim().split("\n").filter(Boolean);
     expect(run.exitCode).toBe(0);
-    // Only the archive path should be printed to stdout
-    expect(out.length).toBe(1);
-    expect(out[0]).toEqual("/tmp/backup/test-archive.tar.gz");
+    // Only the archive path should be printed to stdout.
+    expect(run.stdout.trim()).toEqual("/tmp/backup/test-archive.tar.gz");
 
     // Validate file exists and is a valid gzip tar
     const exists = await execContainer(result.id, [
@@ -123,6 +124,8 @@ describe("archive", async () => {
     expect(tarList.exitCode).toBe(0);
   }, 20000);
 
+  return;
+
   it("creates a zstd-compressed archive when requested", async () => {
     const state = await runTerraformApply(import.meta.dir, {
       agent_id: "agent-123",

registry/coder/modules/archive/main.tf

@@ -20,14 +20,8 @@ variable "paths" {
   default     = ["."]
 }
 
-variable "include_patterns" {
-  description = "Include patterns for the archive."
-  type        = list(string)
-  default     = []
-}
-
 variable "exclude_patterns" {
-  description = "Exclude patterns for the archive, these take precedence over include patterns."
+  description = "Exclude patterns for the archive."
   type        = list(string)
   default     = []
 }
@@ -85,7 +79,6 @@ locals {
   # Ensure ~ is expanded because it cannot be expanded inside quotes in a
   # templated shell script.
   paths            = [for v in var.paths : replace(v, "^~", "$HOME")]
-  include_patterns = var.include_patterns == null ? [] : [for v in var.include_patterns : replace(v, "^~", "$HOME")]
   exclude_patterns = var.exclude_patterns == null ? [] : [for v in var.exclude_patterns : replace(v, "^~", "$HOME")]
   directory        = replace(var.directory, "^~", "$HOME")
   output_dir       = replace(replace(var.output_dir, "^~", "$HOME"), "/+$", "")
@@ -111,7 +104,6 @@ resource "coder_script" "archive_start_script" {
   script = templatefile("${path.module}/run.sh", {
     TF_LIB_B64              = base64encode(file("${path.module}/scripts/archive-lib.sh")),
     TF_PATHS                = join(" ", formatlist("%q", local.paths)),
-    TF_INCLUDE_PATTERNS     = join(" ", formatlist("%q", local.include_patterns)),
     TF_EXCLUDE_PATTERNS     = join(" ", formatlist("%q", local.exclude_patterns)),
     TF_COMPRESSION          = var.compression,
     TF_ARCHIVE_PATH         = local.archive_path,

registry/coder/modules/archive/run.sh

@@ -7,7 +7,6 @@ EXTRACT_WAIT_TIMEOUT="${TF_EXTRACT_WAIT_TIMEOUT}"
 
 # Set script defaults from Terraform.
 DEFAULT_PATHS=(${TF_PATHS})
-DEFAULT_INCLUDE_PATTERNS=(${TF_INCLUDE_PATTERNS})
 DEFAULT_EXCLUDE_PATTERNS=(${TF_EXCLUDE_PATTERNS})
 DEFAULT_COMPRESSION="${TF_COMPRESSION}"
 DEFAULT_ARCHIVE_PATH="${TF_ARCHIVE_PATH}"
@@ -40,7 +39,6 @@ set -euo pipefail
 $(
     declare -p \
       DEFAULT_PATHS \
-      DEFAULT_INCLUDE_PATTERNS \
       DEFAULT_EXCLUDE_PATTERNS \
       DEFAULT_COMPRESSION \
       DEFAULT_ARCHIVE_PATH \
@@ -53,8 +51,8 @@ EOF
   mv "$tmp" "$2"
 }
 
-CREATE_WRAPPER_PATH="$CODER_SCRIPT_BIN_DIR/coder-create-archive"
-EXTRACT_WRAPPER_PATH="$CODER_SCRIPT_BIN_DIR/coder-extract-archive"
+CREATE_WRAPPER_PATH="$CODER_SCRIPT_BIN_DIR/coder-archive-create"
+EXTRACT_WRAPPER_PATH="$CODER_SCRIPT_BIN_DIR/coder-archive-extract"
 create_wrapper create_archive "$CREATE_WRAPPER_PATH"
 create_wrapper extract_archive "$EXTRACT_WRAPPER_PATH"
 

registry/coder/modules/archive/scripts/archive-lib.sh

@@ -14,7 +14,6 @@ error() {
 
 load_defaults() {
   DEFAULT_PATHS=("${DEFAULT_PATHS[@]:-$HOME}")
-  DEFAULT_INCLUDE_PATTERNS=("${DEFAULT_INCLUDE_PATTERNS[@]:-}")
   DEFAULT_EXCLUDE_PATTERNS=("${DEFAULT_EXCLUDE_PATTERNS[@]:-}")
   DEFAULT_COMPRESSION="${DEFAULT_COMPRESSION:-gzip}"
   DEFAULT_ARCHIVE_PATH="${DEFAULT_ARCHIVE_PATH:-/tmp/coder-archive.tar.gz}"
@@ -112,8 +111,8 @@ create_archive() {
   log "Creating archive:"
   log "  Compression: $compression"
   log "  Directory:   $directory"
-  log "  Path:        $file"
-  log "  Include:     ${DEFAULT_PATHS[*]}"
+  log "  Archive:     $file"
+  log "  Paths:       ${DEFAULT_PATHS[*]}"
   log "  Exclude:     ${DEFAULT_EXCLUDE_PATTERNS[*]}"
 
   local -a tar_opts=(-c -f "$file" -C "$directory")
@@ -130,18 +129,14 @@ create_archive() {
       ;;
   esac
 
-  for path in "${DEFAULT_INCLUDE_PATTERNS[@]}"; do
-    tar_opts+=(--include="$path")
-  done
-
   for path in "${DEFAULT_EXCLUDE_PATTERNS[@]}"; do
-    tar_opts+=(--exclude="$path")
+    tar_opts+=(--exclude "$path")
   done
 
   umask 077
   tar "${tar_opts[@]}" "${DEFAULT_PATHS[@]}"
 
-  printf '%s\n' "$name"
+  printf '%s\n' "$file"
 }
 
 usage_extract_archive() {
@@ -216,7 +211,6 @@ extract_archive() {
   log "  Compression: $compression"
   log "  Directory:   $directory"
   log "  Path:        $file"
-  log "  Include:     ${DEFAULT_PATHS[*]}"
   log "  Exclude:     ${DEFAULT_EXCLUDE_PATTERNS[*]}"
 
   # Create archive with appropriate compression, passing paths as separate args to handle spaces safely
@@ -236,12 +230,8 @@ extract_archive() {
       ;;
   esac
 
-  for path in "${DEFAULT_INCLUDE_PATTERNS[@]}"; do
-    tar_opts+=(--include="$path")
-  done
-
   for path in "${DEFAULT_EXCLUDE_PATTERNS[@]}"; do
-    tar_opts+=(--exclude="$path")
+    tar_opts+=(--exclude "$path")
   done
 
   umask 077