merge 21447: closes #21447

[arvados.git] / tools / keep-rsync / keep-rsync.go

diff --git a/tools/keep-rsync/keep-rsync.go b/tools/keep-rsync/keep-rsync.go
index a299d17febb1a46fc276ab6ed0fac5ee49ac09be..43c6be08225a806a6e72195f0eab3cb1f83ebf02 100644 (file)
--- a/tools/keep-rsync/keep-rsync.go
+++ b/tools/keep-rsync/keep-rsync.go
@@ -17,10 +17,13 @@ import (
        "strings"
        "time"
 
        "strings"
        "time"
 

-       "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
-       "git.curoverse.com/arvados.git/sdk/go/keepclient"
+       "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()
        if err != nil {
 func main() {
        err := doMain()
        if err != nil {


@@ -69,8 +72,17 @@ 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.")
 
                0,
                "Lifetime of blob permission signatures on source keepservers. If not provided, this will be retrieved from the API server's discovery document.")
 

-       // Parse args; omit the first arg which is the command name
-       flags.Parse(os.Args[1:])
+       getVersion := flags.Bool(
+               "version",
+               false,
+               "Print version information and exit.")
+
+       if ok, code := cmd.ParseFlags(flags, os.Args[0], os.Args[1:], "", os.Stderr); !ok {
+               os.Exit(code)
+       } else if *getVersion {
+               fmt.Printf("%s %s\n", os.Args[0], version)
+               os.Exit(0)
+       }

 
        srcConfig, srcBlobSigningKey, err := loadConfig(*srcConfigFile)
        if err != nil {
 
        srcConfig, srcBlobSigningKey, err := loadConfig(*srcConfigFile)
        if err != nil {


@@ -106,7 +118,6 @@ type apiConfig struct {
        APIToken        string
        APIHost         string
        APIHostInsecure bool
        APIToken        string
        APIHost         string
        APIHostInsecure bool

-       ExternalClient  bool

 }
 
 // Load src and dst config from given files
 }
 
 // Load src and dst config from given files


@@ -152,8 +163,6 @@ func readConfigFromFile(filename string) (config apiConfig, blobSigningKey strin
                        config.APIHost = value
                case "ARVADOS_API_HOST_INSECURE":
                        config.APIHostInsecure = arvadosclient.StringBool(value)
                        config.APIHost = value
                case "ARVADOS_API_HOST_INSECURE":
                        config.APIHostInsecure = arvadosclient.StringBool(value)

-               case "ARVADOS_EXTERNAL_CLIENT":
-                       config.ExternalClient = arvadosclient.StringBool(value)

                case "ARVADOS_BLOB_SIGNING_KEY":
                        blobSigningKey = value
                }
                case "ARVADOS_BLOB_SIGNING_KEY":
                        blobSigningKey = value
                }


@@ -169,7 +178,6 @@ func setupKeepClient(config apiConfig, keepServicesJSON string, isDst bool, repl
                ApiInsecure: config.APIHostInsecure,
                Client: &http.Client{Transport: &http.Transport{
                        TLSClientConfig: &tls.Config{InsecureSkipVerify: config.APIHostInsecure}}},
                ApiInsecure: config.APIHostInsecure,
                Client: &http.Client{Transport: &http.Transport{
                        TLSClientConfig: &tls.Config{InsecureSkipVerify: config.APIHostInsecure}}},

-               External: config.ExternalClient,

        }
 
        // If keepServicesJSON is provided, use it instead of service discovery
        }
 
        // If keepServicesJSON is provided, use it instead of service discovery


@@ -185,6 +193,7 @@ func setupKeepClient(config apiConfig, keepServicesJSON string, isDst bool, repl
                        return kc, 0, err
                }
        }
                        return kc, 0, err
                }
        }

+       kc.DiskCacheSize = keepclient.DiskCacheDisabled

 
        if isDst {
                // Get default replications value from destination, if it is not already provided
 
        if isDst {
                // Get default replications value from destination, if it is not already provided