Correctly detect env from ctx (#346)

#345
pharmer · Dec 19, 2017 · bd1aa83 · bd1aa83
1 parent 830e7e3
commit bd1aa83
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 13 deletions.
diff --git a/cloud/providers/azure/cloud.go b/cloud/providers/azure/cloud.go
@@ -16,7 +16,6 @@ import (
 	"github.com/Azure/go-autorest/autorest"
 	"github.com/Azure/go-autorest/autorest/adal"
 	"github.com/Azure/go-autorest/autorest/azure"
-	_env "github.com/appscode/go/env"
 	"github.com/appscode/go/errors"
 	. "github.com/appscode/go/types"
 	api "github.com/pharmer/pharmer/apis/v1alpha1"
@@ -573,7 +572,7 @@ func (conn *cloudConnector) createVirtualMachine(nic network.Interface, as compu
 				AdminUsername: StringP(conn.namer.AdminUsername()),
 				CustomData:    StringP(base64.StdEncoding.EncodeToString([]byte(data))),
 				LinuxConfiguration: &compute.LinuxConfiguration{
-					DisablePasswordAuthentication: BoolP(!_env.FromHost().DebugEnabled()),
+					DisablePasswordAuthentication: BoolP(!Env(conn.ctx).DebugEnabled()),
 					SSH: &compute.SSHConfiguration{
 						PublicKeys: &[]compute.SSHPublicKey{
 							{

diff --git a/cloud/providers/vultr/cloud.go b/cloud/providers/vultr/cloud.go
@@ -7,7 +7,6 @@ import (
 	"strings"
 
 	gv "github.com/JamesClonk/vultr/lib"
-	_env "github.com/appscode/go/env"
 	"github.com/appscode/go/errors"
 	api "github.com/pharmer/pharmer/apis/v1alpha1"
 	. "github.com/pharmer/pharmer/cloud"
@@ -272,7 +271,7 @@ func (conn *cloudConnector) CreateInstance(name, token string, ng *api.NodeGroup
 		Hostname:             name,
 		Tag:                  conn.cluster.Name,
 	}
-	if _env.FromHost().IsPublic() {
+	if Env(conn.ctx).IsPublic() {
 		opts.SSHKey = sshKeyID
 	}
 	resp, err := conn.client.CreateServer(name, regionID, planID, osID, opts)

diff --git a/docs/cloud/aws/README.md b/docs/cloud/aws/README.md
@@ -22,7 +22,7 @@ Following example will use `pharmer ` to create a Kubernetes cluster with 2 work
 
 As a prerequisite, you need to have `pharmer` installed.  To install `pharmer` run the following command.
 ```console
-$ go get github.com/pharmer/pharmer
+$ go get -u github.com/pharmer/pharmer
 ```
 
 ### Pharmer storage

diff --git a/docs/cloud/azure/README.md b/docs/cloud/azure/README.md
@@ -23,7 +23,7 @@ Following example will use `pharmer ` to create a Kubernetes cluster with 1 work
 
 As a prerequisite, you need to have `pharmer` installed.  To install `pharmer` run the following command.
 ```console
-$ go get github.com/pharmer/pharmer
+$ go get -u github.com/pharmer/pharmer
 ```
 
 ### Pharmer storage

diff --git a/docs/cloud/digitalocean/README.md b/docs/cloud/digitalocean/README.md
@@ -21,7 +21,7 @@ Following example will use `pharmer ` to create a Kubernetes cluster with 2 work
 
 As a prerequisite, you need to have `pharmer` installed.  To install `pharmer` run the following command.
 ```console
-$ go get github.com/pharmer/pharmer
+$ go get -u github.com/pharmer/pharmer
 ```
 
 ### Pharmer storage

diff --git a/docs/cloud/lightsail/README.md b/docs/cloud/lightsail/README.md
@@ -22,7 +22,7 @@ Following example will use `pharmer ` to create a Kubernetes cluster with 1 work
 
 As a prerequisite, you need to have `pharmer` installed.  To install `pharmer` run the following command.
 ```console
-$ go get github.com/pharmer/pharmer
+$ go get -u github.com/pharmer/pharmer
 ```
 
 ### Pharmer storage

diff --git a/docs/cloud/linode/README.md b/docs/cloud/linode/README.md
@@ -22,7 +22,7 @@ Following example will use `pharmer ` to create a Kubernetes cluster with 2 work
 
 As a prerequisite, you need to have `pharmer` installed.  To install `pharmer` run the following command.
 ```console
-$ go get github.com/pharmer/pharmer
+$ go get -u github.com/pharmer/pharmer
 ```
 
 ### Pharmer storage

diff --git a/docs/cloud/packet/README.md b/docs/cloud/packet/README.md
@@ -22,7 +22,7 @@ Following example will use `pharmer ` to create a Kubernetes cluster with 1 work
 
 As a prerequisite, you need to have `pharmer` installed.  To install `pharmer` run the following command.
 ```console
-$ go get github.com/pharmer/pharmer
+$ go get -u github.com/pharmer/pharmer
 ```
 
 ### Pharmer storage

diff --git a/docs/cloud/scaleway/README.md b/docs/cloud/scaleway/README.md
@@ -22,7 +22,7 @@ Following example will use `pharmer ` to create a Kubernetes cluster with 2 work
 
 As a prerequisite, you need to have `pharmer` installed.  To install `pharmer` run the following command.
 ```console
-$ go get github.com/pharmer/pharmer
+$ go get -u github.com/pharmer/pharmer
 ```
 
 ### Pharmer storage

diff --git a/docs/cloud/vultr/README.md b/docs/cloud/vultr/README.md
@@ -23,7 +23,7 @@ Following example will use `pharmer ` to create a Kubernetes cluster with 2 work
 As a prerequisite, you need to have `pharmer` installed.  To install `pharmer` run the following command.
 
 ```console
-$ go get github.com/pharmer/pharmer
+$ go get -u github.com/pharmer/pharmer
 ```
 
 ### Pharmer storage

diff --git a/docs/developer-guide/README.md b/docs/developer-guide/README.md
@@ -33,7 +33,7 @@ development environment, please follow [these instructions](https://golang.org/d
 #### Download Source
 
 ```console
-$ go get github.com/pharmer/pharmer
+$ go get -u github.com/pharmer/pharmer
 $ cd $(go env GOPATH)/src/github.com/pharmer/pharmer
 ```