Upgraded fsnotify to 1.8.0 (#6)

- upgraded fsnotify
- converted the project to a Go module
- removed irrelevant command

Author: buskamuza

.gitignore

@@ -1,3 +1,4 @@
 /bin
 /pkg
 api-gateway-config-supervisor
+/vendor

Godeps/Godeps.json

@@ -3,15 +3,6 @@ GOBIN ?= `pwd`/bin
 GOOS ?= $(`uname -a | awk '{print tolower($1)}'`)
 .PHONY: setup install test format static docker docker-ssh
 
-setup:
-	go get github.com/tools/godep
-
-install:
-	@go version
-#	export GO15VENDOREXPERIMENT=1
-#	GOPATH=$(GOPATH) GOBIN=$(GOBIN) go install -v ./...
-	GOPATH=$(GOPATH) GOBIN=$(GOBIN) $(GOPATH)/bin/godep go install -v ./...
-
 test:
 	go test
 

Godeps/Readme

@@ -53,26 +53,17 @@ api-gateway-config-supervisor \
 Dependencies
 ============
 
-* https://github.com/tools/godep
+* Golang
 * https://gowalker.org/github.com/ncw/rclone
-* gopkg.in/fsnotify.v1
-* TBD
 
 Developer guide
 ===============
 
-Make sure you have go 1.5.1+ installed. On a Mac you can execute:
+Make sure you have go installed. On a Mac you can execute:
 ```
 brew install go
 ```
 
-The go dependencies have been already added using `godeps` in the existing GitRepo in order to achieve repeatable builds and isolated envs.
-To build the project you can run:
-
-```
-make install
-```
-
 To run the unit tests run:
 
 ```

Makefile

@@ -150,6 +150,8 @@ func TestThatReloadCommandExecutesWhenNewFolderIsAdded(t *testing.T) {
 	// wait for some time
 	time.Sleep(500 * time.Millisecond)
 
+	startTime := time.Now()
+
 	//modifyFS: create a new directory and file
 	dir, err := ioutil.TempDir(tmpDir, "new-folder-")
 	if err != nil {
@@ -165,20 +167,20 @@ func TestThatReloadCommandExecutesWhenNewFolderIsAdded(t *testing.T) {
 	time.Sleep(1000 * time.Millisecond)
 
 	status = sync.GetStatusInstance()
-	// check that reload cmd has been executed
-	if time.Since(status.LastSync).Seconds() > 1 {
-		t.Fatal("sync should have executed earlier than 1.5 but was executed " + time.Since(status.LastSync).String())
+
+	if status.LastSync.Before(startTime) {
+		t.Fatalf("sync has not been executed since FS changes triggered at %s. Last sync time: %s", startTime, status.LastSync)
 	}
-	if time.Since(status.LastReload).Seconds() > 1 {
-		t.Fatal("reload should have executed earlier than 1.5s but was executed " + time.Since(status.LastReload).String())
+	if status.LastReload.Before(startTime) {
+		t.Fatalf("reload has not been executed since FS changes triggered at %s. Last reload time: %s", startTime, status.LastReload)
 	}
-	if time.Since(status.LastFSChangeDetected).Seconds() > 1 {
-		t.Fatal("FS changes should have been detected earlier than 1.5s but was detected " + time.Since(status.LastFSChangeDetected).String())
+	if status.LastFSChangeDetected.Before(startTime) {
+		t.Fatalf("FS changes have not been detected since FS changes triggered at %s. Last FS change detected at %s", startTime, status.LastFSChangeDetected)
 	}
 
 	// check that the reload_cmd.txt file was created when the reload command executed
 	if _, err := os.Stat(tmpDir + "/reload_cmd.txt"); err != nil {
-		t.Fatal("Expected to find the file created by the reload command " + tmpDir + "/reload_cmd.txt")
+		t.Fatalf("Expected to find the file created by the reload command " + tmpDir + "/reload_cmd.txt")
 	}
 
 	//delete the tmp file and the TempDir

README.md

@@ -0,0 +1,15 @@
+module github.com/adobe-apiplatform/api-gateway-config-supervisor
+
+go 1.20
+
+require (
+	github.com/carlescere/scheduler v0.0.0-20170109141437-ee74d2f83d82
+	github.com/fsnotify/fsnotify v1.8.0
+	github.com/koyachi/go-term-ansicolor v0.0.0-20130114081603-6f81280f9360
+	github.com/spf13/pflag v1.0.5
+)
+
+require (
+	github.com/stretchr/testify v1.10.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+)

config-supervisor_test.go

@@ -0,0 +1,15 @@
+github.com/carlescere/scheduler v0.0.0-20170109141437-ee74d2f83d82 h1:9bAydALqAjBfPHd/eAiJBHnMZUYov8m2PkXVr+YGQeI=
+github.com/carlescere/scheduler v0.0.0-20170109141437-ee74d2f83d82/go.mod h1:tyA14J0sA3Hph4dt+AfCjPrYR13+vVodshQSM7km9qw=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M=
+github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
+github.com/koyachi/go-term-ansicolor v0.0.0-20130114081603-6f81280f9360 h1:RAav20p/CzLXPs8DxPry4eM4YuTooJ1d6ctCmXjpaA8=
+github.com/koyachi/go-term-ansicolor v0.0.0-20130114081603-6f81280f9360/go.mod h1:zUllqwUpvIS0pyapVJDiHwwEkmaV9qeCR9+sh5MPdRs=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
+github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
+github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

go.mod

@@ -8,8 +8,8 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/fsnotify/fsnotify"
 	"github.com/koyachi/go-term-ansicolor/ansicolor"
-	"gopkg.in/fsnotify.v1"
 )
 
 type RecursiveWatcher struct {
@@ -37,6 +37,7 @@ func NewRecursiveWatcher(path string) (*RecursiveWatcher, error) {
 	if err != nil {
 		return nil, err
 	}
+
 	rw := &RecursiveWatcher{fsw: watcher}
 
 	rw.Files = make(chan string, 10)