Skip to content

Commit

Permalink
Make Go module paths semantic versions
Browse files Browse the repository at this point in the history
(this is required to import the packages from this module elsewhere)
  • Loading branch information
abh committed May 29, 2023
1 parent e5ede9a commit 63b1969
Show file tree
Hide file tree
Showing 21 changed files with 52 additions and 52 deletions.
2 changes: 1 addition & 1 deletion config.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"sync"
"time"

"github.com/abh/geodns/targeting/geoip2"
"github.com/abh/geodns/v3/targeting/geoip2"

"github.com/fsnotify/fsnotify"
gcfg "gopkg.in/gcfg.v1"
Expand Down
14 changes: 7 additions & 7 deletions geodns-logs/process-stats.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"github.com/prometheus/client_golang/prometheus"
"github.com/prometheus/client_golang/prometheus/promhttp"

"github.com/abh/geodns/countries"
"github.com/abh/geodns/querylog"
"github.com/abh/geodns/v3/countries"
"github.com/abh/geodns/v3/querylog"
)

// TODO:
Expand Down Expand Up @@ -111,11 +111,11 @@ func main() {
}

var extraValidLabels = map[string]struct{}{
"uk": struct{}{},
"_status": struct{}{},
"_country": struct{}{},
"www": struct{}{},
"nag-test": struct{}{},
"uk": {},
"_status": {},
"_country": {},
"www": {},
"nag-test": {},
}

func validCC(label string) bool {
Expand Down
2 changes: 1 addition & 1 deletion geodns-logs/stats.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"
"time"

"github.com/abh/geodns/querylog"
"github.com/abh/geodns/v3/querylog"
"github.com/miekg/dns"
"github.com/prometheus/client_golang/prometheus"
)
Expand Down
16 changes: 8 additions & 8 deletions geodns.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ import (
"strings"
"time"

"github.com/abh/geodns/applog"
"github.com/abh/geodns/health"
"github.com/abh/geodns/monitor"
"github.com/abh/geodns/querylog"
"github.com/abh/geodns/server"
"github.com/abh/geodns/targeting"
"github.com/abh/geodns/targeting/geoip2"
"github.com/abh/geodns/zones"
"github.com/abh/geodns/v3/applog"
"github.com/abh/geodns/v3/health"
"github.com/abh/geodns/v3/monitor"
"github.com/abh/geodns/v3/querylog"
"github.com/abh/geodns/v3/server"
"github.com/abh/geodns/v3/targeting"
"github.com/abh/geodns/v3/targeting/geoip2"
"github.com/abh/geodns/v3/zones"
"github.com/pborman/uuid"
)

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/abh/geodns
module github.com/abh/geodns/v3

go 1.18

Expand Down
2 changes: 1 addition & 1 deletion health/health.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package health
import (
"fmt"

"github.com/abh/geodns/typeutil"
"github.com/abh/geodns/v3/typeutil"
)

type HealthTester interface {
Expand Down
4 changes: 2 additions & 2 deletions health/healthtest/healthtest.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"sync"
"time"

"github.com/abh/geodns/applog"
"github.com/abh/geodns/typeutil"
"github.com/abh/geodns/v3/applog"
"github.com/abh/geodns/v3/typeutil"

"github.com/miekg/dns"
)
Expand Down
4 changes: 2 additions & 2 deletions health/healthtest/healthtesters.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ import (
"strings"
"time"

"github.com/abh/geodns/applog"
"github.com/abh/geodns/typeutil"
"github.com/abh/geodns/v3/applog"
"github.com/abh/geodns/v3/typeutil"
)

/*
Expand Down
4 changes: 2 additions & 2 deletions http.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"net/http"
"strconv"

"github.com/abh/geodns/monitor"
"github.com/abh/geodns/zones"
"github.com/abh/geodns/v3/monitor"
"github.com/abh/geodns/v3/zones"
"github.com/prometheus/client_golang/prometheus/promhttp"
)

Expand Down
6 changes: 3 additions & 3 deletions http_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (

"github.com/stretchr/testify/require"

"github.com/abh/geodns/targeting"
"github.com/abh/geodns/targeting/geoip2"
"github.com/abh/geodns/zones"
"github.com/abh/geodns/v3/targeting"
"github.com/abh/geodns/v3/targeting/geoip2"
"github.com/abh/geodns/v3/zones"
)

func TestHTTP(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions server/serve.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import (
"strings"
"time"

"github.com/abh/geodns/applog"
"github.com/abh/geodns/edns"
"github.com/abh/geodns/querylog"
"github.com/abh/geodns/zones"
"github.com/abh/geodns/v3/applog"
"github.com/abh/geodns/v3/edns"
"github.com/abh/geodns/v3/querylog"
"github.com/abh/geodns/v3/zones"

"github.com/miekg/dns"
"github.com/prometheus/client_golang/prometheus"
Expand Down
4 changes: 2 additions & 2 deletions server/serve_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"

"github.com/abh/geodns/monitor"
"github.com/abh/geodns/zones"
"github.com/abh/geodns/v3/monitor"
"github.com/abh/geodns/v3/zones"
"github.com/miekg/dns"
)

Expand Down
6 changes: 3 additions & 3 deletions server/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package server
import (
"log"

"github.com/abh/geodns/monitor"
"github.com/abh/geodns/querylog"
"github.com/abh/geodns/zones"
"github.com/abh/geodns/v3/monitor"
"github.com/abh/geodns/v3/querylog"
"github.com/abh/geodns/v3/zones"

"github.com/miekg/dns"
"github.com/prometheus/client_golang/prometheus"
Expand Down
4 changes: 2 additions & 2 deletions targeting/geoip2/geoip2.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"sync"
"time"

"github.com/abh/geodns/countries"
"github.com/abh/geodns/targeting/geo"
"github.com/abh/geodns/v3/countries"
"github.com/abh/geodns/v3/targeting/geo"
gdb "github.com/oschwald/geoip2-golang"
)

Expand Down
2 changes: 1 addition & 1 deletion targeting/targeting.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net"
"strings"

"github.com/abh/geodns/targeting/geo"
"github.com/abh/geodns/v3/targeting/geo"
)

type TargetOptions int
Expand Down
2 changes: 1 addition & 1 deletion targeting/targeting_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"reflect"
"testing"

"github.com/abh/geodns/targeting/geoip2"
"github.com/abh/geodns/v3/targeting/geoip2"
)

func TestTargetString(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions zones/picker.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package zones
import (
"math/rand"

"github.com/abh/geodns/health"
"github.com/abh/geodns/targeting/geo"
"github.com/abh/geodns/v3/health"
"github.com/abh/geodns/v3/targeting/geo"

"github.com/miekg/dns"
)
Expand Down
4 changes: 2 additions & 2 deletions zones/reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"strconv"
"strings"

"github.com/abh/geodns/targeting"
"github.com/abh/geodns/typeutil"
"github.com/abh/geodns/v3/targeting"
"github.com/abh/geodns/v3/typeutil"

"github.com/abh/errorutil"
"github.com/miekg/dns"
Expand Down
4 changes: 2 additions & 2 deletions zones/reader_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"os"
"testing"

"github.com/abh/geodns/targeting"
"github.com/abh/geodns/targeting/geoip2"
"github.com/abh/geodns/v3/targeting"
"github.com/abh/geodns/v3/targeting/geoip2"
"github.com/stretchr/testify/assert"
)

Expand Down
8 changes: 4 additions & 4 deletions zones/zone.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (
"strings"
"sync"

"github.com/abh/geodns/applog"
"github.com/abh/geodns/health"
"github.com/abh/geodns/targeting"
"github.com/abh/geodns/targeting/geo"
"github.com/abh/geodns/v3/applog"
"github.com/abh/geodns/v3/health"
"github.com/abh/geodns/v3/targeting"
"github.com/abh/geodns/v3/targeting/geo"

"github.com/miekg/dns"
)
Expand Down
2 changes: 1 addition & 1 deletion zones/zone_health_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"math/rand"
"testing"

"github.com/abh/geodns/health"
"github.com/abh/geodns/v3/health"
"github.com/miekg/dns"
)

Expand Down

0 comments on commit 63b1969

Please sign in to comment.