X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f5617be935a121dc339effcaafebb569109ebe5b..b6d7efab2c4bffa3fabd55b166e44cca8ac1391f:/tools/keep-rsync/keep-rsync.go

diff --git a/tools/keep-rsync/keep-rsync.go b/tools/keep-rsync/keep-rsync.go
index c6e7665caa..6926a945e1 100644
--- a/tools/keep-rsync/keep-rsync.go
+++ b/tools/keep-rsync/keep-rsync.go
@@ -1,3 +1,7 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
 package main
 
 import (
@@ -6,17 +10,19 @@ 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.arvados.org/arvados.git/sdk/go/arvadosclient"
+	"git.arvados.org/arvados.git/sdk/go/keepclient"
 )
 
+var version = "dev"
+
 func main() {
 	err := doMain()
 	if err != nil {
@@ -65,9 +71,20 @@ func doMain() error {
 		0,
 		"Lifetime of blob permission signatures on source keepservers. If not provided, this will be retrieved from the API server's discovery document.")
 
+	getVersion := flags.Bool(
+		"version",
+		false,
+		"Print version information and exit.")
+
 	// Parse args; omit the first arg which is the command name
 	flags.Parse(os.Args[1:])
 
+	// Print version information if requested
+	if *getVersion {
+		fmt.Printf("keep-rsync %s\n", version)
+		os.Exit(0)
+	}
+
 	srcConfig, srcBlobSigningKey, err := loadConfig(*srcConfigFile)
 	if err != nil {
 		return fmt.Errorf("Error loading src configuration from file: %s", err.Error())
@@ -119,8 +136,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, "/") {
@@ -149,9 +164,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
 		}
@@ -170,7 +185,7 @@ func setupKeepClient(config apiConfig, keepServicesJSON string, isDst bool, repl
 		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 {