Merge branch 'fix/go-mod' into 'master'

Add go.mod

See merge request !5

.gitlab-ci.yml

@@ -21,7 +21,7 @@ before_script:
   - cd $GOPATH/src/$REPO_NAME
   - cp config-sample.json config.json
 
-  - export CC=clang-5.0
+  - export CC=clang
 
   - make dep
 
@@ -63,4 +63,4 @@ build:
     - make
   artifacts:
     paths:
-      - gitlab-runner-do-monitor/
\ No newline at end of file
+      - gitlab-runner-do-monitor/

Makefile

@@ -30,7 +30,7 @@ dep:
 	@go get github.com/mitchellh/gox
 
 build: dep
-	@gox -output="${CI_PROJECT_DIR}/${PROJECT_NAME}/{{.Dir}}_{{.OS}}_{{.Arch}}" -parallel=6
+	@gox -output="${CI_PROJECT_DIR}/${PROJECT_NAME}/{{.Dir}}_{{.OS}}_{{.Arch}}" -parallel=6 -osarch '!darwin/386'
 
 clean:
 	@rm -f $(PROJECT_NAME)

glrdomon.go

@@ -30,8 +30,7 @@ type tokenSource struct {
 var (
 	configPath string
 
-	logger  *log.Logger
-	logDest string
+	logger *log.Logger
 
 	apiKey      string
 	threshold   int
@@ -42,7 +41,7 @@ var (
 	client *godo.Client
 )
 
-func init() {
+func initConfig() {
 	flag.StringVar(&configPath, "config", "./config.json", "Path to configuration file")
 	flag.Parse()
 
@@ -64,8 +63,7 @@ func init() {
 	threshold = cfg.Threshold
 	deleteStale = cfg.DeleteStale
 
-	logDest = cfg.LogDest
-	setUpLogger()
+	setUpLogger(cfg.LogDest)
 
 	logger.Printf("Starting GitLab Runner monitoring with config %s", configPath)
 
@@ -77,6 +75,7 @@ func init() {
 }
 
 func main() {
+	initConfig()
 	authenticate()
 	checkAPI()
 
@@ -193,7 +192,7 @@ func deleteDroplet(droplet godo.Droplet) bool {
 	return err == nil
 }
 
-func setUpLogger() {
+func setUpLogger(logDest string) {
 	logOpts := log.Ldate | log.Ltime | log.LUTC | log.Lshortfile
 
 	if logDest == "os.Stdout" {

glrdomon_test.go

@@ -8,6 +8,9 @@ import (
 )
 
 func TestCheckDropletAge(t *testing.T) {
+	threshold = 3600
+	setUpLogger("os.Stdout")
+
 	staleDroplet := godo.Droplet{
 		ID:      1234,
 		Name:    "very-old",

go.mod

+module git.ethitter.com/debian/gitlab-runner-do-monitor
+
+go 1.17
+
+require (
+	github.com/digitalocean/godo v1.75.0
+	github.com/dustin/go-humanize v1.0.0
+	golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b
+)
+
+require (
+	github.com/golang/protobuf v1.4.2 // indirect
+	github.com/google/go-querystring v1.0.0 // indirect
+	golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
+	google.golang.org/appengine v1.6.6 // indirect
+	google.golang.org/protobuf v1.25.0 // indirect
+)