Skip to content

feat(clusters): add force param to cluster purge endpoint #345

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonra82 merged 1 commit into from
Aug 4, 2026
Merged

feat(clusters): add force param to cluster purge endpoint #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions internal/apiservices/clustersservice/clusters_purge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,12 @@ type PurgeResult struct {
//
// The clusterid required for the v1 resources collection is resolved from the
// cluster document. ErrClusterNotFound is returned if no cluster matches uid.
func PurgeClusterByUid(ctx context.Context, uid string) (PurgeResult, error) {
//
// force skips the recent-activity safety check. Intended for controlled
// decommissioning where the caller has already verified the cluster's agents
// are stopped (e.g. pre-cluster-delete tooling); external reporters may keep
// refreshing lastobserved long after the cluster itself is being torn down.
func PurgeClusterByUid(ctx context.Context, uid string, force bool) (PurgeResult, error) {
ctx, span := rortracer.StartSpan(ctx, "clustersservice.PurgeClusterByUid")
defer span.End()

Expand Down Expand Up @@ -95,11 +100,19 @@ func PurgeClusterByUid(ctx context.Context, uid string) (PurgeResult, error) {
lastReport = lastSeenV2
}
if !lastReport.IsZero() && time.Since(lastReport) < clusterInactivityThreshold {
return result, fmt.Errorf("%w: last reported %s ago (v1: %s, v2: %s)",
ErrClusterRecentlyActive,
time.Since(lastReport).Round(time.Second),
formatReportTime(clusterDoc.LastObserved),
formatReportTime(lastSeenV2),
if !force {
return result, fmt.Errorf("%w: last reported %s ago (v1: %s, v2: %s)",
ErrClusterRecentlyActive,
time.Since(lastReport).Round(time.Second),
formatReportTime(clusterDoc.LastObserved),
formatReportTime(lastSeenV2),
)
}
rlog.Warnc(ctx, "force purge: skipping recent-activity check",
rlog.String("uid", uid),
rlog.String("clusterid", clusterDoc.ClusterId),
rlog.String("last report v1", formatReportTime(clusterDoc.LastObserved)),
rlog.String("last report v2", formatReportTime(lastSeenV2)),
)
}

Expand Down
10 changes: 8 additions & 2 deletions internal/controllers/clusterscontroller/clusters_controller_delete.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package clusterscontroller
import (
"errors"
"net/http"
"strconv"

"github.com/NorskHelsenett/ror-api/internal/acl/aclservice"
"github.com/NorskHelsenett/ror-api/internal/apiservices/clustersservice"
Expand All @@ -26,7 +27,8 @@ import (
// @Tags clusters
// @Accept application/json
// @Produce application/json
// @Param uid path string true "cluster uid"
// @Param uid path string true "cluster uid"
// @Param force query bool false "skip the recent-activity safety check; for controlled decommissioning where the caller has verified the cluster's agents are stopped"
// @Success 200 {object} clustersservice.PurgeResult
// @Failure 403 {string} Forbidden
// @Failure 401 {object} rorerror.ErrorData
Expand Down Expand Up @@ -58,7 +60,11 @@ func DeleteClusterByUid() gin.HandlerFunc {
return
}

result, err := clustersservice.PurgeClusterByUid(ctx, uid)
// force=true skips the recent-activity guard — restricted to callers that
// already hold ror global delete access (checked above).
force, _ := strconv.ParseBool(c.Query("force"))

result, err := clustersservice.PurgeClusterByUid(ctx, uid, force)
if err != nil {
if errors.Is(err, clustersservice.ErrClusterNotFound) {
c.JSON(http.StatusNotFound, "404: Cluster not found")
Expand Down
Loading