X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/ecf4a87ac687b713d3eb4f191f4c5ead293fa046..3f0ec839af28e56eb94bc9507ab59df1e670e59f:/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 ed546f0104..e22e4b5cfe 100644
--- a/tools/keep-block-check/keep-block-check.go
+++ b/tools/keep-block-check/keep-block-check.go
@@ -5,15 +5,15 @@ import (
 	"errors"
 	"flag"
 	"fmt"
-	"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
-	"git.curoverse.com/arvados.git/sdk/go/keepclient"
 	"io/ioutil"
 	"log"
 	"net/http"
 	"os"
-	"regexp"
 	"strings"
 	"time"
+
+	"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
+	"git.curoverse.com/arvados.git/sdk/go/keepclient"
 )
 
 func main() {
@@ -48,10 +48,10 @@ func doMain(args []string) error {
 		"",
 		"Block hash prefix. When a prefix is specified, only hashes listed in the file with this prefix will be checked.")
 
-	blobSigningTTL := flags.Duration(
-		"blob-signing-ttl",
-		0*time.Second,
-		"Lifetime of blob permission signatures on the keepservers. If not provided, this will be retrieved from the keepservers.")
+	blobSignatureTTLFlag := flags.Duration(
+		"blob-signature-ttl",
+		0,
+		"Lifetime of blob permission signatures on the keepservers. If not provided, this will be retrieved from the API server's discovery document.")
 
 	verbose := flags.Bool(
 		"v",
@@ -73,12 +73,12 @@ func doMain(args []string) error {
 	}
 
 	// setup keepclient
-	kc, err := setupKeepClient(config, *keepServicesJSON, *blobSigningTTL)
+	kc, blobSignatureTTL, err := setupKeepClient(config, *keepServicesJSON, *blobSignatureTTLFlag)
 	if err != nil {
 		return fmt.Errorf("Error configuring keepclient: %s", err.Error())
 	}
 
-	return performKeepBlockCheck(kc, *blobSigningTTL, blobSigningKey, blockLocators, *verbose)
+	return performKeepBlockCheck(kc, blobSignatureTTL, blobSigningKey, blockLocators, *verbose)
 }
 
 type apiConfig struct {
@@ -99,8 +99,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 +128,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
 			}
@@ -143,7 +141,7 @@ func readConfigFromFile(filename string) (config apiConfig, blobSigningKey strin
 }
 
 // setup keepclient using the config provided
-func setupKeepClient(config apiConfig, keepServicesJSON string, blobSigningTTL time.Duration) (kc *keepclient.KeepClient, err error) {
+func setupKeepClient(config apiConfig, keepServicesJSON string, blobSignatureTTL time.Duration) (kc *keepclient.KeepClient, ttl time.Duration, err error) {
 	arv := arvadosclient.ArvadosClient{
 		ApiToken:    config.APIToken,
 		ApiServer:   config.APIHost,
@@ -153,7 +151,7 @@ func setupKeepClient(config apiConfig, keepServicesJSON string, blobSigningTTL t
 		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 {
@@ -167,13 +165,14 @@ func setupKeepClient(config apiConfig, keepServicesJSON string, blobSigningTTL t
 		}
 	}
 
-	// Get if blobSigningTTL is not provided
-	if blobSigningTTL == 0 {
+	// Get if blobSignatureTTL is not provided
+	ttl = blobSignatureTTL
+	if blobSignatureTTL == 0 {
 		value, err := arv.Discovery("blobSignatureTtl")
 		if err == nil {
-			blobSigningTTL = time.Duration(int(value.(float64))) * time.Second
+			ttl = time.Duration(int(value.(float64))) * time.Second
 		} else {
-			return nil, err
+			return nil, 0, err
 		}
 	}
 
@@ -206,7 +205,7 @@ func getBlockLocators(locatorFile, prefix string) (locators []string, err error)
 }
 
 // Get block headers from keep. Log any errors.
-func performKeepBlockCheck(kc *keepclient.KeepClient, blobSigningTTL time.Duration, blobSigningKey string, blockLocators []string, verbose bool) error {
+func performKeepBlockCheck(kc *keepclient.KeepClient, blobSignatureTTL time.Duration, blobSigningKey string, blockLocators []string, verbose bool) error {
 	totalBlocks := len(blockLocators)
 	notFoundBlocks := 0
 	current := 0
@@ -218,7 +217,7 @@ func performKeepBlockCheck(kc *keepclient.KeepClient, blobSigningTTL time.Durati
 		getLocator := locator
 		if blobSigningKey != "" {
 			expiresAt := time.Now().AddDate(0, 0, 1)
-			getLocator = keepclient.SignLocator(locator, kc.Arvados.ApiToken, expiresAt, blobSigningTTL, []byte(blobSigningKey))
+			getLocator = keepclient.SignLocator(locator, kc.Arvados.ApiToken, expiresAt, blobSignatureTTL, []byte(blobSigningKey))
 		}
 
 		_, _, err := kc.Ask(getLocator)