Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
bobgroup-go-utils
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Bob Public Utils
bobgroup-go-utils
Commits
62f2794f
Commit
62f2794f
authored
1 year ago
by
Christel Loftus
Browse files
Options
Downloads
Patches
Plain Diff
#1784 - cleanup audit events
parent
205c0d0b
No related branches found
No related tags found
1 merge request
!43
Audit changes move to utils
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
audit/audit.go
+69
-0
69 additions, 0 deletions
audit/audit.go
with
69 additions
and
0 deletions
audit/audit.go
+
69
−
0
View file @
62f2794f
...
...
@@ -4,6 +4,7 @@ import (
"encoding/json"
"fmt"
"gitlab.bob.co.za/bob-public-utils/bobgroup-go-utils/errors"
"gitlab.bob.co.za/bob-public-utils/bobgroup-go-utils/logs"
"gitlab.bob.co.za/bob-public-utils/bobgroup-go-utils/number_utils"
"reflect"
"regexp"
...
...
@@ -39,6 +40,10 @@ func VerifyAuditEvents(original interface{}, new interface{}) error {
}
func
GetChanges
(
original
interface
{},
new
interface
{})
(
map
[
string
]
interface
{},
error
)
{
// Clean audit events
cleanStruct
(
original
)
cleanStruct
(
new
)
changes
:=
map
[
string
]
interface
{}{}
changelog
,
err
:=
diff
.
Diff
(
original
,
new
)
if
err
!=
nil
{
...
...
@@ -128,6 +133,70 @@ func GetChanges(original interface{}, new interface{}) (map[string]interface{},
return
changes
,
nil
}
func
cleanStruct
(
object
interface
{})
interface
{}
{
defer
func
()
{
if
err
:=
recover
();
err
!=
nil
{
logs
.
ErrorMsg
(
fmt
.
Sprintf
(
"audit event panic: %+v"
,
err
))
}
}()
// If the object is empty, we have nothing to do
if
object
==
nil
{
return
object
}
// Convert the object to a pointer
if
reflect
.
ValueOf
(
object
)
.
Kind
()
!=
reflect
.
Ptr
{
val
:=
reflect
.
ValueOf
(
object
)
// Create a new pointer to a new value of the type of the object
ptr
:=
reflect
.
New
(
reflect
.
TypeOf
(
object
))
// Set the newly created pointer to point to the object
ptr
.
Elem
()
.
Set
(
val
)
// Overwrite the original object
object
=
ptr
.
Interface
()
}
// Get the value of the object
val
:=
reflect
.
ValueOf
(
object
)
if
val
.
Kind
()
==
reflect
.
Ptr
{
val
=
val
.
Elem
()
}
// We can only clean structs
if
val
.
Kind
()
!=
reflect
.
Struct
{
return
object
}
// Loop through the field tags to see if we should include the related object or not.
// We default to exclude, unless specified to include
for
i
:=
0
;
i
<
val
.
NumField
();
i
++
{
fieldVal
:=
val
.
Field
(
i
)
structField
:=
val
.
Type
()
.
Field
(
i
)
// Determine whether the field should be included or excluded
value
,
_
:=
structField
.
Tag
.
Lookup
(
"audit"
)
shouldIncludeForAudit
:=
value
==
"true"
shouldExcludeForAudit
:=
value
==
"false"
// If the audit tag is present and specified to 'true', we should always include the relation
if
shouldIncludeForAudit
{
continue
}
// By default, all bun relations are excluded
isBunRelationField
:=
strings
.
Contains
(
structField
.
Tag
.
Get
(
"bun"
),
"rel:"
)
if
shouldExcludeForAudit
||
isBunRelationField
{
if
fieldVal
.
CanSet
()
{
// Set the field to its zero value (nil for pointers)
fieldVal
.
Set
(
reflect
.
Zero
(
fieldVal
.
Type
()))
}
}
}
return
object
}
func
ChildObjectChanges
(
changes
map
[
string
]
interface
{},
objectPath
string
,
fieldPath
string
,
changeFrom
interface
{},
changeTo
interface
{})
{
objectKey
:=
ToSnakeCase
(
objectPath
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment