From 5525cf9f6f058bf4fe90891d365643d49a049f16 Mon Sep 17 00:00:00 2001 From: Dan Lorenc Date: Tue, 16 Dec 2014 09:35:30 -0800 Subject: [PATCH] Proppy code review feedback. Signed-off-by: Dan Lorenc --- drivers/googlecomputeengine/auth_util.go | 9 ++++++--- drivers/googlecomputeengine/compute_util.go | 16 +++++++++------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/drivers/googlecomputeengine/auth_util.go b/drivers/googlecomputeengine/auth_util.go index b108a68e10..843ab13454 100644 --- a/drivers/googlecomputeengine/auth_util.go +++ b/drivers/googlecomputeengine/auth_util.go @@ -17,6 +17,8 @@ import ( ) const ( + AuthURL = "https://accounts.google.com/o/oauth2/auth" + TokenURL = "https://accounts.google.com/o/oauth2/token" ClientId = "22738965389-8arp8bah3uln9eoenproamovfjj1ac33.apps.googleusercontent.com" ClientSecret = "qApc3amTyr5wI74vVrRWAfC_" ) @@ -32,8 +34,8 @@ func newOauthClient(storePath string) *http.Client { ClientId: ClientId, ClientSecret: ClientSecret, Scope: raw.ComputeScope, - AuthURL: "https://accounts.google.com/o/oauth2/auth", - TokenURL: "https://accounts.google.com/o/oauth2/token", + AuthURL: AuthURL, + TokenURL: TokenURL, } token := token(storePath, config) t := oauth.Transport{ @@ -91,8 +93,9 @@ func tokenFromWeb(config *oauth.Config) *oauth.Token { config.RedirectURL = ts.URL authURL := config.AuthCodeURL(randState) - log.Infof("Opening auth URL in browser. If the URL doesn't open, please open it manually and copy the code here.") + log.Info("Opening auth URL in browser.") log.Info(authURL) + log.Info("If the URL doesn't open, please open it manually and copy the code here.") go openURL(authURL) go getCodeFromStdin(ch) diff --git a/drivers/googlecomputeengine/compute_util.go b/drivers/googlecomputeengine/compute_util.go index 749a4c13f9..41def0beee 100644 --- a/drivers/googlecomputeengine/compute_util.go +++ b/drivers/googlecomputeengine/compute_util.go @@ -24,10 +24,12 @@ type ComputeUtil struct { } const ( - apiURL = "https://www.googleapis.com/compute/v1/projects/" - imageName = "https://www.googleapis.com/compute/v1/projects/google-containers/global/images/container-vm-v20141016" - dockerUrl = "https://bfirsh.s3.amazonaws.com/docker/docker-1.3.1-dev-identity-auth" - firewallRule = "docker-machines" + apiURL = "https://www.googleapis.com/compute/v1/projects/" + imageName = "https://www.googleapis.com/compute/v1/projects/google-containers/global/images/container-vm-v20141016" + dockerUrl = "https://bfirsh.s3.amazonaws.com/docker/docker-1.3.1-dev-identity-auth" + firewallRule = "docker-machines" + port = "2376" + firewallTargetTag = "docker-machine" ) // NewComputeUtil creates and initializes a ComputeUtil. @@ -79,7 +81,7 @@ func (c *ComputeUtil) createFirewallRule() error { { IPProtocol: "tcp", Ports: []string{ - "2376", + port, }, }, }, @@ -87,7 +89,7 @@ func (c *ComputeUtil) createFirewallRule() error { "0.0.0.0/0", }, TargetTags: []string{ - "docker-machine", + firewallTargetTag, }, Name: firewallRule, } @@ -135,7 +137,7 @@ func (c *ComputeUtil) createInstance(d *Driver) error { }, Tags: &raw.Tags{ Items: []string{ - "docker-machine", + firewallTargetTag, }, }, }