PR Feedback

Author: aphralG

internal/resource/resource_plugin.go

@@ -94,7 +94,7 @@ func (r *Resource) Process(ctx context.Context, msg *bus.Message) {
 
 			return
 		}
-		resource := r.resourceService.UpdateInstances(instanceList)
+		resource := r.resourceService.UpdateInstances(ctx, instanceList)
 
 		r.messagePipe.Process(ctx, &bus.Message{Topic: bus.ResourceUpdateTopic, Data: resource})
 
@@ -107,7 +107,7 @@ func (r *Resource) Process(ctx context.Context, msg *bus.Message) {
 
 			return
 		}
-		resource := r.resourceService.DeleteInstances(instanceList)
+		resource := r.resourceService.DeleteInstances(ctx, instanceList)
 
 		r.messagePipe.Process(ctx, &bus.Message{Topic: bus.ResourceUpdateTopic, Data: resource})
 

internal/resource/resource_service.go

@@ -44,8 +44,8 @@ const (
 
 type resourceServiceInterface interface {
 	AddInstances(instanceList []*mpi.Instance) *mpi.Resource
-	UpdateInstances(instanceList []*mpi.Instance) *mpi.Resource
-	DeleteInstances(instanceList []*mpi.Instance) *mpi.Resource
+	UpdateInstances(ctx context.Context, instanceList []*mpi.Instance) *mpi.Resource
+	DeleteInstances(ctx context.Context, instanceList []*mpi.Instance) *mpi.Resource
 	ApplyConfig(ctx context.Context, instanceID string) error
 	Instance(instanceID string) *mpi.Instance
 	GetHTTPUpstreamServers(ctx context.Context, instance *mpi.Instance, upstreams string) ([]client.UpstreamServer,
@@ -128,7 +128,7 @@ func (r *ResourceService) RemoveOperator(instanceList []*mpi.Instance) {
 	}
 }
 
-func (r *ResourceService) UpdateInstances(instanceList []*mpi.Instance) *mpi.Resource {
+func (r *ResourceService) UpdateInstances(ctx context.Context, instanceList []*mpi.Instance) *mpi.Resource {
 	r.resourceMutex.Lock()
 	defer r.resourceMutex.Unlock()
 
@@ -144,14 +144,15 @@ func (r *ResourceService) UpdateInstances(instanceList []*mpi.Instance) *mpi.Res
 			}
 			r.resource = resourceCopy
 		} else {
-			slog.Warn("Error updating resource instances", "instances", instanceList)
+			slog.WarnContext(ctx, "Unable to clone resource while updating instances", "resource",
+				r.resource, "instances", instanceList)
 		}
 	}
 
 	return r.resource
 }
 
-func (r *ResourceService) DeleteInstances(instanceList []*mpi.Instance) *mpi.Resource {
+func (r *ResourceService) DeleteInstances(ctx context.Context, instanceList []*mpi.Instance) *mpi.Resource {
 	r.resourceMutex.Lock()
 	defer r.resourceMutex.Unlock()
 
@@ -164,7 +165,8 @@ func (r *ResourceService) DeleteInstances(instanceList []*mpi.Instance) *mpi.Res
 				}
 			}
 		} else {
-			slog.Warn("Error deleting instances from resource", "instances", instanceList)
+			slog.WarnContext(ctx, "Unable to clone resource while deleting instances", "resource",
+				r.resource, "instances", instanceList)
 		}
 	}
 	r.RemoveOperator(instanceList)

internal/resource/resource_service_test.go

@@ -104,7 +104,7 @@ func TestResourceService_UpdateInstance(t *testing.T) {
 		t.Run(test.name, func(tt *testing.T) {
 			resourceService := NewResourceService(ctx, types.AgentConfig())
 			resourceService.resource.Instances = []*v1.Instance{protos.GetNginxOssInstance([]string{})}
-			resource := resourceService.UpdateInstances(test.instanceList)
+			resource := resourceService.UpdateInstances(ctx, test.instanceList)
 			assert.Equal(tt, test.resource.GetInstances(), resource.GetInstances())
 		})
 	}
@@ -141,7 +141,7 @@ func TestResourceService_DeleteInstance(t *testing.T) {
 				protos.GetNginxOssInstance([]string{}),
 				protos.GetNginxPlusInstance([]string{}),
 			}
-			resource := resourceService.DeleteInstances(test.instanceList)
+			resource := resourceService.DeleteInstances(ctx, test.instanceList)
 			assert.Equal(tt, test.resource.GetInstances(), resource.GetInstances())
 		})
 	}