mirror of
https://github.com/rcourtman/Pulse.git
synced 2026-07-10 00:14:38 +00:00
Dedupe internal/api handler families behind shared flows and generics
Clears the sixteen dupl pair groups in internal/api plus the pkg/pulsecli pair: - router.go: privileged settings endpoints share the serveSetupTokenOrSettingsWrite gate; patrol findings convert via one unifiedFindingFromAI; the five infrastructure-summary chart loops share collectGuestChartData / fillChartSeriesFromBatch; the VM/LXC workloads summary loops share appendGuestWorkloadSummaries. - deploy_handlers.go: preflight and job status/SSE handlers share handleDeployJobStatus / handleDeployJobEvents. - recovery_handlers.go: points series/facets share parseRecoveryListPointsOptions. - truenas_handlers.go / vmware_handlers.go / router_routes_registration.go: the connection update flow (locate, decode-with-fallback, normalize, preserve masked secrets, validate, save, redact) moves to the new platform_connection_shared.go (updatePlatformConnection + decodeOptionalInstanceRequest + the admin-gated item-route builder); per-platform wrappers carry nolint'd declarative wiring only. - docker_metadata.go / guest_metadata.go: GET/PUT payload semantics move to metadata_handlers_shared.go; the zero-record-instead-of-404 contract is pinned by TestContract_MetadataGetPayloadsUseZeroRecordsInsteadOf404. - kubernetes_agents.go / docker_agents.go: lifecycle PUTs share per-handler action helpers. - config_node_handlers.go: PBS/PMG probes share testProxmoxPlatformConnection. - cloud_handoff_handlers.go / purchase_return_redemptions.go: secrets sqlite stores open through openHardenedSecretsDB so permission hardening stays single-sourced. - ai_handlers.go / chat_service_adapter.go: the GetMessages adapters are deliberate contract mirrors — suppressed with nolint and enforced by TestOrchestratorAndChatAdaptersMapTheSameMessageFields. - pkg/pulsecli/actions.go: action subcommands seed env defaults via actionAPIDefaults (tested); the audit/events cobra registration pair is nolint'd parallel wiring. - .golangci.yml: exclude gitignored tmp/ from ./... typechecking. - subsystem_lookup_test.py: refresh the pinned api-contracts.md line numbers shifted by the contract additions. golangci-lint run ./... is now fully green. Full internal/api and pkg/pulsecli test suites pass.
This commit is contained in:
parent
26c7ca910c
commit
6340cd36f2
24 changed files with 977 additions and 1132 deletions
|
|
@ -1,6 +1,7 @@
|
|||
package api
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"net/http"
|
||||
|
|
@ -407,20 +408,29 @@ func (h *DockerAgentHandlers) HandleAllowReenroll(w http.ResponseWriter, r *http
|
|||
}
|
||||
}
|
||||
|
||||
// HandleUnhideHost unhides a previously hidden Docker / Podman host.
|
||||
func (h *DockerAgentHandlers) HandleUnhideHost(w http.ResponseWriter, r *http.Request) {
|
||||
// handleHostLifecycleAction runs the shared PUT docker host lifecycle flow:
|
||||
// resolve the agent ID from the suffixed route, apply the monitor action,
|
||||
// broadcast state, and respond. action returns the canonical host ID.
|
||||
func (h *DockerAgentHandlers) handleHostLifecycleAction(
|
||||
w http.ResponseWriter,
|
||||
r *http.Request,
|
||||
pathSuffix string,
|
||||
successMsg string,
|
||||
logMsg string,
|
||||
action func(ctx context.Context, agentID string) (string, error),
|
||||
) {
|
||||
if r.Method != http.MethodPut {
|
||||
writeErrorResponse(w, http.StatusMethodNotAllowed, "method_not_allowed", "Only PUT is allowed", nil)
|
||||
return
|
||||
}
|
||||
|
||||
agentID := dockerRuntimeAgentIDFromPath(r.URL.Path, "/unhide")
|
||||
agentID := dockerRuntimeAgentIDFromPath(r.URL.Path, pathSuffix)
|
||||
if agentID == "" {
|
||||
writeErrorResponse(w, http.StatusBadRequest, "missing_agent_id", "Agent ID is required", nil)
|
||||
return
|
||||
}
|
||||
|
||||
host, err := h.getMonitor(r.Context()).UnhideDockerHost(agentID)
|
||||
hostID, err := action(r.Context(), agentID)
|
||||
if err != nil {
|
||||
writeErrorResponse(w, http.StatusNotFound, "docker_agent_not_found", err.Error(), nil)
|
||||
return
|
||||
|
|
@ -430,41 +440,35 @@ func (h *DockerAgentHandlers) HandleUnhideHost(w http.ResponseWriter, r *http.Re
|
|||
|
||||
if err := utils.WriteJSONResponse(w, map[string]any{
|
||||
"success": true,
|
||||
"agentId": host.ID,
|
||||
"message": "Docker / Podman module unhidden",
|
||||
"agentId": hostID,
|
||||
"message": successMsg,
|
||||
}); err != nil {
|
||||
log.Error().Err(err).Msg("Failed to serialize docker host unhide response")
|
||||
log.Error().Err(err).Msg(logMsg)
|
||||
}
|
||||
}
|
||||
|
||||
// HandleUnhideHost unhides a previously hidden Docker / Podman host.
|
||||
func (h *DockerAgentHandlers) HandleUnhideHost(w http.ResponseWriter, r *http.Request) {
|
||||
h.handleHostLifecycleAction(w, r, "/unhide", "Docker / Podman module unhidden", "Failed to serialize docker host unhide response",
|
||||
func(ctx context.Context, agentID string) (string, error) {
|
||||
host, err := h.getMonitor(ctx).UnhideDockerHost(agentID)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return host.ID, nil
|
||||
})
|
||||
}
|
||||
|
||||
// HandleMarkPendingUninstall marks a Docker / Podman host as pending uninstall.
|
||||
func (h *DockerAgentHandlers) HandleMarkPendingUninstall(w http.ResponseWriter, r *http.Request) {
|
||||
if r.Method != http.MethodPut {
|
||||
writeErrorResponse(w, http.StatusMethodNotAllowed, "method_not_allowed", "Only PUT is allowed", nil)
|
||||
return
|
||||
}
|
||||
|
||||
agentID := dockerRuntimeAgentIDFromPath(r.URL.Path, "/pending-uninstall")
|
||||
if agentID == "" {
|
||||
writeErrorResponse(w, http.StatusBadRequest, "missing_agent_id", "Agent ID is required", nil)
|
||||
return
|
||||
}
|
||||
|
||||
host, err := h.getMonitor(r.Context()).MarkDockerHostPendingUninstall(agentID)
|
||||
if err != nil {
|
||||
writeErrorResponse(w, http.StatusNotFound, "docker_agent_not_found", err.Error(), nil)
|
||||
return
|
||||
}
|
||||
|
||||
h.broadcastState(r.Context())
|
||||
|
||||
if err := utils.WriteJSONResponse(w, map[string]any{
|
||||
"success": true,
|
||||
"agentId": host.ID,
|
||||
"message": "Docker / Podman module marked as pending uninstall",
|
||||
}); err != nil {
|
||||
log.Error().Err(err).Msg("Failed to serialize docker host pending uninstall response")
|
||||
}
|
||||
h.handleHostLifecycleAction(w, r, "/pending-uninstall", "Docker / Podman module marked as pending uninstall", "Failed to serialize docker host pending uninstall response",
|
||||
func(ctx context.Context, agentID string) (string, error) {
|
||||
host, err := h.getMonitor(ctx).MarkDockerHostPendingUninstall(agentID)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
return host.ID, nil
|
||||
})
|
||||
}
|
||||
|
||||
// HandleSetCustomDisplayName updates the custom display name for a Docker / Podman host.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue