LogDog: Update to archival V2.

appengine/logdog/coordinator/endpoints/logs/get_test.go

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package logs
 
 import (
         "bytes"
         "errors"
         "fmt"
@@ skipping 144 matching lines @@
                 fs := authtest.FakeState{}
                 c = auth.WithState(c, &fs)
 
                 c = ct.UseConfig(c, &svcconfig.Coordinator{
                         AdminAuthGroup: "test-administrators",
                 })
 
                 // Generate our test stream.
                 desc := ct.TestLogStreamDescriptor(c, "foo/bar")
                 ls := ct.TestLogStream(c, desc)
-                if err := ls.Put(ds.Get(c)); err != nil {
+                if err := ds.Get(c).Put(ls); err != nil {
                         panic(err)
                 }
 
                 tc.Add(time.Second)
                 var entries []*logpb.LogEntry
                 protobufs := map[uint64][]byte{}
                 for _, v := range []int{0, 1, 2, 4, 5, 7} {
                         le := ct.TestLogEntry(c, ls, v)
                         le.GetText().Lines = append(le.GetText().Lines, &logpb.Text_Line{
                                 Value: "another line of text",
@@ skipping 97 matching lines @@
                                                 Desc:             desc,
                                                 Source:           &src,
                                                 LogWriter:        &lbuf,
                                                 IndexWriter:      &ibuf,
                                                 StreamIndexRange: 2,
                                         }
                                         if err := archive.Archive(m); err != nil {
                                                 panic(err)
                                         }
 
+                                        now := tc.Now().UTC()
+
                                         gsc.put("testbucket", "stream", lbuf.Bytes())
                                         gsc.put("testbucket", "index", ibuf.Bytes())
                                         ls.State = coordinator.LSArchived
+                                        ls.TerminatedTime = now
+                                        ls.ArchivedTime = now
                                         ls.ArchiveStreamURL = "gs://testbucket/stream"
                                         ls.ArchiveIndexURL = "gs://testbucket/index"
                                 }
-                                if err := ls.Put(ds.Get(c)); err != nil {
+                                if err := ds.Get(c).Put(ls); err != nil {
                                         panic(err)
                                 }
 
                                 Convey(`Testing Get requests`, func() {
                                         req := logdog.GetRequest{
                                                 Path: string(ls.Path()),
                                         }
 
                                         Convey(`When the log stream is purged`, func() {
                                                 ls.Purged = true
-                                                if err := ls.Put(ds.Get(c)); err != nil {
+                                                if err := ds.Get(c).Put(ls); err != nil {
                                                         panic(err)
                                                 }
 
                                                 Convey(`Will return NotFound if the user is not an administrator.`, func() {
                                                         _, err := s.Get(c, &req)
                                                         So(err, ShouldBeRPCNotFound)
                                                 })
 
                                                 Convey(`Will process the request if the user is an administrator.`, func() {
                                                         fs.IdentityGroups = []string{"test-administrators"}
@@ skipping 104 matching lines @@
                                                 req.LogCount = -1
 
                                                 Convey(`Will successfully retrieve stream state.`, func() {
                                                         resp, err := s.Get(c, &req)
                                                         So(err, ShouldBeRPCOK)
                                                         So(resp.State, ShouldResemble, loadLogStreamState(ls))
                                                         So(len(resp.Logs), ShouldEqual, 0)
                                                 })
 
                                                 Convey(`Will return Internal if the protobuf descriptor data is corrupt.`, func() {
-                                                        // We can't use "ls.Put" here because it validates the protobuf!
+                                                        ls.SetDSValidate(false)
                                                         ls.Descriptor = []byte{0x00} // Invalid protobuf, zero tag.
                                                         if err := ds.Get(c).Put(ls); err != nil {
                                                                 panic(err)
                                                         }
 
                                                         _, err := s.Get(c, &req)
                                                         So(err, ShouldBeRPCInternal)
                                                 })
                                         })
 
@@ skipping 133 matching lines @@
                                                 resp, err := s.Tail(c, &req)
                                                 So(err, ShouldBeRPCOK)
                                                 So(resp, shouldHaveLogs, 7)
                                                 So(resp.State, ShouldResemble, loadLogStreamState(ls))
                                         })
                                 })
                         })
                 }
         })
 }