Implement DeleteReminder

Signed-off-by: Artur Souza <[email protected]>

dapr/proto/scheduler/v1/scheduler.proto

@@ -63,6 +63,7 @@ message ScheduleJobResponse {
 // JobRequest is the message used by the daprd sidecar to delete or get a job.
 message JobRequest {
 	string job_name = 1;
+	string namespace = 2;
 }
 
 message DeleteJobResponse {

pkg/actors/actors.go

@@ -1256,6 +1256,23 @@ func (a *actorsRuntime) CreateTimer(ctx context.Context, req *CreateTimerRequest
 }
 
 func (a *actorsRuntime) DeleteReminder(ctx context.Context, req *DeleteReminderRequest) error {
+	if a.scheduler != nil {
+		jobName := constructCompositeKey(
+			"reminder",
+			req.ActorType,
+			req.ActorID,
+			req.Name,
+		)
+
+		internalDeleteJobReq := &schedulerv1pb.JobRequest{
+			JobName:   jobName,
+			Namespace: a.actorsConfig.Namespace,
+		}
+
+		_, err := a.scheduler.DeleteJob(ctx, internalDeleteJobReq)
+		return err
+	}
+
 	if !a.actorsConfig.Config.HostedActorTypes.IsActorTypeHosted(req.ActorType) {
 		return ErrReminderOpActorNotHosted
 	}

pkg/api/universal/scheduler.go

@@ -55,7 +55,7 @@ func (a *Universal) ScheduleJob(ctx context.Context, inReq *runtimev1pb.Schedule
 			DueTime:  inReq.GetJob().GetDueTime(),
 			Ttl:      inReq.GetJob().GetTtl(),
 		},
-		Namespace: "",  // TODO
+		Namespace: a.globalConfig.Namespace,
 		Metadata:  nil, // TODO: this should generate key if jobStateStore is configured
 	}
 
@@ -79,7 +79,8 @@ func (a *Universal) DeleteJob(ctx context.Context, inReq *runtimev1pb.DeleteJobR
 
 	jobName := a.AppID() + "||" + inReq.GetName()
 	internalDeleteJobReq := &schedulerv1pb.JobRequest{
-		JobName: jobName,
+		JobName:   jobName,
+		Namespace: a.globalConfig.Namespace,
 	}
 
 	_, err := a.schedulerClient.DeleteJob(ctx, internalDeleteJobReq)

pkg/scheduler/server/api.go

@@ -31,7 +31,6 @@ func (s *Server) ConnectHost(context.Context, *schedulerv1pb.ConnectHostRequest)
 	return nil, fmt.Errorf("not implemented")
 }
 
-// ScheduleJob is a placeholder method that needs to be implemented
 func (s *Server) ScheduleJob(ctx context.Context, req *schedulerv1pb.ScheduleJobRequest) (*schedulerv1pb.ScheduleJobResponse, error) {
 	select {
 	case <-ctx.Done():
@@ -101,17 +100,17 @@ func (s *Server) triggerJob(ctx context.Context, metadata map[string]string, pay
 	return etcdcron.Failure, nil
 }
 
-// DeleteJob is a placeholder method that needs to be implemented
 func (s *Server) DeleteJob(ctx context.Context, req *schedulerv1pb.JobRequest) (*schedulerv1pb.DeleteJobResponse, error) {
 	select {
 	case <-ctx.Done():
 		return nil, ctx.Err()
 	case <-s.readyCh:
 	}
 
-	err := s.cron.DeleteJob(ctx, req.GetJobName())
+	jobName := composeJobName(req.GetNamespace(), req.GetJobName())
+	err := s.cron.DeleteJob(ctx, jobName)
 	if err != nil {
-		log.Errorf("error deleting job %s: %s", req.GetJobName(), err)
+		log.Errorf("error deleting job %s: %s", jobName, err)
 		return nil, err
 	}