clean up

denik · denik · commit 9cb62616f757 · 2025-11-27T16:10:10.000+01:00
diff --git a/bundle/direct/dresources/adapter.go b/bundle/direct/dresources/adapter.go
@@ -86,7 +86,7 @@ type IResource interface {
 
 	// [Optional] KeyedSlices returns a map from path patterns to KeyFunc for comparing slices by key instead of by index.
 	// Example: func (*ResourcePermissions) KeyedSlices(state *PermissionsState) map[string]any
-	KeyedSlices(state any) map[string]any
+	KeyedSlices() map[string]any
 }
 
 // Adapter wraps resource implementation, validates signatures and type consistency across methods
@@ -202,18 +202,7 @@ func loadFieldTriggers(triggerCall *calladapt.BoundCaller, isLocal bool) (map[st
 
 // loadKeyedSlices validates and calls KeyedSlices method, returning the resulting map.
 func loadKeyedSlices(call *calladapt.BoundCaller) (map[string]any, error) {
-	// Validate signature: func(stateType) map[string]any
-	if len(call.InTypes) != 1 {
-		return nil, fmt.Errorf("KeyedSlices must take exactly 1 parameter, got %d", len(call.InTypes))
-	}
-	expectedReturnType := reflect.TypeOf(map[string]any{})
-	if len(call.OutTypes) != 1 || call.OutTypes[0] != expectedReturnType {
-		return nil, fmt.Errorf("KeyedSlices must return map[string]any, got %v", call.OutTypes)
-	}
-
-	// Create a nil pointer of the expected type (KeyedSlices implementations should not depend on the state value)
-	nilArg := reflect.Zero(call.InTypes[0]).Interface()
-	outs, err := call.Call(nilArg)
+	outs, err := call.Call()
 	if err != nil {
 		return nil, fmt.Errorf("failed to call KeyedSlices: %w", err)
 	}
diff --git a/bundle/direct/dresources/permissions.go b/bundle/direct/dresources/permissions.go
@@ -98,7 +98,7 @@ func accessControlRequestKey(x iam.AccessControlRequest) (string, string) {
 	return "", ""
 }
 
-func (*ResourcePermissions) KeyedSlices(s *PermissionsState) map[string]any {
+func (*ResourcePermissions) KeyedSlices() map[string]any {
 	return map[string]any{
 		"permissions": accessControlRequestKey,
 	}

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ func accessControlRequestKey(x iam.AccessControlRequest) (string, string) {`
`98`	`98`	`return "", ""`
`99`	`99`	`}`
`100`	`100`
`101`		`-func (ResourcePermissions) KeyedSlices(s PermissionsState) map[string]any {`
	`101`	`+func (*ResourcePermissions) KeyedSlices() map[string]any {`
`102`	`102`	`return map[string]any{`
`103`	`103`	`"permissions": accessControlRequestKey,`
`104`	`104`	`}`