Merge pull request #153 from cloudflare/internal-packages

Convert all packages to be internal

CONTRIBUTING.md

@@ -90,4 +90,4 @@ To support a new release that breaks API following changes needs to be done:
   silences (depending if both need a new code) under mapper/vXY (X major
   Alertmanager version, Y minor version).
 * Register new mapper in the `init()` function in the
-  `alertmanager/mapper.go` file.
+  `internal/alertmanager/mapper.go` file.

Makefile

@@ -2,7 +2,7 @@ NAME    := unsee
 VERSION := $(shell git describe --tags --always --dirty='-dev')
 
 # Alertmanager instance used when running locally, points to mock data
-MOCK_PATH         := $(CURDIR)/mock/0.8.0
+MOCK_PATH         := $(CURDIR)/internal/mock/0.8.0
 ALERTMANAGER_URIS := "mock:file://$(MOCK_PATH)"
 # Listen port when running locally
 PORT := 8080

alerts.go

@@ -3,9 +3,9 @@ package main
 import (
 	"strings"
 
-	"github.com/cloudflare/unsee/alertmanager"
-	"github.com/cloudflare/unsee/filters"
-	"github.com/cloudflare/unsee/models"
+	"github.com/cloudflare/unsee/internal/alertmanager"
+	"github.com/cloudflare/unsee/internal/filters"
+	"github.com/cloudflare/unsee/internal/models"
 )
 
 func getFiltersFromQuery(filterString string) ([]filters.FilterT, bool) {

api_test.go

@@ -8,8 +8,8 @@ import (
 	"testing"
 
 	"github.com/blang/semver"
-	"github.com/cloudflare/unsee/mock"
-	"github.com/cloudflare/unsee/models"
+	"github.com/cloudflare/unsee/internal/mock"
+	"github.com/cloudflare/unsee/internal/models"
 )
 
 type groupTest struct {

internal/alertmanager/benchmark_test.go

@@ -4,8 +4,8 @@ import (
 	"os"
 	"testing"
 
-	"github.com/cloudflare/unsee/alertmanager"
-	"github.com/cloudflare/unsee/config"
+	"github.com/cloudflare/unsee/internal/alertmanager"
+	"github.com/cloudflare/unsee/internal/config"
 )
 
 func BenchmarkDedupAlerts(b *testing.B) {

internal/alertmanager/dedup.go

@@ -3,8 +3,8 @@ package alertmanager
 import (
 	"sort"
 
-	"github.com/cloudflare/unsee/models"
-	"github.com/cloudflare/unsee/slices"
+	"github.com/cloudflare/unsee/internal/models"
+	"github.com/cloudflare/unsee/internal/slices"
 )
 
 // DedupAlerts will collect alert groups from all defined Alertmanager

internal/alertmanager/dedup_test.go

@@ -6,9 +6,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cloudflare/unsee/alertmanager"
-	"github.com/cloudflare/unsee/config"
-	"github.com/cloudflare/unsee/mock"
+	"github.com/cloudflare/unsee/internal/alertmanager"
+	"github.com/cloudflare/unsee/internal/config"
+	"github.com/cloudflare/unsee/internal/mock"
 
 	log "github.com/sirupsen/logrus"
 )

internal/alertmanager/mapper.go

@@ -1,11 +1,11 @@
 package alertmanager
 
 import (
-	"github.com/cloudflare/unsee/mapper"
-	"github.com/cloudflare/unsee/mapper/v04"
-	"github.com/cloudflare/unsee/mapper/v05"
-	"github.com/cloudflare/unsee/mapper/v061"
-	"github.com/cloudflare/unsee/mapper/v062"
+	"github.com/cloudflare/unsee/internal/mapper"
+	"github.com/cloudflare/unsee/internal/mapper/v04"
+	"github.com/cloudflare/unsee/internal/mapper/v05"
+	"github.com/cloudflare/unsee/internal/mapper/v061"
+	"github.com/cloudflare/unsee/internal/mapper/v062"
 )
 
 // initialize all mappers

internal/alertmanager/models.go

@@ -6,11 +6,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/cloudflare/unsee/config"
-	"github.com/cloudflare/unsee/mapper"
-	"github.com/cloudflare/unsee/models"
-	"github.com/cloudflare/unsee/transform"
-	"github.com/cloudflare/unsee/transport"
+	"github.com/cloudflare/unsee/internal/config"
+	"github.com/cloudflare/unsee/internal/mapper"
+	"github.com/cloudflare/unsee/internal/models"
+	"github.com/cloudflare/unsee/internal/transform"
+	"github.com/cloudflare/unsee/internal/transport"
 
 	log "github.com/sirupsen/logrus"
 )

internal/alertmanager/upstream.go

@@ -5,7 +5,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/cloudflare/unsee/models"
+	"github.com/cloudflare/unsee/internal/models"
 
 	log "github.com/sirupsen/logrus"
 )

internal/alertmanager/version.go

@@ -3,7 +3,7 @@ package alertmanager
 import (
 	"time"
 
-	"github.com/cloudflare/unsee/transport"
+	"github.com/cloudflare/unsee/internal/transport"
 
 	log "github.com/sirupsen/logrus"
 )

internal/config/config_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cloudflare/unsee/slices"
+	"github.com/cloudflare/unsee/internal/slices"
 )
 
 type flagNameTest struct {

internal/filters/autocomplete.go

@@ -1,7 +1,7 @@
 package filters
 
 import (
-	"github.com/cloudflare/unsee/models"
+	"github.com/cloudflare/unsee/internal/models"
 )
 
 type autocompleteFactory func(name string, operators []string, alerts []models.Alert) []models.Autocomplete

internal/filters/filter.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"regexp"
 
-	"github.com/cloudflare/unsee/models"
-	"github.com/cloudflare/unsee/slices"
+	"github.com/cloudflare/unsee/internal/models"
+	"github.com/cloudflare/unsee/internal/slices"
 )
 
 // FilterT provides methods for interacting with alert filters

internal/filters/filter_age.go

@@ -5,7 +5,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/cloudflare/unsee/models"
+	"github.com/cloudflare/unsee/internal/models"
 )
 
 type ageFilter struct {

internal/filters/filter_alertmanager.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/cloudflare/unsee/models"
+	"github.com/cloudflare/unsee/internal/models"
 )
 
 type alertmanagerInstanceFilter struct {

internal/filters/filter_fuzzy.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"regexp"
 
-	"github.com/cloudflare/unsee/models"
+	"github.com/cloudflare/unsee/internal/models"
 )
 
 type fuzzyFilter struct {

internal/filters/filter_label.go

@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/cloudflare/unsee/models"
+	"github.com/cloudflare/unsee/internal/models"
 )
 
 type labelFilter struct {

internal/filters/filter_limit.go

@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/cloudflare/unsee/models"
+	"github.com/cloudflare/unsee/internal/models"
 )
 
 type limitFilter struct {

internal/filters/filter_receiver.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/cloudflare/unsee/models"
+	"github.com/cloudflare/unsee/internal/models"
 )
 
 type receiverFilter struct {

internal/filters/filter_silence_author.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/cloudflare/unsee/models"
+	"github.com/cloudflare/unsee/internal/models"
 )
 
 type silenceAuthorFilter struct {

internal/filters/filter_silence_jira.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/cloudflare/unsee/models"
+	"github.com/cloudflare/unsee/internal/models"
 )
 
 type silenceJiraFilter struct {

internal/filters/filter_state.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/cloudflare/unsee/models"
-	"github.com/cloudflare/unsee/slices"
+	"github.com/cloudflare/unsee/internal/models"
+	"github.com/cloudflare/unsee/internal/slices"
 )
 
 type stateFilter struct {

internal/filters/filter_test.go

@@ -5,9 +5,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cloudflare/unsee/alertmanager"
-	"github.com/cloudflare/unsee/filters"
-	"github.com/cloudflare/unsee/models"
+	"github.com/cloudflare/unsee/internal/alertmanager"
+	"github.com/cloudflare/unsee/internal/filters"
+	"github.com/cloudflare/unsee/internal/models"
 
 	log "github.com/sirupsen/logrus"
 )

internal/mapper/mapper.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/cloudflare/unsee/models"
+	"github.com/cloudflare/unsee/internal/models"
 )
 
 var (

internal/mapper/v04/alerts.go

@@ -11,9 +11,9 @@ import (
 	"time"
 
 	"github.com/blang/semver"
-	"github.com/cloudflare/unsee/mapper"
-	"github.com/cloudflare/unsee/models"
-	"github.com/cloudflare/unsee/transport"
+	"github.com/cloudflare/unsee/internal/mapper"
+	"github.com/cloudflare/unsee/internal/models"
+	"github.com/cloudflare/unsee/internal/transport"
 )
 
 type alert struct {

internal/mapper/v04/silences.go

@@ -12,9 +12,9 @@ import (
 	"time"
 
 	"github.com/blang/semver"
-	"github.com/cloudflare/unsee/mapper"
-	"github.com/cloudflare/unsee/models"
-	"github.com/cloudflare/unsee/transport"
+	"github.com/cloudflare/unsee/internal/mapper"
+	"github.com/cloudflare/unsee/internal/models"
+	"github.com/cloudflare/unsee/internal/transport"
 )
 
 // Alertmanager 0.4 silence format

internal/mapper/v05/alerts.go

@@ -10,9 +10,9 @@ import (
 	"time"
 
 	"github.com/blang/semver"
-	"github.com/cloudflare/unsee/mapper"
-	"github.com/cloudflare/unsee/models"
-	"github.com/cloudflare/unsee/transport"
+	"github.com/cloudflare/unsee/internal/mapper"
+	"github.com/cloudflare/unsee/internal/models"
+	"github.com/cloudflare/unsee/internal/transport"
 )
 
 type alert struct {

internal/mapper/v05/silences.go

@@ -9,9 +9,9 @@ import (
 	"time"
 
 	"github.com/blang/semver"
-	"github.com/cloudflare/unsee/mapper"
-	"github.com/cloudflare/unsee/models"
-	"github.com/cloudflare/unsee/transport"
+	"github.com/cloudflare/unsee/internal/mapper"
+	"github.com/cloudflare/unsee/internal/models"
+	"github.com/cloudflare/unsee/internal/transport"
 )
 
 type silence struct {

internal/mapper/v061/alerts.go

@@ -11,9 +11,9 @@ import (
 	"time"
 
 	"github.com/blang/semver"
-	"github.com/cloudflare/unsee/mapper"
-	"github.com/cloudflare/unsee/models"
-	"github.com/cloudflare/unsee/transport"
+	"github.com/cloudflare/unsee/internal/mapper"
+	"github.com/cloudflare/unsee/internal/models"
+	"github.com/cloudflare/unsee/internal/transport"
 )
 
 type alert struct {

internal/mapper/v062/alerts.go

@@ -11,9 +11,9 @@ import (
 	"time"
 
 	"github.com/blang/semver"
-	"github.com/cloudflare/unsee/mapper"
-	"github.com/cloudflare/unsee/models"
-	"github.com/cloudflare/unsee/transport"
+	"github.com/cloudflare/unsee/internal/mapper"
+	"github.com/cloudflare/unsee/internal/models"
+	"github.com/cloudflare/unsee/internal/transport"
 )
 
 type alertStatus struct {

internal/models/alert_test.go

@@ -4,7 +4,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cloudflare/unsee/models"
+	"github.com/cloudflare/unsee/internal/models"
 )
 
 type alertStateTest struct {

internal/models/alertgroup_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cloudflare/unsee/models"
+	"github.com/cloudflare/unsee/internal/models"
 )
 
 type alertListSortTest struct {

internal/slices/slices_test.go

@@ -3,7 +3,7 @@ package slices_test
 import (
 	"testing"
 
-	"github.com/cloudflare/unsee/slices"
+	"github.com/cloudflare/unsee/internal/slices"
 )
 
 type stringSliceTest struct {

internal/transform/autocomplete.go

@@ -1,8 +1,8 @@
 package transform
 
 import (
-	"github.com/cloudflare/unsee/filters"
-	"github.com/cloudflare/unsee/models"
+	"github.com/cloudflare/unsee/internal/filters"
+	"github.com/cloudflare/unsee/internal/models"
 )
 
 // BuildAutocomplete takes an alert object and generates list of autocomplete

internal/transform/color_test.go

@@ -3,9 +3,9 @@ package transform_test
 import (
 	"testing"
 
-	"github.com/cloudflare/unsee/config"
-	"github.com/cloudflare/unsee/models"
-	"github.com/cloudflare/unsee/transform"
+	"github.com/cloudflare/unsee/internal/config"
+	"github.com/cloudflare/unsee/internal/models"
+	"github.com/cloudflare/unsee/internal/transform"
 )
 
 type colorTest struct {

internal/transform/colors.go

@@ -5,9 +5,9 @@ import (
 	"io"
 	"math/rand"
 
-	"github.com/cloudflare/unsee/config"
-	"github.com/cloudflare/unsee/models"
-	"github.com/cloudflare/unsee/slices"
+	"github.com/cloudflare/unsee/internal/config"
+	"github.com/cloudflare/unsee/internal/models"
+	"github.com/cloudflare/unsee/internal/slices"
 
 	"github.com/hansrodtang/randomcolor"
 )

internal/transform/jira.go

@@ -6,7 +6,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/cloudflare/unsee/models"
+	"github.com/cloudflare/unsee/internal/models"
 )
 
 type jiraDetectRule struct {

internal/transform/jira_test.go

@@ -3,8 +3,8 @@ package transform_test
 import (
 	"testing"
 
-	"github.com/cloudflare/unsee/models"
-	"github.com/cloudflare/unsee/transform"
+	"github.com/cloudflare/unsee/internal/models"
+	"github.com/cloudflare/unsee/internal/transform"
 )
 
 type jiraTest struct {

internal/transform/links.go

@@ -3,7 +3,7 @@ package transform
 import (
 	"net/url"
 
-	"github.com/cloudflare/unsee/slices"
+	"github.com/cloudflare/unsee/internal/slices"
 )
 
 // list of URI schema which we turn into links in the UI

internal/transform/links_test.go

@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/cloudflare/unsee/transform"
+	"github.com/cloudflare/unsee/internal/transform"
 )
 
 type linkTest struct {

internal/transform/strip.go

@@ -3,7 +3,7 @@ package transform
 import (
 	"strings"
 
-	"github.com/cloudflare/unsee/slices"
+	"github.com/cloudflare/unsee/internal/slices"
 )
 
 // StripLables allows filtering out some labels from alerts

internal/transform/strip_test.go

@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/cloudflare/unsee/transform"
+	"github.com/cloudflare/unsee/internal/transform"
 )
 
 type stripTest struct {