Merge pull request #2101 from ahmetalpbalkan/pr-azure-update

azure: revendor + remove hacky solution in is404
distribution · Jan 10, 2017 · e468480 · e468480
2 parents 1140605 + cc68bdb
commit e468480
Show file tree

Hide file tree

Showing 8 changed files with 999 additions and 114 deletions.
diff --git a/registry/storage/driver/azure/azure.go b/registry/storage/driver/azure/azure.go
@@ -397,14 +397,6 @@ func (d *driver) listBlobs(container, virtPath string) ([]string, error) {
 }
 
 func is404(err error) bool {
-	// handle the case when the request was a HEAD and service error could not
-	// be parsed, such as "storage: service returned without a response body
-	// (404 The specified blob does not exist.)"
-	if strings.Contains(fmt.Sprintf("%v", err), "404 The specified blob does not exist") {
-		return true
-	}
-
-	// common case
 	statusCodeErr, ok := err.(azure.AzureStorageServiceError)
 	return ok && statusCodeErr.StatusCode == http.StatusNotFound
 }

diff --git a/vendor.conf b/vendor.conf
@@ -1,4 +1,4 @@
-github.com/Azure/azure-sdk-for-go/storage 0b5fe2abe0271ba07049eacaa65922d67c319543
+github.com/Azure/azure-sdk-for-go c6f0533defaaaa26ea4dff3c9774e36033088112
 github.com/Sirupsen/logrus d26492970760ca5d33129d2d799e34be5c4782eb
 github.com/aws/aws-sdk-go 90dec2183a5f5458ee79cbaf4b8e9ab910bc81a6
 github.com/bshuster-repo/logrus-logstash-hook 5f729f2fb50a301153cae84ff5c58981d51c095a