payload.proto: return both local and remote paths
Apologies for the thrash here, we should give both the local and remote
(if uploaded) paths for the response.
BUG=chromium:1122854
TEST=regen
Change-Id: I152ce7e7306819395d0e7314ed7c6766c529327a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/infra/proto/+/2535577
Commit-Queue: George Engelbrecht <engeg@google.com>
Commit-Queue: Navil Perez <navil@google.com>
Auto-Submit: George Engelbrecht <engeg@google.com>
Reviewed-by: Navil Perez <navil@google.com>
diff --git a/go/chromite/api/payload.pb.go b/go/chromite/api/payload.pb.go
index 90a5aa1..b7d0902 100644
--- a/go/chromite/api/payload.pb.go
+++ b/go/chromite/api/payload.pb.go
@@ -495,10 +495,11 @@
type GenerationResponse struct {
// Whether we've completed successfully.
Success bool `protobuf:"varint,1,opt,name=success,proto3" json:"success,omitempty"`
- // If successful we may have uploaded an artifact to google storage. This will
- // have a random bit included, but is otherwise deterministic with the input
- // properties. Return it so we can find the artifact.
- UniqueId string `protobuf:"bytes,2,opt,name=unique_id,json=uniqueId,proto3" json:"unique_id,omitempty"`
+ // If successful we may have a local artifact available. Generally this takes
+ // the form of '/tmp/ioadwjoawjd/delta.bin'.
+ LocalPath string `protobuf:"bytes,2,opt,name=local_path,json=localPath,proto3" json:"local_path,omitempty"`
+ // If successful we may have uploaded an artifact to google storage.
+ RemoteUri string `protobuf:"bytes,3,opt,name=remote_uri,json=remoteUri,proto3" json:"remote_uri,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@@ -536,9 +537,16 @@
return false
}
-func (m *GenerationResponse) GetUniqueId() string {
+func (m *GenerationResponse) GetLocalPath() string {
if m != nil {
- return m.UniqueId
+ return m.LocalPath
+ }
+ return ""
+}
+
+func (m *GenerationResponse) GetRemoteUri() string {
+ if m != nil {
+ return m.RemoteUri
}
return ""
}
@@ -555,49 +563,50 @@
func init() { proto.RegisterFile("chromite/api/payload.proto", fileDescriptor_0ecdf1e4e8bef7a4) }
var fileDescriptor_0ecdf1e4e8bef7a4 = []byte{
- // 668 bytes of a gzipped FileDescriptorProto
- 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x54, 0xc1, 0x4e, 0xdb, 0x4a,
- 0x14, 0x8d, 0x81, 0x84, 0xe4, 0x1a, 0x02, 0xcc, 0x13, 0xe0, 0x17, 0x90, 0xe0, 0x65, 0xc5, 0xdb,
- 0x24, 0x12, 0xad, 0xaa, 0xaa, 0xea, 0x8a, 0x52, 0x35, 0x88, 0x2e, 0xd0, 0x00, 0x9b, 0x6e, 0x22,
- 0x67, 0x3c, 0x31, 0xa3, 0x38, 0x33, 0x66, 0x66, 0x4c, 0xe5, 0x5d, 0xd7, 0x5d, 0xb4, 0xff, 0xd4,
- 0x2f, 0xe9, 0x0f, 0xf4, 0x1f, 0xaa, 0x99, 0x71, 0xb0, 0x0d, 0x6a, 0x51, 0x37, 0xdd, 0xf9, 0x9e,
- 0xb9, 0xf7, 0xcc, 0x39, 0xd7, 0x77, 0x2e, 0xf4, 0xc8, 0x8d, 0x14, 0x73, 0xa6, 0xe9, 0x30, 0x4c,
- 0xd9, 0x30, 0x0d, 0xf3, 0x44, 0x84, 0xd1, 0x20, 0x95, 0x42, 0x0b, 0xb4, 0xb6, 0x38, 0x1b, 0x84,
- 0x29, 0xeb, 0xed, 0xd7, 0x32, 0x27, 0x19, 0x4b, 0xa2, 0x71, 0x98, 0x32, 0x97, 0xdb, 0xdb, 0x75,
- 0xa7, 0xd9, 0x5c, 0xa8, 0x21, 0x11, 0xf3, 0xb9, 0xe0, 0xee, 0xa0, 0xff, 0xd5, 0x83, 0xe6, 0x89,
- 0x49, 0x46, 0xaf, 0x60, 0xcd, 0x55, 0xe9, 0x50, 0xc6, 0x54, 0x07, 0xde, 0xa1, 0x77, 0xe4, 0x1f,
- 0xef, 0x0e, 0xca, 0xca, 0x81, 0x4d, 0xbc, 0xb2, 0xc7, 0xd8, 0x9f, 0x94, 0x01, 0x0a, 0x60, 0xf5,
- 0x8e, 0x4a, 0xc5, 0x04, 0x0f, 0x96, 0x0e, 0xbd, 0xa3, 0x0e, 0x5e, 0x84, 0x68, 0x07, 0x5a, 0x93,
- 0x8c, 0xcc, 0xa8, 0x0e, 0x96, 0xed, 0x41, 0x11, 0x99, 0x0a, 0x72, 0x13, 0x72, 0x4e, 0x93, 0x60,
- 0xc5, 0x55, 0x14, 0x61, 0xff, 0xb3, 0x07, 0xed, 0xd3, 0xf7, 0x6f, 0xce, 0xe6, 0x61, 0x4c, 0xd1,
- 0xff, 0xd0, 0xb4, 0xf7, 0x14, 0x6a, 0xfe, 0x19, 0x54, 0x3d, 0x3b, 0x3d, 0xd8, 0x65, 0xa0, 0x6d,
- 0x68, 0x45, 0x09, 0x19, 0xb3, 0xa8, 0x90, 0xd0, 0x8c, 0x12, 0x72, 0x16, 0xa1, 0x03, 0xf0, 0x0d,
- 0x9c, 0x86, 0x64, 0x16, 0xc6, 0xb4, 0x50, 0x01, 0x51, 0x42, 0x2e, 0x1c, 0x82, 0xf6, 0xa0, 0x63,
- 0xeb, 0xcc, 0x7d, 0x85, 0x96, 0xb6, 0x29, 0x35, 0x71, 0xff, 0x93, 0x07, 0xfe, 0x25, 0x8b, 0x39,
- 0x8d, 0xfe, 0x58, 0xcf, 0x73, 0x00, 0xcb, 0x39, 0xd6, 0x79, 0x4a, 0xad, 0xa6, 0xee, 0xf1, 0x76,
- 0xb5, 0x9b, 0x96, 0xf1, 0x2a, 0x4f, 0x29, 0xee, 0xb0, 0xc5, 0x27, 0xda, 0x84, 0xe5, 0x19, 0xcd,
- 0x0b, 0x99, 0xe6, 0xb3, 0xff, 0xc5, 0x83, 0xf5, 0x6b, 0xae, 0xfe, 0xa6, 0x88, 0x7d, 0xe8, 0xcc,
- 0x59, 0x42, 0x95, 0x16, 0x7c, 0xd1, 0xb1, 0x12, 0xe8, 0x7f, 0x5f, 0x81, 0xad, 0x77, 0x94, 0x53,
- 0x19, 0x6a, 0x26, 0x38, 0xa6, 0xb7, 0x19, 0x55, 0x1a, 0xfd, 0x07, 0xfe, 0x34, 0x4b, 0x92, 0x71,
- 0x96, 0x46, 0xa1, 0xa6, 0x56, 0x5a, 0x7b, 0xd4, 0xc0, 0x60, 0xc0, 0x6b, 0x8b, 0xa1, 0xb7, 0xb0,
- 0xa9, 0x24, 0x19, 0x3b, 0x2b, 0x45, 0xc3, 0x97, 0xac, 0x85, 0x7f, 0xeb, 0x16, 0x2a, 0x1d, 0x1f,
- 0x35, 0x70, 0x57, 0x49, 0x52, 0xfd, 0x07, 0xe7, 0x80, 0x0c, 0x4d, 0xc6, 0x6b, 0x44, 0xcb, 0x96,
- 0x68, 0xaf, 0x4e, 0x54, 0xeb, 0xdb, 0xa8, 0x81, 0xcd, 0xfd, 0xf5, 0x5e, 0xbe, 0x86, 0x75, 0x43,
- 0x56, 0x4e, 0x00, 0x58, 0x9e, 0x9d, 0x3a, 0xcf, 0x62, 0x1e, 0x47, 0x0d, 0xec, 0x2b, 0x49, 0x4e,
- 0x8b, 0xf1, 0x30, 0x8e, 0x74, 0xac, 0xeb, 0x8e, 0x56, 0x9e, 0x72, 0xe4, 0xe1, 0xae, 0x8e, 0xf5,
- 0x03, 0x47, 0x86, 0xe6, 0x81, 0xa3, 0xe6, 0xd3, 0x8e, 0x3c, 0x6c, 0xee, 0x7f, 0xe4, 0xc8, 0x90,
- 0x95, 0x8e, 0xfc, 0xdf, 0x3a, 0xf2, 0xb0, 0xaf, 0x63, 0x7d, 0xef, 0xa8, 0x7c, 0xaf, 0xad, 0xda,
- 0x7b, 0xdd, 0x81, 0xd6, 0x1d, 0x95, 0x6c, 0x9a, 0x07, 0xab, 0xe6, 0xcf, 0xe2, 0x22, 0x32, 0xf8,
- 0x8c, 0xe6, 0x8a, 0xea, 0xa0, 0xed, 0xf2, 0x5d, 0x64, 0xf0, 0x48, 0xe6, 0x32, 0xe3, 0x41, 0xc7,
- 0xe5, 0xbb, 0xe8, 0x64, 0x0b, 0x36, 0x4c, 0xbf, 0xdd, 0x50, 0x0a, 0x4e, 0xc5, 0xd4, 0x40, 0x46,
- 0x70, 0x05, 0xea, 0x9f, 0x03, 0xaa, 0x4e, 0x98, 0x4a, 0x05, 0x57, 0xd4, 0xec, 0x0c, 0x95, 0x11,
- 0x42, 0x95, 0x72, 0xe3, 0x85, 0x17, 0xa1, 0x79, 0xc3, 0x19, 0x67, 0xb7, 0x19, 0x2d, 0x9f, 0x7f,
- 0xdb, 0x01, 0x67, 0xd1, 0xf1, 0x47, 0xe8, 0x5e, 0xb8, 0xc5, 0x79, 0x49, 0xe5, 0x1d, 0x23, 0x14,
- 0x5d, 0xc1, 0x46, 0x41, 0x4f, 0x8b, 0x13, 0x74, 0x50, 0x6f, 0xcf, 0xa3, 0xf9, 0xee, 0x1d, 0xfe,
- 0x3a, 0xc1, 0xc9, 0xeb, 0x6d, 0x7c, 0xfb, 0xd1, 0xf3, 0x61, 0xb5, 0x58, 0xd2, 0x9b, 0xde, 0xc9,
- 0xcb, 0x0f, 0x2f, 0x62, 0x71, 0xff, 0xd8, 0x06, 0x42, 0xc6, 0xc3, 0xca, 0x1a, 0x66, 0x7c, 0x2a,
- 0xc3, 0xa1, 0xdd, 0xc2, 0xc3, 0x58, 0x0c, 0xab, 0xeb, 0x7b, 0xd2, 0xb2, 0xf0, 0xb3, 0x9f, 0x01,
- 0x00, 0x00, 0xff, 0xff, 0x0b, 0x26, 0x81, 0x9e, 0xff, 0x05, 0x00, 0x00,
+ // 688 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x54, 0xcd, 0x4e, 0xdb, 0x4a,
+ 0x14, 0x8e, 0x81, 0x84, 0xe4, 0x18, 0x02, 0xcc, 0x15, 0xe0, 0x1b, 0xb8, 0x82, 0x9b, 0x15, 0x77,
+ 0x93, 0x48, 0xdc, 0xaa, 0xaa, 0xaa, 0xae, 0x28, 0x55, 0x83, 0xda, 0x05, 0x32, 0xb0, 0xe9, 0x26,
+ 0x9a, 0x8c, 0x4f, 0x9c, 0x51, 0x1c, 0x8f, 0x3b, 0x1e, 0x53, 0x65, 0xd7, 0x75, 0x17, 0xed, 0x3b,
+ 0xf5, 0x49, 0xfa, 0x02, 0x7d, 0x87, 0x6a, 0x7e, 0x42, 0x6c, 0x50, 0x8b, 0xba, 0xe9, 0xce, 0xe7,
+ 0x3b, 0x67, 0xbe, 0xf9, 0xbe, 0xe3, 0x33, 0x07, 0x3a, 0x6c, 0x22, 0xc5, 0x8c, 0x2b, 0xec, 0xd3,
+ 0x8c, 0xf7, 0x33, 0x3a, 0x4f, 0x04, 0x8d, 0x7a, 0x99, 0x14, 0x4a, 0x90, 0x8d, 0x45, 0xae, 0x47,
+ 0x33, 0xde, 0x39, 0xac, 0x54, 0x8e, 0x0a, 0x9e, 0x44, 0x43, 0x9a, 0x71, 0x5b, 0xdb, 0xd9, 0xb7,
+ 0xd9, 0x62, 0x26, 0xf2, 0x3e, 0x13, 0xb3, 0x99, 0x48, 0x6d, 0xa2, 0xfb, 0xc5, 0x83, 0xfa, 0x99,
+ 0x2e, 0x26, 0xcf, 0x61, 0xc3, 0x9e, 0x52, 0x54, 0xc6, 0xa8, 0x02, 0xef, 0xd8, 0x3b, 0xf1, 0x4f,
+ 0xf7, 0x7b, 0xcb, 0x93, 0x3d, 0x53, 0x78, 0x6d, 0xd2, 0xa1, 0x3f, 0x5a, 0x06, 0x24, 0x80, 0xf5,
+ 0x5b, 0x94, 0x39, 0x17, 0x69, 0xb0, 0x72, 0xec, 0x9d, 0xb4, 0xc2, 0x45, 0x48, 0xf6, 0xa0, 0x31,
+ 0x2a, 0xd8, 0x14, 0x55, 0xb0, 0x6a, 0x12, 0x2e, 0xd2, 0x27, 0xd8, 0x84, 0xa6, 0x29, 0x26, 0xc1,
+ 0x9a, 0x3d, 0xe1, 0xc2, 0xee, 0x27, 0x0f, 0x9a, 0xe7, 0x6f, 0x5f, 0x5e, 0xcc, 0x68, 0x8c, 0xe4,
+ 0x3f, 0xa8, 0x9b, 0x7b, 0x9c, 0x9a, 0xbf, 0x7a, 0x65, 0xcf, 0x56, 0x4f, 0x68, 0x2b, 0xc8, 0x2e,
+ 0x34, 0xa2, 0x84, 0x0d, 0x79, 0xe4, 0x24, 0xd4, 0xa3, 0x84, 0x5d, 0x44, 0xe4, 0x08, 0x7c, 0x0d,
+ 0x67, 0x94, 0x4d, 0x69, 0x8c, 0x4e, 0x05, 0x44, 0x09, 0xbb, 0xb4, 0x08, 0x39, 0x80, 0x96, 0x39,
+ 0xa7, 0xef, 0x73, 0x5a, 0x9a, 0xfa, 0xa8, 0x8e, 0xbb, 0x1f, 0x3d, 0xf0, 0xaf, 0x78, 0x9c, 0x62,
+ 0xf4, 0xdb, 0x7a, 0x9e, 0x00, 0x18, 0xce, 0xa1, 0x9a, 0x67, 0x68, 0x34, 0xb5, 0x4f, 0x77, 0xcb,
+ 0xdd, 0x34, 0x8c, 0xd7, 0xf3, 0x0c, 0xc3, 0x16, 0x5f, 0x7c, 0x92, 0x6d, 0x58, 0x9d, 0xe2, 0xdc,
+ 0xc9, 0xd4, 0x9f, 0xdd, 0xcf, 0x1e, 0x6c, 0xde, 0xa4, 0xf9, 0x9f, 0x14, 0x71, 0x08, 0xad, 0x19,
+ 0x4f, 0x30, 0x57, 0x22, 0x5d, 0x74, 0x6c, 0x09, 0x74, 0xbf, 0xad, 0xc1, 0xce, 0x6b, 0x4c, 0x51,
+ 0x52, 0xc5, 0x45, 0x1a, 0xe2, 0xfb, 0x02, 0x73, 0x45, 0xfe, 0x05, 0x7f, 0x5c, 0x24, 0xc9, 0xb0,
+ 0xc8, 0x22, 0xaa, 0xd0, 0x48, 0x6b, 0x0e, 0x6a, 0x21, 0x68, 0xf0, 0xc6, 0x60, 0xe4, 0x15, 0x6c,
+ 0xe7, 0x92, 0x0d, 0xad, 0x15, 0xd7, 0xf0, 0x15, 0x63, 0xe1, 0xef, 0xaa, 0x85, 0x52, 0xc7, 0x07,
+ 0xb5, 0xb0, 0x9d, 0x4b, 0x56, 0xfe, 0x07, 0x6f, 0x80, 0x68, 0x9a, 0x22, 0xad, 0x10, 0xad, 0x1a,
+ 0xa2, 0x83, 0x2a, 0x51, 0xa5, 0x6f, 0x83, 0x5a, 0xa8, 0xef, 0xaf, 0xf6, 0xf2, 0x05, 0x6c, 0x6a,
+ 0xb2, 0xe5, 0x04, 0x80, 0xe1, 0xd9, 0xab, 0xf2, 0x2c, 0xe6, 0x71, 0x50, 0x0b, 0xfd, 0x5c, 0xb2,
+ 0x73, 0x37, 0x1e, 0xda, 0x91, 0x8a, 0x55, 0xd5, 0xd1, 0xda, 0x63, 0x8e, 0xbc, 0xb0, 0xad, 0x62,
+ 0x75, 0xcf, 0x91, 0xa6, 0xb9, 0xe7, 0xa8, 0xfe, 0xb8, 0x23, 0x2f, 0xd4, 0xf7, 0x3f, 0x70, 0xa4,
+ 0xc9, 0x96, 0x8e, 0xfc, 0x5f, 0x3a, 0xf2, 0x42, 0x5f, 0xc5, 0xea, 0xce, 0xd1, 0xf2, 0xbd, 0x36,
+ 0x2a, 0xef, 0x75, 0x0f, 0x1a, 0xb7, 0x28, 0xf9, 0x78, 0x1e, 0xac, 0xeb, 0x3f, 0x1b, 0xba, 0x48,
+ 0xe3, 0x53, 0x9c, 0xe7, 0xa8, 0x82, 0xa6, 0xad, 0xb7, 0x91, 0xc6, 0x23, 0x39, 0x97, 0x45, 0x1a,
+ 0xb4, 0x6c, 0xbd, 0x8d, 0xce, 0x76, 0x60, 0x4b, 0xf7, 0xdb, 0x0e, 0xa5, 0x48, 0x51, 0x8c, 0x35,
+ 0xa4, 0x05, 0x97, 0xa0, 0x6e, 0x02, 0xa4, 0x3c, 0x61, 0x79, 0x26, 0xd2, 0x1c, 0xf5, 0xce, 0xc8,
+ 0x0b, 0xc6, 0x30, 0xcf, 0xed, 0x78, 0x85, 0x8b, 0x90, 0xfc, 0x03, 0x90, 0x08, 0x46, 0x93, 0x61,
+ 0x46, 0xd5, 0xc4, 0xbd, 0xff, 0x96, 0x41, 0x2e, 0xa9, 0x9a, 0xe8, 0xb4, 0xc4, 0x99, 0x50, 0x38,
+ 0x2c, 0x24, 0x5f, 0x0c, 0xb4, 0x45, 0x6e, 0x24, 0x3f, 0xfd, 0x00, 0xed, 0x4b, 0xbb, 0x59, 0xaf,
+ 0x50, 0xde, 0x72, 0x86, 0xe4, 0x1a, 0xb6, 0xdc, 0xfd, 0xe8, 0x32, 0xe4, 0xa8, 0xda, 0xbf, 0x07,
+ 0x0f, 0xa0, 0x73, 0xfc, 0xf3, 0x02, 0xab, 0xbf, 0xb3, 0xf5, 0xf5, 0x7b, 0xc7, 0x87, 0x75, 0xb7,
+ 0xc5, 0xb7, 0xbd, 0xb3, 0x67, 0xef, 0x9e, 0xc6, 0xe2, 0xee, 0x35, 0xf6, 0x84, 0x8c, 0xfb, 0xa5,
+ 0x3d, 0xcd, 0xd3, 0xb1, 0xa4, 0x7d, 0xb3, 0xa6, 0xfb, 0xb1, 0xe8, 0x97, 0xf7, 0xfb, 0xa8, 0x61,
+ 0xe0, 0xff, 0x7f, 0x04, 0x00, 0x00, 0xff, 0xff, 0xbc, 0x8b, 0x4b, 0x60, 0x20, 0x06, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
diff --git a/src/chromite/api/payload.proto b/src/chromite/api/payload.proto
index 1d0bd08..7c484e1 100644
--- a/src/chromite/api/payload.proto
+++ b/src/chromite/api/payload.proto
@@ -107,10 +107,12 @@
// Whether we've completed successfully.
bool success = 1;
- // If successful we may have uploaded an artifact to google storage. This will
- // have a random bit included, but is otherwise deterministic with the input
- // properties. Return it so we can find the artifact.
- string unique_id = 2;
+ // If successful we may have a local artifact available. Generally this takes
+ // the form of '/tmp/ioadwjoawjd/delta.bin'.
+ string local_path = 2;
+
+ // If successful we may have uploaded an artifact to google storage.
+ string remote_uri = 3;
}
// The image service definition.
