X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a6401a8c59a582633de2ae197e71aad493de291a..bb99d90e25a47dff9405fb6f68be0779dd2d8989:/tools/keep-block-check/keep-block-check.go

diff --git a/tools/keep-block-check/keep-block-check.go b/tools/keep-block-check/keep-block-check.go
index 6cf11a7280..995a1fd559 100644
--- a/tools/keep-block-check/keep-block-check.go
+++ b/tools/keep-block-check/keep-block-check.go
@@ -1,3 +1,7 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package main
 
 import (
@@ -5,25 +9,26 @@ import (
 	"errors"
 	"flag"
 	"fmt"
-	"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
-	"git.curoverse.com/arvados.git/sdk/go/keepclient"
+	"io"
 	"io/ioutil"
 	"log"
 	"net/http"
 	"os"
-	"regexp"
 	"strings"
 	"time"
+
+	"git.arvados.org/arvados.git/lib/cmd"
+	"git.arvados.org/arvados.git/sdk/go/arvadosclient"
+	"git.arvados.org/arvados.git/sdk/go/keepclient"
 )
 
+var version = "dev"
+
 func main() {
-	err := doMain(os.Args[1:])
-	if err != nil {
-		log.Fatalf("%v", err)
-	}
+	os.Exit(doMain(os.Args[1:], os.Stderr))
 }
 
-func doMain(args []string) error {
+func doMain(args []string, stderr io.Writer) int {
 	flags := flag.NewFlagSet("keep-block-check", flag.ExitOnError)
 
 	configFile := flags.String(
@@ -58,27 +63,45 @@ func doMain(args []string) error {
 		false,
 		"Log progress of each block verification")
 
-	// Parse args; omit the first arg which is the command name
-	flags.Parse(args)
+	getVersion := flags.Bool(
+		"version",
+		false,
+		"Print version information and exit.")
+
+	if ok, code := cmd.ParseFlags(flags, os.Args[0], args, "", stderr); !ok {
+		return code
+	} else if *getVersion {
+		fmt.Printf("%s %s\n", os.Args[0], version)
+		return 0
+	}
 
 	config, blobSigningKey, err := loadConfig(*configFile)
 	if err != nil {
-		return fmt.Errorf("Error loading configuration from file: %s", err.Error())
+		fmt.Fprintf(stderr, "Error loading configuration from file: %s\n", err)
+		return 1
 	}
 
 	// get list of block locators to be checked
 	blockLocators, err := getBlockLocators(*locatorFile, *prefix)
 	if err != nil {
-		return fmt.Errorf("Error reading block hashes to be checked from file: %s", err.Error())
+		fmt.Fprintf(stderr, "Error reading block hashes to be checked from file: %s\n", err)
+		return 1
 	}
 
 	// setup keepclient
 	kc, blobSignatureTTL, err := setupKeepClient(config, *keepServicesJSON, *blobSignatureTTLFlag)
 	if err != nil {
-		return fmt.Errorf("Error configuring keepclient: %s", err.Error())
+		fmt.Fprintf(stderr, "Error configuring keepclient: %s\n", err)
+		return 1
+	}
+
+	err = performKeepBlockCheck(kc, blobSignatureTTL, blobSigningKey, blockLocators, *verbose)
+	if err != nil {
+		fmt.Fprintln(stderr, err)
+		return 1
 	}
 
-	return performKeepBlockCheck(kc, blobSignatureTTL, blobSigningKey, blockLocators, *verbose)
+	return 0
 }
 
 type apiConfig struct {
@@ -99,8 +122,6 @@ func loadConfig(configFile string) (config apiConfig, blobSigningKey string, err
 	return
 }
 
-var matchTrue = regexp.MustCompile("^(?i:1|yes|true)$")
-
 // Read config from file
 func readConfigFromFile(filename string) (config apiConfig, blobSigningKey string, err error) {
 	if !strings.Contains(filename, "/") {
@@ -130,9 +151,9 @@ func readConfigFromFile(filename string) (config apiConfig, blobSigningKey strin
 			case "ARVADOS_API_HOST":
 				config.APIHost = value
 			case "ARVADOS_API_HOST_INSECURE":
-				config.APIHostInsecure = matchTrue.MatchString(value)
+				config.APIHostInsecure = arvadosclient.StringBool(value)
 			case "ARVADOS_EXTERNAL_CLIENT":
-				config.ExternalClient = matchTrue.MatchString(value)
+				config.ExternalClient = arvadosclient.StringBool(value)
 			case "ARVADOS_BLOB_SIGNING_KEY":
 				blobSigningKey = value
 			}
@@ -153,7 +174,7 @@ func setupKeepClient(config apiConfig, keepServicesJSON string, blobSignatureTTL
 		External: config.ExternalClient,
 	}
 
-	// if keepServicesJSON is provided, use it to load services; else, use DiscoverKeepServers
+	// If keepServicesJSON is provided, use it instead of service discovery
 	if keepServicesJSON == "" {
 		kc, err = keepclient.MakeKeepClient(&arv)
 		if err != nil {
@@ -232,7 +253,7 @@ func performKeepBlockCheck(kc *keepclient.KeepClient, blobSignatureTTL time.Dura
 	log.Printf("Verify block totals: %d attempts, %d successes, %d errors", totalBlocks, totalBlocks-notFoundBlocks, notFoundBlocks)
 
 	if notFoundBlocks > 0 {
-		return fmt.Errorf("Block verification failed for %d out of %d blocks with matching prefix.", notFoundBlocks, totalBlocks)
+		return fmt.Errorf("Block verification failed for %d out of %d blocks with matching prefix", notFoundBlocks, totalBlocks)
 	}
 
 	return nil