Merge branch 'bump-linter' into 'master'

agneum · agneum · commit 11c5e4992fd3 · 2021-02-05T13:57:21.000Z
refactor: bump the code linter to be an up-to-date

See merge request postgres-ai/database-lab!255
diff --git a/Makefile b/Makefile
@@ -29,7 +29,7 @@ all: clean build
 
 # Install the linter to $GOPATH/bin which is expected to be in $PATH
 install-lint:
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.30.0
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.35.2
 
 run-lint:
 	golangci-lint run
diff --git a/cmd/database-lab/main.go b/cmd/database-lab/main.go
@@ -51,9 +51,6 @@ func main() {
 		log.Fatal(errors.WithMessage(err, "failed to parse config"))
 	}
 
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
 	runner := runners.NewLocalRunner(cfg.Provision.UseSudo)
 
 	pm := pool.NewPoolManager(&cfg.PoolManager, runner)
@@ -66,10 +63,14 @@ func main() {
 		log.Fatal("Failed to create a Docker client:", err)
 	}
 
+	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
 	// Create a platform service to make requests to Platform.
 	platformSvc, err := platform.New(ctx, cfg.Platform)
 	if err != nil {
-		log.Fatalf(errors.WithMessage(err, "failed to create a new platform service"))
+		log.Errf(errors.WithMessage(err, "failed to create a new platform service").Error())
+		return
 	}
 
 	// Create a new retrieval service to prepare a data directory and start snapshotting.
@@ -80,7 +81,9 @@ func main() {
 			log.Err("Failed to clean up service containers:", cleanUpErr)
 		}
 
-		log.Fatal("Failed to run the data retrieval service:", err)
+		log.Err("Failed to run the data retrieval service:", err)
+
+		return
 	}
 
 	defer retrievalSvc.Stop()
@@ -93,12 +96,13 @@ func main() {
 	// Create a cloning service to provision new clones.
 	provisionSvc, err := provision.New(ctx, &cfg.Provision, dbCfg, dockerCLI, pm)
 	if err != nil {
-		log.Fatalf(errors.WithMessage(err, `error in the "provision" section of the config`))
+		log.Errf(errors.WithMessage(err, `error in the "provision" section of the config`).Error())
 	}
 
 	cloningSvc := cloning.New(&cfg.Cloning, provisionSvc)
 	if err = cloningSvc.Run(ctx); err != nil {
-		log.Fatal(err)
+		log.Err(err)
+		return
 	}
 
 	obs := observer.NewObserver(dockerCLI, &cfg.Observer, platformSvc.Client, pm.Active().Pool())
diff --git a/pkg/services/provision/thinclones/zfs/zfs.go b/pkg/services/provision/thinclones/zfs/zfs.go
@@ -76,7 +76,7 @@ type ListEntry struct {
 	// The amount of data that is accessible by this dataset, which may
 	// or may not be shared with other datasets in the pool. When a snapshot
 	// or clone is created, it initially references the same amount of space
-	//as the  file system or snapshot it was created from, since its contents
+	// as the  file system or snapshot it was created from, since its contents
 	// are identical.
 	Referenced uint64
 
