Merge 6d44077 into 7a5849f

.travis.yml

@@ -63,18 +63,17 @@ script:
 # the coverage collection.
 - go test ./...
 # Also run benchmarks
-- go test -bench . ./search/...
+- go test -bench . ./geolite2/...
 
 # Run all tests, collecting coverage data.
-- go test -covermode=count -coverprofile=geoip.cov -v github.com/m-lab/annotation-service/geoip
+- go test -covermode=count -coverprofile=common.cov -v github.com/m-lab/annotation-service/common
 - go test -covermode=count -coverprofile=handler.cov -v github.com/m-lab/annotation-service/handler
 - go test -covermode=count -coverprofile=loader.cov -v github.com/m-lab/annotation-service/loader
 - go test -covermode=count -coverprofile=metrics.cov -v github.com/m-lab/annotation-service/metrics
-- go test -covermode=count -coverprofile=parser.cov -v github.com/m-lab/annotation-service/parser
-- go test -covermode=count -coverprofile=search.cov -v github.com/m-lab/annotation-service/search
+- go test -covermode=count -coverprofile=geolite2.cov -v github.com/m-lab/annotation-service/geolite2
 
 # Coveralls
-- $HOME/gopath/bin/gocovmerge handler.cov geoip.cov loader.cov parser.cov search.cov > merge.cov
+- $HOME/gopath/bin/gocovmerge handler.cov loader.cov geolite2.cov common.cov > merge.cov
 - $HOME/gopath/bin/goveralls -coverprofile=merge.cov -service=travis-ci
 
 # Build and prepare for deployment

common/geo.go

@@ -4,26 +4,15 @@ package common
 
 import (
 	"errors"
-	"os"
 	"regexp"
 	"time"
 )
 
-var (
-	// This is the bucket containing maxmind files.
-	MaxmindBucketName = "downloader-" + os.Getenv("GCLOUD_PROJECT")
-	// This is the regex used to filter for which files we want to consider acceptable for using with Geolite2
-	GeoLite2Regex = regexp.MustCompile(`Maxmind/\d{4}/\d{2}/\d{2}/\d{8}T\d{6}Z-GeoLite2-City-CSV\.zip`)
-)
-
-const (
-	MaxmindPrefix = "Maxmind/" // Folder containing the maxmind files
-)
-
 // The GeolocationIP struct contains all the information needed for the
 // geolocation data that will be inserted into big query. The fiels are
 // capitalized for exporting, although the originals in the DB schema
 // are not.
+// This is in common because it is used by the etl repository.
 // TODO update these to proper camelCase.
 type GeolocationIP struct {
 	Continent_code string  `json:"continent_code,,omitempty"` // Gives a shorthand for the continent