Overhaul database package

golden/go/skiacorrectness/main.go

 package main
 
 import (
         "encoding/json"
         "flag"
         "fmt"
         "net/http"
         "path/filepath"
         "time"
 
         "github.com/golang/glog"
         "github.com/gorilla/mux"
         "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/login"
         "skia.googlesource.com/buildbot.git/go/metadata"
         "skia.googlesource.com/buildbot.git/golden/go/analysis"
         "skia.googlesource.com/buildbot.git/golden/go/db"
         "skia.googlesource.com/buildbot.git/golden/go/expstorage"
         "skia.googlesource.com/buildbot.git/golden/go/filediffstore"
         "skia.googlesource.com/buildbot.git/golden/go/types"
         "skia.googlesource.com/buildbot.git/perf/go/filetilestore"
 )
 
 // Command line flags.
 var (
-        // Get the default connection string suitable for production.
-        defaultDbConnStr = db.GetConnectionString("readwrite", "", "", "")
-
         graphiteServer = flag.String("graphite_server", "skia-monitoring:2003", "Where is Graphite metrics ingestion server running.")
         port           = flag.String("port", ":9000", "HTTP service address (e.g., ':9000')")
         local          = flag.Bool("local", false, "Running locally if true. As opposed to in production.")
         staticDir      = flag.String("static_dir", "./app", "Directory with static content to serve")
         tileStoreDir   = flag.String("tile_store_dir", "/tmp/tileStore", "What directory to look for tiles in.")
         imageDir       = flag.String("image_dir", "/tmp/imagedir", "What directory to store test and diff images in.")
         gsBucketName   = flag.String("gs_bucket", "chromium-skia-gm", "Name of the google storage bucket that holds uploaded images.")
-        dbConnStr      = flag.String("db_conn_string", defaultDbConnStr, "MySQL connection string for backend database. If 'local' is false the password in this string will be substituted via the metadata server.")
-        sqlitePath     = flag.String("sqlite_path", "./golden.db", "Filepath of the embedded SQLite database. Requires 'local' to be set to true and 'mysql_conn' to be empty to take effect.")
         doOauth        = flag.Bool("oauth", true, "Run through the OAuth 2.0 flow on startup, otherwise use a GCE service account.")
         oauthCacheFile = flag.String("oauth_cache_file", "/home/perf/google_storage_token.data", "Path to the file where to cache cache the oauth credentials.")
 )
 
 const (
         IMAGE_URL_PREFIX = "/img/"
 )
 
 // TODO (stephana): Factor out to "go/login/login.go"
 const (
@@ skipping 173 matching lines @@
                 client, err := auth.RunFlow(config)
                 if err != nil {
                         glog.Fatalf("Failed to auth: %s", err)
                 }
                 return client
         }
         return nil
 }
 
 func main() {
+        // Setup DB flags.
+        database.SetupFlags(db.PROD_DB_HOST, db.PROD_DB_PORT, database.USER_RW, db.PROD_DB_NAME)
+
         // Global init to initialize
         common.InitWithMetrics("skiacorrectness", *graphiteServer)
 
         // Initialize submodules.
         filediffstore.Init()
 
         // Set up login
         // TODO (stephana): Factor out to go/login/login.go and removed hard coded
         // values.
         var cookieSalt = "notverysecret"
         var clientID = "31977622648-ubjke2f3staq6ouas64r31h8f8tcbiqp.apps.googleusercontent.com"
         var clientSecret = "rK-kRY71CXmcg0v9I9KIgWci"
         var redirectURL = fmt.Sprintf("http://localhost%s/oauth2callback/", *port)
         if !*local {
                 cookieSalt = metadata.MustGet(COOKIESALT_METADATA_KEY)
                 clientID = metadata.MustGet(CLIENT_ID_METADATA_KEY)
                 clientSecret = metadata.MustGet(CLIENT_SECRET_METADATA_KEY)
                 redirectURL = "https://skiagold.com/oauth2callback/"
         }
         login.Init(clientID, clientSecret, redirectURL, cookieSalt)
 
         // get the Oauthclient if necessary.
         client := getOAuthClient(*doOauth, *oauthCacheFile)
 
         // Get the expecations storage, the filediff storage and the tilestore.
         diffStore := filediffstore.NewFileDiffStore(client, *imageDir, *gsBucketName, filediffstore.DEFAULT_GS_IMG_DIR_NAME, filediffstore.RECOMMENDED_WORKER_POOL_SIZE)
-        vdb := database.NewVersionedDB(db.GetConfig(*dbConnStr, *sqlitePath, *local))
+        conf, err := database.ConfigFromFlagsAndMetadata(*local, db.MigrationSteps())
+        if err != nil {
+                glog.Fatal(err)
+        }
+        vdb := database.NewVersionedDB(conf)
         expStore := expstorage.NewCachingExpectationStore(expstorage.NewSQLExpectationStore(vdb))
         tileStore := filetilestore.NewFileTileStore(*tileStoreDir, "golden", -1)
 
         // Initialize the Analyzer
         imgFS := NewURLAwareFileServer(*imageDir, IMAGE_URL_PREFIX)
         analyzer = analysis.NewAnalyzer(expStore, tileStore, diffStore, imgFS.GetURL, 5*time.Minute)
 
         router := mux.NewRouter()
 
         // Wire up the resources. We use the 'rest' prefix to avoid any name
@@ skipping 18 matching lines @@
         // Everything else is served out of the static directory.
         router.PathPrefix("/").Handler(http.FileServer(http.Dir(*staticDir)))
 
         // Send all requests to the router
         http.Handle("/", router)
 
         // Start the server
         glog.Infoln("Serving on http://127.0.0.1" + *port)
         glog.Fatal(http.ListenAndServe(*port, nil))
 }