Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ require (
github.com/stretchr/testify v1.11.1
go.uber.org/goleak v1.3.0
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8
gorm.io/driver/sqlite v1.6.0
gorm.io/gorm v1.31.2
gotest.tools/v3 v3.5.2
k8s.io/api v0.35.3
Expand Down Expand Up @@ -166,7 +167,6 @@ require (
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
gorm.io/driver/postgres v1.6.0 // indirect
gorm.io/driver/sqlite v1.6.0 // indirect
helm.sh/helm/v3 v3.20.2 // indirect
k8s.io/apiextensions-apiserver v0.35.1 // indirect
k8s.io/apiserver v0.35.1 // indirect
Expand Down
11 changes: 6 additions & 5 deletions pkg/model/model.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,12 @@ type KubernetesResource struct {
PatternResource *uuid.UUID `json:"pattern_resource"`
ComponentMetadata map[string]interface{} `json:"component_metadata" gorm:"type:bytes;serializer:json"`
// Secondary fields for configsmaps and secrets
Immutable string `json:"immutable,omitempty"`
Data string `json:"data,omitempty"`
BinaryData string `json:"binaryData,omitempty"`
StringData string `json:"stringData,omitempty"`
Type string `json:"type,omitempty"`
Immutable string `json:"immutable,omitempty"`
Data string `json:"data,omitempty"`
BinaryData string `json:"binaryData,omitempty"`
StringData string `json:"stringData,omitempty"`
Type string `json:"type,omitempty"`
DeletedAt gorm.DeletedAt `json:"-" gorm:"index"`
}
Comment thread
pontusringblom marked this conversation as resolved.
Resolved

type KubernetesKeyValue struct {
Expand Down
67 changes: 67 additions & 0 deletions pkg/model/model_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
package model

import (
"encoding/json"
"errors"
"strings"
"testing"

"gorm.io/driver/sqlite"
"gorm.io/gorm"
)

func TestKubernetesResourceSoftDelete(t *testing.T) {
db, err := gorm.Open(sqlite.Open(":memory:"), &gorm.Config{})
Comment thread
pontusringblom marked this conversation as resolved.
Resolved
if err != nil {
t.Fatalf("open test database: %v", err)
}

if err := db.AutoMigrate(&KubernetesResource{}); err != nil {
t.Fatalf("migrate KubernetesResource: %v", err)
}

resource := KubernetesResource{
ID: "resource-1",
APIVersion: "v1",
Kind: "Pod",
ClusterID: "cluster-1",
}
if err := db.Create(&resource).Error; err != nil {
t.Fatalf("create KubernetesResource: %v", err)
}

if err := db.Delete(&resource).Error; err != nil {
t.Fatalf("soft-delete KubernetesResource: %v", err)
}
if !resource.DeletedAt.Valid {
t.Fatal("expected Delete to set the tombstone timestamp")
}

t.Run("excluded from normal queries", func(t *testing.T) {
var got KubernetesResource
err := db.First(&got, "id = ?", resource.ID).Error
if !errors.Is(err, gorm.ErrRecordNotFound) {
t.Fatalf("expected gorm.ErrRecordNotFound, got %v", err)
}
})

t.Run("retained for unscoped queries", func(t *testing.T) {
var got KubernetesResource
if err := db.Unscoped().First(&got, "id = ?", resource.ID).Error; err != nil {
t.Fatalf("find tombstoned KubernetesResource: %v", err)
}
if !got.DeletedAt.Valid {
t.Fatal("expected DeletedAt to contain the tombstone timestamp")
}
})

t.Run("omitted from wire representation", func(t *testing.T) {
encoded, err := json.Marshal(resource)
if err != nil {
t.Fatalf("marshal KubernetesResource: %v", err)
}
if strings.Contains(string(encoded), "DeletedAt") || strings.Contains(string(encoded), "deletedAt") {
t.Fatalf("DeletedAt leaked into JSON: %s", encoded)
}
})
}