Refactor how we create the context

internal/cli/geoip/geoip.go

@@ -0,0 +1,44 @@
+package geoip
+
+import (
+	"path/filepath"
+
+	"github.com/alecthomas/kingpin"
+	"github.com/apex/log"
+	"github.com/openobservatory/gooni/internal/cli/root"
+	"github.com/openobservatory/gooni/utils"
+)
+
+func init() {
+	cmd := root.Command("geoip", "Perform a geoip lookup")
+
+	shouldUpdate := cmd.Flag("update", "Update the geoip database").Bool()
+
+	cmd.Action(func(_ *kingpin.ParseContext) error {
+		log.Info("geoip")
+		ctx, err := root.Init()
+		if err != nil {
+			return err
+		}
+
+		geoipPath := filepath.Join(ctx.Home, "geoip")
+
+		if *shouldUpdate {
+			utils.DownloadGeoIPDatabaseFiles(geoipPath)
+		}
+
+		loc, err := utils.GeoIPLookup(geoipPath)
+		if err != nil {
+			return err
+		}
+
+		log.WithFields(log.Fields{
+			"asn":          loc.ASN,
+			"network_name": loc.NetworkName,
+			"country_code": loc.CountryCode,
+			"ip":           loc.IP,
+		}).Info("Looked up your location")
+
+		return nil
+	})
+}

internal/cli/root/root.go

@@ -4,7 +4,6 @@ import (
 	"github.com/alecthomas/kingpin"
 	"github.com/apex/log"
 	ooni "github.com/openobservatory/gooni"
-	"github.com/openobservatory/gooni/internal/database"
 	"github.com/openobservatory/gooni/internal/log/handlers/batch"
 	"github.com/openobservatory/gooni/internal/log/handlers/cli"
 	"github.com/prometheus/common/version"
@@ -17,7 +16,7 @@ var Cmd = kingpin.New("ooni", "")
 var Command = Cmd.Command
 
 // Init should be called by all subcommand that care to have a ooni.OONI instance
-var Init func() (*ooni.Config, *ooni.Context, error)
+var Init func() (*ooni.Context, error)
 
 func init() {
 	configPath := Cmd.Flag("config", "Set a custom config file path").Short('c').String()
@@ -36,39 +35,21 @@ func init() {
 			log.Debugf("ooni version %s", version.Version)
 		}
 
-		Init = func() (*ooni.Config, *ooni.Context, error) {
-			var config *ooni.Config
+		Init = func() (*ooni.Context, error) {
 			var err error
 
-			if *configPath != "" {
-				log.Debugf("Reading config file from %s", *configPath)
-				config, err = ooni.ReadConfig(*configPath)
-			} else {
-				log.Debug("Reading default config file")
-				config, err = ooni.ReadDefaultConfigPaths()
-			}
+			homePath, err := ooni.GetOONIHome()
 			if err != nil {
-				return nil, nil, err
+				return nil, err
 			}
 
-			dbPath, err := database.DefaultDatabasePath()
-			if err != nil {
-				return nil, nil, err
-			}
-
-			log.Debugf("Connecting to database sqlite3://%s", dbPath)
-			db, err := database.Connect(dbPath)
-			if err != nil {
-				return nil, nil, err
-			}
-
-			ctx := ooni.New(config, db)
+			ctx := ooni.NewContext(*configPath, homePath)
 			err = ctx.Init()
 			if err != nil {
-				return nil, nil, err
+				return nil, err
 			}
 
-			return config, ctx, nil
+			return ctx, nil
 		}
 
 		return nil

internal/cli/run/run.go

@@ -21,7 +21,7 @@ func init() {
 
 	cmd.Action(func(_ *kingpin.ParseContext) error {
 		log.Infof("Starting %s", *nettestGroup)
-		_, ctx, err := root.Init()
+		ctx, err := root.Init()
 		if err != nil {
 			log.Errorf("%s", err)
 			return err
@@ -33,7 +33,7 @@ func init() {
 		}
 		log.Debugf("Running test group %s", group.Label)
 
-		result, err := database.CreateResult(ctx.DB, database.Result{
+		result, err := database.CreateResult(ctx.DB, ctx.Home, database.Result{
 			Name:      *nettestGroup,
 			StartTime: time.Now().UTC(),
 		})