Kitchen: Generate LogDog prefix from Swarming.

go/src/infra/tools/kitchen/cook.go

 // Copyright 2016 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 main
 
 import (
         "encoding/json"
         "fmt"
         "io/ioutil"
         "net/url"
         "os"
         "path"
         "path/filepath"
         "strconv"
         "strings"
 
         "github.com/maruel/subcommands"
         "golang.org/x/net/context"
 
         "github.com/luci/luci-go/common/cli"
         "github.com/luci/luci-go/common/clock"
         "github.com/luci/luci-go/common/ctxcmd"
         "github.com/luci/luci-go/common/environ"
         "github.com/luci/luci-go/common/flag/stringlistflag"
-        ldTypes "github.com/luci/luci-go/common/logdog/types"
 )
 
 // BootstrapStepName is the name of kitchen's step where it makes preparations
 // for running a recipe, e.g. fetches a repository.
 const BootstrapStepName = "recipe bootstrap"
 
 // cmdCook checks out a repository at a revision and runs a recipe.
 var cmdCook = &subcommands.Command{
         UsageLine: "cook -repository <repository URL> -revision <revision> -recipe <recipe>",
         ShortDesc: "Checks out a repository and runs a recipe.",
@@ skipping 28 matching lines @@
                         &c.OutputResultJSONFile,
                         "output-result-json",
                         "",
                         "The file to write the JSON serialized returned value of the recipe to")
                 fs.BoolVar(
                         &c.Timestamps,
                         "timestamps",
                         false,
                         "If true, print CURRENT_TIMESTAMP annotations.")
 
-                fs.StringVar(
-                        &c.logdog.host,
-                        "logdog-host",
-                        "",
-                        "The name of the LogDog host.")
-                fs.StringVar(
-                        &c.logdog.project,
-                        "logdog-project",
-                        "",
-                        "The name of the LogDog project to log into. Projects have different ACL sets, "+
-                                "so choose this appropriately.")
-                fs.Var(
-                        &c.logdog.prefix,
-                        "logdog-prefix",
-                        "The LogDog stream Prefix to use.")
-                fs.BoolVar(
-                        &c.logdog.annotee,
-                        "logdog-enable-annotee",
-                        true,
-                        "Process bootstrap STDOUT/STDERR annotations through Annotee.")
-                fs.StringVar(
-                        &c.logdog.filePath,
-                        "logdog-debug-out-file",
-                        "",
-                        "If specified, write all generated logs to this path instead of sending them.")
+                c.logdog.addFlags(fs)
+
                 return &c
         },
 }
 
 type cookRun struct {
         subcommands.CommandRunBase
 
         RepositoryURL        string
         Revision             string
         Recipe               string
         CheckoutDir          string
         Workdir              string
         Properties           string
         PropertiesFile       string
         OutputResultJSONFile string
         Timestamps           bool
         PythonPaths          stringlistflag.Flag
 
         logdog cookLogDogParams
 }
 
-type cookLogDogParams struct {
-        host     string
-        project  string
-        prefix   ldTypes.StreamName
-        annotee  bool
-        filePath string
-}
-
-func (p *cookLogDogParams) active() bool {
-        return p.host != "" || p.project != "" || p.prefix != ""
-}
-
 func (c *cookRun) validateFlags() error {
         // Validate Repository.
         if c.RepositoryURL == "" {
                 return fmt.Errorf("-repository is required")
         }
         repoURL, err := url.Parse(c.RepositoryURL)
         if err != nil {
                 return fmt.Errorf("invalid repository %q: %s", repoURL, err)
         }
         repoName := path.Base(repoURL.Path)
         if repoName == "" {
                 return fmt.Errorf("invalid repository %q: no path", repoURL)
         }
 
         // Validate Recipe.
         if c.Recipe == "" {
                 return fmt.Errorf("-recipe is required")
         }
 
         if c.Properties != "" && c.PropertiesFile != "" {
                 return fmt.Errorf("only one of -properties or -properties-file is allowed")
         }
 
         // If LogDog is enabled, all required LogDog flags must be supplied.
         if c.logdog.active() {
-                if c.logdog.project == "" {
-                        return fmt.Errorf("a LogDog project must be supplied (-logdog-project)")
+                if err := c.logdog.validate(); err != nil {
+                        return err
                 }
         }
 
         // Fix CheckoutDir.
         if c.CheckoutDir == "" {
                 c.CheckoutDir = repoName
         }
         return nil
 }
 
@@ skipping 152 matching lines @@
 }
 
 func annotateTime(ctx context.Context) {
         timestamp := clock.Get(ctx).Now().Unix()
         annotate("CURRENT_TIMESTAMP", strconv.FormatInt(timestamp, 10))
 }
 
 func annotate(args ...string) {
         fmt.Printf("@@@%s@@@\n", strings.Join(args, "@"))
 }