3021: Remove ARVADOS_KEEP_PROXY support. (If you need to interfere

with the discovery mechanism from out-of-process, use some combination
of HTTP_PROXY, NO_PROXY, and a generic proxy server.)

diff --git a/sdk/go/keepclient/support.go b/sdk/go/keepclient/support.go
index c24849e687a8d11cf2e5d2154fdd62d0e470ec83..9db6ebcbaa234a82778825e92baa8a7017a3f418 100644 (file)
--- a/sdk/go/keepclient/support.go
+++ b/sdk/go/keepclient/support.go
@@ -11,7 +11,6 @@ import (
        "log"
        "net"
        "net/http"
-       "os"
        "strings"
        "time"
 )
@@ -78,14 +77,6 @@ func (this *KeepClient) setClientSettingsStore() {
 }
 
 func (this *KeepClient) DiscoverKeepServers() error {
-       if prx := os.Getenv("ARVADOS_KEEP_PROXY"); prx != "" {
-               sr := map[string]string{"proxy": prx}
-               this.SetServiceRoots(sr)
-               this.Using_proxy = true
-               this.setClientSettingsProxy()
-               return nil
-       }
-
        type svcList struct {
                Items []keepDisk `json:"items"`
        }