adds context to run, so that we can call cancelation later

Author: ncode

cmd/run.go

@@ -16,6 +16,7 @@ limitations under the License.
 package cmd
 
 import (
+	"context"
 	"fmt"
 	"os"
 	"time"
@@ -39,6 +40,7 @@ example: tagit run -s my-super-service -x '/tmp/tag-role.sh'
 		script := cmd.PersistentFlags().Lookup("script").Value.String()
 		tagPrefix := cmd.PersistentFlags().Lookup("tag-prefix").Value.String()
 		interval := cmd.PersistentFlags().Lookup("interval").Value.String()
+		ctx := context.Background()
 
 		if serviceID == "" {
 			fmt.Println("service-id is required")
@@ -71,7 +73,7 @@ example: tagit run -s my-super-service -x '/tmp/tag-role.sh'
 		}
 
 		t := tagit.New(tagit.NewConsulAPIWrapper(consulClient), &tagit.CmdExecutor{}, serviceID, script, validInterval, tagPrefix)
-		t.Run()
+		t.Run(ctx)
 	},
 }
 

pkg/tagit/tagit.go

@@ -1,6 +1,7 @@
 package tagit
 
 import (
+	"context"
 	"fmt"
 	"os/exec"
 	"strings"
@@ -77,16 +78,22 @@ func New(consulClient ConsulClient, commandExecutor CommandExecutor, serviceID s
 }
 
 // Run will run the tagit flow and tag consul services based on the script output
-func (t *TagIt) Run() {
+func (t *TagIt) Run(ctx context.Context) {
+	ticker := time.NewTicker(t.Interval)
 	for {
-		err := t.updateServiceTags()
-		if err != nil {
-			log.WithFields(log.Fields{
-				"service": t.ServiceID,
-				"error":   err,
-			}).Error("error updating service tags")
+		select {
+		case <-ctx.Done():
+			ticker.Stop()
+			return
+		case <-ticker.C:
+			err := t.updateServiceTags()
+			if err != nil {
+				log.WithFields(log.Fields{
+					"service": t.ServiceID,
+					"error":   err,
+				}).Error("error updating service tags")
+			}
 		}
-		time.Sleep(t.Interval)
 	}
 }