gsadmin/PSProxmoxVE
1
0
Fork 0
mirror of https://github.com/GoodOlClint/PSProxmoxVE.git synced 2026-09-04 19:25:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: address Copilot review round 2

Browse Source 
- Update header comments: PVETEST_APITOKEN → PVETEST_PASSWORD,
  CACHE_DIR default → /opt/pve-integration
- Pin ubuntu and NFS server Docker images to SHA256 digests
- Fix cmd_all to pass version to provision and cleanup
- Keep .terraform.lock.hcl in force cleanup (provider reproducibility)
- Remove || true from terraform destroy in cleanup (propagate errors;
  use -Force for best-effort recovery)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Clint Branham
2026-03-25 16:00:16 -05:00
parent 7ffc57e16f
commit 03f6cc86eb
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/infrastructure/scripts/run-integration.sh
+8 -8
View File
@@ -27,12 +27,12 @@
# #
# Required env vars (test with pre-existing PVE): # Required env vars (test with pre-existing PVE):
# PVETEST_HOST PVE host IP (node A) # PVETEST_HOST PVE host IP (node A)
# PVETEST_APITOKEN PVE API token (node A) # PVETEST_PASSWORD Root password for the PVE instances
# Set SKIP_PROVISION=true # Set SKIP_PROVISION=true
# #
# Optional env vars: # Optional env vars:
# CACHE_DIR ISO/image cache (default: /opt/pve-isos) # CACHE_DIR ISO/image cache (default: /opt/pve-integration)
# WORK_DIR Temp dir for build artifacts (default: $RUNNER_TEMP or /tmp/pve-integration) # WORK_DIR Temp dir for build artifacts (default: $CACHE_DIR/work)
# CONFIG_FILE Test config JSON path (default: $WORK_DIR/config.json) # CONFIG_FILE Test config JSON path (default: $WORK_DIR/config.json)
# MODULE_ARTIFACT Path to built module DLLs (default: ./publish/netstandard2.0) # MODULE_ARTIFACT Path to built module DLLs (default: ./publish/netstandard2.0)
# PVE_VERSIONS Space-separated versions to provision (default: "9 8") # PVE_VERSIONS Space-separated versions to provision (default: "9 8")
@@ -584,7 +584,7 @@ cmd_cleanup() {
TF_VAR_docker_host_ip="${storage_ip:-127.0.0.1}" \ TF_VAR_docker_host_ip="${storage_ip:-127.0.0.1}" \
TF_VAR_answer_files_dir="${WORK_DIR}/answers" \ TF_VAR_answer_files_dir="${WORK_DIR}/answers" \
TF_VAR_default_answer_file="${WORK_DIR}/default-answer.toml" \ TF_VAR_default_answer_file="${WORK_DIR}/default-answer.toml" \
terraform destroy -auto-approve -input=false -var-file="$tfvars" $tf_targets) || true terraform destroy -auto-approve -input=false -var-file="$tfvars" $tf_targets)
# Clean up work directory when destroying all # Clean up work directory when destroying all
if [[ "$requested" == "all" ]]; then if [[ "$requested" == "all" ]]; then
@@ -633,10 +633,10 @@ cmd_force_cleanup() {
docker rm -f pvetest-iscsi pvetest-nfs pvetest-answer-server 2>/dev/null || true docker rm -f pvetest-iscsi pvetest-nfs pvetest-answer-server 2>/dev/null || true
docker volume rm pvetest-iscsi-data pvetest-nfs-data 2>/dev/null || true docker volume rm pvetest-iscsi-data pvetest-nfs-data 2>/dev/null || true
# Remove Terraform state so next provision starts clean # Remove Terraform state so next provision starts clean.
# Keep .terraform.lock.hcl (provider version lock) for reproducibility.
log "Removing Terraform state..." log "Removing Terraform state..."
rm -f "$INFRA_DIR/terraform.tfstate" "$INFRA_DIR/terraform.tfstate.backup" rm -f "$INFRA_DIR/terraform.tfstate" "$INFRA_DIR/terraform.tfstate.backup"
rm -f "$INFRA_DIR/.terraform.lock.hcl"
rm -rf "$INFRA_DIR/.terraform" rm -rf "$INFRA_DIR/.terraform"
# Remove work artifacts # Remove work artifacts
@@ -681,9 +681,9 @@ cmd_all() {
local test_versions="${1:-all}" local test_versions="${1:-all}"
local test_exit=0 local test_exit=0
trap 'log "Running cleanup after test run..."; cmd_cleanup || true' EXIT trap 'log "Running cleanup after test run..."; cmd_cleanup "$test_versions" || true' EXIT
cmd_provision cmd_provision "$test_versions"
cmd_test "$test_versions" || test_exit=$? cmd_test "$test_versions" || test_exit=$?
if [[ $test_exit -ne 0 ]]; then if [[ $test_exit -ne 0 ]]; then
tests/infrastructure/storage.tf
+6 -2
View File
@@ -25,7 +25,9 @@ resource "docker_container" "answer_server" {
# ── Docker images & volumes ────────────────────────────────────────── # ── Docker images & volumes ──────────────────────────────────────────
resource "docker_image" "ubuntu" { resource "docker_image" "ubuntu" {
name = "ubuntu:24.04" # Pin to digest for reproducibility. Update:
# docker pull ubuntu:24.04 && docker inspect ubuntu:24.04 --format '{{index .RepoDigests 0}}'
name = "ubuntu@sha256:186072bba1b2f436cbb91ef2567abca677337cfc786c86e107d25b7072feef0c"
} }
resource "docker_volume" "iscsi_data" { resource "docker_volume" "iscsi_data" {
@@ -85,7 +87,9 @@ resource "docker_container" "iscsi_target" {
resource "docker_container" "nfs_server" { resource "docker_container" "nfs_server" {
name = "pvetest-nfs" name = "pvetest-nfs"
image = "erichough/nfs-server:2.2.1" # Pin to digest for reproducibility. Update:
# docker pull erichough/nfs-server:2.2.1 && docker inspect erichough/nfs-server:2.2.1 --format '{{index .RepoDigests 0}}'
image = "erichough/nfs-server@sha256:1efd4ece380c5ba27479417585224ef857006daa46ab84560a28c1224bc71e9e"
privileged = true privileged = true
restart = "unless-stopped" restart = "unless-stopped"