Overhaul database package

datahopper/go/datahopper/main.go

 /*
         Pulls data from multiple sources and funnels into InfluxDB.
 */
 
 package main
 
 import (
         "flag"
         "path"
         "time"
 
         "github.com/golang/glog"
         influxdb "github.com/influxdb/influxdb/client"
         "skia.googlesource.com/buildbot.git/datahopper/go/autoroll_ingest"
         "skia.googlesource.com/buildbot.git/go/buildbot"
         "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/go/metadata"
 )
 
 const (
         INFLUXDB_NAME_METADATA_KEY     = "influxdb_name"
         INFLUXDB_PASSWORD_METADATA_KEY = "influxdb_password"
         SKIA_REPO                      = "https://skia.googlesource.com/skia"
 )
 
@@ skipping 27 matching lines @@
                 IsUDP:      false,
         })
         if err != nil {
                 glog.Fatalf("Failed to initialize InfluxDB client: %s", err)
         }
 
         // Data generation goroutines.
         go autoroll_ingest.LoadAutoRollData(dbClient, *workdir)
         go func() {
                 // Initialize the buildbot database.
-                var conf *database.DatabaseConfig
-                if *testing {
-                        conf = buildbot.LocalMySQLTestDatabaseConfig("test_user", "")
-                } else {
-                        conf = buildbot.ProdDatabaseConfig(false)
-                }
-                if err := buildbot.InitDB(conf); err != nil {
+                if err := buildbot.InitDB(buildbot.DatabaseConfig(*testing)); err != nil {
                         glog.Fatal(err)
                 }
                 // Create the Git repo.
                 skiaRepo, err := gitinfo.CloneOrUpdate(SKIA_REPO, path.Join(*workdir, "buildbot_git", "skia"), true)
                 if err != nil {
                         glog.Fatal(err)
                 }
                 // Ingest data in a loop.
                 for _ = range time.Tick(30 * time.Second) {
                         skiaRepo.Update(true, true)
                         glog.Info("Ingesting builds.")
                         if err := buildbot.IngestNewBuilds(skiaRepo); err != nil {
                                 glog.Errorf("Failed to ingest new builds: %v", err)
                         }
                 }
         }()
 
         // Wait while the above goroutines generate data.
         select {}
 }