From 0618a2ebd73fe2965cc5ff3f67e69162bedd7b74 Mon Sep 17 00:00:00 2001
From: Stephen J Day <stephen.day@docker.com>
Date: Mon, 10 Nov 2014 18:26:06 -0800
Subject: [PATCH] Clearer names for layer upload routes

---
 routes.go      | 20 ++++++++++----------
 routes_test.go |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/routes.go b/routes.go
index 10c9e398f..d49426966 100644
--- a/routes.go
+++ b/routes.go
@@ -5,21 +5,21 @@ import (
 )
 
 const (
-	routeNameRoot             = "root"
-	routeNameName             = "name"
-	routeNameImageManifest    = "image-manifest"
-	routeNameTags             = "tags"
-	routeNameLayer            = "layer"
-	routeNameStartLayerUpload = "start-layer-upload"
-	routeNameLayerUpload      = "layer-upload"
+	routeNameRoot              = "root"
+	routeNameName              = "name"
+	routeNameImageManifest     = "image-manifest"
+	routeNameTags              = "tags"
+	routeNameLayer             = "layer"
+	routeNameLayerUpload       = "layer-upload"
+	routeNameLayerUploadResume = "layer-upload-resume"
 )
 
 var allEndpoints = []string{
 	routeNameImageManifest,
 	routeNameTags,
 	routeNameLayer,
-	routeNameStartLayerUpload,
 	routeNameLayerUpload,
+	routeNameLayerUploadResume,
 }
 
 // v2APIRouter builds a gorilla router with named routes for the various API
@@ -59,14 +59,14 @@ func v2APIRouter() *mux.Router {
 	// POST	/v2/<name>/layer/<tarsum>/upload/	Layer Upload	Initiate an upload of the layer identified by tarsum. Requires length and a checksum parameter.
 	namedRouter.
 		Path("/layer/{tarsum}/upload/").
-		Name(routeNameStartLayerUpload)
+		Name(routeNameLayerUpload)
 
 	// GET	/v2/<name>/layer/<tarsum>/upload/<uuid>	Layer Upload	Get the status of the upload identified by tarsum and uuid.
 	// PUT	/v2/<name>/layer/<tarsum>/upload/<uuid>	Layer Upload	Upload all or a chunk of the upload identified by tarsum and uuid.
 	// DELETE	/v2/<name>/layer/<tarsum>/upload/<uuid>	Layer Upload	Cancel the upload identified by layer and uuid
 	namedRouter.
 		Path("/layer/{tarsum}/upload/{uuid}").
-		Name(routeNameLayerUpload)
+		Name(routeNameLayerUploadResume)
 
 	return router
 }
diff --git a/routes_test.go b/routes_test.go
index 6b1daf80c..e3ef371a7 100644
--- a/routes_test.go
+++ b/routes_test.go
@@ -76,7 +76,7 @@ func TestRouter(t *testing.T) {
 			},
 		},
 		{
-			routeName: routeNameStartLayerUpload,
+			routeName: routeNameLayerUpload,
 			expectedRouteInfo: routeInfo{
 				RequestURI: "/v2/foo/bar/layer/tarsum/upload/",
 				Vars: map[string]string{
@@ -86,7 +86,7 @@ func TestRouter(t *testing.T) {
 			},
 		},
 		{
-			routeName: routeNameLayerUpload,
+			routeName: routeNameLayerUploadResume,
 			expectedRouteInfo: routeInfo{
 				RequestURI: "/v2/foo/bar/layer/tarsum/upload/uuid",
 				Vars: map[string]string{