[patch] Forward package publish lock settings (#18)

Author: libops-agent

.github/workflows/package-lock-test.yaml

@@ -3,16 +3,20 @@ name: package-lock-test
 on:
   pull_request:
     paths:
+      - "Makefile"
       - "scripts/publish-package-repo.sh"
       - "scripts/test-publish-cache-control.sh"
+      - "scripts/test-make-lock-env.sh"
       - "scripts/test-publish-lock.sh"
       - ".github/workflows/package-lock-test.yaml"
   push:
     branches:
       - main
     paths:
+      - "Makefile"
       - "scripts/publish-package-repo.sh"
       - "scripts/test-publish-cache-control.sh"
+      - "scripts/test-make-lock-env.sh"
       - "scripts/test-publish-lock.sh"
       - ".github/workflows/package-lock-test.yaml"
 
@@ -35,10 +39,14 @@ jobs:
           bash -n
           scripts/publish-package-repo.sh
           scripts/test-publish-cache-control.sh
+          scripts/test-make-lock-env.sh
           scripts/test-publish-lock.sh
 
       - name: Test cache-control upload contract
         run: bash scripts/test-publish-cache-control.sh
 
       - name: Test lock handoff race
         run: bash scripts/test-publish-lock.sh
+
+      - name: Test lock configuration forwarding
+        run: bash scripts/test-make-lock-env.sh

Makefile

@@ -23,6 +23,10 @@ APTLY_ORIGIN ?= libops
 RPM_REPOSITORY_PATH ?= rpm
 CDN_URL_MAP ?= packages-url-map
 CDN_INVALIDATE_CACHE ?= true
+LOCK_TIMEOUT_SECONDS ?= 600
+LOCK_STALE_SECONDS ?= 600
+LOCK_POLL_SECONDS ?= 5
+LOCK_HEARTBEAT_SECONDS ?= 60
 PACKAGE_REPO_STAGE_DIR ?= $(ROOT_DIR)/.out/$(PACKAGE_NAME)/$(RELEASE_VERSION)
 PACKAGE_TOOLS_IMAGE ?= ghcr.io/libops/terraform-linux-packages:main
 HOST_GCLOUD_CONFIG ?= $(if $(CLOUDSDK_CONFIG),$(CLOUDSDK_CONFIG),$(HOME)/.config/gcloud)
@@ -146,6 +150,10 @@ publish-package-repo:
 		-e RPM_REPOSITORY_PATH="$(RPM_REPOSITORY_PATH)" \
 		-e CDN_URL_MAP="$(CDN_URL_MAP)" \
 		-e CDN_INVALIDATE_CACHE="$(CDN_INVALIDATE_CACHE)" \
+		-e LOCK_TIMEOUT_SECONDS="$(LOCK_TIMEOUT_SECONDS)" \
+		-e LOCK_STALE_SECONDS="$(LOCK_STALE_SECONDS)" \
+		-e LOCK_POLL_SECONDS="$(LOCK_POLL_SECONDS)" \
+		-e LOCK_HEARTBEAT_SECONDS="$(LOCK_HEARTBEAT_SECONDS)" \
 		-e PACKAGE_REPO_STAGE_DIR="$(PACKAGE_REPO_STAGE_DIR)" \
 		"$(PACKAGE_TOOLS_IMAGE)" \
 		/bin/bash /workspace/terraform-linux-packages/scripts/publish-package-repo.sh

scripts/test-make-lock-env.sh

@@ -0,0 +1,54 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+repo_root="$(cd "$(dirname "$0")/.." && pwd)"
+tmp="$(mktemp -d "${TMPDIR:-/tmp}/package-lock-env-test.XXXXXX")"
+trap 'rm -rf "$tmp"' EXIT
+
+mkdir -p "$tmp/bin" "$tmp/dist" "$tmp/gcloud" "$tmp/stage"
+
+cat >"$tmp/bin/docker" <<'MOCK'
+#!/usr/bin/env bash
+set -euo pipefail
+
+if [ "${1:-}" = "image" ] && [ "${2:-}" = "inspect" ]; then
+  exit 0
+fi
+
+if [ "${1:-}" != "run" ]; then
+  printf 'Unexpected docker invocation: %s\n' "$*" >&2
+  exit 1
+fi
+
+printf '%s\n' "$@" >"${MOCK_DOCKER_ARGS:?}"
+MOCK
+chmod +x "$tmp/bin/docker"
+
+PATH="$tmp/bin:$PATH" \
+MOCK_DOCKER_ARGS="$tmp/docker-args" \
+make --no-print-directory -C "$repo_root" publish-package-repo \
+  PACKAGE_NAME=sitectl-test \
+  RELEASE_VERSION=v1.2.3 \
+  GCLOUD_PROJECT=test-project \
+  GCS_BUCKET=test-bucket \
+  APTLY_GPG_KEY_ID=test-key \
+  DIST_DIR="$tmp/dist" \
+  PACKAGE_REPO_STAGE_DIR="$tmp/stage" \
+  HOST_GCLOUD_CONFIG="$tmp/gcloud" \
+  PACKAGE_TOOLS_IMAGE=test-image \
+  LOCK_TIMEOUT_SECONDS=7200 \
+  LOCK_STALE_SECONDS=900 \
+  LOCK_POLL_SECONDS=7 \
+  LOCK_HEARTBEAT_SECONDS=30
+
+for expected in \
+  LOCK_TIMEOUT_SECONDS=7200 \
+  LOCK_STALE_SECONDS=900 \
+  LOCK_POLL_SECONDS=7 \
+  LOCK_HEARTBEAT_SECONDS=30; do
+  if ! grep -Fxq "$expected" "$tmp/docker-args"; then
+    printf 'Docker invocation did not forward %s\n' "$expected" >&2
+    exit 1
+  fi
+done