Merge pull request #49 from joshlopes/main

Prevent deletion of jobs
PremoWeb · Nov 10, 2022 · cff87dc · cff87dc
2 parents ea4533d + a04d26a
commit cff87dc
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 11 deletions.
diff --git a/cli/config.go b/cli/config.go
@@ -119,6 +119,11 @@ func (c *Config) dockerLabelsUpdate(labels map[string]map[string]string) {
 
 	// Calculate the delta
 	for name, j := range c.ExecJobs {
+		// this prevents deletion of jobs that were added by reading a configuration file
+		if !j.FromDockerLabel {
+			continue
+		}
+
 		found := false
 		for newJobsName, newJob := range parsedLabelConfig.ExecJobs {
 			// Check if the schedule has changed
@@ -178,6 +183,7 @@ type ExecJobConfig struct {
 	middlewares.SaveConfig    `mapstructure:",squash"`
 	middlewares.MailConfig    `mapstructure:",squash"`
 	middlewares.GotifyConfig  `mapstructure:",squash"`
+	FromDockerLabel bool `mapstructure:"fromDockerLabel"`
 }
 
 func (c *ExecJobConfig) buildMiddlewares() {

diff --git a/cli/config_test.go b/cli/config_test.go
@@ -190,17 +190,25 @@ func (s *SuiteConfig) TestLabelsConfig(c *C) {
 			},
 			ExpectedConfig: Config{
 				ExecJobs: map[string]*ExecJobConfig{
-					"job1": &ExecJobConfig{ExecJob: core.ExecJob{BareJob: core.BareJob{
-						Schedule: "schedule1",
-						Command:  "command1",
-					}}},
-					"job2": &ExecJobConfig{ExecJob: core.ExecJob{
-						BareJob: core.BareJob{
-							Schedule: "schedule2",
-							Command:  "command2",
+					"job1": &ExecJobConfig{
+						ExecJob: core.ExecJob{
+							BareJob: core.BareJob{
+								Schedule: "schedule1",
+								Command:  "command1",
+							},
 						},
-						Container: "other",
-					}},
+						FromDockerLabel: true,
+					},
+					"job2": &ExecJobConfig{
+						ExecJob: core.ExecJob{
+							BareJob: core.BareJob{
+								Schedule: "schedule2",
+								Command:  "command2",
+							},
+							Container: "other",
+						},
+						FromDockerLabel: true,
+					},
 				},
 			},
 			Comment: "Exec jobs from non-service container, saves container name to be able to exect to",
@@ -221,7 +229,8 @@ func (s *SuiteConfig) TestLabelsConfig(c *C) {
 						Schedule: "schedule1",
 						Command:  "command1",
 					}},
-						OverlapConfig: middlewares.OverlapConfig{NoOverlap: true},
+						OverlapConfig:   middlewares.OverlapConfig{NoOverlap: true},
+						FromDockerLabel: true,
 					},
 				},
 			},

diff --git a/cli/docker-labels.go b/cli/docker-labels.go
@@ -47,6 +47,7 @@ func (c *Config) buildFromDockerLabels(labels map[string]map[string]string) erro
 			case jobType == jobExec: // only job exec can be provided on the non-service container
 				if _, ok := execJobs[jobName]; !ok {
 					execJobs[jobName] = make(map[string]interface{})
+					execJobs[jobName]["fromDockerLabel"] = true
 				}
 
 				setJobParam(execJobs[jobName], jopParam, v)