Merge pull request #150 from launchdarkly/eb/ch83491/core-packages-5

(v6 - #18) move all remaining core stuff into core, clean up tests, move Relay app starter to main package

.golangci.yml

@@ -31,6 +31,10 @@ issues:
     - path: core/sharedtest/
       linters:
         - golint  # don't need linter warnings about comment formatting etc. on our test helpers
+    - path: core/sharedtest/testsuites/
+      linters:
+        - bodyclose
+        - goconst
   exclude:
     # golint exclusions
     - "(const|func|method|struct field|type|var) .* should be " # golint errors about variable names (don't want to fix them because they're in a public interface)

.goreleaser.yml

@@ -3,7 +3,7 @@ project_name: ld-relay
 builds:
 - env:
   - CGO_ENABLED=0
-  main: ./cmd/ld-relay/
+  main: .
   binary: ld-relay
   # Default is `-s -w -X main.version={{.Version}} -X main.commit={{.ShortCommit}} -X main.date={{.Date}}`.
   ldflags:

Dockerfile

@@ -18,7 +18,7 @@ ENV CGO_ENABLED=0
 ENV GOOS=linux
 ENV GOPATH=/go
 
-RUN go build -a -o ldr ./cmd/ld-relay
+RUN go build -a -o ldr .
 
 FROM golang:1.13.12-alpine
 

core/application/server.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/launchdarkly/ld-relay/v6/config"
+	"github.com/launchdarkly/ld-relay/v6/core/config"
 	"gopkg.in/launchdarkly/go-sdk-common.v2/ldlog"
 )
 

client-side.go → core/client-side.go

@@ -1,4 +1,4 @@
-package relay
+package core
 
 import (
 	"bytes"
@@ -7,19 +7,12 @@ import (
 	"net/http/httptest"
 	"strconv"
 
+	"github.com/launchdarkly/ld-relay/v6/core/internal/browser"
+	"github.com/launchdarkly/ld-relay/v6/core/internal/events"
+	"github.com/launchdarkly/ld-relay/v6/core/internal/util"
 	"github.com/launchdarkly/ld-relay/v6/core/middleware"
-	"github.com/launchdarkly/ld-relay/v6/internal/events"
-	"github.com/launchdarkly/ld-relay/v6/internal/util"
 )
 
-const transparent1PixelImgBase64 = "R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7="
-
-var transparent1PixelImg []byte
-
-func init() {
-	transparent1PixelImg, _ = base64.StdEncoding.DecodeString(transparent1PixelImgBase64)
-}
-
 func getEventsImage(w http.ResponseWriter, req *http.Request) {
 	clientCtx := middleware.GetEnvContextInfo(req.Context())
 
@@ -49,7 +42,7 @@ func getEventsImage(w http.ResponseWriter, req *http.Request) {
 	}
 
 	w.Header().Set("Content-Type", "image/gif")
-	w.Write(transparent1PixelImg)
+	w.Write(browser.Transparent1PixelImageData)
 }
 
 func getGoals(w http.ResponseWriter, req *http.Request) {

core/httpconfig/httpconfig.go

@@ -4,7 +4,7 @@ import (
 	"errors"
 	"net/http"
 
-	"github.com/launchdarkly/ld-relay/v6/config"
+	"github.com/launchdarkly/ld-relay/v6/core/config"
 	"github.com/launchdarkly/ld-relay/v6/internal/version"
 	"gopkg.in/launchdarkly/go-sdk-common.v2/ldlog"
 	"gopkg.in/launchdarkly/go-server-sdk.v5/interfaces"

core/internal/cors/cors.go → core/internal/browser/cors.go

@@ -1,23 +1,23 @@
-package cors
+package browser
 
 import (
 	"context"
 	"net/http"
 	"strings"
 
-	"github.com/launchdarkly/ld-relay/v6/internal/events"
+	"github.com/launchdarkly/ld-relay/v6/core/internal/events"
 )
 
 const (
 	// The default origin string to use in CORS response headers.
 	DefaultAllowedOrigin = "*"
 )
 
-type contextKeyType string
+type corsContextKeyType string
 
 const (
-	contextKey contextKeyType = "context"
-	maxAge     string         = "300"
+	corsContextKey corsContextKeyType = "context"
+	maxAge         string             = "300"
 )
 
 var allowedHeadersList = []string{
@@ -33,27 +33,27 @@ var allowedHeadersList = []string{
 
 var allowedHeaders = strings.Join(allowedHeadersList, ",")
 
-// RequestContext represents a scope that has a specific set of allowed origins for CORS requests. This
+// CORSContext represents a scope that has a specific set of allowed origins for CORS requests. This
 // can be attached to a request context with WithCORSContext().
-type RequestContext interface {
+type CORSContext interface {
 	AllowedOrigins() []string
 }
 
 // GetCORSContext returns the CORSContext that has been attached to this Context with WithCORSContext(),
 // or nil if none.
-func GetCORSContext(ctx context.Context) RequestContext {
-	if cc, ok := ctx.Value(contextKey).(RequestContext); ok {
+func GetCORSContext(ctx context.Context) CORSContext {
+	if cc, ok := ctx.Value(corsContextKey).(CORSContext); ok {
 		return cc
 	}
 	return nil
 }
 
 // WithCORSContext returns a copy of the parent context with the specified CORSContext attached.
-func WithCORSContext(parent context.Context, cc RequestContext) context.Context {
+func WithCORSContext(parent context.Context, cc CORSContext) context.Context {
 	if cc == nil {
 		return parent
 	}
-	return context.WithValue(parent, contextKey, cc)
+	return context.WithValue(parent, corsContextKey, cc)
 }
 
 // SetCORSHeaders sets a standard set of CORS headers on an HTTP response. This is meant to be the same

core/internal/cors/cors_test.go → core/internal/browser/cors_test.go

@@ -1,4 +1,4 @@
-package cors
+package browser
 
 import (
 	"context"

core/internal/browser/package_info.go

@@ -0,0 +1,2 @@
+// Package browser contains internal helpers that are only used for browser requests.
+package browser

core/internal/browser/pixel_image.go

@@ -0,0 +1,12 @@
+package browser
+
+import "encoding/base64"
+
+const Transparent1PixelImgBase64 = "R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7="
+
+var Transparent1PixelImageData []byte = makePixelImageData()
+
+func makePixelImageData() []byte {
+	data, _ := base64.StdEncoding.DecodeString(Transparent1PixelImgBase64)
+	return data
+}

internal/events/event-relay.go → core/internal/events/event-relay.go

@@ -13,10 +13,10 @@ import (
 
 	"gopkg.in/launchdarkly/go-sdk-common.v2/ldlog"
 
-	c "github.com/launchdarkly/ld-relay/v6/config"
+	c "github.com/launchdarkly/ld-relay/v6/core/config"
 	"github.com/launchdarkly/ld-relay/v6/core/httpconfig"
-	"github.com/launchdarkly/ld-relay/v6/internal/store"
-	"github.com/launchdarkly/ld-relay/v6/internal/util"
+	"github.com/launchdarkly/ld-relay/v6/core/internal/store"
+	"github.com/launchdarkly/ld-relay/v6/core/internal/util"
 )
 
 // Describes one of the possible endpoints (on both events.launchdarkly.com and the relay) for posting events

internal/events/event-summarizing-relay.go → core/internal/events/event-summarizing-relay.go

@@ -15,9 +15,9 @@ import (
 	"gopkg.in/launchdarkly/go-server-sdk-evaluation.v1/ldmodel"
 	"gopkg.in/launchdarkly/go-server-sdk.v5/ldcomponents/ldstoreimpl"
 
-	c "github.com/launchdarkly/ld-relay/v6/config"
+	c "github.com/launchdarkly/ld-relay/v6/core/config"
 	"github.com/launchdarkly/ld-relay/v6/core/httpconfig"
-	"github.com/launchdarkly/ld-relay/v6/internal/store"
+	"github.com/launchdarkly/ld-relay/v6/core/internal/store"
 )
 
 type eventSummarizingRelay struct {

internal/events/event-summarizing-relay_test.go → core/internal/events/event-summarizing-relay_test.go

@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"testing"
 
+	"github.com/launchdarkly/ld-relay/v6/core/internal/store"
 	"github.com/launchdarkly/ld-relay/v6/core/sharedtest"
-	"github.com/launchdarkly/ld-relay/v6/internal/store"
 	ldevents "gopkg.in/launchdarkly/go-sdk-events.v1"
 	"gopkg.in/launchdarkly/go-server-sdk-evaluation.v1/ldbuilders"
 	"gopkg.in/launchdarkly/go-server-sdk.v5/interfaces"
@@ -18,7 +18,7 @@ import (
 	"gopkg.in/launchdarkly/go-sdk-common.v2/ldreason"
 	"gopkg.in/launchdarkly/go-sdk-common.v2/ldvalue"
 
-	relaystore "github.com/launchdarkly/ld-relay/v6/internal/store"
+	relaystore "github.com/launchdarkly/ld-relay/v6/core/internal/store"
 )
 
 func makeStoreAdapterWithExistingStore(store interfaces.DataStore) *store.SSERelayDataStoreAdapter {

internal/events/event_publisher.go → core/internal/events/event_publisher.go

@@ -14,7 +14,7 @@ import (
 
 	"gopkg.in/launchdarkly/go-sdk-common.v2/ldlog"
 
-	"github.com/launchdarkly/ld-relay/v6/config"
+	"github.com/launchdarkly/ld-relay/v6/core/config"
 	"github.com/launchdarkly/ld-relay/v6/internal/version"
 )
 

internal/events/event_publisher_test.go → core/internal/events/event_publisher_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/stretchr/testify/assert"
 
 	"github.com/launchdarkly/go-test-helpers/v2/httphelpers"
-	"github.com/launchdarkly/ld-relay/v6/config"
+	"github.com/launchdarkly/ld-relay/v6/core/config"
 	"gopkg.in/launchdarkly/go-sdk-common.v2/ldlog"
 )
 

internal/metrics/datadog.go → core/internal/metrics/datadog.go

@@ -5,7 +5,7 @@ import (
 	"go.opencensus.io/stats/view"
 	"go.opencensus.io/trace"
 
-	"github.com/launchdarkly/ld-relay/v6/config"
+	"github.com/launchdarkly/ld-relay/v6/core/config"
 	"gopkg.in/launchdarkly/go-sdk-common.v2/ldlog"
 )
 

internal/metrics/datadog_test.go → core/internal/metrics/datadog_test.go

@@ -6,7 +6,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/launchdarkly/ld-relay/v6/config"
+	"github.com/launchdarkly/ld-relay/v6/core/config"
 	"gopkg.in/launchdarkly/go-sdk-common.v2/ldlog"
 )
 

internal/metrics/events_exporter.go → core/internal/metrics/events_exporter.go

@@ -6,7 +6,7 @@ import (
 
 	"go.opencensus.io/stats/view"
 
-	"github.com/launchdarkly/ld-relay/v6/internal/events"
+	"github.com/launchdarkly/ld-relay/v6/core/internal/events"
 )
 
 type currentConnectionsMetric struct {

internal/metrics/events_exporter_test.go → core/internal/metrics/events_exporter_test.go

@@ -14,7 +14,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/launchdarkly/ld-relay/v6/internal/events"
+	"github.com/launchdarkly/ld-relay/v6/core/internal/events"
 )
 
 const testReportingPeriod = time.Millisecond

internal/metrics/exporters.go → core/internal/metrics/exporters.go

@@ -1,7 +1,7 @@
 package metrics
 
 import (
-	"github.com/launchdarkly/ld-relay/v6/config"
+	"github.com/launchdarkly/ld-relay/v6/core/config"
 	"gopkg.in/launchdarkly/go-sdk-common.v2/ldlog"
 )
 

internal/metrics/exporters_test.go → core/internal/metrics/exporters_test.go

@@ -10,7 +10,7 @@ import (
 	"gopkg.in/launchdarkly/go-sdk-common.v2/ldlog"
 	"gopkg.in/launchdarkly/go-sdk-common.v2/ldlogtest"
 
-	"github.com/launchdarkly/ld-relay/v6/config"
+	"github.com/launchdarkly/ld-relay/v6/core/config"
 )
 
 func TestRegisterExporters(t *testing.T) {

internal/metrics/metrics.go → core/internal/metrics/metrics.go

@@ -15,8 +15,8 @@ import (
 
 	"github.com/pborman/uuid"
 
-	"github.com/launchdarkly/ld-relay/v6/config"
-	"github.com/launchdarkly/ld-relay/v6/internal/events"
+	"github.com/launchdarkly/ld-relay/v6/core/config"
+	"github.com/launchdarkly/ld-relay/v6/core/internal/events"
 )
 
 // Manager is the top-level object that controls all of our metrics exporter activity. It should be

internal/metrics/metrics_test.go → core/internal/metrics/metrics_test.go

@@ -13,7 +13,7 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/launchdarkly/ld-relay/v6/config"
+	"github.com/launchdarkly/ld-relay/v6/core/config"
 )
 
 type args struct {

internal/metrics/prometheus.go → core/internal/metrics/prometheus.go

@@ -9,7 +9,7 @@ import (
 
 	"gopkg.in/launchdarkly/go-sdk-common.v2/ldlog"
 
-	"github.com/launchdarkly/ld-relay/v6/config"
+	"github.com/launchdarkly/ld-relay/v6/core/config"
 	"github.com/launchdarkly/ld-relay/v6/core/logging"
 )
 

internal/metrics/prometheus_test.go → core/internal/metrics/prometheus_test.go

@@ -11,7 +11,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	ct "github.com/launchdarkly/go-configtypes"
-	"github.com/launchdarkly/ld-relay/v6/config"
+	"github.com/launchdarkly/ld-relay/v6/core/config"
 	"gopkg.in/launchdarkly/go-sdk-common.v2/ldlog"
 )
 

internal/metrics/stackdriver.go → core/internal/metrics/stackdriver.go

@@ -7,7 +7,7 @@ import (
 
 	"gopkg.in/launchdarkly/go-sdk-common.v2/ldlog"
 
-	"github.com/launchdarkly/ld-relay/v6/config"
+	"github.com/launchdarkly/ld-relay/v6/core/config"
 )
 
 var stackdriverExporterType exporterType = stackdriverExporterTypeImpl{}

internal/metrics/stackdriver_test.go → core/internal/metrics/stackdriver_test.go

@@ -9,7 +9,7 @@ import (
 	"github.com/stretchr/testify/require"
 
 	helpers "github.com/launchdarkly/go-test-helpers/v2"
-	"github.com/launchdarkly/ld-relay/v6/config"
+	"github.com/launchdarkly/ld-relay/v6/core/config"
 	"gopkg.in/launchdarkly/go-sdk-common.v2/ldlog"
 )
 

internal/metrics/test_utils_test.go → core/internal/metrics/test_utils_test.go

@@ -5,7 +5,7 @@ import (
 
 	"go.opencensus.io/trace"
 
-	"github.com/launchdarkly/ld-relay/v6/config"
+	"github.com/launchdarkly/ld-relay/v6/core/config"
 	"gopkg.in/launchdarkly/go-sdk-common.v2/ldlog"
 )
 

internal/store/relay_feature_store_testdata_test.go → core/internal/store/relay_feature_store_testdata_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
-	"github.com/launchdarkly/ld-relay/v6/config"
+	"github.com/launchdarkly/ld-relay/v6/core/config"
 	"github.com/launchdarkly/ld-relay/v6/core/sharedtest"
 	"gopkg.in/launchdarkly/go-server-sdk-evaluation.v1/ldbuilders"
 	"gopkg.in/launchdarkly/go-server-sdk.v5/interfaces"

core/middleware/context.go

@@ -3,7 +3,7 @@ package middleware
 import (
 	"context"
 
-	"github.com/launchdarkly/ld-relay/v6/config"
+	"github.com/launchdarkly/ld-relay/v6/core/config"
 	"github.com/launchdarkly/ld-relay/v6/core/relayenv"
 )