Add changes required for Gcmarker

manifests.go

@@ -61,6 +61,10 @@ type ManifestService interface {
 	// Delete removes the manifest specified by the given digest. Deleting
 	// a manifest that doesn't exist will return ErrManifestNotFound
 	Delete(ctx context.Context, dgst digest.Digest) error
+
+	// Stat provides metadata about a manifest identified by the digest. If the
+	// manifest is unknown to the describer, ErrManifestUnknownRevision will be returned.
+	Stat(ctx context.Context, dgst digest.Digest) (Descriptor, error)
 }
 
 // ManifestEnumerator enables iterating over manifests

registry/storage/driver/base/base.go

@@ -84,6 +84,9 @@ func (base *Base) setDriverName(e error) error {
 	case storagedriver.UserSuspendedError:
 		actual.DriverName = base.StorageDriver.Name()
 		return actual
+	case storagedriver.InvalidAccessKeyIdError:
+		actual.DriverName = base.StorageDriver.Name()
+		return actual
 	default:
 		storageError := storagedriver.Error{
 			DriverName: base.StorageDriver.Name(),

registry/storage/driver/s3-aws/s3.go

@@ -1207,7 +1207,7 @@ func (d *driver) Walk(ctx context.Context, from string, f storagedriver.WalkFn)
 
 	var objectCount int64
 	if err := d.doWalk(ctx, &objectCount, d.s3Path(path), prefix, f); err != nil {
-		return err
+		return parseError(from, err)
 	}
 
 	// S3 doesn't have the concept of empty directories, so it'll return path not found if there are no objects
@@ -1414,6 +1414,8 @@ func parseError(path string, err error) error {
 			return storagedriver.QuotaExceededError{}
 		case "UserSuspended":
 			return storagedriver.UserSuspendedError{}
+		case "InvalidAccessKeyId":
+			return storagedriver.InvalidAccessKeyIdError{}
 		}
 	}
 	return err

registry/storage/driver/storagedriver.go

@@ -178,6 +178,16 @@ func (err UserSuspendedError) Error() string {
 	return fmt.Sprintf("%s: user is suspended", err.DriverName)
 }
 
+// InvalidAccessKeyIdError is returned when an invalided access key and/or secret key
+// is provided to the S3 api.
+type InvalidAccessKeyIdError struct {
+	DriverName string
+}
+
+func (err InvalidAccessKeyIdError) Error() string {
+	return fmt.Sprintf("%s: access key and secret key is invalid", err.DriverName)
+}
+
 // Error is a catch-all error type which captures an error string and
 // the driver type on which it occurred.
 type Error struct {

registry/storage/manifeststore.go

@@ -72,6 +72,24 @@ func (ms *manifestStore) Exists(ctx context.Context, dgst digest.Digest) (bool,
 	return true, nil
 }
 
+func (ms *manifestStore) Stat(ctx context.Context, dgst digest.Digest) (distribution.Descriptor, error) {
+	dcontext.GetLogger(ms.ctx).Debug("(*manifestStore).Exists")
+
+	descriptor, err := ms.blobStore.Stat(ctx, dgst)
+	if err != nil {
+		if err == distribution.ErrBlobUnknown {
+			return distribution.Descriptor{}, distribution.ErrManifestUnknownRevision{
+				Name:     ms.repository.Named().Name(),
+				Revision: dgst,
+			}
+		}
+
+		return distribution.Descriptor{}, err
+	}
+
+	return descriptor, nil
+}
+
 func (ms *manifestStore) Get(ctx context.Context, dgst digest.Digest, options ...distribution.ManifestServiceOption) (distribution.Manifest, error) {
 	dcontext.GetLogger(ms.ctx).Debug("(*manifestStore).Get")