From 17536555b19f3788f4218cf5f8bb28c881b9422c Mon Sep 17 00:00:00 2001
From: Dan Lorenc <lorenc.d@gmail.com>
Date: Tue, 16 Dec 2014 15:45:10 -0800
Subject: [PATCH] New import path.

Signed-off-by: Dan Lorenc <lorenc.d@gmail.com>
---
 Godeps/Godeps.json                            | 22 +++++++++----------
 .../api}/compute/v1/compute-api.json          |  0
 .../api}/compute/v1/compute-gen.go            |  4 ++--
 .../api}/googleapi/googleapi.go               |  2 +-
 .../api}/googleapi/googleapi_test.go          |  0
 .../googleapi/internal/uritemplates/LICENSE   |  0
 .../internal/uritemplates/uritemplates.go     |  0
 .../googleapi/internal/uritemplates/utils.go  |  0
 .../api}/googleapi/transport/apikey.go        |  0
 .../api}/googleapi/types.go                   |  0
 .../api}/googleapi/types_test.go              |  0
 drivers/googlecomputeengine/auth_util.go      |  2 +-
 drivers/googlecomputeengine/compute_util.go   |  2 +-
 13 files changed, 15 insertions(+), 17 deletions(-)
 rename Godeps/_workspace/src/{code.google.com/p/google-api-go-client => google.golang.org/api}/compute/v1/compute-api.json (100%)
 rename Godeps/_workspace/src/{code.google.com/p/google-api-go-client => google.golang.org/api}/compute/v1/compute-gen.go (99%)
 rename Godeps/_workspace/src/{code.google.com/p/google-api-go-client => google.golang.org/api}/googleapi/googleapi.go (99%)
 rename Godeps/_workspace/src/{code.google.com/p/google-api-go-client => google.golang.org/api}/googleapi/googleapi_test.go (100%)
 rename Godeps/_workspace/src/{code.google.com/p/google-api-go-client => google.golang.org/api}/googleapi/internal/uritemplates/LICENSE (100%)
 rename Godeps/_workspace/src/{code.google.com/p/google-api-go-client => google.golang.org/api}/googleapi/internal/uritemplates/uritemplates.go (100%)
 rename Godeps/_workspace/src/{code.google.com/p/google-api-go-client => google.golang.org/api}/googleapi/internal/uritemplates/utils.go (100%)
 rename Godeps/_workspace/src/{code.google.com/p/google-api-go-client => google.golang.org/api}/googleapi/transport/apikey.go (100%)
 rename Godeps/_workspace/src/{code.google.com/p/google-api-go-client => google.golang.org/api}/googleapi/types.go (100%)
 rename Godeps/_workspace/src/{code.google.com/p/google-api-go-client => google.golang.org/api}/googleapi/types_test.go (100%)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index ec315cc729..de5589fcaa 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -7,16 +7,6 @@
 			"Comment": "weekly-56",
 			"Rev": "afe77d958c701557ec5dc56f6936fcc194d15520"
 		},
-		{
-			"ImportPath": "code.google.com/p/google-api-go-client/compute/v1",
-			"Comment": "release-107",
-			"Rev": "6ddfebb10ece847f1ae09c701834f1b15abbd8b2"
-		},
-		{
-			"ImportPath": "code.google.com/p/google-api-go-client/googleapi",
-			"Comment": "release-107",
-			"Rev": "6ddfebb10ece847f1ae09c701834f1b15abbd8b2"
-		},
 		{
 			"ImportPath": "github.com/MSOpenTech/azure-sdk-for-go",
 			"Comment": "v1.1-14-g814812a",
@@ -27,6 +17,10 @@
 			"Comment": "v0.6.1",
 			"Rev": "1f2ba2c6317323dd667bd266c1e8ebffc4a4c62f"
 		},
+		{
+			"ImportPath": "github.com/codegangsta/cli",
+			"Rev": "fbda1ce02d5dabcee952040e5f4025753b6c9ce0"
+		},
 		{
 			"ImportPath": "github.com/digitalocean/godo",
 			"Comment": "v0.5.0",
@@ -129,8 +123,12 @@
 			"Rev": "ac974c61c2f990f4115b119354b5e0b47550e888"
 		},
 		{
-			"ImportPath": "github.com/codegangsta/cli",
-			"Rev": "fbda1ce02d5dabcee952040e5f4025753b6c9ce0"
+			"ImportPath": "google.golang.org/api/compute/v1",
+			"Rev": "aa91ac681e18e52b1a0dfe29b9d8354e88c0dcf5"
+		},
+		{
+			"ImportPath": "google.golang.org/api/googleapi",
+			"Rev": "aa91ac681e18e52b1a0dfe29b9d8354e88c0dcf5"
 		}
 	]
 }
diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/compute/v1/compute-api.json b/Godeps/_workspace/src/google.golang.org/api/compute/v1/compute-api.json
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/google-api-go-client/compute/v1/compute-api.json
rename to Godeps/_workspace/src/google.golang.org/api/compute/v1/compute-api.json
diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/compute/v1/compute-gen.go b/Godeps/_workspace/src/google.golang.org/api/compute/v1/compute-gen.go
similarity index 99%
rename from Godeps/_workspace/src/code.google.com/p/google-api-go-client/compute/v1/compute-gen.go
rename to Godeps/_workspace/src/google.golang.org/api/compute/v1/compute-gen.go
index 7d193b56b8..5e9da0dffd 100644
--- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/compute/v1/compute-gen.go
+++ b/Godeps/_workspace/src/google.golang.org/api/compute/v1/compute-gen.go
@@ -4,17 +4,17 @@
 //
 // Usage example:
 //
-//   import "code.google.com/p/google-api-go-client/compute/v1"
+//   import "google.golang.org/api/compute/v1"
 //   ...
 //   computeService, err := compute.New(oauthHttpClient)
 package compute
 
 import (
 	"bytes"
-	"code.google.com/p/google-api-go-client/googleapi"
 	"encoding/json"
 	"errors"
 	"fmt"
+	"google.golang.org/api/googleapi"
 	"io"
 	"net/http"
 	"net/url"
diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/googleapi.go b/Godeps/_workspace/src/google.golang.org/api/googleapi/googleapi.go
similarity index 99%
rename from Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/googleapi.go
rename to Godeps/_workspace/src/google.golang.org/api/googleapi/googleapi.go
index d6e5cd83fb..af3442eb8a 100644
--- a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/googleapi.go
+++ b/Godeps/_workspace/src/google.golang.org/api/googleapi/googleapi.go
@@ -19,7 +19,7 @@ import (
 	"os"
 	"strings"
 
-	"code.google.com/p/google-api-go-client/googleapi/internal/uritemplates"
+	"google.golang.org/api/googleapi/internal/uritemplates"
 )
 
 // ContentTyper is an interface for Readers which know (or would like
diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/googleapi_test.go b/Godeps/_workspace/src/google.golang.org/api/googleapi/googleapi_test.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/googleapi_test.go
rename to Godeps/_workspace/src/google.golang.org/api/googleapi/googleapi_test.go
diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates/LICENSE b/Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/LICENSE
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates/LICENSE
rename to Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/LICENSE
diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates/uritemplates.go b/Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/uritemplates.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates/uritemplates.go
rename to Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/uritemplates.go
diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates/utils.go b/Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/utils.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/internal/uritemplates/utils.go
rename to Godeps/_workspace/src/google.golang.org/api/googleapi/internal/uritemplates/utils.go
diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/transport/apikey.go b/Godeps/_workspace/src/google.golang.org/api/googleapi/transport/apikey.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/transport/apikey.go
rename to Godeps/_workspace/src/google.golang.org/api/googleapi/transport/apikey.go
diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/types.go b/Godeps/_workspace/src/google.golang.org/api/googleapi/types.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/types.go
rename to Godeps/_workspace/src/google.golang.org/api/googleapi/types.go
diff --git a/Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/types_test.go b/Godeps/_workspace/src/google.golang.org/api/googleapi/types_test.go
similarity index 100%
rename from Godeps/_workspace/src/code.google.com/p/google-api-go-client/googleapi/types_test.go
rename to Godeps/_workspace/src/google.golang.org/api/googleapi/types_test.go
diff --git a/drivers/googlecomputeengine/auth_util.go b/drivers/googlecomputeengine/auth_util.go
index 843ab13454..31487ffb74 100644
--- a/drivers/googlecomputeengine/auth_util.go
+++ b/drivers/googlecomputeengine/auth_util.go
@@ -12,8 +12,8 @@ import (
 	"time"
 
 	"code.google.com/p/goauth2/oauth"
-	raw "code.google.com/p/google-api-go-client/compute/v1"
 	log "github.com/Sirupsen/logrus"
+	raw "google.golang.org/api/compute/v1"
 )
 
 const (
diff --git a/drivers/googlecomputeengine/compute_util.go b/drivers/googlecomputeengine/compute_util.go
index 3ebfc4aa6d..e9b85f74e9 100644
--- a/drivers/googlecomputeengine/compute_util.go
+++ b/drivers/googlecomputeengine/compute_util.go
@@ -5,10 +5,10 @@ import (
 	"io/ioutil"
 	"time"
 
-	raw "code.google.com/p/google-api-go-client/compute/v1"
 	log "github.com/Sirupsen/logrus"
 	"github.com/docker/machine/drivers"
 	"github.com/docker/machine/ssh"
+	raw "google.golang.org/api/compute/v1"
 )
 
 // ComputeUtil is used to wrap the raw GCE API code and store common parameters.