Merge branch 'main' into project_in_access_key

Author: estellesoulard

core/human/marshal.go

@@ -26,6 +26,14 @@ type Marshaler interface {
 	MarshalHuman() (string, error)
 }
 
+// Validates fields containing <index> placeholders
+func validateIndexedField(t reflect.Type, fieldName string) error {
+	testFieldName := strings.ReplaceAll(fieldName, "<index>", "0")
+	_, err := gofields.GetType(t, testFieldName)
+
+	return err
+}
+
 func Marshal(data any, opt *MarshalOpt) (string, error) {
 	if opt == nil {
 		opt = &MarshalOpt{}
@@ -298,11 +306,20 @@ func marshalSlice(slice reflect.Value, opt *MarshalOpt) (string, error) {
 
 	// Validate that all field exist
 	for _, f := range opt.Fields {
-		_, err := gofields.GetType(itemType, f.FieldName)
-		if err != nil {
-			return "", &UnknownFieldError{
-				FieldName:   f.FieldName,
-				ValidFields: gofields.ListFields(itemType),
+		if strings.Contains(f.FieldName, "<index>") {
+			if err := validateIndexedField(itemType, f.FieldName); err != nil {
+				return "", &UnknownFieldError{
+					FieldName:   f.FieldName,
+					ValidFields: gofields.ListFields(itemType),
+				}
+			}
+		} else {
+			_, err := gofields.GetType(itemType, f.FieldName)
+			if err != nil {
+				return "", &UnknownFieldError{
+					FieldName:   f.FieldName,
+					ValidFields: gofields.ListFields(itemType),
+				}
 			}
 		}
 	}

internal/namespaces/audit_trail/v1alpha1/custom_event.go

@@ -16,7 +16,7 @@ func eventListBuilder(c *core.Command) *core.Command {
 			},
 			{
 				Label:     "Name",
-				FieldName: "Resource.Name",
+				FieldName: "Resources.<index>.Name",
 			},
 			{
 				Label:     "StatusCode",
@@ -64,19 +64,11 @@ func eventListBuilder(c *core.Command) *core.Command {
 			},
 			{
 				Label:     "Type",
-				FieldName: "Resource.Type",
+				FieldName: "Resources.<index>.Type",
 			},
 			{
 				Label:     "ResourceID",
-				FieldName: "Resource.ID",
-			},
-			{
-				Label:     "Resource Created At",
-				FieldName: "Resource.CreatedAt",
-			},
-			{
-				Label:     "Resource Updated At",
-				FieldName: "Resource.UpdatedAt",
+				FieldName: "Resources.<index>.ID",
 			},
 		},
 	}