rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-16 15:09:27 +00:00
Code Issues Releases Wiki Activity

Refactor a little so 'ros os list' also uses the configured proxy info

Browse Source 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit
2017-09-15 12:14:40 +10:00
parent a608098c39
commit baee5d18ea
4 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
util/network/network.go
View File

@@ -57,7 +57,8 @@ func getServices(urls []string, key string) ([]string, error) {
return result, nil
}
func SetProxyEnvironmentVariables(cfg *config.CloudConfig) {
func SetProxyEnvironmentVariables() {
cfg := config.LoadConfig()
if cfg.Rancher.Network.HTTPProxy != "" {
err := os.Setenv("HTTP_PROXY", cfg.Rancher.Network.HTTPProxy)
if err != nil {
@@ -78,14 +79,16 @@ func SetProxyEnvironmentVariables(cfg *config.CloudConfig) {
}
}
func loadFromNetwork(location string) ([]byte, error) {
func LoadFromNetworkWithCache(location string) ([]byte, error) {
bytes := cacheLookup(location)
if bytes != nil {
return bytes, nil
}
return LoadFromNetwork(location)
}
cfg := config.LoadConfig()
SetProxyEnvironmentVariables(cfg)
func LoadFromNetwork(location string) ([]byte, error) {
SetProxyEnvironmentVariables()
var err error
@@ -116,7 +119,7 @@ func LoadResource(location string, network bool) ([]byte, error) {
if !network {
return nil, ErrNoNetwork
}
return loadFromNetwork(location)
return LoadFromNetworkWithCache(location)
} else if strings.HasPrefix(location, "/") {
return ioutil.ReadFile(location)
}