Feedback

* Simplify if else * Make ParseServiceTags private
crazy-max · Sep 11, 2023 · d759c96 · d759c96
1 parent 80f214b
commit d759c96
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/internal/provider/common.go b/internal/provider/common.go
@@ -65,11 +65,11 @@ func ValidateImage(image string, metadata, labels map[string]string, watchByDef
 		case key == "diun.regopt":
 			img.RegOpt = value
 		case key == "diun.watch_repo":
-			var watchRepo bool
-			if watchRepo, err = strconv.ParseBool(value); err != nil {
+			if watchRepo, err := strconv.ParseBool(value); err == nil {
+				img.WatchRepo = &watchRepo
+			} else {
 				return img, fmt.Errorf("cannot parse %q value of label %s: %w", value, key, ErrInvalidLabel)
 			}
-			img.WatchRepo = &watchRepo
 		case key == "diun.notify_on":
 			if len(value) == 0 {
 				break

diff --git a/internal/provider/nomad/task.go b/internal/provider/nomad/task.go
@@ -9,7 +9,7 @@ import (
 	nomad "github.com/hashicorp/nomad/api"
 )
 
-func ParseServiceTags(tags []string) map[string]string {
+func parseServiceTags(tags []string) map[string]string {
 	labels := map[string]string{}
 
 	for _, tag := range tags {
@@ -61,7 +61,7 @@ func (c *Client) listTaskImages() []model.Image {
 			groupLabels = provider.UpdateMap(groupLabels, taskGroup.Meta)
 
 			for _, service := range taskGroup.Services {
-				groupLabels = provider.UpdateMap(groupLabels, ParseServiceTags(service.Tags))
+				groupLabels = provider.UpdateMap(groupLabels, parseServiceTags(service.Tags))
 			}
 
 			for _, task := range taskGroup.Tasks {
@@ -84,7 +84,7 @@ func (c *Client) listTaskImages() []model.Image {
 					labels := map[string]string{}
 					labels = provider.UpdateMap(labels, groupLabels)
 					for _, service := range task.Services {
-						labels = provider.UpdateMap(labels, ParseServiceTags(service.Tags))
+						labels = provider.UpdateMap(labels, parseServiceTags(service.Tags))
 					}
 
 					// Finally, merge task meta values

diff --git a/internal/provider/nomad/task_test.go b/internal/provider/nomad/task_test.go
@@ -46,7 +46,7 @@ func TestParseServiceTags(t *testing.T) {
 	for _, tt := range testCases {
 		tt := tt
 		t.Run(tt.input[0], func(t *testing.T) {
-			result := ParseServiceTags(tt.input)
+			result := parseServiceTags(tt.input)
 			assert.Equal(t, tt.expected, result)
 		})
 	}