removeJobs now searches for existing scheduled jobs to remove

commands_schedule.go

@@ -70,30 +70,44 @@ func createSchedule(_ io.Writer, ctx commandContext) error {
 }
 
 func removeSchedule(_ io.Writer, ctx commandContext) error {
+	var err error
 	c := ctx.config
 	flags := ctx.flags
 	args := ctx.request.arguments
 
-	// Unschedule all jobs of all selected profiles
-	for _, profileName := range selectProfilesAndGroups(c, flags, args) {
-		profileFlags := flagsForProfile(flags, profileName)
+	if slices.Contains(args, "--legacy") { // TODO: remove this option in the future
+		// Unschedule all jobs of all selected profiles
+		for _, profileName := range selectProfilesAndGroups(c, flags, args) {
+			profileFlags := flagsForProfile(flags, profileName)
 
-		schedulerConfig, jobs, err := getRemovableScheduleJobs(c, profileFlags)
-		if err != nil {
-			return err
-		}
+			schedulerConfig, jobs, err := getRemovableScheduleJobs(c, profileFlags)
+			if err != nil {
+				return err
+			}
 
-		err = removeJobs(schedule.NewHandler(schedulerConfig), jobs)
-		if err != nil {
-			err = retryElevated(err, flags)
-		}
-		if err != nil {
-			// we keep trying to remove the other jobs
-			clog.Error(err)
+			err = removeJobs(schedule.NewHandler(schedulerConfig), jobs)
+			if err != nil {
+				err = retryElevated(err, flags)
+			}
+			if err != nil {
+				// we keep trying to remove the other jobs
+				clog.Error(err)
+			}
 		}
+		return nil
 	}
 
-	return nil
+	profileName := ctx.request.profile
+	if slices.Contains(args, "--all") {
+		// Unschedule all jobs of all profiles
+		profileName = ""
+	}
+	schedulerConfig := schedule.NewSchedulerConfig(ctx.global)
+	err = removeScheduledJobs(schedule.NewHandler(schedulerConfig), ctx.config.GetConfigFile(), profileName)
+	if err != nil {
+		err = retryElevated(err, flags)
+	}
+	return err
 }
 
 func statusSchedule(w io.Writer, ctx commandContext) error {

schedule_jobs.go

@@ -93,6 +93,36 @@ func removeJobs(handler schedule.Handler, configs []*config.Schedule) error {
 	return nil
 }
 
+func removeScheduledJobs(handler schedule.Handler, configFile, profileName string) error {
+	err := handler.Init()
+	if err != nil {
+		return err
+	}
+	defer handler.Close()
+
+	clog.Debugf("looking up schedules from configuration file %s", configFile)
+	configs, err := handler.Scheduled(profileName)
+	if err != nil {
+		return err
+	}
+	if len(configs) == 0 {
+		clog.Info("no scheduled jobs found")
+		return nil
+	}
+	for _, cfg := range configs {
+		if cfg.ConfigFile != configFile {
+			clog.Debugf("skipping job %s/%s from configuration file %s", cfg.ProfileName, cfg.CommandName, cfg.ConfigFile)
+			continue
+		}
+		err = handler.RemoveJob(&cfg, cfg.Permission)
+		if err != nil {
+			clog.Error(err)
+		}
+		clog.Infof("scheduled job %s/%s removed", cfg.ProfileName, cfg.CommandName)
+	}
+	return nil
+}
+
 func statusJobs(handler schedule.Handler, profileName string, configs []*config.Schedule) error {
 	err := handler.Init()
 	if err != nil {

schedule_jobs_test.go

@@ -199,3 +199,72 @@ func TestStatusRemoveOnlyJob(t *testing.T) {
 	err := statusJobs(handler, "profile", []*config.Schedule{scheduleConfig})
 	assert.Error(t, err)
 }
+
+func TestRemoveScheduledJobs(t *testing.T) {
+	testCases := []struct {
+		removeProfileName string
+		fromConfigFile    string
+		scheduledConfigs  []schedule.Config
+		removedConfigs    []schedule.Config
+		permission        string
+	}{
+		{
+			removeProfileName: "profile_no_config",
+			fromConfigFile:    "configFile",
+			scheduledConfigs:  []schedule.Config{},
+			removedConfigs:    []schedule.Config{},
+			permission:        "user",
+		},
+		{
+			removeProfileName: "profile_one_config_to_remove",
+			fromConfigFile:    "configFile",
+			scheduledConfigs: []schedule.Config{
+				{
+					ProfileName: "profile_one_config_to_remove",
+					CommandName: "backup",
+					ConfigFile:  "configFile",
+					Permission:  "user",
+				},
+			},
+			removedConfigs: []schedule.Config{
+				{
+					ProfileName: "profile_one_config_to_remove",
+					CommandName: "backup",
+					ConfigFile:  "configFile",
+					Permission:  "user",
+				},
+			},
+			permission: "user",
+		},
+		{
+			removeProfileName: "profile_different_config_file",
+			fromConfigFile:    "configFile",
+			scheduledConfigs: []schedule.Config{
+				{
+					ProfileName: "profile_different_config_file",
+					CommandName: "backup",
+					ConfigFile:  "other_configFile",
+					Permission:  "user",
+				},
+			},
+			removedConfigs: []schedule.Config{},
+			permission:     "user",
+		},
+	}
+
+	for _, tc := range testCases {
+		t.Run(tc.removeProfileName, func(t *testing.T) {
+			handler := mocks.NewHandler(t)
+			handler.EXPECT().Init().Return(nil)
+			handler.EXPECT().Close()
+
+			handler.EXPECT().Scheduled(tc.removeProfileName).Return(tc.scheduledConfigs, nil)
+			for _, cfg := range tc.removedConfigs {
+				handler.EXPECT().RemoveJob(&cfg, tc.permission).Return(nil)
+			}
+
+			err := removeScheduledJobs(handler, tc.fromConfigFile, tc.removeProfileName)
+			assert.NoError(t, err)
+		})
+	}
+}

systemd/read.go

@@ -44,7 +44,7 @@ func Read(unit string, unitType UnitType) (*Config, error) {
 		IOSchedulingClass:    getIntegerValue(serviceSections, "Service", "IOSchedulingClass"),
 		IOSchedulingPriority: getIntegerValue(serviceSections, "Service", "IOSchedulingPriority"),
 		Schedules:            getValues(timerSections, "Timer", "OnCalendar"),
-		Priority:             "background", //TODO fix this hard-coded value
+		Priority:             "background", // TODO fix this hard-coded value
 	}
 	return cfg, nil
 }