Rename CommittedAt to CreatedAt in content interface

dmcgowan · dmcgowan · commit 6d032b99f243 · 2017-07-12T16:51:16.000-07:00
Use "created at" terminology to be consistent with the rest
of the containerd interfaces.

Signed-off-by: Derek McGowan &lt;derek@mcgstyle.net&gt;
diff --git a/api/services/content/v1/content.pb.go b/api/services/content/v1/content.pb.go
diff --git a/api/services/content/v1/content.proto b/api/services/content/v1/content.proto
@@ -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;
diff --git a/cmd/dist/fetch.go b/cmd/dist/fetch.go
@@ -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{
diff --git a/cmd/dist/list.go b/cmd/dist/list.go
@@ -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
 			}
diff --git a/content/content.go b/content/content.go
@@ -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 {
diff --git a/content/store.go b/content/store.go
@@ -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(),
 	}
 }
 
diff --git a/metadata/content.go b/metadata/content.go
@@ -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
 	}
 
diff --git a/services/content/service.go b/services/content/service.go
@@ -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 {
diff --git a/services/content/store.go b/services/content/store.go
@@ -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,
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -163,13 +163,13 @@ outer:`
`163`	`163`	`Status: "waiting",`
`164`	`164`	`}`
`165`	`165`	`}`
`166`		`- } else if info.CommittedAt.After(start) {`
	`166`	`+ } else if info.CreatedAt.After(start) {`
`167`	`167`	`statuses[key] = statusInfo{`
`168`	`168`	`Ref: key,`
`169`	`169`	`Status: "done",`
`170`	`170`	`Offset: info.Size,`
`171`	`171`	`Total: info.Size,`
`172`		`- UpdatedAt: info.CommittedAt,`
	`172`	`+ UpdatedAt: info.CreatedAt,`
`173`	`173`	`}`
`174`	`174`	`} else {`
`175`	`175`	`statuses[key] = statusInfo{`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ var listCommand = cli.Command{`
`61`	`61`	`fmt.Fprintf(tw, "%s\t%s\t%s\t%s\n",`
`62`	`62`	`info.Digest,`
`63`	`63`	`units.HumanSize(float64(info.Size)),`
`64`		`- units.HumanDuration(time.Since(info.CommittedAt)),`
	`64`	`+ units.HumanDuration(time.Since(info.CreatedAt)),`
`65`	`65`	`labels)`
`66`	`66`	`return nil`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -52,10 +52,10 @@ func (s *store) Info(ctx context.Context, dgst digest.Digest) (Info, error) {`
`52`	`52`
`53`	`53`	`func (s *store) info(dgst digest.Digest, fi os.FileInfo) Info {`
`54`	`54`	`return Info{`
`55`		`- Digest: dgst,`
`56`		`- Size: fi.Size(),`
`57`		`- CommittedAt: fi.ModTime(),`
`58`		`- UpdatedAt: fi.ModTime(),`
	`55`	`+ Digest: dgst,`
	`56`	`+ Size: fi.Size(),`
	`57`	`+ CreatedAt: fi.ModTime(),`
	`58`	`+ UpdatedAt: fi.ModTime(),`
`59`	`59`	`}`
`60`	`60`	`}`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -432,7 +432,7 @@ func (cs *contentStore) checkAccess(ctx context.Context, dgst digest.Digest) err`
`432`	`432`	`}`
`433`	`433`
`434`	`434`	`func readInfo(info content.Info, bkt bolt.Bucket) error {`
`435`		`- if err := readTimestamps(&info.CommittedAt, &info.UpdatedAt, bkt); err != nil {`
	`435`	`+ if err := readTimestamps(&info.CreatedAt, &info.UpdatedAt, bkt); err != nil {`
`436`	`436`	`return err`
`437`	`437`	`}`
`438`	`438`
`@@ -452,7 +452,7 @@ func readInfo(info content.Info, bkt bolt.Bucket) error {`
`452`	`452`	`}`
`453`	`453`
`454`	`454`	`func writeInfo(info content.Info, bkt bolt.Bucket) error {`
`455`		`- if err := writeTimestamps(bkt, info.CommittedAt, info.UpdatedAt); err != nil {`
	`455`	`+ if err := writeTimestamps(bkt, info.CreatedAt, info.UpdatedAt); err != nil {`
`456`	`456`	`return err`
`457`	`457`	`}`
`458`	`458`