V1.12.4

pkg/cloudbroker/audit/filter.go

@@ -0,0 +1,81 @@
+package audit
+
+// FilterByID returns ListAudits with specified ID.
+func (la ListAudits) FilterByID(guid string) ListAudits {
+	predicate := func(ia ItemAudit) bool {
+		return ia.GUID == guid
+	}
+
+	return la.FilterFunc(predicate)
+}
+
+// FilterByCall returns ListAudits with specified call.
+func (la ListAudits) FilterByCall(call string) ListAudits {
+	predicate := func(ic ItemAudit) bool {
+		return ic.Call == call
+	}
+
+	return la.FilterFunc(predicate)
+}
+
+// FilterByCorrelationID returns ListAudits with specified correlation id.
+func (la ListAudits) FilterByCorrelationID(correlationID string) ListAudits {
+	predicate := func(ic ItemAudit) bool {
+		return ic.CorrelationID == correlationID
+	}
+
+	return la.FilterFunc(predicate)
+}
+
+// FilterByRemoteAddr returns ListAudits with specified remote address.
+func (la ListAudits) FilterByRemoteAddr(remoteAddr string) ListAudits {
+	predicate := func(ic ItemAudit) bool {
+		return ic.RemoteAddr == remoteAddr
+	}
+
+	return la.FilterFunc(predicate)
+}
+
+// FilterByUser returns ListAudits with specified user name.
+func (la ListAudits) FilterByUser(user string) ListAudits {
+	predicate := func(ic ItemAudit) bool {
+		return ic.User == user
+	}
+
+	return la.FilterFunc(predicate)
+}
+
+// FilterByStatusCode return ListAudits with specified status code.
+func (la ListAudits) FilterByStatusCode(statusCode uint64) ListAudits {
+	predicate := func(ic ItemAudit) bool {
+		return ic.StatusCode == statusCode
+	}
+
+	return la.FilterFunc(predicate)
+
+}
+
+// FilterFunc allows filtering ListAudits based on a user-specified predicate.
+func (la ListAudits) FilterFunc(predicate func(ItemAudit) bool) ListAudits {
+	var result ListAudits
+
+	for _, item := range la.Data {
+		if predicate(item) {
+			result.Data = append(result.Data, item)
+		}
+	}
+
+	result.EntryCount = uint64(len(result.Data))
+
+	return result
+}
+
+// FindOne returns first found ItemAudit
+// If none was found, returns an empty struct.
+func (la ListAudits) FindOne() ItemAudit {
+	if len(la.Data) == 0 {
+		return ItemAudit{}
+	}
+
+	return la.Data[0]
+}

pkg/cloudbroker/audit/filter_test.go

@@ -0,0 +1,115 @@
+package audit
+
+import (
+	"testing"
+)
+
+var audits = ListAudits{
+	Data: []ItemAudit{
+		{
+			Args:          "[]",
+			Call:          "/restmachine/cloudapi/audit/linkedJobs",
+			GUID:          "550e8400-e29b-41d4-a716-446655440001",
+			CorrelationID: "550e8400-e29b-41d4-a716-446655440001",
+			Kwargs:        `{\"audit_guid\":\"dd8623a1-a887-48c1-a500-c10210d404cf\"}`,
+			RemoteAddr:    "192.168.1.100",
+			ResponseTime:  1,
+			Result:        `[]`,
+			StatusCode:    200,
+			Timestamp:     1640995200,
+			TimestampEnd:  1640995201,
+			User:          "test@example.com",
+			TTL:           "2025-07-31T14:22:57.028000",
+		},
+		{
+			Args:          "[]",
+			Call:          "/restmachine/cloudapi/audit/test",
+			GUID:          "550e8400-e29b-41d4-a716-446655440002",
+			CorrelationID: "550e8400-e29b-41d4-a716-446655440002",
+			Kwargs:        `{\"audit_guid\":\"dd8623a1-a887-48c1-a500-c10210d404cf\"}`,
+			RemoteAddr:    "192.168.1.105",
+			ResponseTime:  5,
+			Result:        `[]`,
+			StatusCode:    400,
+			Timestamp:     1640995200,
+			TimestampEnd:  1640995201,
+			User:          "test2@example.com",
+			TTL:           "2025-07-31T14:22:57.028000",
+		},
+	},
+	EntryCount: 2,
+}
+
+func TestFilterByID(t *testing.T) {
+	actual := audits.FilterByID("550e8400-e29b-41d4-a716-446655440002").FindOne()
+
+	if actual.GUID != "550e8400-e29b-41d4-a716-446655440002" {
+		t.Fatal("expected GUID 550e8400-e29b-41d4-a716-446655440002, found: ", actual.GUID)
+	}
+
+	actualEmpty := audits.FilterByID("")
+
+	if len(actualEmpty.Data) != 0 {
+		t.Fatal("expected empty, actual: ", len(actualEmpty.Data))
+	}
+}
+
+func TestFilterByCorrelationID(t *testing.T) {
+	actual := audits.FilterByCorrelationID("550e8400-e29b-41d4-a716-446655440002").FindOne()
+
+	if actual.CorrelationID != "550e8400-e29b-41d4-a716-446655440002" {
+		t.Fatal("expected GUID 550e8400-e29b-41d4-a716-446655440002, found: ", actual.CorrelationID)
+	}
+
+	actualEmpty := audits.FilterByCorrelationID("")
+
+	if len(actualEmpty.Data) != 0 {
+		t.Fatal("expected empty, actual: ", len(actualEmpty.Data))
+	}
+}
+
+func TestFilterByRemoteAddr(t *testing.T) {
+	actual := audits.FilterByRemoteAddr("192.168.1.100").FindOne()
+
+	if actual.RemoteAddr != "192.168.1.100" {
+		t.Fatal("expected remote address 192.168.1.100, found: ", actual.RemoteAddr)
+	}
+
+	actualEmpty := audits.FilterByRemoteAddr("")
+
+	if len(actualEmpty.Data) != 0 {
+		t.Fatal("expected empty, actual: ", len(actualEmpty.Data))
+	}
+}
+
+func TestFilterByUser(t *testing.T) {
+	actual := audits.FilterByUser("test@example.com").FindOne()
+
+	if actual.User != "test@example.com" {
+		t.Fatal("expected user test@example.com, found: ", actual.RemoteAddr)
+	}
+
+	actualEmpty := audits.FilterByUser("")
+
+	if len(actualEmpty.Data) != 0 {
+		t.Fatal("expected empty, actual: ", len(actualEmpty.Data))
+	}
+}
+
+func TestFilterByCall(t *testing.T) {
+	actual := audits.FilterByCall("/restmachine/cloudapi/audit/test").FindOne()
+
+	if actual.Call != "/restmachine/cloudapi/audit/test" {
+		t.Fatal("expected call /restmachine/cloudapi/audit/test, found: ", actual.Call)
+	}
+}
+
+func TestFilterByStatusCode(t *testing.T) {
+	actual := audits.FilterByStatusCode(200)
+
+	for _, item := range actual.Data {
+		if item.StatusCode != 200 {
+			t.Fatal("expected 200 status code, found: ", item.StatusCode)
+		}
+	}
+}

pkg/cloudbroker/audit/list.go

@@ -50,6 +50,50 @@ type ListRequest struct {
 	// Page size
 	// Required: false
 	Size uint64 `url:"size,omitempty" json:"size,omitempty"`
+
+	// Find by resource group id
+	// Required: false
+	RGID uint64 `url:"resgroup_id,omitempty" json:"resgroup_id,omitempty"`
+
+	// Find by compute id
+	// Required: false
+	ComputeID uint64 `url:"compute_id,omitempty" json:"compute_id,omitempty"`
+
+	// Find by account id
+	// Required: false
+	AccountID uint64 `url:"account_id,omitempty" json:"account_id,omitempty"`
+
+	// Find by vins id
+	// Required: false
+	VINSID uint64 `url:"vins_id,omitempty" json:"vins_id,omitempty"`
+
+	// Find by service id
+	// Required: false
+	ServiceID uint64 `url:"service_id,omitempty" json:"service_id,omitempty"`
+
+	// Find by k8s id
+	// Required: false
+	K8SID uint64 `url:"k8s_id,omitempty" json:"k8s_id,omitempty"`
+
+	// Find by flipgroup id
+	// Required: false
+	FLIPGroupID uint64 `url:"flipgroup_id,omitempty" json:"flipgroup_id,omitempty"`
+
+	// Find by load balancer id
+	// Required: false
+	LBID uint64 `url:"lb_id,omitempty" json:"lb_id,omitempty"`
+
+	// Find by sep id
+	// Required: false
+	SEPID uint64 `url:"sep_id,omitempty" json:"sep_id,omitempty"`
+
+	// Find by node id
+	// Required: false
+	NodeID uint64 `url:"node_id,omitempty" json:"node_id,omitempty"`
+
+	// Exclude audit lines from response
+	// Required: false
+	ExcludeAuditLines bool `url:"exclude_audit_lines,omitempty" json:"exclude_audit_lines,omitempty"`
 }
 
 // List gets audit records for the specified account object

pkg/cloudbroker/audit/models.go

@@ -40,9 +40,6 @@ type ItemAudit struct {
 
 	// TTL
 	TTL string `json:"_ttl"`
-
-	// Tags
-	Tags string `json:"tags"`
 }
 
 // List of audits