github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #1174 from dmcgowan/refactor-committedat-createdat

Browse Source 
Rename CommittedAt to CreatedAt in content interface
This commit is contained in:
Michael Crosby 2017-07-12 17:11:02 -07:00 committed by GitHub
commit 89934640d8
9 changed files with 108 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

154
api/services/content/v1/content.pb.go
View File

@ -111,8 +111,8 @@ type Info struct {
Digest github_com_opencontainers_go_digest.Digest `protobuf:"bytes,1,opt,name=digest,proto3,customtype=github.com/opencontainers/go-digest.Digest" json:"digest"`
// Size is the total number of bytes in the blob.
Size_ int64 `protobuf:"varint,2,opt,name=size,proto3" json:"size,omitempty"`
// CommittedAt provides the time at which the blob was committed.
CommittedAt time.Time `protobuf:"bytes,3,opt,name=committed_at,json=committedAt,stdtime" json:"committed_at"`
// CreatedAt provides the time at which the blob was committed.
CreatedAt time.Time `protobuf:"bytes,3,opt,name=created_at,json=createdAt,stdtime" json:"created_at"`
// UpdatedAt provides the time the info was last updated.
UpdatedAt time.Time `protobuf:"bytes,4,opt,name=updated_at,json=updatedAt,stdtime" json:"updated_at"`
// Labels are arbitrary data on content.
@ -144,7 +144,7 @@ type UpdateRequest struct {
// UpdateMask specifies which fields to perform the update on. If empty,
// the operation applies to all fields.
//
// In info, Digest, Size, and CommittedAt are immutable,
// In info, Digest, Size, and CreatedAt are immutable,
// other field may be updated using this mask.
// If no mask is provided, all mutable field are updated.
UpdateMask *google_protobuf1.FieldMask `protobuf:"bytes,2,opt,name=update_mask,json=updateMask" json:"update_mask,omitempty"`
@ -930,8 +930,8 @@ func (m *Info) MarshalTo(dAtA []byte) (int, error) {
}
dAtA[i] = 0x1a
i++
i = encodeVarintContent(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(m.CommittedAt)))
n1, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.CommittedAt, dAtA[i:])
i = encodeVarintContent(dAtA, i, uint64(github_com_gogo_protobuf_types.SizeOfStdTime(m.CreatedAt)))
n1, err := github_com_gogo_protobuf_types.StdTimeMarshalTo(m.CreatedAt, dAtA[i:])
if err != nil {
return 0, err
}
@ -1564,7 +1564,7 @@ func (m *Info) Size() (n int) {
if m.Size_ != 0 {
n += 1 + sovContent(uint64(m.Size_))
}
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.CommittedAt)
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.CreatedAt)
n += 1 + l + sovContent(uint64(l))
l = github_com_gogo_protobuf_types.SizeOfStdTime(m.UpdatedAt)
n += 1 + l + sovContent(uint64(l))
@ -1838,7 +1838,7 @@ func (this *Info) String() string {
s := strings.Join([]string{`&Info{`,
`Digest:` + fmt.Sprintf("%v", this.Digest) + `,`,
`Size_:` + fmt.Sprintf("%v", this.Size_) + `,`,
`CommittedAt:` + strings.Replace(strings.Replace(this.CommittedAt.String(), "Timestamp", "google_protobuf2.Timestamp", 1), `&`, ``, 1) + `,`,
`CreatedAt:` + strings.Replace(strings.Replace(this.CreatedAt.String(), "Timestamp", "google_protobuf2.Timestamp", 1), `&`, ``, 1) + `,`,
`UpdatedAt:` + strings.Replace(strings.Replace(this.UpdatedAt.String(), "Timestamp", "google_protobuf2.Timestamp", 1), `&`, ``, 1) + `,`,
`Labels:` + mapStringForLabels + `,`,
`}`,
@ -2121,7 +2121,7 @@ func (m *Info) Unmarshal(dAtA []byte) error {
}
case 3:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field CommittedAt", wireType)
return fmt.Errorf("proto: wrong wireType = %d for field CreatedAt", wireType)
}
var msglen int
for shift := uint(0); ; shift += 7 {
@ -2145,7 +2145,7 @@ func (m *Info) Unmarshal(dAtA []byte) error {
if postIndex > l {
return io.ErrUnexpectedEOF
}
if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.CommittedAt, dAtA[iNdEx:postIndex]); err != nil {
if err := github_com_gogo_protobuf_types.StdTimeUnmarshal(&m.CreatedAt, dAtA[iNdEx:postIndex]); err != nil {
return err
}
iNdEx = postIndex
@ -4233,72 +4233,72 @@ func init() {
}
var fileDescriptorContent = []byte{
// 1067 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0x4f, 0x6f, 0x1a, 0x47,
0x14, 0xf7, 0xb0, 0xb0, 0x36, 0x0f, 0x92, 0xd2, 0x81, 0x46, 0x68, 0xab, 0xc2, 0x66, 0x55, 0x55,
0x28, 0xa9, 0x17, 0x07, 0xfb, 0xd0, 0x36, 0x52, 0x55, 0x4c, 0x9c, 0xc6, 0x55, 0x9c, 0x56, 0x1b,
0xd2, 0xa8, 0xb9, 0xa4, 0x0b, 0x0c, 0x74, 0x65, 0x60, 0x09, 0x33, 0xa0, 0xba, 0xa7, 0x5e, 0x2a,
0x55, 0x56, 0x0e, 0xfd, 0x02, 0xbe, 0xb4, 0xfd, 0x14, 0x3d, 0xf4, 0xec, 0x63, 0x8f, 0x55, 0x0f,
0x49, 0xe3, 0x6f, 0xd1, 0x4b, 0x55, 0xed, 0xcc, 0x2c, 0x2c, 0x60, 0x97, 0x05, 0x93, 0x13, 0x6f,
0x66, 0xdf, 0xef, 0xfd, 0xff, 0x33, 0xc0, 0xdd, 0x96, 0xc3, 0xbe, 0x19, 0xd4, 0xcc, 0xba, 0xdb,
0x29, 0xd6, 0xdd, 0x2e, 0xb3, 0x9d, 0x2e, 0xe9, 0x37, 0x82, 0xa4, 0xdd, 0x73, 0x8a, 0x94, 0xf4,
0x87, 0x4e, 0x9d, 0x50, 0x7e, 0x4f, 0xba, 0xac, 0x38, 0xbc, 0xe5, 0x93, 0x66, 0xaf, 0xef, 0x32,
0x17, 0xe7, 0xc6, 0x08, 0xd3, 0xe7, 0x36, 0x7d, 0x96, 0xe1, 0x2d, 0x2d, 0xd3, 0x72, 0x5b, 0x2e,
0x67, 0x2d, 0x7a, 0x94, 0x40, 0x69, 0x7a, 0xcb, 0x75, 0x5b, 0x6d, 0x52, 0xe4, 0xa7, 0xda, 0xa0,
0x59, 0x6c, 0x3a, 0xa4, 0xdd, 0x78, 0xda, 0xb1, 0xe9, 0xa1, 0xe4, 0xc8, 0x4f, 0x73, 0x30, 0xa7,
0x43, 0x28, 0xb3, 0x3b, 0x3d, 0xc9, 0xf0, 0xf6, 0x34, 0x03, 0xe9, 0xf4, 0xd8, 0x91, 0xf8, 0x68,
0xfc, 0x13, 0x81, 0xe8, 0x7e, 0xb7, 0xe9, 0xe2, 0xcf, 0x40, 0x6d, 0x38, 0x2d, 0x42, 0x59, 0x16,
0xe9, 0xa8, 0x10, 0xdf, 0x2d, 0x9d, 0xbe, 0xc8, 0xaf, 0xfd, 0xf5, 0x22, 0x7f, 0x23, 0xe0, 0xbe,
0xdb, 0x23, 0xdd, 0x91, 0x17, 0xb4, 0xd8, 0x72, 0x37, 0x05, 0xc4, 0xbc, 0xc3, 0x7f, 0x2c, 0x29,
0x01, 0x63, 0x88, 0x52, 0xe7, 0x3b, 0x92, 0x8d, 0xe8, 0xa8, 0xa0, 0x58, 0x9c, 0xc6, 0x9f, 0x42,
0xb2, 0xee, 0x76, 0x3a, 0x0e, 0x63, 0xa4, 0xf1, 0xd4, 0x66, 0x59, 0x45, 0x47, 0x85, 0x44, 0x49,
0x33, 0x85, 0x71, 0xa6, 0x6f, 0x9c, 0x59, 0xf5, 0xad, 0xdf, 0xdd, 0xf0, 0x2c, 0xf8, 0xe9, 0x65,
0x1e, 0x59, 0x89, 0x11, 0xb2, 0xcc, 0x70, 0x05, 0x60, 0xd0, 0x6b, 0xd8, 0x52, 0x4c, 0x74, 0x01,
0x31, 0x71, 0x89, 0x2b, 0x33, 0x7c, 0x0f, 0xd4, 0xb6, 0x5d, 0x23, 0x6d, 0x9a, 0x8d, 0xe9, 0x4a,
0x21, 0x51, 0xda, 0x32, 0xff, 0x3f, 0x3b, 0xa6, 0x17, 0x23, 0xf3, 0x3e, 0x87, 0xec, 0x75, 0x59,
0xff, 0xc8, 0x92, 0x78, 0xed, 0x43, 0x48, 0x04, 0xae, 0x71, 0x0a, 0x94, 0x43, 0x72, 0x24, 0x62,
0x68, 0x79, 0x24, 0xce, 0x40, 0x6c, 0x68, 0xb7, 0x07, 0x22, 0x1a, 0x71, 0x4b, 0x1c, 0x3e, 0x8a,
0x7c, 0x80, 0x8c, 0xaf, 0x20, 0xe1, 0x89, 0xb5, 0xc8, 0xb3, 0x81, 0x17, 0xb5, 0x15, 0x66, 0xc0,
0x78, 0x00, 0x49, 0x21, 0x9a, 0xf6, 0xdc, 0x2e, 0x25, 0xf8, 0x63, 0x88, 0x3a, 0xdd, 0xa6, 0xcb,
0x25, 0x27, 0x4a, 0xef, 0x86, 0xf1, 0x76, 0x37, 0xea, 0xe9, 0xb7, 0x38, 0xce, 0x78, 0x8e, 0xe0,
0xca, 0x23, 0x1e, 0x3d, 0xdf, 0xda, 0x4b, 0x4a, 0xc4, 0xb7, 0x21, 0x21, 0xd2, 0xc1, 0x6b, 0x99,
0x07, 0xe7, 0xbc, 0x3c, 0xde, 0xf5, 0xca, 0xfd, 0xc0, 0xa6, 0x87, 0x96, 0xcc, 0xba, 0x47, 0x1b,
0x5f, 0xc0, 0x55, 0xdf, 0x9a, 0x15, 0x39, 0x68, 0x02, 0xbe, 0xef, 0x50, 0x56, 0x11, 0x2c, 0xbe,
0x93, 0x59, 0x58, 0x6f, 0x3a, 0x6d, 0x46, 0xfa, 0x34, 0x8b, 0x74, 0xa5, 0x10, 0xb7, 0xfc, 0xa3,
0xf1, 0x08, 0xd2, 0x13, 0xfc, 0x33, 0x66, 0x28, 0x4b, 0x99, 0x51, 0x83, 0xcc, 0x1d, 0xd2, 0x26,
0x8c, 0x4c, 0x19, 0xb2, 0xca, 0xda, 0x78, 0x8e, 0x00, 0x5b, 0xc4, 0x6e, 0xbc, 0x3e, 0x15, 0xf8,
0x1a, 0xa8, 0x6e, 0xb3, 0x49, 0x09, 0x93, 0x23, 0x40, 0x9e, 0x46, 0x83, 0x41, 0x19, 0x0f, 0x06,
0xa3, 0x0c, 0xe9, 0x09, 0x6b, 0x64, 0x24, 0xc7, 0x22, 0xd0, 0xb4, 0x88, 0x86, 0xcd, 0x6c, 0x2e,
0x38, 0x69, 0x71, 0xda, 0xf8, 0x39, 0x02, 0xea, 0x43, 0x66, 0xb3, 0x01, 0xf5, 0xa6, 0x03, 0x65,
0x76, 0x5f, 0x4e, 0x07, 0xb4, 0xc8, 0x74, 0x90, 0xb8, 0x99, 0x11, 0x13, 0x59, 0x6e, 0xc4, 0xa4,
0x40, 0xe9, 0x93, 0x26, 0x77, 0x35, 0x6e, 0x79, 0x64, 0xc0, 0xa5, 0xe8, 0x84, 0x4b, 0x19, 0x88,
0x31, 0x97, 0xd9, 0xed, 0x6c, 0x8c, 0x5f, 0x8b, 0x03, 0x7e, 0x00, 0x1b, 0xe4, 0xdb, 0x1e, 0xa9,
0x33, 0xd2, 0xc8, 0xaa, 0x4b, 0x67, 0x64, 0x24, 0xc3, 0xb8, 0x0e, 0x57, 0x44, 0x8c, 0xfc, 0x84,
0x4b, 0x03, 0xd1, 0xc8, 0x40, 0xaf, 0xad, 0x7c, 0x96, 0x51, 0x3d, 0xab, 0x94, 0xdf, 0xc8, 0x50,
0xbe, 0x37, 0xaf, 0xa2, 0x25, 0x5e, 0xa2, 0x8c, 0xa2, 0x68, 0x13, 0x71, 0x4b, 0xe8, 0xfc, 0xbe,
0xfa, 0x1a, 0x32, 0x93, 0x00, 0x69, 0xc8, 0x3d, 0xd8, 0xa0, 0xf2, 0x4e, 0x36, 0x57, 0x48, 0x53,
0x64, 0x7b, 0x8d, 0xd0, 0xc6, 0xbf, 0x08, 0xd2, 0x8f, 0xfb, 0xce, 0x4c, 0x8b, 0x55, 0x40, 0xb5,
0xeb, 0xcc, 0x71, 0xbb, 0xdc, 0xd5, 0xab, 0xa5, 0x9b, 0xf3, 0xe4, 0x73, 0x21, 0x65, 0x0e, 0xb1,
0x24, 0xd4, 0x8f, 0x69, 0x64, 0x9c, 0xf4, 0x51, 0x72, 0x95, 0x8b, 0x92, 0x1b, 0xbd, 0x7c, 0x72,
0x03, 0xa5, 0x15, 0x3b, 0xb7, 0x5b, 0xd4, 0x40, 0xb7, 0xbc, 0x8c, 0x40, 0x66, 0x32, 0x00, 0x32,
0xc6, 0x2b, 0x89, 0xc0, 0x64, 0x03, 0x46, 0x56, 0xd1, 0x80, 0xca, 0x72, 0x0d, 0xb8, 0x58, 0xbb,
0x8d, 0xc7, 0x9f, 0x7a, 0xe9, 0x09, 0xab, 0x43, 0xb2, 0x5c, 0x73, 0xfb, 0xec, 0xc2, 0x4e, 0xbb,
0xf1, 0x03, 0x82, 0x44, 0x20, 0x7a, 0xf8, 0x1d, 0x88, 0x3e, 0xac, 0x96, 0xab, 0xa9, 0x35, 0x2d,
0x7d, 0x7c, 0xa2, 0xbf, 0x11, 0xf8, 0xe4, 0x55, 0x31, 0xce, 0x43, 0xec, 0xb1, 0xb5, 0x5f, 0xdd,
0x4b, 0x21, 0x2d, 0x73, 0x7c, 0xa2, 0xa7, 0x02, 0xdf, 0x39, 0x89, 0xaf, 0x83, 0x5a, 0xf9, 0xfc,
0xe0, 0x60, 0xbf, 0x9a, 0x8a, 0x68, 0x6f, 0x1d, 0x9f, 0xe8, 0x6f, 0x06, 0x38, 0x2a, 0xfc, 0xf1,
0xa4, 0xa5, 0x7f, 0xfc, 0x25, 0xb7, 0xf6, 0xdb, 0xaf, 0xb9, 0xa0, 0xde, 0xd2, 0xef, 0xeb, 0xb0,
0x2e, 0xcb, 0x00, 0xdb, 0xf2, 0x25, 0x78, 0x33, 0xcc, 0xd6, 0x92, 0xae, 0x69, 0xef, 0x87, 0x63,
0x96, 0x15, 0xd6, 0x02, 0x55, 0xec, 0x6d, 0xbc, 0x39, 0x0f, 0x37, 0xf1, 0xda, 0xd0, 0xcc, 0xb0,
0xec, 0x52, 0xd1, 0x33, 0x88, 0x7a, 0x63, 0x04, 0x97, 0xe6, 0xe1, 0x66, 0x97, 0xbe, 0xb6, 0xbd,
0x10, 0x46, 0x28, 0xdc, 0x42, 0xf8, 0x4b, 0x50, 0xc5, 0xea, 0xc6, 0x3b, 0xf3, 0x04, 0x9c, 0xb7,
0xe2, 0xb5, 0x6b, 0x33, 0xf5, 0xbd, 0xe7, 0xbd, 0xd3, 0x3d, 0x57, 0xbc, 0xfd, 0x38, 0xdf, 0x95,
0xd9, 0x9d, 0x3e, 0xdf, 0x95, 0x73, 0x36, 0xef, 0x16, 0xf2, 0xd2, 0x24, 0xd7, 0xe9, 0x66, 0xc8,
0x79, 0x1f, 0x36, 0x4d, 0x53, 0xeb, 0xe5, 0x08, 0x92, 0xc1, 0x69, 0x8f, 0x43, 0x85, 0x7e, 0x6a,
0x99, 0x68, 0x3b, 0x8b, 0x81, 0xa4, 0xea, 0x21, 0xc4, 0x44, 0xeb, 0x6c, 0x87, 0x9a, 0x72, 0x53,
0x81, 0xdd, 0x59, 0x0c, 0x24, 0x74, 0x16, 0xd0, 0x16, 0xc2, 0x07, 0x10, 0xe3, 0xb3, 0x01, 0xcf,
0xed, 0x9c, 0xe0, 0x08, 0xb9, 0xa8, 0x3a, 0x76, 0x9f, 0x9c, 0xbe, 0xca, 0xad, 0xfd, 0xf9, 0x2a,
0xb7, 0xf6, 0xfd, 0x59, 0x0e, 0x9d, 0x9e, 0xe5, 0xd0, 0x1f, 0x67, 0x39, 0xf4, 0xf7, 0x59, 0x0e,
0x3d, 0xf9, 0x64, 0xd9, 0xff, 0xad, 0xb7, 0x25, 0x59, 0x53, 0xb9, 0xae, 0xed, 0xff, 0x02, 0x00,
0x00, 0xff, 0xff, 0x63, 0x60, 0xb3, 0x49, 0x02, 0x0f, 0x00, 0x00,
// 1065 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0x4f, 0x6f, 0x1b, 0x45,
0x14, 0xf7, 0x78, 0xed, 0x4d, 0xfc, 0x9c, 0x16, 0x33, 0x36, 0x95, 0xb5, 0x08, 0x7b, 0xbb, 0x42,
0xc8, 0x6a, 0xc9, 0x3a, 0x75, 0x72, 0x00, 0x2a, 0x21, 0x1c, 0x37, 0x55, 0x83, 0x9a, 0x82, 0xb6,
0x2e, 0x15, 0xbd, 0x94, 0xb5, 0x3d, 0x36, 0xab, 0xd8, 0x5e, 0x77, 0x77, 0x6c, 0x11, 0x4e, 0x5c,
0x90, 0x50, 0xd4, 0x03, 0x5f, 0x20, 0x17, 0xe0, 0x53, 0x70, 0xe0, 0x9c, 0x23, 0x47, 0xc4, 0xa1,
0x25, 0xf9, 0x0e, 0x5c, 0x11, 0x9a, 0x3f, 0x6b, 0xaf, 0xed, 0x04, 0xff, 0x89, 0x39, 0xe5, 0xcd,
0xf8, 0xfd, 0xde, 0xbc, 0xf7, 0x7b, 0xff, 0x36, 0x70, 0xbf, 0xe5, 0xd0, 0xaf, 0xfb, 0x35, 0xb3,
0xee, 0x76, 0x8a, 0x75, 0xb7, 0x4b, 0x6d, 0xa7, 0x4b, 0xbc, 0x46, 0x58, 0xb4, 0x7b, 0x4e, 0xd1,
0x27, 0xde, 0xc0, 0xa9, 0x13, 0x9f, 0xdf, 0x93, 0x2e, 0x2d, 0x0e, 0xee, 0x04, 0xa2, 0xd9, 0xf3,
0x5c, 0xea, 0xe2, 0xdc, 0x08, 0x61, 0x06, 0xda, 0x66, 0xa0, 0x32, 0xb8, 0xa3, 0x65, 0x5a, 0x6e,
0xcb, 0xe5, 0xaa, 0x45, 0x26, 0x09, 0x94, 0xa6, 0xb7, 0x5c, 0xb7, 0xd5, 0x26, 0x45, 0x7e, 0xaa,
0xf5, 0x9b, 0xc5, 0xa6, 0x43, 0xda, 0x8d, 0xe7, 0x1d, 0xdb, 0x3f, 0x94, 0x1a, 0xf9, 0x49, 0x0d,
0xea, 0x74, 0x88, 0x4f, 0xed, 0x4e, 0x4f, 0x2a, 0xbc, 0x3d, 0xa9, 0x40, 0x3a, 0x3d, 0x7a, 0x24,
0x7e, 0x34, 0xfe, 0x8e, 0x42, 0x6c, 0xbf, 0xdb, 0x74, 0xf1, 0xa7, 0xa0, 0x36, 0x9c, 0x16, 0xf1,
0x69, 0x16, 0xe9, 0xa8, 0x90, 0xd8, 0x2d, 0x9d, 0xbe, 0xca, 0x47, 0xfe, 0x7c, 0x95, 0xbf, 0x15,
0x0a, 0xdf, 0xed, 0x91, 0xee, 0x30, 0x0a, 0xbf, 0xd8, 0x72, 0x37, 0x05, 0xc4, 0xbc, 0xc7, 0xff,
0x58, 0xd2, 0x02, 0xc6, 0x10, 0xf3, 0x9d, 0x6f, 0x49, 0x36, 0xaa, 0xa3, 0x82, 0x62, 0x71, 0x19,
0x57, 0x00, 0xea, 0x1e, 0xb1, 0x29, 0x69, 0x3c, 0xb7, 0x69, 0x56, 0xd1, 0x51, 0x21, 0x59, 0xd2,
0x4c, 0xe1, 0x9a, 0x19, 0xb8, 0x66, 0x56, 0x03, 0xdf, 0x77, 0xd7, 0xd9, 0xfb, 0x3f, 0xbe, 0xce,
0x23, 0x2b, 0x21, 0x71, 0x65, 0xca, 0x8c, 0xf4, 0x7b, 0x8d, 0xc0, 0x48, 0x6c, 0x11, 0x23, 0x12,
0x57, 0xa6, 0xf8, 0x01, 0xa8, 0x6d, 0xbb, 0x46, 0xda, 0x7e, 0x36, 0xae, 0x2b, 0x85, 0x64, 0x69,
0xcb, 0xfc, 0xef, 0xcc, 0x98, 0x8c, 0x1f, 0xf3, 0x21, 0x87, 0xec, 0x75, 0xa9, 0x77, 0x64, 0x49,
0xbc, 0xf6, 0x21, 0x24, 0x43, 0xd7, 0x38, 0x05, 0xca, 0x21, 0x39, 0x12, 0xfc, 0x59, 0x4c, 0xc4,
0x19, 0x88, 0x0f, 0xec, 0x76, 0x5f, 0x30, 0x91, 0xb0, 0xc4, 0xe1, 0xa3, 0xe8, 0x07, 0xc8, 0xf8,
0x12, 0x92, 0xcc, 0xac, 0x45, 0x5e, 0xf4, 0x19, 0x63, 0x2b, 0x64, 0xdf, 0x78, 0x04, 0x1b, 0xc2,
0xb4, 0xdf, 0x73, 0xbb, 0x3e, 0xc1, 0x1f, 0x43, 0xcc, 0xe9, 0x36, 0x5d, 0x6e, 0x39, 0x59, 0x7a,
0x77, 0x9e, 0x68, 0x77, 0x63, 0xec, 0x7d, 0x8b, 0xe3, 0x8c, 0x97, 0x08, 0xae, 0x3d, 0xe1, 0xec,
0x05, 0xde, 0x5e, 0xd1, 0x22, 0xbe, 0x0b, 0x49, 0x91, 0x0e, 0x5e, 0xc7, 0x9c, 0x9c, 0x8b, 0xf2,
0x78, 0x9f, 0x95, 0xfa, 0x81, 0xed, 0x1f, 0x5a, 0x32, 0xeb, 0x4c, 0x36, 0x3e, 0x87, 0xeb, 0x81,
0x37, 0x2b, 0x0a, 0xd0, 0x04, 0xfc, 0xd0, 0xf1, 0x69, 0x45, 0xa8, 0x04, 0x41, 0x66, 0x61, 0xad,
0xe9, 0xb4, 0x29, 0xf1, 0xfc, 0x2c, 0xd2, 0x95, 0x42, 0xc2, 0x0a, 0x8e, 0xc6, 0x13, 0x48, 0x8f,
0xe9, 0x4f, 0xb9, 0xa1, 0x2c, 0xe5, 0x46, 0x0d, 0x32, 0xf7, 0x48, 0x9b, 0x50, 0x32, 0xe1, 0xc8,
0x2a, 0x6b, 0xe3, 0x25, 0x02, 0x6c, 0x11, 0xbb, 0xf1, 0xff, 0x3d, 0x81, 0x6f, 0x80, 0xea, 0x36,
0x9b, 0x3e, 0xa1, 0xb2, 0xfd, 0xe5, 0x69, 0x38, 0x14, 0x94, 0xd1, 0x50, 0x30, 0xca, 0x90, 0x1e,
0xf3, 0x46, 0x32, 0x39, 0x32, 0x81, 0x26, 0x4d, 0x34, 0x6c, 0x6a, 0x73, 0xc3, 0x1b, 0x16, 0x97,
0x8d, 0x9f, 0xa2, 0xa0, 0x3e, 0xa6, 0x36, 0xed, 0xfb, 0x6c, 0x3a, 0xf8, 0xd4, 0xf6, 0xe4, 0x74,
0x40, 0x8b, 0x4c, 0x07, 0x89, 0x9b, 0x1a, 0x31, 0xd1, 0xe5, 0x46, 0x4c, 0x0a, 0x14, 0x8f, 0x34,
0x79, 0xa8, 0x09, 0x8b, 0x89, 0xa1, 0x90, 0x62, 0x63, 0x21, 0x65, 0x20, 0x4e, 0x5d, 0x6a, 0xb7,
0xb3, 0x71, 0x7e, 0x2d, 0x0e, 0xf8, 0x11, 0xac, 0x93, 0x6f, 0x7a, 0xa4, 0x4e, 0x49, 0x23, 0xab,
0x2e, 0x9d, 0x91, 0xa1, 0x0d, 0xe3, 0x26, 0x5c, 0x13, 0x1c, 0x05, 0x09, 0x97, 0x0e, 0xa2, 0xa1,
0x83, 0xac, 0xad, 0x02, 0x95, 0x61, 0x3d, 0xab, 0x3e, 0xbf, 0x91, 0x54, 0xbe, 0x37, 0xab, 0xa2,
0x25, 0x5e, 0xa2, 0x8c, 0xa2, 0x68, 0x13, 0x71, 0x4b, 0xfc, 0xd9, 0x7d, 0xf5, 0x15, 0x64, 0xc6,
0x01, 0xd2, 0x91, 0x07, 0xb0, 0xee, 0xcb, 0x3b, 0xd9, 0x5c, 0x73, 0xba, 0x22, 0xdb, 0x6b, 0x88,
0x36, 0xfe, 0x41, 0x90, 0x7e, 0xea, 0x39, 0x53, 0x2d, 0x56, 0x01, 0xd5, 0xae, 0x53, 0xc7, 0xed,
0xf2, 0x50, 0xaf, 0x97, 0x6e, 0xcf, 0xb2, 0xcf, 0x8d, 0x94, 0x39, 0xc4, 0x92, 0xd0, 0x80, 0xd3,
0xe8, 0x28, 0xe9, 0xc3, 0xe4, 0x2a, 0x97, 0x25, 0x37, 0x76, 0xf5, 0xe4, 0x86, 0x4a, 0x2b, 0x7e,
0x61, 0xb7, 0xa8, 0xa1, 0x6e, 0x79, 0x1d, 0x85, 0xcc, 0x38, 0x01, 0x92, 0xe3, 0x95, 0x30, 0x30,
0xde, 0x80, 0xd1, 0x55, 0x34, 0xa0, 0xb2, 0x5c, 0x03, 0x2e, 0xd6, 0x6e, 0xa3, 0xf1, 0xa7, 0x5e,
0x79, 0xc2, 0xea, 0xb0, 0x51, 0xae, 0xb9, 0x1e, 0xbd, 0xb4, 0xd3, 0x6e, 0x7d, 0x8f, 0x20, 0x19,
0x62, 0x0f, 0xbf, 0x03, 0xb1, 0xc7, 0xd5, 0x72, 0x35, 0x15, 0xd1, 0xd2, 0xc7, 0x27, 0xfa, 0x1b,
0xa1, 0x9f, 0x58, 0x15, 0xe3, 0x3c, 0xc4, 0x9f, 0x5a, 0xfb, 0xd5, 0xbd, 0x14, 0xd2, 0x32, 0xc7,
0x27, 0x7a, 0x2a, 0xf4, 0x3b, 0x17, 0xf1, 0x4d, 0x50, 0x2b, 0x9f, 0x1d, 0x1c, 0xec, 0x57, 0x53,
0x51, 0xed, 0xad, 0xe3, 0x13, 0xfd, 0xcd, 0x90, 0x46, 0xc5, 0xed, 0x74, 0x1c, 0xaa, 0xa5, 0x7f,
0xf8, 0x39, 0x17, 0xf9, 0xf5, 0x97, 0x5c, 0xf8, 0xdd, 0xd2, 0x6f, 0x6b, 0xb0, 0x26, 0xcb, 0x00,
0xdb, 0xf2, 0x2b, 0xf0, 0xf6, 0x3c, 0x5b, 0x4b, 0x86, 0xa6, 0xbd, 0x3f, 0x9f, 0xb2, 0xac, 0xb0,
0x16, 0xa8, 0x62, 0x6f, 0xe3, 0xcd, 0x59, 0xb8, 0xb1, 0xaf, 0x0d, 0xcd, 0x9c, 0x57, 0x5d, 0x3e,
0xf4, 0x02, 0x62, 0x6c, 0x8c, 0xe0, 0xd2, 0x2c, 0xdc, 0xf4, 0xd2, 0xd7, 0xb6, 0x17, 0xc2, 0x88,
0x07, 0xb7, 0x10, 0xfe, 0x02, 0x54, 0xb1, 0xba, 0xf1, 0xce, 0x2c, 0x03, 0x17, 0xad, 0x78, 0xed,
0xc6, 0x54, 0x7d, 0xef, 0xb1, 0x6f, 0x74, 0x16, 0x0a, 0xdb, 0x8f, 0xb3, 0x43, 0x99, 0xde, 0xe9,
0xb3, 0x43, 0xb9, 0x60, 0xf3, 0x6e, 0x21, 0x96, 0x26, 0xb9, 0x4e, 0x37, 0xe7, 0x9c, 0xf7, 0xf3,
0xa6, 0x69, 0x62, 0xbd, 0x1c, 0xc1, 0x46, 0x78, 0xda, 0xe3, 0xb9, 0xa8, 0x9f, 0x58, 0x26, 0xda,
0xce, 0x62, 0x20, 0xf9, 0xf4, 0x00, 0xe2, 0xa2, 0x75, 0xb6, 0xe7, 0x9a, 0x72, 0x13, 0xc4, 0xee,
0x2c, 0x06, 0x12, 0x6f, 0x16, 0xd0, 0x16, 0xc2, 0x07, 0x10, 0xe7, 0xb3, 0x01, 0xcf, 0xec, 0x9c,
0xf0, 0x08, 0xb9, 0xac, 0x3a, 0x76, 0x9f, 0x9d, 0x9e, 0xe5, 0x22, 0x7f, 0x9c, 0xe5, 0x22, 0xdf,
0x9d, 0xe7, 0xd0, 0xe9, 0x79, 0x0e, 0xfd, 0x7e, 0x9e, 0x43, 0x7f, 0x9d, 0xe7, 0xd0, 0xb3, 0x4f,
0x96, 0xfd, 0x9f, 0xf5, 0xae, 0x14, 0x6b, 0x2a, 0x7f, 0x6b, 0xfb, 0xdf, 0x00, 0x00, 0x00, 0xff,
0xff, 0x28, 0x28, 0x53, 0x76, 0xfe, 0x0e, 0x00, 0x00,
}

6
api/services/content/v1/content.proto
View File

@ -81,8 +81,8 @@ message Info {
// Size is the total number of bytes in the blob.
int64 size = 2;
// CommittedAt provides the time at which the blob was committed.
google.protobuf.Timestamp committed_at = 3 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
// CreatedAt provides the time at which the blob was committed.
google.protobuf.Timestamp created_at = 3 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
// UpdatedAt provides the time the info was last updated.
google.protobuf.Timestamp updated_at = 4 [(gogoproto.stdtime) = true, (gogoproto.nullable) = false];
@ -105,7 +105,7 @@ message UpdateRequest {
// UpdateMask specifies which fields to perform the update on. If empty,
// the operation applies to all fields.
//
// In info, Digest, Size, and CommittedAt are immutable,
// In info, Digest, Size, and CreatedAt are immutable,
// other field may be updated using this mask.
// If no mask is provided, all mutable field are updated.
google.protobuf.FieldMask update_mask = 2;

4
cmd/dist/fetch.go vendored
View File

@ -163,13 +163,13 @@ outer:
Status: "waiting",
}
}
} else if info.CommittedAt.After(start) {
} else if info.CreatedAt.After(start) {
statuses[key] = statusInfo{
Ref: key,
Status: "done",
Offset: info.Size,
Total: info.Size,
UpdatedAt: info.CommittedAt,
UpdatedAt: info.CreatedAt,
}
} else {
statuses[key] = statusInfo{

2
cmd/dist/list.go vendored
View File

@ -61,7 +61,7 @@ var listCommand = cli.Command{
fmt.Fprintf(tw, "%s\t%s\t%s\t%s\n",
info.Digest,
units.HumanSize(float64(info.Size)),
units.HumanDuration(time.Since(info.CommittedAt)),
units.HumanDuration(time.Since(info.CreatedAt)),
labels)
return nil
}

10
content/content.go
View File

@ -29,11 +29,11 @@ type Ingester interface {
// TODO(stevvooe): Consider a very different name for this struct. Info is way
// to general. It also reads very weird in certain context, like pluralization.
type Info struct {
Digest digest.Digest
Size int64
CommittedAt time.Time
UpdatedAt time.Time
Labels map[string]string
Digest digest.Digest
Size int64
CreatedAt time.Time
UpdatedAt time.Time
Labels map[string]string
}
type Status struct {

8
content/store.go
View File

@ -52,10 +52,10 @@ func (s *store) Info(ctx context.Context, dgst digest.Digest) (Info, error) {
func (s *store) info(dgst digest.Digest, fi os.FileInfo) Info {
return Info{
Digest: dgst,
Size: fi.Size(),
CommittedAt: fi.ModTime(),
UpdatedAt: fi.ModTime(),
Digest: dgst,
Size: fi.Size(),
CreatedAt: fi.ModTime(),
UpdatedAt: fi.ModTime(),
}
}

4
metadata/content.go
View File

@ -432,7 +432,7 @@ func (cs *contentStore) checkAccess(ctx context.Context, dgst digest.Digest) err
}
func readInfo(info *content.Info, bkt *bolt.Bucket) error {
if err := readTimestamps(&info.CommittedAt, &info.UpdatedAt, bkt); err != nil {
if err := readTimestamps(&info.CreatedAt, &info.UpdatedAt, bkt); err != nil {
return err
}
@ -452,7 +452,7 @@ func readInfo(info *content.Info, bkt *bolt.Bucket) error {
}
func writeInfo(info *content.Info, bkt *bolt.Bucket) error {
if err := writeTimestamps(bkt, info.CommittedAt, info.UpdatedAt); err != nil {
if err := writeTimestamps(bkt, info.CreatedAt, info.UpdatedAt); err != nil {
return err
}

8
services/content/service.go
View File

@ -111,10 +111,10 @@ func (s *Service) List(req *api.ListContentRequest, session api.Content_ListServ
if err := s.store.Walk(session.Context(), func(info content.Info) error {
buffer = append(buffer, api.Info{
Digest: info.Digest,
Size_: info.Size,
CommittedAt: info.CommittedAt,
Labels: info.Labels,
Digest: info.Digest,
Size_: info.Size,
CreatedAt: info.CreatedAt,
Labels: info.Labels,
})
if len(buffer) >= 100 {

20
services/content/store.go
View File

@ -193,20 +193,20 @@ func (rs *remoteStore) negotiate(ctx context.Context, ref string, size int64, ex
func infoToGRPC(info content.Info) contentapi.Info {
return contentapi.Info{
Digest: info.Digest,
Size_: info.Size,
CommittedAt: info.CommittedAt,
UpdatedAt: info.UpdatedAt,
Labels: info.Labels,
Digest: info.Digest,
Size_: info.Size,
CreatedAt: info.CreatedAt,
UpdatedAt: info.UpdatedAt,
Labels: info.Labels,
}
}
func infoFromGRPC(info contentapi.Info) content.Info {
return content.Info{
Digest: info.Digest,
Size: info.Size_,
CommittedAt: info.CommittedAt,
UpdatedAt: info.UpdatedAt,
Labels: info.Labels,
Digest: info.Digest,
Size: info.Size_,
CreatedAt: info.CreatedAt,
UpdatedAt: info.UpdatedAt,
Labels: info.Labels,
}
}