Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to v7 namespace #217

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ jobs:

steps:
- run: go version
- run: go install github.com/launchdarkly/ld-relay/v6@latest
- run: go install github.com/launchdarkly/ld-relay/v7@latest
- run:
name: verify that executable was built
command: ls -l $GOPATH/bin/ld-relay
Expand Down
2 changes: 1 addition & 1 deletion config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"time"

ct "github.com/launchdarkly/go-configtypes"
"github.com/launchdarkly/ld-relay/v6/internal/logging"
"github.com/launchdarkly/ld-relay/v7/internal/logging"
)

const (
Expand Down
8 changes: 4 additions & 4 deletions docs/in-app.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ Here is an example of how you might run the Relay Proxy endpoints inside your we
```go
import (
"github.com/gorilla/mux"
"github.com/launchdarkly/ld-relay/v6/config"
"github.com/launchdarkly/ld-relay/v6/relay"
"github.com/launchdarkly/ld-relay/v7/config"
"github.com/launchdarkly/ld-relay/v7/relay"
"github.com/launchdarkly/go-sdk-common/v3/ldlog"
)

Expand All @@ -37,7 +37,7 @@ The above example uses a configuration file. You can also pass in a `config.Conf

```go
import (
"github.com/launchdarkly/ld-relay/v6/config"
"github.com/launchdarkly/ld-relay/v7/config"
configtypes "github.com/launchdarkly/go-configtypes"
)

Expand All @@ -57,7 +57,7 @@ Alternatively, you can parse the configuration from a string that is in the same

```go
import (
"github.com/launchdarkly/ld-relay/v6/config"
"github.com/launchdarkly/ld-relay/v7/config"
"gopkg.in/gcfg.v1"
)

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/launchdarkly/ld-relay/v6
module github.com/launchdarkly/ld-relay/v7

go 1.18

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

"github.com/launchdarkly/ld-relay/v6/config"
"github.com/launchdarkly/ld-relay/v7/config"

ldapi "github.com/launchdarkly/api-client-go"
"github.com/launchdarkly/go-sdk-common/v3/ldlog"
Expand Down
4 changes: 2 additions & 2 deletions integrationtests/autoconfig_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"testing"
"time"

"github.com/launchdarkly/ld-relay/v6/config"
"github.com/launchdarkly/ld-relay/v6/internal/api"
"github.com/launchdarkly/ld-relay/v7/config"
"github.com/launchdarkly/ld-relay/v7/internal/api"

"github.com/stretchr/testify/require"
)
Expand Down
4 changes: 2 additions & 2 deletions integrationtests/big_segments_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"testing"
"time"

"github.com/launchdarkly/ld-relay/v6/integrationtests/docker"
"github.com/launchdarkly/ld-relay/v6/internal/api"
"github.com/launchdarkly/ld-relay/v7/integrationtests/docker"
"github.com/launchdarkly/ld-relay/v7/internal/api"

"github.com/launchdarkly/go-sdk-common/v3/ldvalue"

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

"github.com/launchdarkly/go-sdk-common/v3/ldlog"
"github.com/launchdarkly/ld-relay/v6/integrationtests/docker"
"github.com/launchdarkly/ld-relay/v6/integrationtests/oshelpers"
"github.com/launchdarkly/ld-relay/v7/integrationtests/docker"
"github.com/launchdarkly/ld-relay/v7/integrationtests/oshelpers"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions integrationtests/database_params_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"reflect"
"testing"

"github.com/launchdarkly/ld-relay/v6/integrationtests/docker"
"github.com/launchdarkly/ld-relay/v6/internal/api"
"github.com/launchdarkly/ld-relay/v7/integrationtests/docker"
"github.com/launchdarkly/ld-relay/v7/internal/api"

"github.com/stretchr/testify/require"
)
Expand Down
4 changes: 2 additions & 2 deletions integrationtests/database_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ package integrationtests
import (
"testing"

"github.com/launchdarkly/ld-relay/v6/integrationtests/docker"
"github.com/launchdarkly/ld-relay/v6/internal/api"
"github.com/launchdarkly/ld-relay/v7/integrationtests/docker"
"github.com/launchdarkly/ld-relay/v7/internal/api"

"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
Expand Down
2 changes: 1 addition & 1 deletion integrationtests/docker/docker_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"os"
"strings"

"github.com/launchdarkly/ld-relay/v6/integrationtests/oshelpers"
"github.com/launchdarkly/ld-relay/v7/integrationtests/oshelpers"

"github.com/launchdarkly/go-sdk-common/v3/ldvalue"

Expand Down
2 changes: 1 addition & 1 deletion integrationtests/offline_mode_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import (
"path/filepath"
"testing"

"github.com/launchdarkly/ld-relay/v6/config"
"github.com/launchdarkly/ld-relay/v7/config"

helpers "github.com/launchdarkly/go-test-helpers/v3"

Expand Down
2 changes: 1 addition & 1 deletion integrationtests/projects_and_environments_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
package integrationtests

import (
"github.com/launchdarkly/ld-relay/v6/config"
"github.com/launchdarkly/ld-relay/v7/config"
)

type projectInfo struct {
Expand Down
8 changes: 4 additions & 4 deletions integrationtests/test_manager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ import (
"testing"
"time"

"github.com/launchdarkly/ld-relay/v6/config"
"github.com/launchdarkly/ld-relay/v6/integrationtests/docker"
"github.com/launchdarkly/ld-relay/v6/integrationtests/oshelpers"
"github.com/launchdarkly/ld-relay/v6/internal/api"
"github.com/launchdarkly/ld-relay/v7/config"
"github.com/launchdarkly/ld-relay/v7/integrationtests/docker"
"github.com/launchdarkly/ld-relay/v7/integrationtests/oshelpers"
"github.com/launchdarkly/ld-relay/v7/internal/api"

ldapi "github.com/launchdarkly/api-client-go"
ct "github.com/launchdarkly/go-configtypes"
Expand Down
2 changes: 1 addition & 1 deletion internal/application/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"net/http"

"github.com/launchdarkly/ld-relay/v6/config"
"github.com/launchdarkly/ld-relay/v7/config"

"github.com/launchdarkly/go-sdk-common/v3/ldlog"
)
Expand Down
2 changes: 1 addition & 1 deletion internal/application/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"testing"
"time"

st "github.com/launchdarkly/ld-relay/v6/internal/sharedtest"
st "github.com/launchdarkly/ld-relay/v7/internal/sharedtest"

"github.com/launchdarkly/go-sdk-common/v3/ldlog"
"github.com/launchdarkly/go-sdk-common/v3/ldlogtest"
Expand Down
4 changes: 2 additions & 2 deletions internal/autoconfig/message_handler.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package autoconfig

import (
"github.com/launchdarkly/ld-relay/v6/config"
"github.com/launchdarkly/ld-relay/v6/internal/envfactory"
"github.com/launchdarkly/ld-relay/v7/config"
"github.com/launchdarkly/ld-relay/v7/internal/envfactory"
)

// MessageHandler defines the methods that StreamManager will call when it receives messages
Expand Down
6 changes: 3 additions & 3 deletions internal/autoconfig/stream_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import (
es "github.com/launchdarkly/eventsource"
"github.com/launchdarkly/go-sdk-common/v3/ldlog"
"github.com/launchdarkly/go-sdk-common/v3/ldtime"
"github.com/launchdarkly/ld-relay/v6/config"
"github.com/launchdarkly/ld-relay/v6/internal/envfactory"
"github.com/launchdarkly/ld-relay/v6/internal/httpconfig"
"github.com/launchdarkly/ld-relay/v7/config"
"github.com/launchdarkly/ld-relay/v7/internal/envfactory"
"github.com/launchdarkly/ld-relay/v7/internal/httpconfig"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion internal/autoconfig/stream_manager_events_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"github.com/stretchr/testify/require"

"github.com/launchdarkly/go-test-helpers/v3/httphelpers"
"github.com/launchdarkly/ld-relay/v6/config"
"github.com/launchdarkly/ld-relay/v7/config"
)

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

"github.com/launchdarkly/ld-relay/v6/config"
"github.com/launchdarkly/ld-relay/v6/internal/envfactory"
"github.com/launchdarkly/ld-relay/v7/config"
"github.com/launchdarkly/ld-relay/v7/internal/envfactory"

"github.com/launchdarkly/go-sdk-common/v3/ldlog"
"github.com/launchdarkly/go-sdk-common/v3/ldtime"
Expand Down
6 changes: 3 additions & 3 deletions internal/autoconfig/stream_manager_test_base_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import (
"testing"
"time"

"github.com/launchdarkly/ld-relay/v6/config"
"github.com/launchdarkly/ld-relay/v6/internal/envfactory"
"github.com/launchdarkly/ld-relay/v6/internal/httpconfig"
"github.com/launchdarkly/ld-relay/v7/config"
"github.com/launchdarkly/ld-relay/v7/internal/envfactory"
"github.com/launchdarkly/ld-relay/v7/internal/httpconfig"

"github.com/launchdarkly/go-sdk-common/v3/ldlog"
"github.com/launchdarkly/go-sdk-common/v3/ldlogtest"
Expand Down
4 changes: 2 additions & 2 deletions internal/autoconfig/stream_messages.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package autoconfig

import (
"github.com/launchdarkly/ld-relay/v6/config"
"github.com/launchdarkly/ld-relay/v6/internal/envfactory"
"github.com/launchdarkly/ld-relay/v7/config"
"github.com/launchdarkly/ld-relay/v7/internal/envfactory"
)

// These SSE message types are exported so that tests in other packages can more easily create
Expand Down
2 changes: 1 addition & 1 deletion internal/bigsegments/store.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package bigsegments
import (
"io"

"github.com/launchdarkly/ld-relay/v6/config"
"github.com/launchdarkly/ld-relay/v7/config"

"github.com/launchdarkly/go-sdk-common/v3/ldlog"
"github.com/launchdarkly/go-sdk-common/v3/ldtime"
Expand Down
4 changes: 2 additions & 2 deletions internal/bigsegments/store_dynamodb.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"errors"
"strconv"

"github.com/launchdarkly/ld-relay/v6/config"
"github.com/launchdarkly/ld-relay/v6/internal/sdks"
"github.com/launchdarkly/ld-relay/v7/config"
"github.com/launchdarkly/ld-relay/v7/internal/sdks"

"github.com/launchdarkly/go-sdk-common/v3/ldlog"
"github.com/launchdarkly/go-sdk-common/v3/ldtime"
Expand Down
2 changes: 1 addition & 1 deletion internal/bigsegments/store_dynamodb_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"testing"
"time"

"github.com/launchdarkly/ld-relay/v6/config"
"github.com/launchdarkly/ld-relay/v7/config"

"github.com/launchdarkly/go-sdk-common/v3/ldlog"

Expand Down
4 changes: 2 additions & 2 deletions internal/bigsegments/store_redis.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"fmt"
"strconv"

"github.com/launchdarkly/ld-relay/v6/config"
"github.com/launchdarkly/ld-relay/v6/internal/sdks"
"github.com/launchdarkly/ld-relay/v7/config"
"github.com/launchdarkly/ld-relay/v7/internal/sdks"

"github.com/launchdarkly/go-sdk-common/v3/ldlog"
"github.com/launchdarkly/go-sdk-common/v3/ldtime"
Expand Down
2 changes: 1 addition & 1 deletion internal/bigsegments/store_redis_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"context"
"testing"

"github.com/launchdarkly/ld-relay/v6/config"
"github.com/launchdarkly/ld-relay/v7/config"

"github.com/launchdarkly/go-configtypes"
"github.com/launchdarkly/go-sdk-common/v3/ldlog"
Expand Down
4 changes: 2 additions & 2 deletions internal/bigsegments/sync.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (
"sync"
"time"

"github.com/launchdarkly/ld-relay/v6/config"
"github.com/launchdarkly/ld-relay/v6/internal/httpconfig"
"github.com/launchdarkly/ld-relay/v7/config"
"github.com/launchdarkly/ld-relay/v7/internal/httpconfig"

es "github.com/launchdarkly/eventsource"
"github.com/launchdarkly/go-sdk-common/v3/ldlog"
Expand Down
4 changes: 2 additions & 2 deletions internal/bigsegments/sync_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"testing"
"time"

"github.com/launchdarkly/ld-relay/v6/config"
"github.com/launchdarkly/ld-relay/v6/internal/sharedtest"
"github.com/launchdarkly/ld-relay/v7/config"
"github.com/launchdarkly/ld-relay/v7/internal/sharedtest"

"github.com/launchdarkly/go-sdk-common/v3/ldlog"
"github.com/launchdarkly/go-sdk-common/v3/ldlogtest"
Expand Down
2 changes: 1 addition & 1 deletion internal/browser/cors.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"net/http"
"strings"

"github.com/launchdarkly/ld-relay/v6/internal/events"
"github.com/launchdarkly/ld-relay/v7/internal/events"
)

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

"github.com/launchdarkly/ld-relay/v6/config"
"github.com/launchdarkly/ld-relay/v7/config"

ct "github.com/launchdarkly/go-configtypes"
)
Expand Down
4 changes: 2 additions & 2 deletions internal/envfactory/env_params.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package envfactory
import (
"time"

"github.com/launchdarkly/ld-relay/v6/config"
"github.com/launchdarkly/ld-relay/v6/internal/relayenv"
"github.com/launchdarkly/ld-relay/v7/config"
"github.com/launchdarkly/ld-relay/v7/internal/relayenv"
)

// EnvironmentParams contains environment-specific information obtained from LaunchDarkly which
Expand Down
4 changes: 2 additions & 2 deletions internal/envfactory/env_rep.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"time"

"github.com/launchdarkly/go-sdk-common/v3/ldtime"
"github.com/launchdarkly/ld-relay/v6/config"
"github.com/launchdarkly/ld-relay/v6/internal/relayenv"
"github.com/launchdarkly/ld-relay/v7/config"
"github.com/launchdarkly/ld-relay/v7/internal/relayenv"
)

// These representation types are used by both the autoconfig package and the filedata package,
Expand Down
4 changes: 2 additions & 2 deletions internal/envfactory/env_rep_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"testing"
"time"

"github.com/launchdarkly/ld-relay/v6/config"
"github.com/launchdarkly/ld-relay/v6/internal/relayenv"
"github.com/launchdarkly/ld-relay/v7/config"
"github.com/launchdarkly/ld-relay/v7/internal/relayenv"

"github.com/launchdarkly/go-sdk-common/v3/ldtime"

Expand Down
10 changes: 5 additions & 5 deletions internal/events/event-relay.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ import (
"sync"
"time"

c "github.com/launchdarkly/ld-relay/v6/config"
"github.com/launchdarkly/ld-relay/v6/internal/basictypes"
"github.com/launchdarkly/ld-relay/v6/internal/httpconfig"
"github.com/launchdarkly/ld-relay/v6/internal/store"
"github.com/launchdarkly/ld-relay/v6/internal/util"
c "github.com/launchdarkly/ld-relay/v7/config"
"github.com/launchdarkly/ld-relay/v7/internal/basictypes"
"github.com/launchdarkly/ld-relay/v7/internal/httpconfig"
"github.com/launchdarkly/ld-relay/v7/internal/store"
"github.com/launchdarkly/ld-relay/v7/internal/util"

"github.com/launchdarkly/go-configtypes"
"github.com/launchdarkly/go-sdk-common/v3/ldlog"
Expand Down
Loading