Milo pubsub: Don't decode properties out of parameters

milo/buildsource/buildbucket/pubsub.go

 // Copyright 2017 The LUCI Authors. All rights reserved.
 // Use of this source code is governed under the Apache License, Version 2.0
 // that can be found in the LICENSE file.
 
 package buildbucket
 
 import (
         "encoding/json"
-        "errors"
         "fmt"
         "net/http"
         "strings"
 
         "golang.org/x/net/context"
 
         "github.com/luci/gae/service/datastore"
         bucketApi "github.com/luci/luci-go/common/api/buildbucket/buildbucket/v1"
         "github.com/luci/luci-go/common/clock"
+        "github.com/luci/luci-go/common/errors"
         "github.com/luci/luci-go/common/logging"
         "github.com/luci/luci-go/common/retry/transient"
         "github.com/luci/luci-go/common/tsmon/field"
         "github.com/luci/luci-go/common/tsmon/metric"
         "github.com/luci/luci-go/milo/api/resp"
         "github.com/luci/luci-go/milo/buildsource/swarming"
         "github.com/luci/luci-go/milo/common"
         "github.com/luci/luci-go/milo/common/model"
         "github.com/luci/luci-go/server/router"
 )
@@ skipping 17 matching lines @@
         Hostname string
 }
 
 var (
         errNoLogLocation = errors.New("log_location tag not found")
         errNoProject     = errors.New("project tag not found")
 )
 
 type parameters struct {
         BuilderName string `json:"builder_name"`
-        Properties  string `json:"properties"`
 }
 
 func isLUCI(build *bucketApi.ApiCommonBuildMessage) bool {
         // All luci buckets are assumed to be prefixed with luci.
         return strings.HasPrefix(build.Bucket, "luci.")
 }
 
 // PubSubHandler is a webhook that stores the builds coming in from pubsub.
 func PubSubHandler(ctx *router.Context) {
         err := pubSubHandlerImpl(ctx.Context, ctx.Request)
@@ skipping 101 matching lines @@
                 entry.respBuild.SummarizeTo(&bs)
         }
         logging.Debugf(c, "Created build summary: %#v", bs)
         // Make datastore flakes transient errors
         return transient.Tag.Apply(datastore.Put(c, &bs))
 }
 
 func handlePubSubBuild(c context.Context, data *psMsg) error {
         host := data.Hostname
         build := &data.Build
+        // We only care about the "builder_name" key from the parameter.
         p := parameters{}
         err := json.Unmarshal([]byte(build.ParametersJson), &p)
         if err != nil {
-                logging.WithError(err).Errorf(c, "could not unmarshal build parameters")
+                err = errors.Annotate(
+                        err, "could not unmarshal build parameters %s", build.ParametersJson).Err()
                 buildCounter.Add(c, 1, build.Bucket, isLUCI(build), build.Status, "Rejected")
                 // Permanent error, since this is probably a type of build we do not recognize.
                 return err
         }
         logging.Debugf(c, "Received from %s: build %s/%s (%s)\n%s",
                 host, build.Bucket, p.BuilderName, build.Status, build)
         if !isLUCI(build) {
                 logging.Infof(c, "This is not a luci build, ignoring")
                 buildCounter.Add(c, 1, build.Bucket, isLUCI(build), build.Status, "Rejected")
                 return nil
@@ skipping 35 matching lines @@
                 logging.WithError(err).Errorf(c, "could not parse pubsub message string")
                 return err
         }
         if err := json.Unmarshal(bData, &data); err != nil {
                 logging.WithError(err).Errorf(c, "could not parse pubsub message data")
                 return err
         }
 
         return handlePubSubBuild(c, &data)
 }