[CWS] remove static defined field from generator (#21175)

DataDog · Nov 29, 2023 · c8cfd6e · c8cfd6e
1 parent d13e6ec
commit c8cfd6e
Show file tree

Hide file tree

Showing 4 changed files with 2,504 additions and 3,865 deletions.
diff --git a/pkg/security/secl/compiler/generators/accessors/accessors.go b/pkg/security/secl/compiler/generators/accessors/accessors.go
@@ -740,7 +740,7 @@ func newField(allFields map[string]*common.StructField, field *common.StructFiel
 	return result
 }
 
-func generatePrefixNilChecks(allFields map[string]*common.StructField, field *common.StructField) string {
+func generatePrefixNilChecks(allFields map[string]*common.StructField, returnType string, field *common.StructField) string {
 	var fieldPath, result string
 	for _, node := range strings.Split(field.Name, ".") {
 		if fieldPath != "" {
@@ -751,7 +751,7 @@ func generatePrefixNilChecks(allFields map[string]*common.StructField, field *co
 
 		if field, ok := allFields[fieldPath]; ok {
 			if field.IsOrigTypePtr {
-				result += fmt.Sprintf("if ev.%s == nil { return zeroValue }\n", field.Name)
+				result += fmt.Sprintf("if ev.%s == nil { return %s }\n", field.Name, getDefaultValueOfType(returnType))
 			}
 		}
 	}

diff --git a/pkg/security/secl/compiler/generators/accessors/field_accessors.tmpl b/pkg/security/secl/compiler/generators/accessors/field_accessors.tmpl
@@ -32,16 +32,13 @@ import (
 
 // Get{{$pascalCaseName}} returns the value of the field, resolving if necessary
 func (ev *Event) Get{{$pascalCaseName}}() {{ $accessorReturnType }} {
-    {{ if and (ne $Field.Handler "ResolveAsync") (and (ne $Field.Handler "ResolveEventTimestamp") (ne $Field.Handler "ResolveEventTime")) }}
-        zeroValue := {{ GetDefaultValueOfType $accessorReturnType}}
-	{{ end }}
     {{if ne $Field.Event "*"}}
         if ev.GetEventType().String() != "{{$Field.Event}}" {
-            return zeroValue
+            return {{ GetDefaultValueOfType $accessorReturnType}}
         }
     {{end}}
 
-    {{$Field | GeneratePrefixNilChecks $.AllFields}}
+    {{$Field | GeneratePrefixNilChecks $.AllFields $accessorReturnType}}
 
     {{if $Field.Iterator}}
         var values {{ $accessorReturnType }}