rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-09-09 18:50:04 +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

10
cmd/control/os.go
View File

@@ -3,7 +3,6 @@ package control
import ( import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"net/http"
"net/url" "net/url"
"os" "os"
"runtime" "runtime"
@@ -22,6 +21,7 @@ import (
"github.com/rancher/os/compose" "github.com/rancher/os/compose"
"github.com/rancher/os/config" "github.com/rancher/os/config"
"github.com/rancher/os/docker" "github.com/rancher/os/docker"
"github.com/rancher/os/util/network"
) )
type Images struct { type Images struct {
@@ -83,7 +83,6 @@ func osSubcommands() []cli.Command {
} }
} }
// TODO: this and the getLatestImage should probably move to utils/network and be suitably cached.
func getImages() (*Images, error) { func getImages() (*Images, error) {
upgradeURL, err := getUpgradeURL() upgradeURL, err := getUpgradeURL()
if err != nil { if err != nil {
@@ -108,12 +107,7 @@ func getImages() (*Images, error) {
u.RawQuery = q.Encode() u.RawQuery = q.Encode()
upgradeURL = u.String() upgradeURL = u.String()
resp, err := http.Get(upgradeURL) body, err = network.LoadFromNetwork(upgradeURL)
if err != nil {
return nil, err
}
defer resp.Body.Close()
body, err = ioutil.ReadAll(resp.Body)
if err != nil { if err != nil {
return nil, err return nil, err
} }

2
config/cloudinit/datasource/url/url.go
View File

@@ -19,6 +19,7 @@ import (
"github.com/rancher/os/config/cloudinit/datasource" "github.com/rancher/os/config/cloudinit/datasource"
"github.com/rancher/os/config/cloudinit/pkg" "github.com/rancher/os/config/cloudinit/pkg"
"github.com/rancher/os/util/network"
) )
type RemoteFile struct { type RemoteFile struct {
@@ -31,6 +32,7 @@ func NewDatasource(url string) *RemoteFile {
} }
func (f *RemoteFile) IsAvailable() bool { func (f *RemoteFile) IsAvailable() bool {
network.SetProxyEnvironmentVariables()
client := pkg.NewHTTPClient() client := pkg.NewHTTPClient()
_, f.lastError = client.Get(f.url) _, f.lastError = client.Get(f.url)
return (f.lastError == nil) return (f.lastError == nil)

2
init/init.go
View File

@@ -451,7 +451,7 @@ func RunInit() error {
}}, }},
config.CfgFuncData{"load modules2", loadModules}, config.CfgFuncData{"load modules2", loadModules},
config.CfgFuncData{"set proxy env", func(cfg *config.CloudConfig) (*config.CloudConfig, error) { config.CfgFuncData{"set proxy env", func(cfg *config.CloudConfig) (*config.CloudConfig, error) {
network.SetProxyEnvironmentVariables(cfg) network.SetProxyEnvironmentVariables()
return cfg, nil return cfg, nil
}}, }},
config.CfgFuncData{"init SELinux", initializeSelinux}, config.CfgFuncData{"init SELinux", initializeSelinux},

13
util/network/network.go
View File

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