Overhaul database package

perf/go/ingest/main.go

 package main
 
 // ingest is the command line tool for pulling performance data from Google
 // Storage and putting in Tiles. See the code in go/ingester for details on how
 // ingestion is done.
 
 import (
         "encoding/json"
         "flag"
         "net/http"
         "os"
         "strings"
         "sync"
         "time"
 
         "github.com/golang/glog"
         "skia.googlesource.com/buildbot.git/go/auth"
         "skia.googlesource.com/buildbot.git/go/common"
+        "skia.googlesource.com/buildbot.git/go/database"
         "skia.googlesource.com/buildbot.git/go/gitinfo"
         "skia.googlesource.com/buildbot.git/perf/go/config"
         "skia.googlesource.com/buildbot.git/perf/go/db"
         "skia.googlesource.com/buildbot.git/perf/go/goldingester"
         "skia.googlesource.com/buildbot.git/perf/go/ingester"
         "skia.googlesource.com/buildbot.git/perf/go/trybot"
 )
 
 // flags
 var (
@@ skipping 103 matching lines @@
 
         return func() {
                 oneStep()
                 for _ = range time.Tick(every) {
                         oneStep()
                 }
         }
 }
 
 func main() {
+        // Setup DB flags.
+        database.SetupFlags(db.PROD_DB_HOST, db.PROD_DB_PORT, database.USER_RW, db.PROD_DB_NAME)
+
         common.InitWithMetrics("ingest", *graphiteServer)
 
         goldingester.Init(*fileCacheDir)
 
         // Initialize the database. We might not need the oauth dialog if it fails.
-        db.Init(db.ProdDatabaseConfig(*local))
+        conf, err := database.ConfigFromFlagsAndMetadata(*local, db.MigrationSteps())
+        if err != nil {
+                glog.Fatal(err)
+        }
+        db.Init(conf)
 
         var client *http.Client
-        var err error
         if *doOauth {
                 config := auth.DefaultOAuthConfig(*oauthCacheFile)
                 client, err = auth.RunFlow(config)
                 if err != nil {
                         glog.Fatalf("Failed to auth: %s", err)
                 }
         } else {
                 client = nil
                 // Add back service account access here when it's fixed.
         }
@@ skipping 19 matching lines @@
                 glog.Infof("Process name: %s", name)
                 if process, ok := ingesters[name]; ok {
                         go process()
                 } else {
                         glog.Fatalf("Not a valid ingester name: %s", name)
                 }
         }
 
         select {}
 }