From 067611fdeacd70b3e59d9f3d802ed8505a932b09 Mon Sep 17 00:00:00 2001
From: Kazuyoshi Kato <katokazu@amazon.com>
Date: Mon, 21 Mar 2022 19:07:10 +0000
Subject: [PATCH] Remove enumvalue_customname, goproto_enum_prefix and
 enum_customname

This commit removes gogoproto.enumvalue_customname,
gogoproto.goproto_enum_prefix and gogoproto.enum_customname.

All of them make proto-generated Go code more idiomatic, but we already
don't use these enums in our external-surfacing types and they are anyway
not supported by Google's official toolchain (see #6564).

Signed-off-by: Kazuyoshi Kato <katokazu@amazon.com>
---
 api/next.pb.txt                               |  51 -------
 api/services/content/v1/content.pb.go         | 136 +++++++++--------
 api/services/content/v1/content.proto         |   9 +-
 api/services/snapshots/v1/snapshots.pb.go     | 138 +++++++++---------
 api/services/snapshots/v1/snapshots.proto     |  11 +-
 api/types/task/task.pb.go                     |  78 +++++-----
 api/types/task/task.proto                     |  15 +-
 container.go                                  |   2 +-
 content/proxy/content_store.go                |   2 +-
 content/proxy/content_writer.go               |   6 +-
 contrib/snapshotservice/service.go            |  10 +-
 runtime/v1/linux/process.go                   |  32 ++--
 runtime/v1/linux/task.go                      |  16 +-
 runtime/v1/shim/service.go                    |  12 +-
 runtime/v2/process.go                         |  32 ++--
 runtime/v2/runc/task/service.go               |  12 +-
 runtime/v2/runc/v1/service.go                 |  12 +-
 runtime/v2/shim.go                            |  16 +-
 .../content/contentserver/contentserver.go    |   8 +-
 services/snapshots/service.go                 |  10 +-
 services/tasks/local.go                       |  12 +-
 snapshots/proxy/proxy.go                      |  10 +-
 22 files changed, 269 insertions(+), 361 deletions(-)

diff --git a/api/next.pb.txt b/api/next.pb.txt
index b420640ef..4e8b3041c 100644
--- a/api/next.pb.txt
+++ b/api/next.pb.txt
@@ -1616,27 +1616,14 @@ file {
     value {
       name: "STAT"
       number: 0
-      options {
-        66001: "WriteActionStat"
-      }
     }
     value {
       name: "WRITE"
       number: 1
-      options {
-        66001: "WriteActionWrite"
-      }
     }
     value {
       name: "COMMIT"
       number: 2
-      options {
-        66001: "WriteActionCommit"
-      }
-    }
-    options {
-      62001: 0
-      62023: "WriteAction"
     }
   }
   service {
@@ -3404,34 +3391,18 @@ file {
     value {
       name: "UNKNOWN"
       number: 0
-      options {
-        66001: "KindUnknown"
-      }
     }
     value {
       name: "VIEW"
       number: 1
-      options {
-        66001: "KindView"
-      }
     }
     value {
       name: "ACTIVE"
       number: 2
-      options {
-        66001: "KindActive"
-      }
     }
     value {
       name: "COMMITTED"
       number: 3
-      options {
-        66001: "KindCommitted"
-      }
-    }
-    options {
-      62001: 0
-      62023: "Kind"
     }
   }
   service {
@@ -3642,48 +3613,26 @@ file {
     value {
       name: "UNKNOWN"
       number: 0
-      options {
-        66001: "StatusUnknown"
-      }
     }
     value {
       name: "CREATED"
       number: 1
-      options {
-        66001: "StatusCreated"
-      }
     }
     value {
       name: "RUNNING"
       number: 2
-      options {
-        66001: "StatusRunning"
-      }
     }
     value {
       name: "STOPPED"
       number: 3
-      options {
-        66001: "StatusStopped"
-      }
     }
     value {
       name: "PAUSED"
       number: 4
-      options {
-        66001: "StatusPaused"
-      }
     }
     value {
       name: "PAUSING"
       number: 5
-      options {
-        66001: "StatusPausing"
-      }
-    }
-    options {
-      62001: 0
-      62023: "Status"
     }
   }
   syntax: "proto3"
diff --git a/api/services/content/v1/content.pb.go b/api/services/content/v1/content.pb.go
index dcea7e426..586a6740b 100644
--- a/api/services/content/v1/content.pb.go
+++ b/api/services/content/v1/content.pb.go
@@ -40,14 +40,14 @@ type WriteAction int32
 const (
 	// WriteActionStat instructs the writer to return the current status while
 	// holding the lock on the write.
-	WriteActionStat WriteAction = 0
+	WriteAction_STAT WriteAction = 0
 	// WriteActionWrite sets the action for the write request to write data.
 	//
 	// Any data included will be written at the provided offset. The
 	// transaction will be left open for further writes.
 	//
 	// This is the default.
-	WriteActionWrite WriteAction = 1
+	WriteAction_WRITE WriteAction = 1
 	// WriteActionCommit will write any outstanding data in the message and
 	// commit the write, storing it under the digest.
 	//
@@ -55,7 +55,7 @@ const (
 	// commit it.
 	//
 	// This action will always terminate the write.
-	WriteActionCommit WriteAction = 2
+	WriteAction_COMMIT WriteAction = 2
 )
 
 var WriteAction_name = map[int32]string{
@@ -934,73 +934,69 @@ func init() {
 }
 
 var fileDescriptor_468430ba3e400391 = []byte{
-	// 1042 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0x4f, 0x8f, 0xdb, 0x44,
-	0x14, 0xdf, 0x89, 0x13, 0xef, 0xe6, 0x65, 0x5b, 0xc2, 0x24, 0x54, 0x91, 0x11, 0x5e, 0xd7, 0x02,
-	0x14, 0x51, 0xea, 0x6c, 0xb3, 0x3d, 0x00, 0x95, 0x80, 0x6c, 0xd8, 0xaa, 0x2b, 0x75, 0x01, 0xb9,
-	0x29, 0x8b, 0x7a, 0x29, 0x4e, 0x32, 0x09, 0xd6, 0x26, 0x71, 0x6a, 0x4f, 0x22, 0x96, 0x13, 0x17,
-	0x24, 0xb4, 0xe2, 0xc0, 0x17, 0xd8, 0x13, 0xdc, 0xf8, 0x06, 0x1c, 0x90, 0xb8, 0xed, 0x91, 0x23,
-	0xa7, 0x42, 0xf7, 0x03, 0xf0, 0x19, 0xd0, 0x8c, 0xc7, 0x89, 0x9d, 0x3f, 0xd8, 0x49, 0xf7, 0xf6,
-	0x66, 0xfc, 0x7e, 0xef, 0xef, 0xef, 0xcd, 0x4b, 0xe0, 0x7e, 0xd7, 0xa6, 0x5f, 0x8f, 0x9a, 0x46,
-	0xcb, 0xe9, 0x57, 0x5a, 0xce, 0x80, 0x5a, 0xf6, 0x80, 0xb8, 0xed, 0xb0, 0x68, 0x0d, 0xed, 0x8a,
-	0x47, 0xdc, 0xb1, 0xdd, 0x22, 0x1e, 0xbf, 0x27, 0x03, 0x5a, 0x19, 0xdf, 0x09, 0x44, 0x63, 0xe8,
-	0x3a, 0xd4, 0xc1, 0xea, 0x14, 0x61, 0x04, 0xda, 0x46, 0xa0, 0x32, 0xbe, 0xa3, 0x14, 0xbb, 0x4e,
-	0xd7, 0xe1, 0xaa, 0x15, 0x26, 0xf9, 0x28, 0x45, 0xeb, 0x3a, 0x4e, 0xb7, 0x47, 0x2a, 0xfc, 0xd4,
-	0x1c, 0x75, 0x2a, 0x1d, 0x9b, 0xf4, 0xda, 0x4f, 0xfb, 0x96, 0x77, 0x22, 0x34, 0x76, 0x66, 0x35,
-	0xa8, 0xdd, 0x27, 0x1e, 0xb5, 0xfa, 0x43, 0xa1, 0xf0, 0xfa, 0xac, 0x02, 0xe9, 0x0f, 0xe9, 0xa9,
-	0xff, 0x51, 0xff, 0x23, 0x05, 0xe9, 0xc3, 0x41, 0xc7, 0xc1, 0x37, 0x40, 0x6e, 0xdb, 0x5d, 0xe2,
-	0xd1, 0x12, 0xd2, 0x50, 0x39, 0x6b, 0x8a, 0x13, 0xc6, 0x90, 0xf6, 0xec, 0x6f, 0x49, 0x29, 0xa5,
-	0xa1, 0xb2, 0x64, 0x72, 0x19, 0xd7, 0x01, 0x5a, 0x2e, 0xb1, 0x28, 0x69, 0x3f, 0xb5, 0x68, 0x49,
-	0xd2, 0x50, 0x39, 0x57, 0x55, 0x0c, 0xdf, 0x8d, 0x11, 0xb8, 0x31, 0x1a, 0x41, 0x1c, 0xfb, 0x5b,
-	0x17, 0xcf, 0x77, 0x36, 0x7e, 0xfa, 0x7b, 0x07, 0x99, 0x59, 0x81, 0xab, 0x51, 0x66, 0x64, 0x34,
-	0x6c, 0x07, 0x46, 0xd2, 0xab, 0x18, 0x11, 0xb8, 0x1a, 0xc5, 0x0f, 0x40, 0xee, 0x59, 0x4d, 0xd2,
-	0xf3, 0x4a, 0x19, 0x4d, 0x2a, 0xe7, 0xaa, 0xbb, 0xc6, 0xff, 0x57, 0xd9, 0x60, 0xb9, 0x1a, 0x0f,
-	0x39, 0xe4, 0x60, 0x40, 0xdd, 0x53, 0x53, 0xe0, 0x95, 0xf7, 0x21, 0x17, 0xba, 0xc6, 0x79, 0x90,
-	0x4e, 0xc8, 0xa9, 0xa8, 0x05, 0x13, 0x71, 0x11, 0x32, 0x63, 0xab, 0x37, 0xf2, 0x2b, 0x91, 0x35,
-	0xfd, 0xc3, 0x07, 0xa9, 0xf7, 0x90, 0xfe, 0x16, 0xe4, 0x98, 0x59, 0x93, 0x3c, 0x1b, 0xb1, 0x8a,
-	0x2d, 0xa9, 0xa4, 0xfe, 0x29, 0x6c, 0xfb, 0x6a, 0xde, 0xd0, 0x19, 0x78, 0x04, 0x7f, 0x08, 0x69,
-	0x7b, 0xd0, 0x71, 0xb8, 0x56, 0xae, 0xfa, 0x66, 0x92, 0xc8, 0xf7, 0xd3, 0xac, 0x08, 0x26, 0xc7,
-	0xe9, 0x3f, 0x22, 0xb8, 0xf6, 0x98, 0x57, 0x22, 0xf0, 0xfc, 0x92, 0x16, 0xf1, 0x3d, 0xc8, 0xf9,
-	0xa5, 0xe5, 0xfc, 0xe2, 0x89, 0x2e, 0xea, 0xc9, 0x7d, 0x46, 0xc1, 0x23, 0xcb, 0x3b, 0x31, 0x45,
-	0x07, 0x99, 0xac, 0x7f, 0x0e, 0xd7, 0x83, 0x68, 0xae, 0x28, 0x41, 0x03, 0xf0, 0x43, 0xdb, 0xa3,
-	0x75, 0x5f, 0x25, 0x48, 0xb2, 0x04, 0x9b, 0x1d, 0xbb, 0x47, 0x89, 0xeb, 0x95, 0x90, 0x26, 0x95,
-	0xb3, 0x66, 0x70, 0xd4, 0x1f, 0x43, 0x21, 0xa2, 0x3f, 0x17, 0x86, 0xb4, 0x66, 0x18, 0xc5, 0x4f,
-	0x48, 0x8f, 0x50, 0x32, 0x13, 0xc8, 0xb2, 0x3e, 0x7f, 0x09, 0xd8, 0x24, 0x56, 0x3b, 0x99, 0x36,
-	0xbb, 0x77, 0x3a, 0x1d, 0x8f, 0x50, 0x31, 0x61, 0xe2, 0x34, 0x99, 0x3b, 0x69, 0x3a, 0x77, 0x7a,
-	0x0d, 0x0a, 0x11, 0xcb, 0x22, 0xc1, 0xa9, 0x09, 0x34, 0x6b, 0xa2, 0x6d, 0x51, 0x8b, 0x1b, 0xde,
-	0x36, 0xb9, 0xac, 0xff, 0x8b, 0x40, 0x7e, 0x44, 0x2d, 0x3a, 0xf2, 0xd8, 0x00, 0x7a, 0xd4, 0x72,
-	0xc5, 0x00, 0xa2, 0x55, 0x06, 0x50, 0xe0, 0xe6, 0xa6, 0x38, 0xb5, 0xde, 0x14, 0xe7, 0x41, 0x72,
-	0x49, 0x87, 0xa7, 0x9a, 0x35, 0x99, 0x18, 0x4a, 0x29, 0x1d, 0x49, 0xa9, 0x08, 0x19, 0xea, 0x50,
-	0xab, 0x57, 0xca, 0xf0, 0x6b, 0xff, 0x80, 0x15, 0xd8, 0x22, 0xdf, 0x0c, 0x49, 0x8b, 0x92, 0x76,
-	0x49, 0xe6, 0x46, 0x26, 0x67, 0xfd, 0x26, 0x5c, 0xf3, 0xf3, 0x0d, 0x1a, 0x21, 0x9c, 0xa1, 0x89,
-	0x33, 0xc6, 0xdc, 0x40, 0x65, 0x42, 0x19, 0xd9, 0xe3, 0x37, 0xa2, 0x2c, 0x6f, 0xc7, 0x91, 0x46,
-	0xe0, 0x05, 0x4a, 0xaf, 0xf8, 0x4c, 0xf4, 0x6f, 0x89, 0x17, 0x4f, 0xdd, 0xaf, 0xa0, 0x18, 0x05,
-	0x88, 0x40, 0x1e, 0xc0, 0x96, 0x27, 0xee, 0x04, 0x7f, 0x13, 0x86, 0x22, 0x18, 0x3c, 0x41, 0xeb,
-	0xcf, 0x53, 0x50, 0x38, 0x76, 0xed, 0x39, 0x16, 0xd7, 0x41, 0xb6, 0x5a, 0xd4, 0x76, 0x06, 0x3c,
-	0xd5, 0xeb, 0xd5, 0x5b, 0x71, 0xf6, 0xb9, 0x91, 0x1a, 0x87, 0x98, 0x02, 0x1a, 0xd4, 0x34, 0x35,
-	0x6d, 0xe0, 0xa4, 0x51, 0xd2, 0xb2, 0x46, 0xa5, 0xa3, 0x8d, 0x0a, 0xb5, 0x3c, 0xb3, 0x90, 0xc5,
-	0xf2, 0x94, 0xc5, 0xf8, 0x78, 0xf2, 0xec, 0x6f, 0xf2, 0xa2, 0x7c, 0x94, 0x28, 0xe8, 0x68, 0xe6,
-	0x57, 0xbd, 0x05, 0x7e, 0x4d, 0x41, 0x31, 0xea, 0x46, 0xf4, 0xf0, 0x4a, 0x2a, 0x1c, 0x1d, 0xd6,
-	0xd4, 0x55, 0x0c, 0xab, 0xb4, 0xde, 0xb0, 0xae, 0x36, 0x9a, 0xd3, 0x67, 0x4f, 0x8e, 0x3c, 0x92,
-	0x1a, 0x6c, 0xd7, 0x9a, 0x8e, 0x4b, 0x97, 0x4e, 0xe5, 0x3b, 0xdf, 0x23, 0xc8, 0x85, 0x2a, 0x81,
-	0xdf, 0x80, 0xf4, 0xa3, 0x46, 0xad, 0x91, 0xdf, 0x50, 0x0a, 0x67, 0xe7, 0xda, 0x2b, 0xa1, 0x4f,
-	0x8c, 0xf1, 0x78, 0x07, 0x32, 0xc7, 0xe6, 0x61, 0xe3, 0x20, 0x8f, 0x94, 0xe2, 0xd9, 0xb9, 0x96,
-	0x0f, 0x7d, 0xe7, 0x22, 0xbe, 0x09, 0x72, 0xfd, 0xb3, 0xa3, 0xa3, 0xc3, 0x46, 0x3e, 0xa5, 0xbc,
-	0x76, 0x76, 0xae, 0xbd, 0x1a, 0xd2, 0xa8, 0x3b, 0xfd, 0xbe, 0x4d, 0x95, 0xc2, 0x0f, 0x3f, 0xab,
-	0x1b, 0xbf, 0xfd, 0xa2, 0x86, 0xfd, 0x56, 0x7f, 0xdf, 0x84, 0x4d, 0xd1, 0x52, 0x6c, 0x89, 0x1f,
-	0x4b, 0xb7, 0x92, 0x2c, 0x11, 0x91, 0x9a, 0xf2, 0x6e, 0x32, 0x65, 0xc1, 0x96, 0x2e, 0xc8, 0xfe,
-	0x1a, 0xc5, 0xb7, 0xe3, 0x70, 0x91, 0xe5, 0xaf, 0x18, 0x49, 0xd5, 0x85, 0xa3, 0x67, 0x90, 0x66,
-	0x4f, 0x0e, 0xae, 0xc6, 0xe1, 0xe6, 0x77, 0xb0, 0xb2, 0xb7, 0x12, 0xc6, 0x77, 0xb8, 0x8b, 0xf0,
-	0x17, 0x20, 0xfb, 0x9b, 0x14, 0xdf, 0x8d, 0x33, 0xb0, 0x68, 0xe3, 0x2a, 0x37, 0xe6, 0xb8, 0x7a,
-	0xc0, 0x7e, 0xca, 0xb2, 0x54, 0xd8, 0x5e, 0x8c, 0x4f, 0x65, 0x7e, 0x2f, 0xc7, 0xa7, 0xb2, 0x60,
-	0xe3, 0xee, 0x22, 0xd6, 0x26, 0xb1, 0x46, 0x6f, 0x27, 0xdc, 0x0d, 0x49, 0xdb, 0x34, 0xb3, 0x8a,
-	0x4e, 0x61, 0x3b, 0xbc, 0x19, 0x70, 0xa2, 0xd2, 0xcf, 0x2c, 0x1e, 0xe5, 0xee, 0x6a, 0x20, 0xe1,
-	0x7a, 0x0c, 0x19, 0x7f, 0x74, 0xf6, 0xd6, 0x78, 0x5e, 0xe3, 0x7d, 0x2e, 0x7a, 0x2c, 0xcb, 0x68,
-	0x17, 0xe1, 0x23, 0xc8, 0xf0, 0xb7, 0x01, 0xc7, 0x4e, 0x4e, 0xf8, 0x09, 0x59, 0xc6, 0x8e, 0xfd,
-	0x27, 0x17, 0x2f, 0xd4, 0x8d, 0xbf, 0x5e, 0xa8, 0x1b, 0xdf, 0x5d, 0xaa, 0xe8, 0xe2, 0x52, 0x45,
-	0x7f, 0x5e, 0xaa, 0xe8, 0x9f, 0x4b, 0x15, 0x3d, 0xf9, 0x78, 0xdd, 0xbf, 0x76, 0xf7, 0x84, 0xd8,
-	0x94, 0xb9, 0xaf, 0xbd, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0xec, 0xfe, 0xb2, 0x1f, 0x25, 0x0e,
-	0x00, 0x00,
+	// 989 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x57, 0xcf, 0x6e, 0x1b, 0x45,
+	0x18, 0xcf, 0xec, 0xae, 0x37, 0xf1, 0xe7, 0xb4, 0xb2, 0x26, 0x56, 0x65, 0x2d, 0x92, 0x63, 0x56,
+	0x80, 0x2c, 0x4a, 0xd7, 0xa9, 0xdb, 0x03, 0x50, 0x09, 0x70, 0x42, 0xaa, 0x46, 0x6a, 0x00, 0x6d,
+	0x5d, 0x82, 0x7a, 0x29, 0x63, 0x7b, 0x6c, 0x56, 0xb1, 0x77, 0xdd, 0x9d, 0xb1, 0x45, 0x38, 0xf1,
+	0x00, 0x1c, 0x78, 0x0f, 0xde, 0x01, 0x89, 0x5b, 0x8e, 0x1c, 0x39, 0x15, 0x9a, 0x07, 0xe0, 0x19,
+	0xd0, 0xcc, 0xce, 0xda, 0x5e, 0xff, 0x61, 0xd7, 0x69, 0x6e, 0x33, 0xe3, 0xef, 0xf7, 0xfd, 0xff,
+	0x7d, 0xdf, 0x1a, 0x1e, 0xf7, 0x3d, 0xfe, 0xc3, 0xb8, 0xed, 0x74, 0x82, 0x61, 0xbd, 0x13, 0xf8,
+	0x9c, 0x78, 0x3e, 0x0d, 0xbb, 0xf3, 0x47, 0x32, 0xf2, 0xea, 0x8c, 0x86, 0x13, 0xaf, 0x43, 0x99,
+	0x7c, 0xa7, 0x3e, 0xaf, 0x4f, 0xee, 0xc7, 0x47, 0x67, 0x14, 0x06, 0x3c, 0xc0, 0x95, 0x19, 0xc2,
+	0x89, 0xa5, 0x9d, 0x58, 0x64, 0x72, 0xdf, 0x2a, 0xf5, 0x83, 0x7e, 0x20, 0x45, 0xeb, 0xe2, 0x14,
+	0xa1, 0xac, 0x6a, 0x3f, 0x08, 0xfa, 0x03, 0x5a, 0x97, 0xb7, 0xf6, 0xb8, 0x57, 0xef, 0x79, 0x74,
+	0xd0, 0x7d, 0x39, 0x24, 0xec, 0x5c, 0x49, 0xec, 0x2f, 0x4a, 0x70, 0x6f, 0x48, 0x19, 0x27, 0xc3,
+	0x91, 0x12, 0x78, 0x67, 0x51, 0x80, 0x0e, 0x47, 0xfc, 0x22, 0xfa, 0xd1, 0xfe, 0x43, 0x03, 0xe3,
+	0xc4, 0xef, 0x05, 0xf8, 0x0e, 0x98, 0x5d, 0xaf, 0x4f, 0x19, 0x2f, 0xa3, 0x2a, 0xaa, 0xe5, 0x5d,
+	0x75, 0xc3, 0x18, 0x0c, 0xe6, 0xfd, 0x44, 0xcb, 0x5a, 0x15, 0xd5, 0x74, 0x57, 0x9e, 0xf1, 0x11,
+	0x40, 0x27, 0xa4, 0x84, 0xd3, 0xee, 0x4b, 0xc2, 0xcb, 0x7a, 0x15, 0xd5, 0x0a, 0x0d, 0xcb, 0x89,
+	0xcc, 0x38, 0xb1, 0x19, 0xa7, 0x15, 0xfb, 0x71, 0xb8, 0x73, 0xf9, 0x7a, 0x7f, 0xeb, 0xd7, 0xbf,
+	0xf7, 0x91, 0x9b, 0x57, 0xb8, 0x26, 0x17, 0x4a, 0xc6, 0xa3, 0x6e, 0xac, 0xc4, 0xd8, 0x44, 0x89,
+	0xc2, 0x35, 0x39, 0x7e, 0x02, 0xe6, 0x80, 0xb4, 0xe9, 0x80, 0x95, 0x73, 0x55, 0xbd, 0x56, 0x68,
+	0x1c, 0x38, 0xff, 0x9f, 0x65, 0x47, 0xc4, 0xea, 0x3c, 0x95, 0x90, 0x63, 0x9f, 0x87, 0x17, 0xae,
+	0xc2, 0x5b, 0x9f, 0x40, 0x61, 0xee, 0x19, 0x17, 0x41, 0x3f, 0xa7, 0x17, 0x2a, 0x17, 0xe2, 0x88,
+	0x4b, 0x90, 0x9b, 0x90, 0xc1, 0x38, 0xca, 0x44, 0xde, 0x8d, 0x2e, 0x9f, 0x6a, 0x1f, 0x23, 0xfb,
+	0x7d, 0x28, 0x08, 0xb5, 0x2e, 0x7d, 0x35, 0x16, 0x19, 0x5b, 0x93, 0x49, 0xfb, 0x2b, 0xd8, 0x8d,
+	0xc4, 0xd8, 0x28, 0xf0, 0x19, 0xc5, 0x9f, 0x81, 0xe1, 0xf9, 0xbd, 0x40, 0x4a, 0x15, 0x1a, 0xef,
+	0x65, 0xf1, 0xfc, 0xd0, 0x10, 0x49, 0x70, 0x25, 0xce, 0xfe, 0x05, 0xc1, 0xad, 0xe7, 0x32, 0x13,
+	0xb1, 0xe5, 0xb7, 0xd4, 0x88, 0x1f, 0x41, 0x21, 0x4a, 0xad, 0xec, 0x2f, 0x19, 0xe8, 0xaa, 0x9a,
+	0x3c, 0x16, 0x2d, 0x78, 0x4a, 0xd8, 0xb9, 0xab, 0x2a, 0x28, 0xce, 0xf6, 0x37, 0x70, 0x3b, 0xf6,
+	0xe6, 0x86, 0x02, 0x74, 0x00, 0x3f, 0xf5, 0x18, 0x3f, 0x8a, 0x44, 0xe2, 0x20, 0xcb, 0xb0, 0xdd,
+	0xf3, 0x06, 0x9c, 0x86, 0xac, 0x8c, 0xaa, 0x7a, 0x2d, 0xef, 0xc6, 0x57, 0xfb, 0x39, 0xec, 0x25,
+	0xe4, 0x97, 0xdc, 0xd0, 0xaf, 0xe9, 0x46, 0xe9, 0x4b, 0x3a, 0xa0, 0x9c, 0x2e, 0x38, 0xb2, 0xae,
+	0xce, 0xdf, 0x01, 0x76, 0x29, 0xe9, 0x66, 0x93, 0x16, 0xef, 0x41, 0xaf, 0xc7, 0x28, 0x57, 0x0c,
+	0x53, 0xb7, 0x29, 0xef, 0xf4, 0x19, 0xef, 0xec, 0x26, 0xec, 0x25, 0x34, 0xab, 0x00, 0x67, 0x2a,
+	0xd0, 0xa2, 0x8a, 0x2e, 0xe1, 0x44, 0x2a, 0xde, 0x75, 0xe5, 0xd9, 0xfe, 0x17, 0x81, 0xf9, 0x8c,
+	0x13, 0x3e, 0x66, 0x82, 0x80, 0x8c, 0x93, 0x50, 0x11, 0x10, 0x6d, 0x42, 0x40, 0x85, 0x5b, 0x62,
+	0xb1, 0x76, 0x3d, 0x16, 0x17, 0x41, 0x0f, 0x69, 0x4f, 0x86, 0x9a, 0x77, 0xc5, 0x71, 0x2e, 0x24,
+	0x23, 0x11, 0x52, 0x09, 0x72, 0x3c, 0xe0, 0x64, 0x50, 0xce, 0xc9, 0xe7, 0xe8, 0x82, 0x2d, 0xd8,
+	0xa1, 0x3f, 0x8e, 0x68, 0x87, 0xd3, 0x6e, 0xd9, 0x94, 0x4a, 0xa6, 0x77, 0xfb, 0x5d, 0xb8, 0x15,
+	0xc5, 0x1b, 0x17, 0x42, 0x19, 0x43, 0x53, 0x63, 0xa2, 0x73, 0x63, 0x91, 0x69, 0xcb, 0x98, 0x4c,
+	0xbe, 0xa8, 0xb4, 0x7c, 0x90, 0xd6, 0x34, 0x0a, 0xaf, 0x50, 0x76, 0x3d, 0xea, 0xc4, 0xe8, 0x95,
+	0xb2, 0xf4, 0xd6, 0xfd, 0x1e, 0x4a, 0x49, 0x80, 0x72, 0xe4, 0x09, 0xec, 0x30, 0xf5, 0xa6, 0xfa,
+	0x37, 0xa3, 0x2b, 0xaa, 0x83, 0xa7, 0x68, 0xfb, 0xb5, 0x06, 0x7b, 0x67, 0xa1, 0xb7, 0xd4, 0xc5,
+	0x47, 0x60, 0x92, 0x0e, 0xf7, 0x02, 0x5f, 0x86, 0x7a, 0xbb, 0x71, 0x37, 0x4d, 0xbf, 0x54, 0xd2,
+	0x94, 0x10, 0x57, 0x41, 0xe3, 0x9c, 0x6a, 0xb3, 0x02, 0x4e, 0x0b, 0xa5, 0xaf, 0x2b, 0x94, 0x91,
+	0x2c, 0xd4, 0x5c, 0xc9, 0x73, 0x2b, 0xbb, 0xd8, 0x9c, 0x75, 0x31, 0x3e, 0x9b, 0x8e, 0xfd, 0x6d,
+	0x99, 0x94, 0xcf, 0x33, 0x39, 0x9d, 0x8c, 0xfc, 0xa6, 0xb7, 0xc0, 0x6f, 0x1a, 0x94, 0x92, 0x66,
+	0x54, 0x0d, 0x6f, 0x24, 0xc3, 0x49, 0xb2, 0x6a, 0x37, 0x41, 0x56, 0xfd, 0x7a, 0x64, 0xdd, 0x8c,
+	0x9a, 0xb3, 0xb1, 0x67, 0x26, 0x86, 0x64, 0x15, 0x76, 0x9b, 0xed, 0x20, 0xe4, 0x6b, 0x59, 0xf9,
+	0xa1, 0x03, 0x85, 0xb9, 0x44, 0xe0, 0x1d, 0x30, 0x9e, 0xb5, 0x9a, 0xad, 0xe2, 0x16, 0xce, 0x43,
+	0xee, 0xcc, 0x3d, 0x69, 0x1d, 0x17, 0x11, 0x06, 0x30, 0x8f, 0xbe, 0x3e, 0x3d, 0x3d, 0x69, 0x15,
+	0xb5, 0xc6, 0xef, 0xdb, 0xb0, 0xad, 0x52, 0x8f, 0x89, 0xfa, 0xa8, 0xb9, 0x9b, 0x65, 0xd8, 0x2b,
+	0x17, 0xac, 0x8f, 0xb2, 0x09, 0xab, 0xaa, 0xf6, 0xc1, 0x8c, 0xd6, 0x1d, 0xbe, 0x97, 0x86, 0x4b,
+	0x2c, 0x69, 0xcb, 0xc9, 0x2a, 0xae, 0x0c, 0xbd, 0x02, 0x43, 0x8c, 0x06, 0xdc, 0x48, 0xc3, 0x2d,
+	0xef, 0x4a, 0xeb, 0xc1, 0x46, 0x98, 0xc8, 0xe0, 0x01, 0xc2, 0xdf, 0x82, 0x19, 0x6d, 0x3c, 0xfc,
+	0x30, 0x4d, 0xc1, 0xaa, 0xcd, 0x68, 0xdd, 0x59, 0xea, 0xa9, 0x63, 0xf1, 0xc9, 0x29, 0x42, 0x11,
+	0xfb, 0x2b, 0x3d, 0x94, 0xe5, 0xfd, 0x99, 0x1e, 0xca, 0x8a, 0xcd, 0x78, 0x80, 0x44, 0x99, 0xd4,
+	0xba, 0xbb, 0x97, 0x71, 0x86, 0x67, 0x2d, 0xd3, 0xc2, 0xca, 0xb8, 0x80, 0xdd, 0xf9, 0x09, 0x8e,
+	0x33, 0xa5, 0x7e, 0x61, 0x41, 0x58, 0x0f, 0x37, 0x03, 0x29, 0xd3, 0x13, 0xc8, 0x49, 0xa6, 0xa4,
+	0xdb, 0x5c, 0x31, 0x06, 0xd3, 0x6d, 0xae, 0x1a, 0x6a, 0x35, 0x74, 0x80, 0xf0, 0x29, 0xe4, 0x24,
+	0x87, 0x71, 0x2a, 0x73, 0xe6, 0xa9, 0xbe, 0xae, 0x3b, 0x0e, 0x5f, 0x5c, 0xbe, 0xa9, 0x6c, 0xfd,
+	0xf5, 0xa6, 0xb2, 0xf5, 0xf3, 0x55, 0x05, 0x5d, 0x5e, 0x55, 0xd0, 0x9f, 0x57, 0x15, 0xf4, 0xcf,
+	0x55, 0x05, 0xbd, 0xf8, 0xe2, 0xba, 0x7f, 0xc1, 0x1e, 0xa9, 0x63, 0xdb, 0x94, 0xb6, 0x1e, 0xfc,
+	0x17, 0x00, 0x00, 0xff, 0xff, 0x28, 0x66, 0x30, 0x0e, 0xcd, 0x0d, 0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/api/services/content/v1/content.proto b/api/services/content/v1/content.proto
index a8555633d..89e6651eb 100644
--- a/api/services/content/v1/content.proto
+++ b/api/services/content/v1/content.proto
@@ -206,12 +206,9 @@ message ListStatusesResponse {
 
 // WriteAction defines the behavior of a WriteRequest.
 enum WriteAction {
-	option (gogoproto.goproto_enum_prefix) = false;
-	option (gogoproto.enum_customname) = "WriteAction";
-
 	// WriteActionStat instructs the writer to return the current status while
 	// holding the lock on the write.
-	STAT = 0 [(gogoproto.enumvalue_customname) = "WriteActionStat"];
+	STAT = 0;
 
 	// WriteActionWrite sets the action for the write request to write data.
 	//
@@ -219,7 +216,7 @@ enum WriteAction {
 	// transaction will be left open for further writes.
 	//
 	// This is the default.
-	WRITE = 1 [(gogoproto.enumvalue_customname) = "WriteActionWrite"];
+	WRITE = 1;
 
 	// WriteActionCommit will write any outstanding data in the message and
 	// commit the write, storing it under the digest.
@@ -228,7 +225,7 @@ enum WriteAction {
 	// commit it.
 	//
 	// This action will always terminate the write.
-	COMMIT = 2 [(gogoproto.enumvalue_customname) = "WriteActionCommit"];
+	COMMIT = 2;
 }
 
 // WriteContentRequest writes data to the request ref at offset.
diff --git a/api/services/snapshots/v1/snapshots.pb.go b/api/services/snapshots/v1/snapshots.pb.go
index 76772cb98..2bc14cece 100644
--- a/api/services/snapshots/v1/snapshots.pb.go
+++ b/api/services/snapshots/v1/snapshots.pb.go
@@ -38,10 +38,10 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 type Kind int32
 
 const (
-	KindUnknown   Kind = 0
-	KindView      Kind = 1
-	KindActive    Kind = 2
-	KindCommitted Kind = 3
+	Kind_UNKNOWN   Kind = 0
+	Kind_VIEW      Kind = 1
+	Kind_ACTIVE    Kind = 2
+	Kind_COMMITTED Kind = 3
 )
 
 var Kind_name = map[int32]string{
@@ -851,73 +851,69 @@ func init() {
 }
 
 var fileDescriptor_cfc0ddf12791f168 = []byte{
-	// 1047 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0x5d, 0x6f, 0x1b, 0x45,
-	0x17, 0xce, 0xda, 0x1b, 0x27, 0x3e, 0x4e, 0xf2, 0xfa, 0x9d, 0x3a, 0xae, 0xb5, 0x20, 0x67, 0xe5,
-	0x0b, 0x14, 0x71, 0xb1, 0xdb, 0x1a, 0xd1, 0xa6, 0xcd, 0x0d, 0x8e, 0x63, 0x90, 0x93, 0x26, 0x45,
-	0x9b, 0x8f, 0x92, 0x82, 0xa8, 0x36, 0xf6, 0xd8, 0x59, 0xd9, 0xfb, 0x81, 0x67, 0xec, 0xca, 0x20,
-	0x21, 0x2e, 0xab, 0x5c, 0xf1, 0x07, 0x72, 0x05, 0x3f, 0x02, 0xf1, 0x0b, 0x72, 0x89, 0xc4, 0x0d,
-	0x57, 0x40, 0xf3, 0x27, 0xb8, 0x42, 0xa0, 0x99, 0x9d, 0xf5, 0x57, 0x5c, 0x79, 0xed, 0x9a, 0xbb,
-	0x99, 0x9d, 0x39, 0xe7, 0x3c, 0xe7, 0x39, 0x73, 0x9e, 0x99, 0x85, 0xbd, 0xba, 0x45, 0x2f, 0xda,
-	0xe7, 0x5a, 0xc5, 0xb5, 0xf5, 0x8a, 0xeb, 0x50, 0xd3, 0x72, 0x70, 0xab, 0x3a, 0x38, 0x34, 0x3d,
-	0x4b, 0x27, 0xb8, 0xd5, 0xb1, 0x2a, 0x98, 0xe8, 0xc4, 0x31, 0x3d, 0x72, 0xe1, 0x52, 0xa2, 0x77,
-	0xee, 0xf7, 0x27, 0x9a, 0xd7, 0x72, 0xa9, 0x8b, 0xd4, 0xbe, 0x95, 0x16, 0x58, 0x68, 0xfd, 0x4d,
-	0x9d, 0xfb, 0x4a, 0xaa, 0xee, 0xd6, 0x5d, 0xbe, 0x59, 0x67, 0x23, 0xdf, 0x4e, 0x79, 0xa7, 0xee,
-	0xba, 0xf5, 0x26, 0xd6, 0xf9, 0xec, 0xbc, 0x5d, 0xd3, 0xb1, 0xed, 0xd1, 0xae, 0x58, 0x54, 0x47,
-	0x17, 0x6b, 0x16, 0x6e, 0x56, 0x5f, 0xd8, 0x26, 0x69, 0x88, 0x1d, 0x1b, 0xa3, 0x3b, 0xa8, 0x65,
-	0x63, 0x42, 0x4d, 0xdb, 0x13, 0x1b, 0x1e, 0x84, 0xca, 0x91, 0x76, 0x3d, 0x4c, 0x74, 0xdb, 0x6d,
-	0x3b, 0xd4, 0xb7, 0xcb, 0xfd, 0x2d, 0x41, 0xfa, 0xd3, 0x16, 0xf6, 0xcc, 0x16, 0x3e, 0x12, 0x59,
-	0x18, 0xf8, 0xab, 0x36, 0x26, 0x14, 0xa9, 0x90, 0x08, 0x12, 0xa3, 0xb8, 0x95, 0x91, 0x54, 0x69,
-	0x33, 0x6e, 0x0c, 0x7e, 0x42, 0x49, 0x88, 0x36, 0x70, 0x37, 0x13, 0xe1, 0x2b, 0x6c, 0x88, 0xd2,
-	0x10, 0x63, 0xae, 0x1c, 0x9a, 0x89, 0xf2, 0x8f, 0x62, 0x86, 0xbe, 0x80, 0x58, 0xd3, 0x3c, 0xc7,
-	0x4d, 0x92, 0x91, 0xd5, 0xe8, 0x66, 0x22, 0xbf, 0xab, 0x4d, 0xe2, 0x51, 0x1b, 0x8f, 0x4a, 0x7b,
-	0xc2, 0xdd, 0x94, 0x1c, 0xda, 0xea, 0x1a, 0xc2, 0xa7, 0xf2, 0x08, 0x12, 0x03, 0x9f, 0x03, 0x58,
-	0x52, 0x1f, 0x56, 0x0a, 0x16, 0x3b, 0x66, 0xb3, 0x8d, 0x05, 0x54, 0x7f, 0xf2, 0x38, 0xb2, 0x25,
-	0xe5, 0xf6, 0xe0, 0xee, 0xad, 0x40, 0xc4, 0x73, 0x1d, 0x82, 0x91, 0x0e, 0x31, 0xce, 0x14, 0xc9,
-	0x48, 0x1c, 0xf3, 0xdd, 0x41, 0xcc, 0x9c, 0x49, 0xed, 0x80, 0xad, 0x1b, 0x62, 0x5b, 0xee, 0x2f,
-	0x09, 0xee, 0x9c, 0x5a, 0xf8, 0xe5, 0x7f, 0x49, 0xe4, 0xd9, 0x08, 0x91, 0x85, 0xc9, 0x44, 0x8e,
-	0x81, 0x34, 0x6f, 0x16, 0x3f, 0x81, 0xd4, 0x70, 0x94, 0x59, 0x29, 0x2c, 0xc2, 0x2a, 0xff, 0x40,
-	0xde, 0x82, 0xbb, 0x5c, 0x01, 0xd6, 0x02, 0x27, 0xb3, 0xe2, 0xd8, 0x87, 0x75, 0x03, 0xdb, 0x6e,
-	0x67, 0x1e, 0x4d, 0xc1, 0xce, 0xc5, 0x7a, 0xd1, 0xb5, 0x6d, 0x8b, 0x4e, 0xef, 0x0d, 0x81, 0xec,
-	0x98, 0x76, 0x40, 0x39, 0x1f, 0x07, 0x11, 0xa2, 0xfd, 0xca, 0x7c, 0x3e, 0x72, 0x2a, 0x8a, 0x93,
-	0x4f, 0xc5, 0x58, 0x40, 0xf3, 0x3e, 0x17, 0x65, 0xb8, 0x73, 0x44, 0x4d, 0x3a, 0x0f, 0x12, 0xff,
-	0x89, 0x80, 0x5c, 0x76, 0x6a, 0x6e, 0x8f, 0x11, 0x69, 0x80, 0x91, 0x7e, 0xb7, 0x44, 0x86, 0xba,
-	0xe5, 0x31, 0xc8, 0x0d, 0xcb, 0xa9, 0x72, 0xaa, 0xd6, 0xf2, 0xef, 0x4d, 0x66, 0x65, 0xdf, 0x72,
-	0xaa, 0x06, 0xb7, 0x41, 0x45, 0x80, 0x4a, 0x0b, 0x9b, 0x14, 0x57, 0x5f, 0x98, 0x34, 0x23, 0xab,
-	0xd2, 0x66, 0x22, 0xaf, 0x68, 0xbe, 0x0e, 0x6b, 0x81, 0x0e, 0x6b, 0xc7, 0x81, 0x0e, 0xef, 0x2c,
-	0x5f, 0xff, 0xbe, 0xb1, 0xf0, 0xfd, 0x1f, 0x1b, 0x92, 0x11, 0x17, 0x76, 0x05, 0xca, 0x9c, 0xb4,
-	0xbd, 0x6a, 0xe0, 0x64, 0x71, 0x1a, 0x27, 0xc2, 0xae, 0x40, 0xd1, 0x5e, 0xaf, 0xba, 0x31, 0x5e,
-	0xdd, 0xfc, 0xe4, 0x3c, 0x18, 0x53, 0xf3, 0x2e, 0xe6, 0x67, 0x90, 0x1a, 0x2e, 0xa6, 0x68, 0xae,
-	0x8f, 0x40, 0xb6, 0x9c, 0x9a, 0xcb, 0x9d, 0x24, 0xc2, 0x90, 0xcc, 0xc0, 0xed, 0xc8, 0x2c, 0x53,
-	0x83, 0x5b, 0xe6, 0x7e, 0x92, 0x60, 0xfd, 0x84, 0xa7, 0x3b, 0xfd, 0x49, 0x09, 0xa2, 0x47, 0x66,
-	0x8d, 0x8e, 0xb6, 0x21, 0xe1, 0x73, 0xcd, 0x2f, 0x5c, 0x7e, 0x56, 0xc6, 0x15, 0xe9, 0x63, 0x76,
-	0x27, 0x1f, 0x98, 0xa4, 0x61, 0x88, 0x92, 0xb2, 0x71, 0xee, 0x39, 0xa4, 0x47, 0x91, 0xcf, 0x8d,
-	0x16, 0x03, 0x52, 0x4f, 0x2c, 0xd2, 0x23, 0x7c, 0x0a, 0x4d, 0xcc, 0xc0, 0x52, 0xcd, 0x6a, 0x52,
-	0xdc, 0x22, 0x99, 0x88, 0x1a, 0xdd, 0x8c, 0x1b, 0xc1, 0x34, 0x77, 0x06, 0xeb, 0x23, 0x3e, 0x6f,
-	0xc1, 0x8d, 0xce, 0x08, 0x77, 0x07, 0x56, 0x4e, 0x88, 0x59, 0xc7, 0x6f, 0xd3, 0xe5, 0xdb, 0xb0,
-	0x2a, 0x7c, 0x08, 0x58, 0x08, 0x64, 0x62, 0x7d, 0xed, 0x77, 0x7b, 0xd4, 0xe0, 0x63, 0xd6, 0xed,
-	0x96, 0xe3, 0x56, 0x31, 0xe1, 0x96, 0x51, 0x43, 0xcc, 0x72, 0x79, 0x58, 0x2b, 0x36, 0xb1, 0xe9,
-	0xb4, 0xbd, 0xd0, 0x10, 0xde, 0x7f, 0x25, 0x81, 0xcc, 0x9a, 0x1e, 0xbd, 0x0b, 0x4b, 0x27, 0x87,
-	0xfb, 0x87, 0x4f, 0x9f, 0x1d, 0x26, 0x17, 0x94, 0xff, 0x5d, 0x5e, 0xa9, 0x09, 0xf6, 0xf9, 0xc4,
-	0x69, 0x38, 0xee, 0x4b, 0x07, 0xa5, 0x41, 0x3e, 0x2d, 0x97, 0x9e, 0x25, 0x25, 0x65, 0xe5, 0xf2,
-	0x4a, 0x5d, 0x66, 0x4b, 0xec, 0xc2, 0x43, 0x0a, 0xc4, 0x0a, 0xc5, 0xe3, 0xf2, 0x69, 0x29, 0x19,
-	0x51, 0xd6, 0x2e, 0xaf, 0x54, 0x60, 0x2b, 0x85, 0x0a, 0xb5, 0x3a, 0x18, 0xa9, 0x10, 0x2f, 0x3e,
-	0x3d, 0x38, 0x28, 0x1f, 0x1f, 0x97, 0x76, 0x93, 0x51, 0xe5, 0xff, 0x97, 0x57, 0xea, 0x2a, 0x5b,
-	0xf6, 0x95, 0x97, 0xe2, 0xaa, 0xb2, 0xf2, 0xea, 0x87, 0xec, 0xc2, 0xcf, 0x3f, 0x66, 0x39, 0x82,
-	0xfc, 0xaf, 0xcb, 0x10, 0xef, 0xd5, 0x05, 0x7d, 0x0b, 0x4b, 0xe2, 0x61, 0x82, 0xb6, 0x66, 0x7d,
-	0x2c, 0x29, 0x8f, 0x66, 0xb0, 0x14, 0xc4, 0xb7, 0x41, 0xe6, 0x19, 0x7e, 0x38, 0xd3, 0x03, 0x43,
-	0x79, 0x30, 0xad, 0x99, 0x08, 0xdb, 0x80, 0x98, 0x7f, 0x77, 0x23, 0x7d, 0xb2, 0x87, 0xa1, 0xa7,
-	0x82, 0x72, 0x2f, 0xbc, 0x81, 0x08, 0x76, 0x06, 0x31, 0xbf, 0x18, 0xe8, 0xe1, 0x8c, 0x17, 0xa6,
-	0x92, 0xbe, 0xa5, 0x13, 0x25, 0xf6, 0xb0, 0x67, 0xae, 0xfd, 0x07, 0x44, 0x18, 0xd7, 0x63, 0x9f,
-	0x1a, 0x6f, 0x74, 0xdd, 0x06, 0x99, 0xe9, 0x70, 0x98, 0xca, 0x8c, 0xb9, 0x7c, 0xc3, 0x54, 0x66,
-	0xac, 0xcc, 0x7f, 0x03, 0x31, 0x5f, 0xe9, 0xc2, 0x64, 0x34, 0x56, 0xcd, 0x95, 0xad, 0xe9, 0x0d,
-	0x45, 0xf0, 0x2e, 0xc8, 0x4c, 0xb6, 0x50, 0x08, 0xf0, 0xe3, 0x24, 0x53, 0x79, 0x38, 0xb5, 0x9d,
-	0x1f, 0xf8, 0x9e, 0x84, 0x2e, 0x60, 0x91, 0x4b, 0x12, 0xd2, 0x42, 0xa0, 0x1f, 0xd0, 0x3f, 0x45,
-	0x0f, 0xbd, 0x5f, 0x24, 0x79, 0x04, 0x4b, 0x42, 0xbf, 0x50, 0x88, 0xb3, 0x3c, 0x2c, 0x75, 0x6f,
-	0x3a, 0x2d, 0x3b, 0x5f, 0x5e, 0xbf, 0xce, 0x2e, 0xfc, 0xf6, 0x3a, 0xbb, 0xf0, 0xdd, 0x4d, 0x56,
-	0xba, 0xbe, 0xc9, 0x4a, 0xbf, 0xdc, 0x64, 0xa5, 0x3f, 0x6f, 0xb2, 0xd2, 0xf3, 0xdd, 0xd9, 0x7f,
-	0x8b, 0xb7, 0x7b, 0x93, 0xf3, 0x18, 0x8f, 0xf7, 0xc1, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x1b,
-	0x47, 0xb6, 0xf0, 0x65, 0x0f, 0x00, 0x00,
+	// 978 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xdd, 0x6e, 0xe3, 0x44,
+	0x14, 0xae, 0x13, 0x37, 0x6d, 0x4e, 0x68, 0x15, 0xcd, 0xa6, 0xdd, 0xc8, 0x48, 0x69, 0x94, 0x0b,
+	0x54, 0x71, 0x61, 0xef, 0x06, 0xb1, 0xdb, 0xdd, 0xde, 0x90, 0xa6, 0x01, 0xa5, 0xdd, 0x76, 0x91,
+	0xfb, 0xb3, 0x74, 0x41, 0xac, 0xdc, 0x66, 0x92, 0x5a, 0x89, 0x7f, 0xf0, 0x8c, 0x83, 0x02, 0x12,
+	0xe2, 0x11, 0x78, 0x1c, 0x1e, 0xa1, 0x97, 0x48, 0xdc, 0x70, 0x05, 0x6c, 0x5f, 0x82, 0x2b, 0x04,
+	0x9a, 0xf1, 0x38, 0x7f, 0xf5, 0x2a, 0x8e, 0x9b, 0xbd, 0x9b, 0xf1, 0xcc, 0x39, 0xe7, 0x3b, 0xdf,
+	0xf9, 0x1b, 0xc3, 0x41, 0xc7, 0xa4, 0xd7, 0xfe, 0xa5, 0x7a, 0xe5, 0x58, 0xda, 0x95, 0x63, 0x53,
+	0xc3, 0xb4, 0xb1, 0xd7, 0x1a, 0x5f, 0x1a, 0xae, 0xa9, 0x11, 0xec, 0xf5, 0xcd, 0x2b, 0x4c, 0x34,
+	0x62, 0x1b, 0x2e, 0xb9, 0x76, 0x28, 0xd1, 0xfa, 0x8f, 0x47, 0x1b, 0xd5, 0xf5, 0x1c, 0xea, 0xa0,
+	0xf2, 0x48, 0x4a, 0x0d, 0x25, 0xd4, 0xd1, 0xa5, 0xfe, 0x63, 0xa5, 0xd0, 0x71, 0x3a, 0x0e, 0xbf,
+	0xac, 0xb1, 0x55, 0x20, 0xa7, 0x7c, 0xd8, 0x71, 0x9c, 0x4e, 0x0f, 0x6b, 0x7c, 0x77, 0xe9, 0xb7,
+	0x35, 0x6c, 0xb9, 0x74, 0x20, 0x0e, 0xcb, 0xd3, 0x87, 0x6d, 0x13, 0xf7, 0x5a, 0x6f, 0x2c, 0x83,
+	0x74, 0xc5, 0x8d, 0xad, 0xe9, 0x1b, 0xd4, 0xb4, 0x30, 0xa1, 0x86, 0xe5, 0x8a, 0x0b, 0x4f, 0x62,
+	0xf9, 0x48, 0x07, 0x2e, 0x26, 0x9a, 0xe5, 0xf8, 0x36, 0x0d, 0xe4, 0x2a, 0xff, 0x4a, 0xb0, 0xf9,
+	0xa5, 0x87, 0x5d, 0xc3, 0xc3, 0x27, 0xc2, 0x0b, 0x1d, 0x7f, 0xe7, 0x63, 0x42, 0x51, 0x19, 0x72,
+	0xa1, 0x63, 0x14, 0x7b, 0x45, 0xa9, 0x2c, 0x6d, 0x67, 0xf5, 0xf1, 0x4f, 0x28, 0x0f, 0xe9, 0x2e,
+	0x1e, 0x14, 0x53, 0xfc, 0x84, 0x2d, 0xd1, 0x26, 0x64, 0x98, 0x2a, 0x9b, 0x16, 0xd3, 0xfc, 0xa3,
+	0xd8, 0xa1, 0x6f, 0x20, 0xd3, 0x33, 0x2e, 0x71, 0x8f, 0x14, 0xe5, 0x72, 0x7a, 0x3b, 0x57, 0xdd,
+	0x57, 0x67, 0xf1, 0xa8, 0x46, 0xa3, 0x52, 0x5f, 0x70, 0x35, 0x0d, 0x9b, 0x7a, 0x03, 0x5d, 0xe8,
+	0x54, 0x9e, 0x41, 0x6e, 0xec, 0x73, 0x08, 0x4b, 0x1a, 0xc1, 0x2a, 0xc0, 0x72, 0xdf, 0xe8, 0xf9,
+	0x58, 0x40, 0x0d, 0x36, 0xcf, 0x53, 0x3b, 0x52, 0xe5, 0x00, 0x1e, 0xde, 0x31, 0x44, 0x5c, 0xc7,
+	0x26, 0x18, 0x69, 0x90, 0xe1, 0x4c, 0x91, 0xa2, 0xc4, 0x31, 0x3f, 0x1c, 0xc7, 0xcc, 0x99, 0x54,
+	0x8f, 0xd8, 0xb9, 0x2e, 0xae, 0x55, 0xfe, 0x91, 0xe0, 0xc1, 0xb9, 0x89, 0xbf, 0x7f, 0x9f, 0x44,
+	0x5e, 0x4c, 0x11, 0x59, 0x9b, 0x4d, 0x64, 0x04, 0xa4, 0x45, 0xb3, 0xf8, 0x05, 0x14, 0x26, 0xad,
+	0x24, 0xa5, 0xb0, 0x0e, 0x6b, 0xfc, 0x03, 0xb9, 0x07, 0x77, 0x95, 0x1a, 0xac, 0x87, 0x4a, 0x92,
+	0xe2, 0x38, 0x84, 0x0d, 0x1d, 0x5b, 0x4e, 0x7f, 0x11, 0x45, 0xc1, 0xf2, 0x62, 0xa3, 0xee, 0x58,
+	0x96, 0x49, 0xe7, 0xd7, 0x86, 0x40, 0xb6, 0x0d, 0x2b, 0xa4, 0x9c, 0xaf, 0x43, 0x0b, 0xe9, 0x51,
+	0x64, 0xbe, 0x9e, 0xca, 0x8a, 0xfa, 0xec, 0xac, 0x88, 0x04, 0xb4, 0xe8, 0xbc, 0x68, 0xc2, 0x83,
+	0x13, 0x6a, 0xd0, 0x45, 0x90, 0xf8, 0x5f, 0x0a, 0xe4, 0xa6, 0xdd, 0x76, 0x86, 0x8c, 0x48, 0x63,
+	0x8c, 0x8c, 0xaa, 0x25, 0x35, 0x51, 0x2d, 0xcf, 0x41, 0xee, 0x9a, 0x76, 0x8b, 0x53, 0xb5, 0x5e,
+	0xfd, 0x68, 0x36, 0x2b, 0x87, 0xa6, 0xdd, 0xd2, 0xb9, 0x0c, 0xaa, 0x03, 0x5c, 0x79, 0xd8, 0xa0,
+	0xb8, 0xf5, 0xc6, 0xa0, 0x45, 0xb9, 0x2c, 0x6d, 0xe7, 0xaa, 0x8a, 0x1a, 0xf4, 0x61, 0x35, 0xec,
+	0xc3, 0xea, 0x69, 0xd8, 0x87, 0xf7, 0x56, 0x6f, 0xfe, 0xdc, 0x5a, 0xfa, 0xe5, 0xaf, 0x2d, 0x49,
+	0xcf, 0x0a, 0xb9, 0x1a, 0x65, 0x4a, 0x7c, 0xb7, 0x15, 0x2a, 0x59, 0x9e, 0x47, 0x89, 0x90, 0xab,
+	0x51, 0x74, 0x30, 0x8c, 0x6e, 0x86, 0x47, 0xb7, 0x3a, 0xdb, 0x0f, 0xc6, 0xd4, 0xa2, 0x83, 0xf9,
+	0x15, 0x14, 0x26, 0x83, 0x29, 0x8a, 0xeb, 0x33, 0x90, 0x4d, 0xbb, 0xed, 0x70, 0x25, 0xb9, 0x38,
+	0x24, 0x33, 0x70, 0x7b, 0x32, 0xf3, 0x54, 0xe7, 0x92, 0x95, 0x5f, 0x25, 0xd8, 0x38, 0xe3, 0xee,
+	0xce, 0x9f, 0x29, 0xa1, 0xf5, 0x54, 0x52, 0xeb, 0x68, 0x17, 0x72, 0x01, 0xd7, 0x7c, 0xe0, 0xf2,
+	0x5c, 0x89, 0x0a, 0xd2, 0xe7, 0x6c, 0x26, 0x1f, 0x19, 0xa4, 0xab, 0x8b, 0x90, 0xb2, 0x75, 0xe5,
+	0x35, 0x6c, 0x4e, 0x23, 0x5f, 0x18, 0x2d, 0x3a, 0x14, 0x5e, 0x98, 0x64, 0x48, 0xf8, 0x1c, 0x3d,
+	0xb1, 0x08, 0x2b, 0x6d, 0xb3, 0x47, 0xb1, 0x47, 0x8a, 0xa9, 0x72, 0x7a, 0x3b, 0xab, 0x87, 0xdb,
+	0xca, 0x05, 0x6c, 0x4c, 0xe9, 0xbc, 0x03, 0x37, 0x9d, 0x10, 0xee, 0x1e, 0x7c, 0x70, 0x46, 0x8c,
+	0x0e, 0xbe, 0x4f, 0x95, 0xef, 0xc2, 0x9a, 0xd0, 0x21, 0x60, 0x21, 0x90, 0x89, 0xf9, 0x43, 0x50,
+	0xed, 0x69, 0x9d, 0xaf, 0x59, 0xb5, 0x9b, 0xb6, 0xd3, 0xc2, 0x84, 0x4b, 0xa6, 0x75, 0xb1, 0xab,
+	0x54, 0x61, 0xbd, 0xde, 0xc3, 0x86, 0xed, 0xbb, 0xb1, 0x21, 0x7c, 0xbc, 0x03, 0x32, 0xab, 0x79,
+	0x94, 0x83, 0x95, 0xb3, 0xe3, 0xc3, 0xe3, 0x97, 0xaf, 0x8e, 0xf3, 0x4b, 0x68, 0x15, 0xe4, 0xf3,
+	0x66, 0xe3, 0x55, 0x5e, 0x42, 0x00, 0x99, 0x5a, 0xfd, 0xb4, 0x79, 0xde, 0xc8, 0xa7, 0xd0, 0x1a,
+	0x64, 0xeb, 0x2f, 0x8f, 0x8e, 0x9a, 0xa7, 0xa7, 0x8d, 0xfd, 0x7c, 0xba, 0xfa, 0xfb, 0x2a, 0x64,
+	0x87, 0x34, 0xa2, 0x9f, 0x60, 0x45, 0xbc, 0x23, 0xd0, 0x4e, 0xd2, 0xb7, 0x8d, 0xf2, 0x2c, 0x81,
+	0xa4, 0xe0, 0xc9, 0x07, 0x99, 0x4d, 0x60, 0xf4, 0x69, 0xa2, 0xf7, 0x80, 0xf2, 0x64, 0x5e, 0x31,
+	0x61, 0xb6, 0x0b, 0x99, 0x60, 0xd4, 0x22, 0x6d, 0xb6, 0x86, 0x89, 0xc9, 0xae, 0x3c, 0x8a, 0x2f,
+	0x20, 0x8c, 0x5d, 0x40, 0x26, 0x98, 0x5a, 0xe8, 0x69, 0xc2, 0xf9, 0xa6, 0x6c, 0xde, 0x29, 0xeb,
+	0x06, 0x7b, 0x87, 0x33, 0xd5, 0xc1, 0xbc, 0x8f, 0xa3, 0x3a, 0xf2, 0x65, 0xf0, 0x4e, 0xd5, 0x3e,
+	0xc8, 0xac, 0x6d, 0xc6, 0x89, 0x4c, 0xc4, 0xac, 0x8c, 0x13, 0x99, 0xc8, 0xae, 0xfc, 0x23, 0x64,
+	0x82, 0xc6, 0x14, 0xc7, 0xa3, 0xc8, 0xe6, 0xab, 0xec, 0xcc, 0x2f, 0x28, 0x8c, 0x0f, 0x40, 0x66,
+	0x5d, 0x06, 0xc5, 0x00, 0x1f, 0xd5, 0xe1, 0x94, 0xa7, 0x73, 0xcb, 0x05, 0x86, 0x1f, 0x49, 0xe8,
+	0x1a, 0x96, 0x79, 0x07, 0x41, 0x6a, 0x0c, 0xf4, 0x63, 0xed, 0x4a, 0xd1, 0x62, 0xdf, 0x17, 0x4e,
+	0x9e, 0xc0, 0x8a, 0x68, 0x37, 0x28, 0x46, 0x2e, 0x4f, 0x76, 0xa6, 0x77, 0x65, 0xcb, 0xde, 0xb7,
+	0x37, 0x6f, 0x4b, 0x4b, 0x7f, 0xbc, 0x2d, 0x2d, 0xfd, 0x7c, 0x5b, 0x92, 0x6e, 0x6e, 0x4b, 0xd2,
+	0x6f, 0xb7, 0x25, 0xe9, 0xef, 0xdb, 0x92, 0xf4, 0x7a, 0x3f, 0xf9, 0x5f, 0xec, 0xee, 0x70, 0x73,
+	0x99, 0xe1, 0xf6, 0x3e, 0xf9, 0x3f, 0x00, 0x00, 0xff, 0xff, 0xc9, 0x3f, 0xcb, 0xb9, 0x14, 0x0f,
+	0x00, 0x00,
 }
 
 // Reference imports to suppress errors if they are not otherwise used.
diff --git a/api/services/snapshots/v1/snapshots.proto b/api/services/snapshots/v1/snapshots.proto
index b6bee7643..cfffcc75b 100644
--- a/api/services/snapshots/v1/snapshots.proto
+++ b/api/services/snapshots/v1/snapshots.proto
@@ -101,13 +101,10 @@ message StatSnapshotRequest {
 }
 
 enum Kind {
-	option (gogoproto.goproto_enum_prefix) = false;
-	option (gogoproto.enum_customname) = "Kind";
-
-	UNKNOWN = 0 [(gogoproto.enumvalue_customname) = "KindUnknown"];
-	VIEW = 1 [(gogoproto.enumvalue_customname) = "KindView"];
-	ACTIVE = 2 [(gogoproto.enumvalue_customname) = "KindActive"];
-	COMMITTED = 3 [(gogoproto.enumvalue_customname) = "KindCommitted"];
+	UNKNOWN = 0;
+	VIEW = 1;
+	ACTIVE = 2;
+	COMMITTED = 3;
 }
 
 message Info {
diff --git a/api/types/task/task.pb.go b/api/types/task/task.pb.go
index 20c9f5072..419566c39 100644
--- a/api/types/task/task.pb.go
+++ b/api/types/task/task.pb.go
@@ -32,12 +32,12 @@ const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 type Status int32
 
 const (
-	StatusUnknown Status = 0
-	StatusCreated Status = 1
-	StatusRunning Status = 2
-	StatusStopped Status = 3
-	StatusPaused  Status = 4
-	StatusPausing Status = 5
+	Status_UNKNOWN Status = 0
+	Status_CREATED Status = 1
+	Status_RUNNING Status = 2
+	Status_STOPPED Status = 3
+	Status_PAUSED  Status = 4
+	Status_PAUSING Status = 5
 )
 
 var Status_name = map[int32]string{
@@ -169,41 +169,37 @@ func init() {
 }
 
 var fileDescriptor_391ef18c8ab0dc16 = []byte{
-	// 543 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xcf, 0x6e, 0xd3, 0x4c,
-	0x14, 0xc5, 0x33, 0x6e, 0xe3, 0x24, 0xe3, 0xb6, 0x9f, 0x3f, 0x13, 0x55, 0xc6, 0x20, 0xdb, 0xea,
-	0xca, 0x62, 0x61, 0x8b, 0x74, 0xc7, 0x2e, 0xff, 0x84, 0x2c, 0x24, 0x37, 0x72, 0x12, 0xb1, 0x8c,
-	0x9c, 0x78, 0x62, 0x46, 0x6d, 0x66, 0x2c, 0x7b, 0x0c, 0x64, 0xc7, 0x12, 0x75, 0xc5, 0x0b, 0x74,
-	0x05, 0x4f, 0xc1, 0x13, 0x64, 0xc9, 0x0a, 0xb1, 0x0a, 0xd4, 0x4f, 0x82, 0xc6, 0x76, 0xd2, 0x08,
-	0xd8, 0x8c, 0xee, 0x3d, 0xbf, 0x33, 0x77, 0xee, 0x1c, 0xf8, 0x22, 0xc2, 0xec, 0x4d, 0x36, 0xb7,
-	0x17, 0x74, 0xe5, 0x2c, 0x28, 0x61, 0x01, 0x26, 0x28, 0x09, 0x0f, 0xcb, 0x20, 0xc6, 0x0e, 0x5b,
-	0xc7, 0x28, 0x75, 0x58, 0x90, 0x5e, 0x17, 0x87, 0x1d, 0x27, 0x94, 0x51, 0xe5, 0xd1, 0x83, 0xcb,
-	0x7e, 0xfb, 0xdc, 0x2e, 0x4c, 0x5a, 0x3b, 0xa2, 0x11, 0x2d, 0xb8, 0xc3, 0xab, 0xd2, 0xaa, 0x19,
-	0x11, 0xa5, 0xd1, 0x0d, 0x72, 0x8a, 0x6e, 0x9e, 0x2d, 0x1d, 0x86, 0x57, 0x28, 0x65, 0xc1, 0x2a,
-	0xae, 0x0c, 0x8f, 0xff, 0x34, 0x04, 0x64, 0x5d, 0xa2, 0x8b, 0x5c, 0x80, 0x8d, 0x51, 0x42, 0x17,
-	0x28, 0x4d, 0x95, 0x0e, 0x3c, 0xd9, 0x3f, 0x3a, 0xc3, 0xa1, 0x0a, 0x4c, 0x60, 0xb5, 0x7a, 0xff,
-	0xe5, 0x5b, 0x43, 0xea, 0xef, 0x74, 0x77, 0xe0, 0x4b, 0x7b, 0x93, 0x1b, 0x2a, 0xe7, 0x50, 0xc0,
-	0xa1, 0x2a, 0x14, 0x4e, 0x31, 0xdf, 0x1a, 0x82, 0x3b, 0xf0, 0x05, 0x1c, 0x2a, 0x32, 0x3c, 0x8a,
-	0x71, 0xa8, 0x1e, 0x99, 0xc0, 0x3a, 0xf5, 0x79, 0xa9, 0x5c, 0x42, 0x31, 0x65, 0x01, 0xcb, 0x52,
-	0xf5, 0xd8, 0x04, 0xd6, 0x59, 0xe7, 0x89, 0xfd, 0x8f, 0x1f, 0xda, 0xe3, 0xc2, 0xe2, 0x57, 0x56,
-	0xa5, 0x0d, 0xeb, 0x29, 0x0b, 0x31, 0x51, 0xeb, 0xfc, 0x05, 0xbf, 0x6c, 0x94, 0x73, 0x3e, 0x2a,
-	0xa4, 0x19, 0x53, 0xc5, 0x42, 0xae, 0xba, 0x4a, 0x47, 0x49, 0xa2, 0x36, 0xf6, 0x3a, 0x4a, 0x12,
-	0x45, 0x83, 0x4d, 0x86, 0x92, 0x15, 0x26, 0xc1, 0x8d, 0xda, 0x34, 0x81, 0xd5, 0xf4, 0xf7, 0xbd,
-	0x62, 0x40, 0x09, 0xbd, 0xc7, 0x6c, 0x56, 0xed, 0xd6, 0x2a, 0x16, 0x86, 0x5c, 0x2a, 0x57, 0x51,
-	0xba, 0xb0, 0xc5, 0x3b, 0x14, 0xce, 0x02, 0xa6, 0x42, 0x13, 0x58, 0x52, 0x47, 0xb3, 0xcb, 0x40,
-	0xed, 0x5d, 0xa0, 0xf6, 0x64, 0x97, 0x78, 0xaf, 0xb9, 0xd9, 0x1a, 0xb5, 0x4f, 0x3f, 0x0d, 0xe0,
-	0x37, 0xcb, 0x6b, 0x5d, 0x76, 0xe1, 0x42, 0xa9, 0xca, 0xd8, 0x25, 0x4b, 0xba, 0xcb, 0x06, 0x3c,
-	0x64, 0x63, 0xc1, 0x63, 0x4c, 0x96, 0xb4, 0xc8, 0x51, 0xea, 0xb4, 0xff, 0x1a, 0xdf, 0x25, 0x6b,
-	0xbf, 0x70, 0x3c, 0xfb, 0x0e, 0xa0, 0x58, 0x2d, 0xa6, 0xc3, 0xc6, 0xd4, 0x7b, 0xe5, 0x5d, 0xbd,
-	0xf6, 0xe4, 0x9a, 0xf6, 0xff, 0xed, 0x9d, 0x79, 0x5a, 0x82, 0x29, 0xb9, 0x26, 0xf4, 0x1d, 0xe1,
-	0xbc, 0xef, 0x0f, 0xbb, 0x93, 0xe1, 0x40, 0x06, 0x87, 0xbc, 0x9f, 0xa0, 0x80, 0xa1, 0x90, 0x73,
-	0x7f, 0xea, 0x79, 0xae, 0xf7, 0x52, 0x16, 0x0e, 0xb9, 0x9f, 0x11, 0x82, 0x49, 0xc4, 0xf9, 0x78,
-	0x72, 0x35, 0x1a, 0x0d, 0x07, 0xf2, 0xd1, 0x21, 0x1f, 0x33, 0x1a, 0xc7, 0x28, 0x54, 0x9e, 0x42,
-	0x71, 0xd4, 0x9d, 0x8e, 0x87, 0x03, 0xf9, 0x58, 0x93, 0x6f, 0xef, 0xcc, 0x93, 0x12, 0x8f, 0x82,
-	0x2c, 0x2d, 0xa7, 0x73, 0xca, 0xa7, 0xd7, 0x0f, 0x6f, 0x73, 0x8c, 0x49, 0xa4, 0x9d, 0x7d, 0xfc,
-	0xac, 0xd7, 0xbe, 0x7e, 0xd1, 0xab, 0xdf, 0xf4, 0xd4, 0xcd, 0xbd, 0x5e, 0xfb, 0x71, 0xaf, 0xd7,
-	0x3e, 0xe4, 0x3a, 0xd8, 0xe4, 0x3a, 0xf8, 0x96, 0xeb, 0xe0, 0x57, 0xae, 0x83, 0xb9, 0x58, 0xc4,
-	0x70, 0xf9, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x19, 0xf7, 0x5b, 0x8f, 0x4e, 0x03, 0x00, 0x00,
+	// 470 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0x4f, 0x8f, 0xd2, 0x40,
+	0x18, 0xc6, 0x99, 0x02, 0x05, 0xa6, 0xfe, 0x69, 0x46, 0xb2, 0x19, 0x31, 0x69, 0xc9, 0x9e, 0x1a,
+	0x0f, 0x6d, 0x64, 0x6f, 0xde, 0x60, 0x4b, 0x4c, 0x63, 0xd2, 0x25, 0x03, 0xc4, 0x23, 0x29, 0x74,
+	0xa8, 0x13, 0x97, 0x4e, 0xd3, 0x0e, 0x46, 0x6e, 0x7e, 0x04, 0x3f, 0x16, 0x47, 0x8f, 0x9e, 0xd0,
+	0xed, 0x27, 0x31, 0x33, 0x2d, 0xac, 0x51, 0x2f, 0xcd, 0xfb, 0x3c, 0xef, 0xaf, 0x33, 0xcf, 0x3c,
+	0xf0, 0x6d, 0xc2, 0xc4, 0xc7, 0xfd, 0xda, 0xdd, 0xf0, 0x9d, 0xb7, 0xe1, 0xa9, 0x88, 0x58, 0x4a,
+	0xf3, 0xf8, 0xcf, 0x31, 0xca, 0x98, 0x27, 0x0e, 0x19, 0x2d, 0x3c, 0x11, 0x15, 0x9f, 0xd4, 0xc7,
+	0xcd, 0x72, 0x2e, 0x38, 0x7a, 0xf1, 0x48, 0xb9, 0x9f, 0xdf, 0xb8, 0x0a, 0x1a, 0xf4, 0x13, 0x9e,
+	0x70, 0xb5, 0xf7, 0xe4, 0x54, 0xa1, 0x03, 0x3b, 0xe1, 0x3c, 0xb9, 0xa7, 0x9e, 0x52, 0xeb, 0xfd,
+	0xd6, 0x13, 0x6c, 0x47, 0x0b, 0x11, 0xed, 0xb2, 0x1a, 0x78, 0xf9, 0x37, 0x10, 0xa5, 0x87, 0x6a,
+	0x75, 0x5d, 0x6a, 0xb0, 0x33, 0xcb, 0xf9, 0x86, 0x16, 0x05, 0x1a, 0xc1, 0x27, 0x97, 0x4b, 0x57,
+	0x2c, 0xc6, 0x60, 0x08, 0x9c, 0xde, 0xe4, 0x79, 0x79, 0xb2, 0x8d, 0xdb, 0xb3, 0x1f, 0xf8, 0xc4,
+	0xb8, 0x40, 0x41, 0x8c, 0xae, 0xa0, 0xc6, 0x62, 0xac, 0x29, 0x52, 0x2f, 0x4f, 0xb6, 0x16, 0xf8,
+	0x44, 0x63, 0x31, 0x32, 0x61, 0x33, 0x63, 0x31, 0x6e, 0x0e, 0x81, 0xf3, 0x94, 0xc8, 0x11, 0xdd,
+	0x40, 0xbd, 0x10, 0x91, 0xd8, 0x17, 0xb8, 0x35, 0x04, 0xce, 0xb3, 0xd1, 0x2b, 0xf7, 0x3f, 0x2f,
+	0x74, 0xe7, 0x0a, 0x21, 0x35, 0x8a, 0xfa, 0xb0, 0x5d, 0x88, 0x98, 0xa5, 0xb8, 0x2d, 0x6f, 0x20,
+	0x95, 0x40, 0x57, 0xf2, 0xa8, 0x98, 0xef, 0x05, 0xd6, 0x95, 0x5d, 0xab, 0xda, 0xa7, 0x79, 0x8e,
+	0x3b, 0x17, 0x9f, 0xe6, 0x39, 0x1a, 0xc0, 0xae, 0xa0, 0xf9, 0x8e, 0xa5, 0xd1, 0x3d, 0xee, 0x0e,
+	0x81, 0xd3, 0x25, 0x17, 0x8d, 0x6c, 0x68, 0xd0, 0x2f, 0x4c, 0xac, 0xea, 0x6c, 0x3d, 0x15, 0x18,
+	0x4a, 0xab, 0x8a, 0x82, 0xc6, 0xb0, 0x27, 0x15, 0x8d, 0x57, 0x91, 0xc0, 0x70, 0x08, 0x1c, 0x63,
+	0x34, 0x70, 0xab, 0x42, 0xdd, 0x73, 0xa1, 0xee, 0xe2, 0xdc, 0xf8, 0xa4, 0x7b, 0x3c, 0xd9, 0x8d,
+	0x6f, 0x3f, 0x6d, 0x40, 0xba, 0xd5, 0x6f, 0x63, 0x71, 0x1d, 0x40, 0xa3, 0xee, 0x38, 0x48, 0xb7,
+	0xfc, 0xdc, 0x0d, 0x78, 0xec, 0xc6, 0x81, 0x2d, 0x96, 0x6e, 0xb9, 0xea, 0xd1, 0x18, 0xf5, 0xff,
+	0x39, 0x7e, 0x9c, 0x1e, 0x88, 0x22, 0x5e, 0x2f, 0xa1, 0x5e, 0xe7, 0x32, 0x60, 0x67, 0x19, 0xbe,
+	0x0f, 0xef, 0x3e, 0x84, 0x66, 0x43, 0x8a, 0x5b, 0x32, 0x1d, 0x2f, 0xa6, 0xbe, 0x09, 0xa4, 0x20,
+	0xcb, 0x30, 0x0c, 0xc2, 0x77, 0xa6, 0x26, 0xc5, 0x7c, 0x71, 0x37, 0x9b, 0x4d, 0x7d, 0xb3, 0x89,
+	0x20, 0xd4, 0x67, 0xe3, 0xe5, 0x7c, 0xea, 0x9b, 0x2d, 0xb9, 0x90, 0xb3, 0xa4, 0xda, 0x13, 0x7c,
+	0x7c, 0xb0, 0x1a, 0x3f, 0x1e, 0xac, 0xc6, 0xd7, 0xd2, 0x02, 0xc7, 0xd2, 0x02, 0xdf, 0x4b, 0x0b,
+	0xfc, 0x2a, 0x2d, 0xb0, 0xd6, 0x55, 0x88, 0x9b, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xa9, 0x54,
+	0x02, 0x74, 0xcc, 0x02, 0x00, 0x00,
 }
 
 func (m *Process) Marshal() (dAtA []byte, err error) {
diff --git a/api/types/task/task.proto b/api/types/task/task.proto
index 7585f839a..6d5f7f9a9 100644
--- a/api/types/task/task.proto
+++ b/api/types/task/task.proto
@@ -23,15 +23,12 @@ import "google/protobuf/timestamp.proto";
 import "google/protobuf/any.proto";
 
 enum Status {
-	option (gogoproto.goproto_enum_prefix) = false;
-	option (gogoproto.enum_customname) = "Status";
-
-	UNKNOWN = 0 [(gogoproto.enumvalue_customname) = "StatusUnknown"];
-	CREATED = 1 [(gogoproto.enumvalue_customname) = "StatusCreated"];
-	RUNNING = 2 [(gogoproto.enumvalue_customname) = "StatusRunning"];
-	STOPPED = 3 [(gogoproto.enumvalue_customname) = "StatusStopped"];
-	PAUSED = 4 [(gogoproto.enumvalue_customname) = "StatusPaused"];
-	PAUSING = 5 [(gogoproto.enumvalue_customname) = "StatusPausing"];
+	UNKNOWN = 0;
+	CREATED = 1;
+	RUNNING = 2;
+	STOPPED = 3;
+	PAUSED = 4;
+	PAUSING = 5;
 }
 
 message Process {
diff --git a/container.go b/container.go
index 7d8d674c8..0a0b6b650 100644
--- a/container.go
+++ b/container.go
@@ -396,7 +396,7 @@ func (c *container) loadTask(ctx context.Context, ioAttach cio.Attach) (Task, er
 		return nil, err
 	}
 	var i cio.IO
-	if ioAttach != nil && response.Process.Status != tasktypes.StatusUnknown {
+	if ioAttach != nil && response.Process.Status != tasktypes.Status_UNKNOWN {
 		// Do not attach IO for task in unknown state, because there
 		// are no fifo paths anyway.
 		if i, err = attachExistingIO(response, ioAttach); err != nil {
diff --git a/content/proxy/content_store.go b/content/proxy/content_store.go
index def119a47..2812128e9 100644
--- a/content/proxy/content_store.go
+++ b/content/proxy/content_store.go
@@ -197,7 +197,7 @@ func (pcs *proxyContentStore) negotiate(ctx context.Context, ref string, size in
 	}
 
 	if err := wrclient.Send(&contentapi.WriteContentRequest{
-		Action:   contentapi.WriteActionStat,
+		Action:   contentapi.WriteAction_STAT,
 		Ref:      ref,
 		Total:    size,
 		Expected: expected.String(),
diff --git a/content/proxy/content_writer.go b/content/proxy/content_writer.go
index c1d9fd6f8..f4fbd04bb 100644
--- a/content/proxy/content_writer.go
+++ b/content/proxy/content_writer.go
@@ -54,7 +54,7 @@ func (rw *remoteWriter) send(req *contentapi.WriteContentRequest) (*contentapi.W
 
 func (rw *remoteWriter) Status() (content.Status, error) {
 	resp, err := rw.send(&contentapi.WriteContentRequest{
-		Action: contentapi.WriteActionStat,
+		Action: contentapi.WriteAction_STAT,
 	})
 	if err != nil {
 		return content.Status{}, fmt.Errorf("error getting writer status: %w", errdefs.FromGRPC(err))
@@ -77,7 +77,7 @@ func (rw *remoteWriter) Write(p []byte) (n int, err error) {
 	offset := rw.offset
 
 	resp, err := rw.send(&contentapi.WriteContentRequest{
-		Action: contentapi.WriteActionWrite,
+		Action: contentapi.WriteAction_WRITE,
 		Offset: offset,
 		Data:   p,
 	})
@@ -112,7 +112,7 @@ func (rw *remoteWriter) Commit(ctx context.Context, size int64, expected digest.
 		}
 	}
 	resp, err := rw.send(&contentapi.WriteContentRequest{
-		Action:   contentapi.WriteActionCommit,
+		Action:   contentapi.WriteAction_COMMIT,
 		Total:    size,
 		Offset:   rw.offset,
 		Expected: expected.String(),
diff --git a/contrib/snapshotservice/service.go b/contrib/snapshotservice/service.go
index 6542333f9..6e8973d2f 100644
--- a/contrib/snapshotservice/service.go
+++ b/contrib/snapshotservice/service.go
@@ -178,12 +178,12 @@ func (s service) Cleanup(ctx context.Context, cr *snapshotsapi.CleanupRequest) (
 
 func fromKind(kind snapshots.Kind) snapshotsapi.Kind {
 	if kind == snapshots.KindActive {
-		return snapshotsapi.KindActive
+		return snapshotsapi.Kind_ACTIVE
 	}
 	if kind == snapshots.KindView {
-		return snapshotsapi.KindView
+		return snapshotsapi.Kind_VIEW
 	}
-	return snapshotsapi.KindCommitted
+	return snapshotsapi.Kind_COMMITTED
 }
 
 func fromInfo(info snapshots.Info) snapshotsapi.Info {
@@ -221,10 +221,10 @@ func toInfo(info snapshotsapi.Info) snapshots.Info {
 }
 
 func toKind(kind snapshotsapi.Kind) snapshots.Kind {
-	if kind == snapshotsapi.KindActive {
+	if kind == snapshotsapi.Kind_ACTIVE {
 		return snapshots.KindActive
 	}
-	if kind == snapshotsapi.KindView {
+	if kind == snapshotsapi.Kind_VIEW {
 		return snapshots.KindView
 	}
 	return snapshots.KindCommitted
diff --git a/runtime/v1/linux/process.go b/runtime/v1/linux/process.go
index b7f9e0dc5..b00efaceb 100644
--- a/runtime/v1/linux/process.go
+++ b/runtime/v1/linux/process.go
@@ -56,6 +56,23 @@ func (p *Process) Kill(ctx context.Context, signal uint32, _ bool) error {
 	return err
 }
 
+func statusFromProto(from task.Status) runtime.Status {
+	var status runtime.Status
+	switch from {
+	case task.Status_CREATED:
+		status = runtime.CreatedStatus
+	case task.Status_RUNNING:
+		status = runtime.RunningStatus
+	case task.Status_STOPPED:
+		status = runtime.StoppedStatus
+	case task.Status_PAUSED:
+		status = runtime.PausedStatus
+	case task.Status_PAUSING:
+		status = runtime.PausingStatus
+	}
+	return status
+}
+
 // State of process
 func (p *Process) State(ctx context.Context) (runtime.State, error) {
 	// use the container status for the status of the process
@@ -72,22 +89,9 @@ func (p *Process) State(ctx context.Context) (runtime.State, error) {
 		// the connection differently if this causes problems.
 		return runtime.State{}, errdefs.ErrNotFound
 	}
-	var status runtime.Status
-	switch response.Status {
-	case task.StatusCreated:
-		status = runtime.CreatedStatus
-	case task.StatusRunning:
-		status = runtime.RunningStatus
-	case task.StatusStopped:
-		status = runtime.StoppedStatus
-	case task.StatusPaused:
-		status = runtime.PausedStatus
-	case task.StatusPausing:
-		status = runtime.PausingStatus
-	}
 	return runtime.State{
 		Pid:        response.Pid,
-		Status:     status,
+		Status:     statusFromProto(response.Status),
 		Stdin:      response.Stdin,
 		Stdout:     response.Stdout,
 		Stderr:     response.Stderr,
diff --git a/runtime/v1/linux/task.go b/runtime/v1/linux/task.go
index 3ac7839ff..4099c0f47 100644
--- a/runtime/v1/linux/task.go
+++ b/runtime/v1/linux/task.go
@@ -27,7 +27,6 @@ import (
 
 	"github.com/containerd/cgroups"
 	eventstypes "github.com/containerd/containerd/api/events"
-	"github.com/containerd/containerd/api/types/task"
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/events/exchange"
 	"github.com/containerd/containerd/identifiers"
@@ -166,22 +165,9 @@ func (t *Task) State(ctx context.Context) (runtime.State, error) {
 		}
 		return runtime.State{}, errdefs.ErrNotFound
 	}
-	var status runtime.Status
-	switch response.Status {
-	case task.StatusCreated:
-		status = runtime.CreatedStatus
-	case task.StatusRunning:
-		status = runtime.RunningStatus
-	case task.StatusStopped:
-		status = runtime.StoppedStatus
-	case task.StatusPaused:
-		status = runtime.PausedStatus
-	case task.StatusPausing:
-		status = runtime.PausingStatus
-	}
 	return runtime.State{
 		Pid:        response.Pid,
-		Status:     status,
+		Status:     statusFromProto(response.Status),
 		Stdin:      response.Stdin,
 		Stdout:     response.Stdout,
 		Stderr:     response.Stderr,
diff --git a/runtime/v1/shim/service.go b/runtime/v1/shim/service.go
index a08757d0a..d54d23caf 100644
--- a/runtime/v1/shim/service.go
+++ b/runtime/v1/shim/service.go
@@ -314,18 +314,18 @@ func (s *Service) State(ctx context.Context, r *shimapi.StateRequest) (*shimapi.
 	if err != nil {
 		return nil, err
 	}
-	status := task.StatusUnknown
+	status := task.Status_UNKNOWN
 	switch st {
 	case "created":
-		status = task.StatusCreated
+		status = task.Status_CREATED
 	case "running":
-		status = task.StatusRunning
+		status = task.Status_RUNNING
 	case "stopped":
-		status = task.StatusStopped
+		status = task.Status_STOPPED
 	case "paused":
-		status = task.StatusPaused
+		status = task.Status_PAUSED
 	case "pausing":
-		status = task.StatusPausing
+		status = task.Status_PAUSING
 	}
 	sio := p.Stdio()
 	return &shimapi.StateResponse{
diff --git a/runtime/v2/process.go b/runtime/v2/process.go
index 84c90c74a..9b68b0c3b 100644
--- a/runtime/v2/process.go
+++ b/runtime/v2/process.go
@@ -48,6 +48,23 @@ func (p *process) Kill(ctx context.Context, signal uint32, _ bool) error {
 	return nil
 }
 
+func statusFromProto(from tasktypes.Status) runtime.Status {
+	var status runtime.Status
+	switch from {
+	case tasktypes.Status_CREATED:
+		status = runtime.CreatedStatus
+	case tasktypes.Status_RUNNING:
+		status = runtime.RunningStatus
+	case tasktypes.Status_STOPPED:
+		status = runtime.StoppedStatus
+	case tasktypes.Status_PAUSED:
+		status = runtime.PausedStatus
+	case tasktypes.Status_PAUSING:
+		status = runtime.PausingStatus
+	}
+	return status
+}
+
 func (p *process) State(ctx context.Context) (runtime.State, error) {
 	response, err := p.shim.task.State(ctx, &task.StateRequest{
 		ID:     p.shim.ID(),
@@ -59,22 +76,9 @@ func (p *process) State(ctx context.Context) (runtime.State, error) {
 		}
 		return runtime.State{}, errdefs.ErrNotFound
 	}
-	var status runtime.Status
-	switch response.Status {
-	case tasktypes.StatusCreated:
-		status = runtime.CreatedStatus
-	case tasktypes.StatusRunning:
-		status = runtime.RunningStatus
-	case tasktypes.StatusStopped:
-		status = runtime.StoppedStatus
-	case tasktypes.StatusPaused:
-		status = runtime.PausedStatus
-	case tasktypes.StatusPausing:
-		status = runtime.PausingStatus
-	}
 	return runtime.State{
 		Pid:        response.Pid,
-		Status:     status,
+		Status:     statusFromProto(response.Status),
 		Stdin:      response.Stdin,
 		Stdout:     response.Stdout,
 		Stderr:     response.Stderr,
diff --git a/runtime/v2/runc/task/service.go b/runtime/v2/runc/task/service.go
index 4ad70dad3..fa6a24a2c 100644
--- a/runtime/v2/runc/task/service.go
+++ b/runtime/v2/runc/task/service.go
@@ -285,18 +285,18 @@ func (s *service) State(ctx context.Context, r *taskAPI.StateRequest) (*taskAPI.
 	if err != nil {
 		return nil, err
 	}
-	status := task.StatusUnknown
+	status := task.Status_UNKNOWN
 	switch st {
 	case "created":
-		status = task.StatusCreated
+		status = task.Status_CREATED
 	case "running":
-		status = task.StatusRunning
+		status = task.Status_RUNNING
 	case "stopped":
-		status = task.StatusStopped
+		status = task.Status_STOPPED
 	case "paused":
-		status = task.StatusPaused
+		status = task.Status_PAUSED
 	case "pausing":
-		status = task.StatusPausing
+		status = task.Status_PAUSING
 	}
 	sio := p.Stdio()
 	return &taskAPI.StateResponse{
diff --git a/runtime/v2/runc/v1/service.go b/runtime/v2/runc/v1/service.go
index 0c84c1403..da81e2605 100644
--- a/runtime/v2/runc/v1/service.go
+++ b/runtime/v2/runc/v1/service.go
@@ -417,18 +417,18 @@ func (s *service) State(ctx context.Context, r *taskAPI.StateRequest) (*taskAPI.
 	if err != nil {
 		return nil, err
 	}
-	status := task.StatusUnknown
+	status := task.Status_UNKNOWN
 	switch st {
 	case "created":
-		status = task.StatusCreated
+		status = task.Status_CREATED
 	case "running":
-		status = task.StatusRunning
+		status = task.Status_RUNNING
 	case "stopped":
-		status = task.StatusStopped
+		status = task.Status_STOPPED
 	case "paused":
-		status = task.StatusPaused
+		status = task.Status_PAUSED
 	case "pausing":
-		status = task.StatusPausing
+		status = task.Status_PAUSING
 	}
 	sio := p.Stdio()
 	return &taskAPI.StateResponse{
diff --git a/runtime/v2/shim.go b/runtime/v2/shim.go
index 456ffb440..e6abc9f6b 100644
--- a/runtime/v2/shim.go
+++ b/runtime/v2/shim.go
@@ -27,7 +27,6 @@ import (
 
 	eventstypes "github.com/containerd/containerd/api/events"
 	"github.com/containerd/containerd/api/types"
-	tasktypes "github.com/containerd/containerd/api/types/task"
 	"github.com/containerd/containerd/errdefs"
 	"github.com/containerd/containerd/events/exchange"
 	"github.com/containerd/containerd/identifiers"
@@ -526,22 +525,9 @@ func (s *shimTask) State(ctx context.Context) (runtime.State, error) {
 		}
 		return runtime.State{}, errdefs.ErrNotFound
 	}
-	var status runtime.Status
-	switch response.Status {
-	case tasktypes.StatusCreated:
-		status = runtime.CreatedStatus
-	case tasktypes.StatusRunning:
-		status = runtime.RunningStatus
-	case tasktypes.StatusStopped:
-		status = runtime.StoppedStatus
-	case tasktypes.StatusPaused:
-		status = runtime.PausedStatus
-	case tasktypes.StatusPausing:
-		status = runtime.PausingStatus
-	}
 	return runtime.State{
 		Pid:        response.Pid,
-		Status:     status,
+		Status:     statusFromProto(response.Status),
 		Stdin:      response.Stdin,
 		Stdout:     response.Stdout,
 		Stderr:     response.Stderr,
diff --git a/services/content/contentserver/contentserver.go b/services/content/contentserver/contentserver.go
index d5d417f0d..70c50af2e 100644
--- a/services/content/contentserver/contentserver.go
+++ b/services/content/contentserver/contentserver.go
@@ -373,12 +373,12 @@ func (s *service) Write(session api.Content_WriteServer) (err error) {
 		}
 
 		switch req.Action {
-		case api.WriteActionStat:
+		case api.WriteAction_STAT:
 			msg.Digest = wr.Digest().String()
 			msg.StartedAt = ws.StartedAt
 			msg.UpdatedAt = ws.UpdatedAt
 			msg.Total = total
-		case api.WriteActionWrite, api.WriteActionCommit:
+		case api.WriteAction_WRITE, api.WriteAction_COMMIT:
 			if req.Offset > 0 {
 				// validate the offset if provided
 				if req.Offset != ws.Offset {
@@ -411,7 +411,7 @@ func (s *service) Write(session api.Content_WriteServer) (err error) {
 				msg.Offset += int64(n)
 			}
 
-			if req.Action == api.WriteActionCommit {
+			if req.Action == api.WriteAction_COMMIT {
 				var opts []content.Opt
 				if req.Labels != nil {
 					opts = append(opts, content.WithLabels(req.Labels))
@@ -428,7 +428,7 @@ func (s *service) Write(session api.Content_WriteServer) (err error) {
 			return err
 		}
 
-		if req.Action == api.WriteActionCommit {
+		if req.Action == api.WriteAction_COMMIT {
 			return nil
 		}
 
diff --git a/services/snapshots/service.go b/services/snapshots/service.go
index c6d711cc2..170f55d13 100644
--- a/services/snapshots/service.go
+++ b/services/snapshots/service.go
@@ -276,12 +276,12 @@ func (s *service) Cleanup(ctx context.Context, cr *snapshotsapi.CleanupRequest)
 
 func fromKind(kind snapshots.Kind) snapshotsapi.Kind {
 	if kind == snapshots.KindActive {
-		return snapshotsapi.KindActive
+		return snapshotsapi.Kind_ACTIVE
 	}
 	if kind == snapshots.KindView {
-		return snapshotsapi.KindView
+		return snapshotsapi.Kind_VIEW
 	}
-	return snapshotsapi.KindCommitted
+	return snapshotsapi.Kind_COMMITTED
 }
 
 func fromInfo(info snapshots.Info) snapshotsapi.Info {
@@ -326,10 +326,10 @@ func toInfo(info snapshotsapi.Info) snapshots.Info {
 }
 
 func toKind(kind snapshotsapi.Kind) snapshots.Kind {
-	if kind == snapshotsapi.KindActive {
+	if kind == snapshotsapi.Kind_ACTIVE {
 		return snapshots.KindActive
 	}
-	if kind == snapshotsapi.KindView {
+	if kind == snapshotsapi.Kind_VIEW {
 		return snapshots.KindView
 	}
 	return snapshots.KindCommitted
diff --git a/services/tasks/local.go b/services/tasks/local.go
index ec82a0681..dcfe1388f 100644
--- a/services/tasks/local.go
+++ b/services/tasks/local.go
@@ -333,18 +333,18 @@ func getProcessState(ctx context.Context, p runtime.Process) (*task.Process, err
 		}
 		log.G(ctx).WithError(err).Errorf("get state for %s", p.ID())
 	}
-	status := task.StatusUnknown
+	status := task.Status_UNKNOWN
 	switch state.Status {
 	case runtime.CreatedStatus:
-		status = task.StatusCreated
+		status = task.Status_CREATED
 	case runtime.RunningStatus:
-		status = task.StatusRunning
+		status = task.Status_RUNNING
 	case runtime.StoppedStatus:
-		status = task.StatusStopped
+		status = task.Status_STOPPED
 	case runtime.PausedStatus:
-		status = task.StatusPaused
+		status = task.Status_PAUSED
 	case runtime.PausingStatus:
-		status = task.StatusPausing
+		status = task.Status_PAUSING
 	default:
 		log.G(ctx).WithField("status", state.Status).Warn("unknown status")
 	}
diff --git a/snapshots/proxy/proxy.go b/snapshots/proxy/proxy.go
index 00c320c60..7c0f51fe5 100644
--- a/snapshots/proxy/proxy.go
+++ b/snapshots/proxy/proxy.go
@@ -192,10 +192,10 @@ func (p *proxySnapshotter) Cleanup(ctx context.Context) error {
 }
 
 func toKind(kind snapshotsapi.Kind) snapshots.Kind {
-	if kind == snapshotsapi.KindActive {
+	if kind == snapshotsapi.Kind_ACTIVE {
 		return snapshots.KindActive
 	}
-	if kind == snapshotsapi.KindView {
+	if kind == snapshotsapi.Kind_VIEW {
 		return snapshots.KindView
 	}
 	return snapshots.KindCommitted
@@ -233,12 +233,12 @@ func toMounts(mm []*types.Mount) []mount.Mount {
 
 func fromKind(kind snapshots.Kind) snapshotsapi.Kind {
 	if kind == snapshots.KindActive {
-		return snapshotsapi.KindActive
+		return snapshotsapi.Kind_ACTIVE
 	}
 	if kind == snapshots.KindView {
-		return snapshotsapi.KindView
+		return snapshotsapi.Kind_VIEW
 	}
-	return snapshotsapi.KindCommitted
+	return snapshotsapi.Kind_COMMITTED
 }
 
 func fromInfo(info snapshots.Info) snapshotsapi.Info {