From 21c033c144017d36898b02708cf56f4108bcf965 Mon Sep 17 00:00:00 2001 From: rcourtman Date: Wed, 26 Nov 2025 09:57:06 +0000 Subject: [PATCH] fix: remove references to deleted install-host-agent.sh script The unified agent system replaced install-host-agent.sh with install.sh. This commit updates all references: - Dockerfile: removed COPY for deleted script - router.go: serve install.sh at /install-host-agent.sh endpoint (backwards compatible) - build-release.sh: removed copy of deleted script - validate-release.sh: removed validation of deleted script - install.sh: updated script list for bare-metal installs --- Dockerfile | 1 - install.sh | 2 +- internal/api/router.go | 9 +++++---- scripts/build-release.sh | 2 -- scripts/validate-release.sh | 4 ++-- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 86ecd7e..e85a77c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -263,7 +263,6 @@ RUN chmod +x /docker-entrypoint.sh RUN mkdir -p /opt/pulse/scripts COPY scripts/install-docker-agent.sh /opt/pulse/scripts/install-docker-agent.sh COPY scripts/install-container-agent.sh /opt/pulse/scripts/install-container-agent.sh -COPY scripts/install-host-agent.sh /opt/pulse/scripts/install-host-agent.sh COPY scripts/install-host-agent.ps1 /opt/pulse/scripts/install-host-agent.ps1 COPY scripts/uninstall-host-agent.sh /opt/pulse/scripts/uninstall-host-agent.sh COPY scripts/uninstall-host-agent.ps1 /opt/pulse/scripts/uninstall-host-agent.ps1 diff --git a/install.sh b/install.sh index 3965c66..ea48c42 100755 --- a/install.sh +++ b/install.sh @@ -2737,12 +2737,12 @@ deploy_agent_scripts() { local scripts=( "install-docker-agent.sh" "install-container-agent.sh" - "install-host-agent.sh" "install-host-agent.ps1" "uninstall-host-agent.sh" "uninstall-host-agent.ps1" "install-sensor-proxy.sh" "install-docker.sh" + "install.sh" ) local deployed=0 diff --git a/internal/api/router.go b/internal/api/router.go index 8f4c9df..18bd1aa 100644 --- a/internal/api/router.go +++ b/internal/api/router.go @@ -3428,20 +3428,21 @@ func (r *Router) handleDownloadHostAgentInstallScript(w http.ResponseWriter, req w.Header().Set("Pragma", "no-cache") w.Header().Set("Expires", "0") - scriptPath := "/opt/pulse/scripts/install-host-agent.sh" + // Serve the unified install.sh script (backwards compatible with install-host-agent.sh URL) + scriptPath := "/opt/pulse/scripts/install.sh" content, err := os.ReadFile(scriptPath) if err != nil { // Fallback to project root (dev environment) - scriptPath = filepath.Join(r.projectRoot, "scripts", "install-host-agent.sh") + scriptPath = filepath.Join(r.projectRoot, "scripts", "install.sh") content, err = os.ReadFile(scriptPath) if err != nil { - log.Error().Err(err).Str("path", scriptPath).Msg("Failed to read host agent installer script") + log.Error().Err(err).Str("path", scriptPath).Msg("Failed to read unified agent installer script") http.Error(w, "Failed to read installer script", http.StatusInternalServerError) return } } - http.ServeContent(w, req, "install-host-agent.sh", time.Now(), bytes.NewReader(content)) + http.ServeContent(w, req, "install.sh", time.Now(), bytes.NewReader(content)) } // handleDownloadHostAgentInstallScriptPS serves the PowerShell installation script for Windows diff --git a/scripts/build-release.sh b/scripts/build-release.sh index f82334e..27e2541 100755 --- a/scripts/build-release.sh +++ b/scripts/build-release.sh @@ -163,7 +163,6 @@ for build_name in "${build_order[@]}"; do # Copy scripts and VERSION metadata cp "scripts/install-docker-agent.sh" "$staging_dir/scripts/install-docker-agent.sh" cp "scripts/install-container-agent.sh" "$staging_dir/scripts/install-container-agent.sh" - cp "scripts/install-host-agent.sh" "$staging_dir/scripts/install-host-agent.sh" cp "scripts/install-host-agent.ps1" "$staging_dir/scripts/install-host-agent.ps1" cp "scripts/uninstall-host-agent.sh" "$staging_dir/scripts/uninstall-host-agent.sh" cp "scripts/uninstall-host-agent.ps1" "$staging_dir/scripts/uninstall-host-agent.ps1" @@ -202,7 +201,6 @@ done cp "scripts/install-docker-agent.sh" "$universal_dir/scripts/install-docker-agent.sh" cp "scripts/install-container-agent.sh" "$universal_dir/scripts/install-container-agent.sh" -cp "scripts/install-host-agent.sh" "$universal_dir/scripts/install-host-agent.sh" cp "scripts/install-host-agent.ps1" "$universal_dir/scripts/install-host-agent.ps1" cp "scripts/uninstall-host-agent.sh" "$universal_dir/scripts/uninstall-host-agent.sh" cp "scripts/uninstall-host-agent.ps1" "$universal_dir/scripts/uninstall-host-agent.ps1" diff --git a/scripts/validate-release.sh b/scripts/validate-release.sh index 3aa1389..7f65a7e 100755 --- a/scripts/validate-release.sh +++ b/scripts/validate-release.sh @@ -130,7 +130,7 @@ if [ "$SKIP_DOCKER" = false ]; then # Validate all required scripts exist and are executable info "Checking installer/uninstaller scripts in /opt/pulse/scripts/..." - docker run --rm --entrypoint /bin/sh "$IMAGE" -c 'set -euo pipefail; cd /opt/pulse/scripts; required="install-docker-agent.sh install-container-agent.sh install-host-agent.sh install-host-agent.ps1 uninstall-host-agent.sh uninstall-host-agent.ps1 install-sensor-proxy.sh install-docker.sh install.sh"; for f in $required; do [ -f "$f" ] || { echo "missing script $f" >&2; exit 1; }; case "$f" in *.sh|*.ps1) [ -x "$f" ] || { echo "$f not executable" >&2; exit 1; };; esac; done; echo "All scripts present and executable"' || { error "Script validation failed"; exit 1; } + docker run --rm --entrypoint /bin/sh "$IMAGE" -c 'set -euo pipefail; cd /opt/pulse/scripts; required="install-docker-agent.sh install-container-agent.sh install-host-agent.ps1 uninstall-host-agent.sh uninstall-host-agent.ps1 install-sensor-proxy.sh install-docker.sh install.sh"; for f in $required; do [ -f "$f" ] || { echo "missing script $f" >&2; exit 1; }; case "$f" in *.sh|*.ps1) [ -x "$f" ] || { echo "$f not executable" >&2; exit 1; };; esac; done; echo "All scripts present and executable"' || { error "Script validation failed"; exit 1; } success "All installer/uninstaller scripts present and executable" # Validate all required binaries exist and are non-empty @@ -446,7 +446,7 @@ for arch in "${tar_arches[@]}"; do check_tar_entries_nonempty "$tarball" "${unified_agent_entries[@]}" # Check scripts - tar -tzf "$tarball" ./scripts/install-docker-agent.sh ./scripts/install-container-agent.sh ./scripts/install-host-agent.sh ./scripts/install-host-agent.ps1 ./scripts/uninstall-host-agent.sh ./scripts/uninstall-host-agent.ps1 ./scripts/install-sensor-proxy.sh ./scripts/install-docker.sh ./scripts/install.sh >/dev/null 2>&1 || { error "$(basename $tarball) missing scripts"; exit 1; } + tar -tzf "$tarball" ./scripts/install-docker-agent.sh ./scripts/install-container-agent.sh ./scripts/install-host-agent.ps1 ./scripts/uninstall-host-agent.sh ./scripts/uninstall-host-agent.ps1 ./scripts/install-sensor-proxy.sh ./scripts/install-docker.sh ./scripts/install.sh >/dev/null 2>&1 || { error "$(basename $tarball) missing scripts"; exit 1; } # Check VERSION file tar -tzf "$tarball" ./VERSION >/dev/null 2>&1 || { error "$(basename $tarball) missing VERSION file"; exit 1; }