From e92083586f6c348061d64689b209e1f86223cc19 Mon Sep 17 00:00:00 2001 From: Matthew Keeler Date: Mon, 6 Apr 2026 15:12:53 -0400 Subject: [PATCH] chore: Rename v8 path to v9 --- .github/actions/install-relay/action.yml | 6 +- .github/workflows/check-alpine-version.yml | 14 +- .github/workflows/check-go-versions.yml | 21 ++- .github/workflows/ci.yml | 4 +- .github/workflows/daily-installation-test.yml | 2 +- .github/workflows/daily-integration-tests.yml | 2 +- .../workflows/daily-security-scan-alpine.yml | 2 +- .../daily-security-scan-distroless.yml | 2 +- .github/workflows/release-please.yml | 2 +- config/config.go | 2 +- docs/in-app.md | 8 +- go.mod | 2 +- integrationtests/api_helpers_test.go | 8 +- integrationtests/autoconfig_test.go | 4 +- integrationtests/big_segments_test.go | 4 +- integrationtests/build_relay_test.go | 4 +- integrationtests/database_params_test.go | 4 +- integrationtests/database_test.go | 4 +- integrationtests/docker/docker_helpers.go | 6 +- integrationtests/offline_mode_test.go | 2 +- .../projects_and_environments_test.go | 2 +- integrationtests/test_manager_test.go | 15 +- internal/application/server.go | 4 +- internal/application/server_test.go | 6 +- internal/autoconfig/message_handler.go | 4 +- internal/autoconfig/stream_manager.go | 7 +- .../autoconfig/stream_manager_events_test.go | 7 +- .../stream_manager_test_base_test.go | 6 +- internal/autoconfig/stream_messages.go | 4 +- internal/bigsegments/store.go | 2 +- internal/bigsegments/store_dynamodb.go | 4 +- internal/bigsegments/store_dynamodb_test.go | 2 +- internal/bigsegments/store_redis.go | 4 +- internal/bigsegments/store_redis_test.go | 2 +- internal/bigsegments/sync.go | 4 +- internal/bigsegments/sync_test.go | 4 +- internal/browser/cors.go | 2 +- internal/credential/rotator.go | 2 +- internal/credential/rotator_test.go | 3 +- internal/datadestination/datadestination.go | 2 +- internal/envfactory/env_config_factory.go | 2 +- internal/envfactory/env_params.go | 4 +- internal/envfactory/env_rep.go | 4 +- internal/envfactory/env_rep_test.go | 7 +- internal/events/event-relay.go | 12 +- internal/events/event-relay_test.go | 16 +-- internal/events/event_publisher.go | 8 +- internal/events/event_publisher_test.go | 6 +- .../events/oldevents/translate_events_test.go | 2 +- internal/events/summarizing-relay.go | 10 +- internal/events/summarizing-relay_test.go | 8 +- internal/filedata/archive_manager.go | 2 +- .../archive_manager_test_base_test.go | 2 +- internal/filedata/archive_reader.go | 4 +- internal/filedata/archive_reader_test.go | 4 +- internal/filedata/testdata_test.go | 18 +-- internal/filedata/update_handler.go | 4 +- internal/httpconfig/httpconfig.go | 4 +- internal/httpconfig/httpconfig_test.go | 2 +- internal/metrics/metrics.go | 4 +- internal/metrics/metrics_test.go | 2 +- internal/metrics/otlp.go | 2 +- internal/metrics/relay_metrics_collector.go | 2 +- internal/metrics/test_utils_test.go | 6 +- internal/metrics/usage.go | 8 +- internal/middleware/context.go | 4 +- internal/middleware/context_test.go | 4 +- internal/middleware/metrics_middleware.go | 8 +- .../middleware/metrics_middleware_test.go | 10 +- internal/middleware/middleware.go | 18 +-- internal/middleware/middleware_test.go | 26 ++-- internal/middleware/usage_middleware.go | 2 +- internal/projmanager/environment_manager.go | 4 +- .../projmanager/environment_manager_test.go | 10 +- internal/projmanager/project_router.go | 6 +- internal/projmanager/project_router_test.go | 10 +- internal/relayenv/env_context.go | 14 +- internal/relayenv/env_context_impl.go | 26 ++-- internal/relayenv/env_context_impl_test.go | 35 +++-- internal/sdkauth/credential.go | 4 +- internal/sdks/big_segments.go | 4 +- internal/sdks/big_segments_test.go | 2 +- internal/sdks/client_factory.go | 2 +- internal/sdks/client_factory_test.go | 2 +- internal/sdks/data_stores.go | 4 +- internal/sdks/data_stores_test.go | 2 +- internal/sdks/sdk_kinds.go | 6 +- internal/sdks/sdk_kinds_test.go | 4 +- internal/sharedtest/configs.go | 4 +- internal/sharedtest/endpoints.go | 2 +- internal/sharedtest/requests.go | 2 +- internal/sharedtest/testclient/fake_client.go | 6 +- internal/sharedtest/testdata_envs.go | 2 +- .../sharedtest/testenv/test_env_context.go | 8 +- .../relay_feature_store_testdata_test.go | 4 +- internal/streams/env_streams.go | 6 +- internal/streams/env_streams_test.go | 6 +- internal/streams/stream_events.go | 2 +- .../streams/stream_events_benchmark_test.go | 2 +- internal/streams/stream_events_test.go | 3 +- internal/streams/stream_provider.go | 4 +- .../stream_provider_client_side_ping.go | 6 +- .../stream_provider_client_side_ping_test.go | 4 +- .../stream_provider_ping_jitter_test.go | 6 +- .../streams/stream_provider_server_side.go | 4 +- .../stream_provider_server_side_flags.go | 4 +- .../stream_provider_server_side_flags_test.go | 6 +- .../stream_provider_server_side_test.go | 6 +- internal/streams/stream_provider_test.go | 4 +- internal/streams/stream_testdata_test.go | 4 +- ld-relay.go | 10 +- relay/autoconfig_actions.go | 8 +- relay/autoconfig_actions_test.go | 6 +- relay/autoconfig_key_change_test.go | 10 +- relay/autoconfig_testdata_test.go | 9 +- relay/client_side_helpers.go | 10 +- relay/endpoint_tests_base_test.go | 6 +- relay/endpoints_eval_test.go | 134 ++++++++++++------ relay/endpoints_events_test.go | 16 ++- relay/endpoints_fdv2_client_poll_test.go | 4 +- relay/endpoints_fdv2_client_stream_test.go | 4 +- relay/endpoints_fdv2_poll_test.go | 4 +- relay/endpoints_fdv2_streams_test.go | 8 +- relay/endpoints_js_cors_test.go | 6 +- relay/endpoints_other_test.go | 4 +- relay/endpoints_php_test.go | 34 +++-- relay/endpoints_status.go | 8 +- relay/endpoints_status_autoconfig_test.go | 15 +- relay/endpoints_status_single_test.go | 6 +- relay/endpoints_status_test.go | 10 +- relay/endpoints_streams_test.go | 48 ++++--- relay/environment_lookup.go | 6 +- relay/environment_lookup_identifier_test.go | 6 +- relay/filedata_actions.go | 10 +- relay/filedata_actions_test.go | 12 +- relay/filedata_testdata_test.go | 19 +-- relay/relay.go | 30 ++-- relay/relay_end_to_end_redis_test.go | 10 +- relay/relay_end_to_end_test.go | 6 +- relay/relay_endpoints.go | 16 +-- relay/relay_endpoints_benchmark_test.go | 6 +- relay/relay_endpoints_test.go | 10 +- relay/relay_environments_test.go | 14 +- relay/relay_routes.go | 12 +- relay/relay_test.go | 2 +- relay/relay_test_base_test.go | 4 +- relay/request_logging_test.go | 4 +- relay/testutils_test.go | 14 +- 148 files changed, 619 insertions(+), 556 deletions(-) diff --git a/.github/actions/install-relay/action.yml b/.github/actions/install-relay/action.yml index b7b3cd13..1808e626 100644 --- a/.github/actions/install-relay/action.yml +++ b/.github/actions/install-relay/action.yml @@ -2,10 +2,10 @@ name: Install Relay description: "Installs Relay's Go module using normal Go tooling." inputs: go-version: - description: 'Go version to use for installation.' + description: "Go version to use for installation." required: true relay-major: - description: "Relay major version to install, e.g. 'v8'." + description: "Relay major version to install, e.g. 'v9'." required: false relay-version: description: "Relay semver to install e.g. 'latest'." @@ -26,7 +26,7 @@ runs: MAJOR: ${{ inputs.relay-major }} SEMVER: ${{ inputs.relay-version }} run: | - echo "major=${MAJOR:-v8}" >> $GITHUB_OUTPUT + echo "major=${MAJOR:-v9}" >> $GITHUB_OUTPUT echo "semver=${SEMVER:-latest}" >> $GITHUB_OUTPUT - name: Install Relay ${{ steps.rv.outputs.major }}/${{ steps.rv.outputs.semver }} diff --git a/.github/workflows/check-alpine-version.yml b/.github/workflows/check-alpine-version.yml index 59eaa80d..a6ca0975 100644 --- a/.github/workflows/check-alpine-version.yml +++ b/.github/workflows/check-alpine-version.yml @@ -13,7 +13,7 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: v8 + ref: v9 - name: Get current Alpine version id: alpine-current @@ -47,17 +47,17 @@ jobs: commit-message: "Bumps from ${{ steps.alpine-current.outputs.version }} -> alpine:${{ steps.alpine-latest.outputs.version }}" body: | It's time to update Relay's Docker image Alpine versions. Alpine updates should generally be consumed - as soon as possible since they contain patches for CVEs. - - + as soon as possible since they contain patches for CVEs. + + | | Current repo configuration | Desired repo configuration | |-------------|------------------------------------|---------------------------------------------------------------------------------------------------------------------| | Alpine Version | ${{ steps.alpine-current.outputs.version }} | [alpine:${{ steps.alpine-latest.outputs.version }}](https://hub.docker.com/_/alpine/tags) | - - + + This PR's change was generated by running: ```bash ./scripts/update-alpine-version.sh ${{ steps.alpine-latest.outputs.version }} ``` - + - [ ] I have triggered CI on this PR (either close & reopen this PR in Github UI, or `git commit -m "run ci" --allow-empty && git push`) diff --git a/.github/workflows/check-go-versions.yml b/.github/workflows/check-go-versions.yml index efa08a8e..89f488d9 100644 --- a/.github/workflows/check-go-versions.yml +++ b/.github/workflows/check-go-versions.yml @@ -1,15 +1,15 @@ name: Check Supported Go Versions on: schedule: - - cron: "0 17 * * *" + - cron: "0 17 * * *" workflow_dispatch: jobs: check-go-eol: runs-on: ubuntu-latest outputs: - latest: ${{ steps.parse.outputs.latest }} - penultimate: ${{ steps.parse.outputs.penultimate }} + latest: ${{ steps.parse.outputs.latest }} + penultimate: ${{ steps.parse.outputs.penultimate }} timeout-minutes: 2 steps: - uses: actions/checkout@v4 @@ -28,7 +28,6 @@ jobs: echo "latest=${{ fromJSON(env.fetch-api-data)[0].latest }}" >> $GITHUB_OUTPUT echo "penultimate=${{ fromJSON(env.fetch-api-data)[1].latest }}" >> $GITHUB_OUTPUT - create-prs: permissions: contents: write @@ -41,11 +40,11 @@ jobs: steps: - uses: actions/checkout@v4 with: - ref: v8 + ref: v9 - name: Get current Go versions id: go-versions - run: cat ./.github/variables/go-versions.env > $GITHUB_OUTPUT + run: cat ./.github/variables/go-versions.env > $GITHUB_OUTPUT - name: Run update script if: steps.go-versions.outputs.latest != env.officialLatestVersion @@ -69,10 +68,10 @@ jobs: body: | It's time to update Relay's supported Go versions, due to a recent upstream Go release. - The Go major release cadence is ~every 6 months; the two most recent major versions are supported. - Note that between major releases, the Go team often ships multiple minor versions. - - + The Go major release cadence is ~every 6 months; the two most recent major versions are supported. + Note that between major releases, the Go team often ships multiple minor versions. + + | | Current repo configuration | Desired repo configuration | |-------------|------------------------------------|---------------------------------------------------------------------------------------------------------------------| | Latest | ${{ steps.go-versions.outputs.latest }} | [${{ env.officialLatestVersion }}](https://go.dev/doc/devel/release#go${{ env.officialLatestVersion }}) | @@ -83,5 +82,5 @@ jobs: ```bash ./scripts/update-go-release-version.sh ${{ env.officialLatestVersion }} ${{ env.officialPenultimateVersion }} ``` - + - [ ] I have triggered CI on this PR (either close & reopen this PR in Github UI, or `git commit -m "run ci" --allow-empty && git push`) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 080e5217..ab69e25f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,11 +1,11 @@ name: CI on: push: - branches: ["v8"] + branches: ["v9"] paths-ignore: - "**.md" # Don't run CI on markdown changes. pull_request: - branches: ["v8", "feat/**"] + branches: ["v9", "feat/**"] paths-ignore: - "**.md" diff --git a/.github/workflows/daily-installation-test.yml b/.github/workflows/daily-installation-test.yml index f2dc0bac..90e9e93a 100644 --- a/.github/workflows/daily-installation-test.yml +++ b/.github/workflows/daily-installation-test.yml @@ -14,7 +14,7 @@ jobs: strategy: matrix: go-version: ${{ fromJson(needs.go-versions.outputs.matrix) }} - relay-major: ['v7', 'v8'] + relay-major: ['v7', 'v8', 'v9'] fail-fast: false steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/daily-integration-tests.yml b/.github/workflows/daily-integration-tests.yml index d93be7ab..e02ef3ee 100644 --- a/.github/workflows/daily-integration-tests.yml +++ b/.github/workflows/daily-integration-tests.yml @@ -20,7 +20,7 @@ jobs: fail-fast: false matrix: environment: ['staging', 'production'] - branch: ['v8'] + branch: ['v9'] uses: ./.github/workflows/integration-test.yml permissions: diff --git a/.github/workflows/daily-security-scan-alpine.yml b/.github/workflows/daily-security-scan-alpine.yml index 163d74b8..90590479 100644 --- a/.github/workflows/daily-security-scan-alpine.yml +++ b/.github/workflows/daily-security-scan-alpine.yml @@ -8,7 +8,7 @@ jobs: scan-relay: strategy: matrix: - tag: ['latest', 'latest-alpine', 'v8', 'v8-alpine'] + tag: ["latest", "latest-alpine", "v9", "v9-alpine"] fail-fast: false runs-on: ubuntu-latest permissions: diff --git a/.github/workflows/daily-security-scan-distroless.yml b/.github/workflows/daily-security-scan-distroless.yml index 568145cd..89aa913d 100644 --- a/.github/workflows/daily-security-scan-distroless.yml +++ b/.github/workflows/daily-security-scan-distroless.yml @@ -8,7 +8,7 @@ jobs: scan-relay: strategy: matrix: - tag: ['latest-static-debian12-nonroot', 'v8-static-debian12-debug-nonroot'] + tag: ['latest-static-debian12-nonroot', 'v9-static-debian12-debug-nonroot'] fail-fast: false runs-on: ubuntu-latest permissions: diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 05c50d9a..0f437565 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -3,7 +3,7 @@ name: Run Release Please on: push: branches: - - v8 + - v9 jobs: go-versions: diff --git a/config/config.go b/config/config.go index cdd3811e..d21171eb 100644 --- a/config/config.go +++ b/config/config.go @@ -4,7 +4,7 @@ import ( "time" ct "github.com/launchdarkly/go-configtypes" - "github.com/launchdarkly/ld-relay/v8/internal/logging" + "github.com/launchdarkly/ld-relay/v9/internal/logging" ) const ( diff --git a/docs/in-app.md b/docs/in-app.md index 8c4324f2..f900742a 100644 --- a/docs/in-app.md +++ b/docs/in-app.md @@ -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/v8/config" - "github.com/launchdarkly/ld-relay/v8/relay" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/relay" "github.com/launchdarkly/go-sdk-common/v3/ldlog" ) @@ -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/v8/config" + "github.com/launchdarkly/ld-relay/v9/config" configtypes "github.com/launchdarkly/go-configtypes" ) @@ -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/v8/config" + "github.com/launchdarkly/ld-relay/v9/config" "gopkg.in/gcfg.v1" ) diff --git a/go.mod b/go.mod index 42b728f6..fce559e7 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/launchdarkly/ld-relay/v8 +module github.com/launchdarkly/ld-relay/v9 go 1.25.0 diff --git a/integrationtests/api_helpers_test.go b/integrationtests/api_helpers_test.go index 69bf85b1..18eae30a 100644 --- a/integrationtests/api_helpers_test.go +++ b/integrationtests/api_helpers_test.go @@ -10,7 +10,7 @@ import ( "strings" "time" - "github.com/launchdarkly/ld-relay/v8/config" + "github.com/launchdarkly/ld-relay/v9/config" ldapi "github.com/launchdarkly/api-client-go/v13" "github.com/launchdarkly/go-sdk-common/v3/ldlog" @@ -130,7 +130,6 @@ func (a *apiHelper) createProject(numEnvironments int) (projectInfo, []environme PostProject(a.apiContext). ProjectPost(projectBody). Execute() - if err != nil { return projectInfo{}, nil, a.logResult("Create project", err) } @@ -178,6 +177,7 @@ func (f filterRules) ToOpaqueRep() []map[string]interface{} { } return opaqueRules } + func (a *apiHelper) createSpecificFilter(projKey string, filterKey string, rules filterRules) (string, error) { filterRep, _, err := a.apiClient.PayloadFiltersApi.PostPayloadFilters(a.apiContext, projKey).PostFilterRep(ldapi.PostFilterRep{ Key: filterKey, @@ -236,7 +236,6 @@ func (a *apiHelper) addEnvironment(project projectInfo) (environmentInfo, error) PostEnvironment(a.apiContext, project.key). EnvironmentPost(envBody). Execute() - if err != nil { return environmentInfo{}, a.logResult("Create environment", err) } @@ -256,7 +255,8 @@ func (a *apiHelper) deleteEnvironment(project projectInfo, env environmentInfo) } func (a *apiHelper) rotateSDKKey(project projectInfo, env environmentInfo, expirationTime time.Time) ( - config.SDKKey, error) { + config.SDKKey, error, +) { req := a.apiClient.EnvironmentsApi.ResetEnvironmentSDKKey(a.apiContext, project.key, env.key) if !expirationTime.IsZero() { req = req.Expiry(int64(ldtime.UnixMillisFromTime(expirationTime))) diff --git a/integrationtests/autoconfig_test.go b/integrationtests/autoconfig_test.go index b3973cac..88adb893 100644 --- a/integrationtests/autoconfig_test.go +++ b/integrationtests/autoconfig_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/api" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/api" "github.com/stretchr/testify/require" ) diff --git a/integrationtests/big_segments_test.go b/integrationtests/big_segments_test.go index 367acf58..3e742d6a 100644 --- a/integrationtests/big_segments_test.go +++ b/integrationtests/big_segments_test.go @@ -11,8 +11,8 @@ import ( "testing" "time" - "github.com/launchdarkly/ld-relay/v8/integrationtests/docker" - "github.com/launchdarkly/ld-relay/v8/internal/api" + "github.com/launchdarkly/ld-relay/v9/integrationtests/docker" + "github.com/launchdarkly/ld-relay/v9/internal/api" "github.com/launchdarkly/go-sdk-common/v3/ldvalue" diff --git a/integrationtests/build_relay_test.go b/integrationtests/build_relay_test.go index 60a1c792..2c8fa1a2 100644 --- a/integrationtests/build_relay_test.go +++ b/integrationtests/build_relay_test.go @@ -9,8 +9,8 @@ import ( "strings" "github.com/launchdarkly/go-sdk-common/v3/ldlog" - "github.com/launchdarkly/ld-relay/v8/integrationtests/docker" - "github.com/launchdarkly/ld-relay/v8/integrationtests/oshelpers" + "github.com/launchdarkly/ld-relay/v9/integrationtests/docker" + "github.com/launchdarkly/ld-relay/v9/integrationtests/oshelpers" ) const ( diff --git a/integrationtests/database_params_test.go b/integrationtests/database_params_test.go index 72f26316..f6b7b68c 100644 --- a/integrationtests/database_params_test.go +++ b/integrationtests/database_params_test.go @@ -8,8 +8,8 @@ import ( "reflect" "testing" - "github.com/launchdarkly/ld-relay/v8/integrationtests/docker" - "github.com/launchdarkly/ld-relay/v8/internal/api" + "github.com/launchdarkly/ld-relay/v9/integrationtests/docker" + "github.com/launchdarkly/ld-relay/v9/internal/api" "github.com/stretchr/testify/require" ) diff --git a/integrationtests/database_test.go b/integrationtests/database_test.go index 12aa6d35..22258a1f 100644 --- a/integrationtests/database_test.go +++ b/integrationtests/database_test.go @@ -5,8 +5,8 @@ package integrationtests import ( "testing" - "github.com/launchdarkly/ld-relay/v8/integrationtests/docker" - "github.com/launchdarkly/ld-relay/v8/internal/api" + "github.com/launchdarkly/ld-relay/v9/integrationtests/docker" + "github.com/launchdarkly/ld-relay/v9/internal/api" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/integrationtests/docker/docker_helpers.go b/integrationtests/docker/docker_helpers.go index 6fe75c11..4224b6ec 100644 --- a/integrationtests/docker/docker_helpers.go +++ b/integrationtests/docker/docker_helpers.go @@ -6,7 +6,7 @@ import ( "os" "strings" - "github.com/launchdarkly/ld-relay/v8/integrationtests/oshelpers" + "github.com/launchdarkly/ld-relay/v9/integrationtests/oshelpers" "github.com/launchdarkly/go-sdk-common/v3/ldvalue" @@ -45,9 +45,7 @@ type Network struct { host string } -var ( - defaultWriter = oshelpers.NewLogWriter(os.Stdout, "Docker") //nolint:gochecknoglobals -) +var defaultWriter = oshelpers.NewLogWriter(os.Stdout, "Docker") //nolint:gochecknoglobals func command(cmd string, args ...string) *oshelpers.CommandWrapper { //nolint:unparam return oshelpers.Command(cmd, args...).OutputWriter(defaultWriter) diff --git a/integrationtests/offline_mode_test.go b/integrationtests/offline_mode_test.go index a7b66f53..c84d8f2c 100644 --- a/integrationtests/offline_mode_test.go +++ b/integrationtests/offline_mode_test.go @@ -14,7 +14,7 @@ import ( "testing" "time" - "github.com/launchdarkly/ld-relay/v8/config" + "github.com/launchdarkly/ld-relay/v9/config" helpers "github.com/launchdarkly/go-test-helpers/v3" diff --git a/integrationtests/projects_and_environments_test.go b/integrationtests/projects_and_environments_test.go index af8f571c..15a2b0d9 100644 --- a/integrationtests/projects_and_environments_test.go +++ b/integrationtests/projects_and_environments_test.go @@ -5,7 +5,7 @@ package integrationtests import ( "strings" - "github.com/launchdarkly/ld-relay/v8/config" + "github.com/launchdarkly/ld-relay/v9/config" ) type projectInfo struct { diff --git a/integrationtests/test_manager_test.go b/integrationtests/test_manager_test.go index 8afc4bcc..e14ddfa9 100644 --- a/integrationtests/test_manager_test.go +++ b/integrationtests/test_manager_test.go @@ -17,12 +17,12 @@ import ( "testing" "time" - "github.com/launchdarkly/ld-relay/v8/internal/credential" + "github.com/launchdarkly/ld-relay/v9/internal/credential" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/integrationtests/docker" - "github.com/launchdarkly/ld-relay/v8/integrationtests/oshelpers" - "github.com/launchdarkly/ld-relay/v8/internal/api" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/integrationtests/docker" + "github.com/launchdarkly/ld-relay/v9/integrationtests/oshelpers" + "github.com/launchdarkly/ld-relay/v9/internal/api" ldapi "github.com/launchdarkly/api-client-go/v13" ct "github.com/launchdarkly/go-configtypes" @@ -143,7 +143,7 @@ func newIntegrationTestManager() (*integrationTestManager, error) { if err != nil { return nil, err } - if err := os.Chmod(relaySharedDir, 0755); err != nil { + if err := os.Chmod(relaySharedDir, 0o755); err != nil { return nil, err } @@ -457,7 +457,8 @@ func (m *integrationTestManager) getFlagValues(t *testing.T, proj projectInfo, e // getFlagPrerequisites fetches a payload from the given URL, which is expected to be a Relay polling evaluation // endpoint, and returns the "prerequisites" field of the flags in the payload. func (m *integrationTestManager) getFlagPrerequisites(t *testing.T, envKey string, - url *url.URL, auth credential.SDKCredential) ldvalue.Value { + url *url.URL, auth credential.SDKCredential, +) ldvalue.Value { req, err := http.NewRequest("GET", url.String(), nil) require.NoError(t, err) req.Header.Add("Authorization", auth.GetAuthorizationHeaderValue()) diff --git a/internal/application/server.go b/internal/application/server.go index afcb9570..65cb076a 100644 --- a/internal/application/server.go +++ b/internal/application/server.go @@ -10,8 +10,8 @@ import ( "syscall" "time" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/relay" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/relay" "github.com/launchdarkly/go-sdk-common/v3/ldlog" ) diff --git a/internal/application/server_test.go b/internal/application/server_test.go index 5190c918..393c95ce 100644 --- a/internal/application/server_test.go +++ b/internal/application/server_test.go @@ -13,9 +13,9 @@ import ( "testing" "time" - "github.com/launchdarkly/ld-relay/v8/config" - st "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" - "github.com/launchdarkly/ld-relay/v8/relay" + "github.com/launchdarkly/ld-relay/v9/config" + st "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" + "github.com/launchdarkly/ld-relay/v9/relay" ct "github.com/launchdarkly/go-configtypes" "github.com/launchdarkly/go-sdk-common/v3/ldlog" diff --git a/internal/autoconfig/message_handler.go b/internal/autoconfig/message_handler.go index 15b5a007..3c44d116 100644 --- a/internal/autoconfig/message_handler.go +++ b/internal/autoconfig/message_handler.go @@ -1,8 +1,8 @@ package autoconfig import ( - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/envfactory" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/envfactory" ) // MessageHandler defines the methods that StreamManager will call when it receives messages diff --git a/internal/autoconfig/stream_manager.go b/internal/autoconfig/stream_manager.go index ed6d1c10..095ef5e2 100644 --- a/internal/autoconfig/stream_manager.go +++ b/internal/autoconfig/stream_manager.go @@ -13,9 +13,9 @@ import ( es "github.com/launchdarkly/eventsource" "github.com/launchdarkly/go-sdk-common/v3/ldlog" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/envfactory" - "github.com/launchdarkly/ld-relay/v8/internal/httpconfig" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/envfactory" + "github.com/launchdarkly/ld-relay/v9/internal/httpconfig" ) const ( @@ -167,7 +167,6 @@ func (s *StreamManager) subscribe(readyCh chan<- error) { es.StreamOptionCanRetryFirstConnection(-1), es.StreamOptionLogger(s.loggers.ForLevel(ldlog.Info)), ) - if err != nil { s.loggers.Errorf(logMsgStreamOtherError, err) signalReady(err) diff --git a/internal/autoconfig/stream_manager_events_test.go b/internal/autoconfig/stream_manager_events_test.go index cb33b805..8eca619f 100644 --- a/internal/autoconfig/stream_manager_events_test.go +++ b/internal/autoconfig/stream_manager_events_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/launchdarkly/ld-relay/v8/internal/envfactory" + "github.com/launchdarkly/ld-relay/v9/internal/envfactory" "github.com/launchdarkly/go-sdk-common/v3/ldlog" @@ -12,7 +12,7 @@ import ( "github.com/stretchr/testify/require" "github.com/launchdarkly/go-test-helpers/v3/httphelpers" - "github.com/launchdarkly/ld-relay/v8/config" + "github.com/launchdarkly/ld-relay/v9/config" ) func TestEnvironmentPutEvent(t *testing.T) { @@ -393,7 +393,8 @@ func TestFilterPutEvent(t *testing.T) { assert.ElementsMatch(t, []envfactory.FilterParams{ testFilter1.ToTestParams(), - testFilter2.ToTestParams()}, + testFilter2.ToTestParams(), + }, []envfactory.FilterParams{ *msg3.addFilter, *msg4.addFilter, diff --git a/internal/autoconfig/stream_manager_test_base_test.go b/internal/autoconfig/stream_manager_test_base_test.go index b5a05e6b..d620d84a 100644 --- a/internal/autoconfig/stream_manager_test_base_test.go +++ b/internal/autoconfig/stream_manager_test_base_test.go @@ -9,9 +9,9 @@ import ( "testing" "time" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/envfactory" - "github.com/launchdarkly/ld-relay/v8/internal/httpconfig" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/envfactory" + "github.com/launchdarkly/ld-relay/v9/internal/httpconfig" "github.com/launchdarkly/go-sdk-common/v3/ldlog" "github.com/launchdarkly/go-sdk-common/v3/ldlogtest" diff --git a/internal/autoconfig/stream_messages.go b/internal/autoconfig/stream_messages.go index 72a01566..8b9e43ea 100644 --- a/internal/autoconfig/stream_messages.go +++ b/internal/autoconfig/stream_messages.go @@ -3,8 +3,8 @@ package autoconfig import ( "encoding/json" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/envfactory" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/envfactory" ) // These SSE message types are exported so that tests in other packages can more easily create diff --git a/internal/bigsegments/store.go b/internal/bigsegments/store.go index a70319f3..a34fc7c4 100644 --- a/internal/bigsegments/store.go +++ b/internal/bigsegments/store.go @@ -3,7 +3,7 @@ package bigsegments import ( "io" - "github.com/launchdarkly/ld-relay/v8/config" + "github.com/launchdarkly/ld-relay/v9/config" "github.com/launchdarkly/go-sdk-common/v3/ldlog" "github.com/launchdarkly/go-sdk-common/v3/ldtime" diff --git a/internal/bigsegments/store_dynamodb.go b/internal/bigsegments/store_dynamodb.go index 15eae8b1..0470b267 100644 --- a/internal/bigsegments/store_dynamodb.go +++ b/internal/bigsegments/store_dynamodb.go @@ -5,8 +5,8 @@ import ( "errors" "strconv" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/sdks" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/sdks" "github.com/launchdarkly/go-sdk-common/v3/ldlog" "github.com/launchdarkly/go-sdk-common/v3/ldtime" diff --git a/internal/bigsegments/store_dynamodb_test.go b/internal/bigsegments/store_dynamodb_test.go index f745e569..c919660f 100644 --- a/internal/bigsegments/store_dynamodb_test.go +++ b/internal/bigsegments/store_dynamodb_test.go @@ -12,7 +12,7 @@ import ( "testing" "time" - "github.com/launchdarkly/ld-relay/v8/config" + "github.com/launchdarkly/ld-relay/v9/config" "github.com/launchdarkly/go-sdk-common/v3/ldlog" diff --git a/internal/bigsegments/store_redis.go b/internal/bigsegments/store_redis.go index b1cf5264..17bb0994 100644 --- a/internal/bigsegments/store_redis.go +++ b/internal/bigsegments/store_redis.go @@ -6,8 +6,8 @@ import ( "fmt" "strconv" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/sdks" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/sdks" "github.com/launchdarkly/go-sdk-common/v3/ldlog" "github.com/launchdarkly/go-sdk-common/v3/ldtime" diff --git a/internal/bigsegments/store_redis_test.go b/internal/bigsegments/store_redis_test.go index 7502adbf..85cbb032 100644 --- a/internal/bigsegments/store_redis_test.go +++ b/internal/bigsegments/store_redis_test.go @@ -7,7 +7,7 @@ import ( "context" "testing" - "github.com/launchdarkly/ld-relay/v8/config" + "github.com/launchdarkly/ld-relay/v9/config" "github.com/launchdarkly/go-configtypes" "github.com/launchdarkly/go-sdk-common/v3/ldlog" diff --git a/internal/bigsegments/sync.go b/internal/bigsegments/sync.go index 1b3fbfbf..5b04972b 100644 --- a/internal/bigsegments/sync.go +++ b/internal/bigsegments/sync.go @@ -9,8 +9,8 @@ import ( "sync" "time" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/httpconfig" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/httpconfig" es "github.com/launchdarkly/eventsource" "github.com/launchdarkly/go-sdk-common/v3/ldlog" diff --git a/internal/bigsegments/sync_test.go b/internal/bigsegments/sync_test.go index 585065c6..93bc9159 100644 --- a/internal/bigsegments/sync_test.go +++ b/internal/bigsegments/sync_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" "github.com/launchdarkly/go-sdk-common/v3/ldlog" "github.com/launchdarkly/go-sdk-common/v3/ldlogtest" diff --git a/internal/browser/cors.go b/internal/browser/cors.go index 10d0b90e..e327f431 100644 --- a/internal/browser/cors.go +++ b/internal/browser/cors.go @@ -5,7 +5,7 @@ import ( "net/http" "strings" - "github.com/launchdarkly/ld-relay/v8/internal/events" + "github.com/launchdarkly/ld-relay/v9/internal/events" ) const ( diff --git a/internal/credential/rotator.go b/internal/credential/rotator.go index da9b167f..1df04f62 100644 --- a/internal/credential/rotator.go +++ b/internal/credential/rotator.go @@ -6,7 +6,7 @@ import ( "time" "github.com/launchdarkly/go-sdk-common/v3/ldlog" - "github.com/launchdarkly/ld-relay/v8/config" + "github.com/launchdarkly/ld-relay/v9/config" ) type Rotator struct { diff --git a/internal/credential/rotator_test.go b/internal/credential/rotator_test.go index 1cb23336..f7ea8d1c 100644 --- a/internal/credential/rotator_test.go +++ b/internal/credential/rotator_test.go @@ -6,7 +6,7 @@ import ( "time" "github.com/launchdarkly/go-sdk-common/v3/ldlogtest" - "github.com/launchdarkly/ld-relay/v8/config" + "github.com/launchdarkly/ld-relay/v9/config" "github.com/stretchr/testify/assert" ) @@ -68,7 +68,6 @@ func TestImmediateKeyExpiration(t *testing.T) { } func TestManyImmediateKeyExpirations(t *testing.T) { - kinds := []struct { name string makeKey func(string) SDKCredential diff --git a/internal/datadestination/datadestination.go b/internal/datadestination/datadestination.go index 3d5f4635..1e8383e1 100644 --- a/internal/datadestination/datadestination.go +++ b/internal/datadestination/datadestination.go @@ -4,7 +4,7 @@ import ( "sync" "github.com/launchdarkly/go-server-sdk/v7/subsystems" - "github.com/launchdarkly/ld-relay/v8/internal/streams" + "github.com/launchdarkly/ld-relay/v9/internal/streams" ) func NewDataDesinationWrapper(updates streams.EnvStreamUpdates) *DataDestinationWrapper { diff --git a/internal/envfactory/env_config_factory.go b/internal/envfactory/env_config_factory.go index 025fb867..a49b1c5e 100644 --- a/internal/envfactory/env_config_factory.go +++ b/internal/envfactory/env_config_factory.go @@ -3,7 +3,7 @@ package envfactory import ( "strings" - "github.com/launchdarkly/ld-relay/v8/config" + "github.com/launchdarkly/ld-relay/v9/config" ct "github.com/launchdarkly/go-configtypes" ) diff --git a/internal/envfactory/env_params.go b/internal/envfactory/env_params.go index d0230c3f..0d90aa72 100644 --- a/internal/envfactory/env_params.go +++ b/internal/envfactory/env_params.go @@ -3,8 +3,8 @@ package envfactory import ( "time" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/relayenv" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/relayenv" ) // EnvironmentParams contains environment-specific information obtained from LaunchDarkly which diff --git a/internal/envfactory/env_rep.go b/internal/envfactory/env_rep.go index 3d46cced..b0179937 100644 --- a/internal/envfactory/env_rep.go +++ b/internal/envfactory/env_rep.go @@ -5,8 +5,8 @@ import ( "time" "github.com/launchdarkly/go-sdk-common/v3/ldtime" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/relayenv" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/relayenv" ) // These representation types are used by both the autoconfig package and the filedata package, diff --git a/internal/envfactory/env_rep_test.go b/internal/envfactory/env_rep_test.go index b46e7566..a0e9956a 100644 --- a/internal/envfactory/env_rep_test.go +++ b/internal/envfactory/env_rep_test.go @@ -5,8 +5,8 @@ import ( "testing" "time" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/relayenv" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/relayenv" "github.com/launchdarkly/go-sdk-common/v3/ldtime" @@ -53,7 +53,8 @@ func TestEnvironmentRepToParams(t *testing.T) { Expiring: ExpiringKeyRep{ Value: config.SDKKey("oldkey"), Timestamp: ldtime.UnixMillisecondTime(10000), - }}, + }, + }, } params2 := env2.ToParams() assert.Equal(t, EnvironmentParams{ diff --git a/internal/events/event-relay.go b/internal/events/event-relay.go index c657301a..90c02b1a 100644 --- a/internal/events/event-relay.go +++ b/internal/events/event-relay.go @@ -8,14 +8,14 @@ import ( "sync" "time" - "github.com/launchdarkly/ld-relay/v8/internal/credential" - "github.com/launchdarkly/ld-relay/v8/internal/datadestination" + "github.com/launchdarkly/ld-relay/v9/internal/credential" + "github.com/launchdarkly/ld-relay/v9/internal/datadestination" - c "github.com/launchdarkly/ld-relay/v8/config" + c "github.com/launchdarkly/ld-relay/v9/config" - "github.com/launchdarkly/ld-relay/v8/internal/basictypes" - "github.com/launchdarkly/ld-relay/v8/internal/httpconfig" - "github.com/launchdarkly/ld-relay/v8/internal/util" + "github.com/launchdarkly/ld-relay/v9/internal/basictypes" + "github.com/launchdarkly/ld-relay/v9/internal/httpconfig" + "github.com/launchdarkly/ld-relay/v9/internal/util" "github.com/launchdarkly/go-configtypes" "github.com/launchdarkly/go-sdk-common/v3/ldlog" diff --git a/internal/events/event-relay_test.go b/internal/events/event-relay_test.go index a1e2ded3..bc23ff8b 100644 --- a/internal/events/event-relay_test.go +++ b/internal/events/event-relay_test.go @@ -9,16 +9,16 @@ import ( "time" "github.com/launchdarkly/go-server-sdk/v7/subsystems" - "github.com/launchdarkly/ld-relay/v8/internal/sharedtest/testclient" + "github.com/launchdarkly/ld-relay/v9/internal/sharedtest/testclient" - "github.com/launchdarkly/ld-relay/v8/internal/credential" - "github.com/launchdarkly/ld-relay/v8/internal/datadestination" - "github.com/launchdarkly/ld-relay/v8/internal/util" + "github.com/launchdarkly/ld-relay/v9/internal/credential" + "github.com/launchdarkly/ld-relay/v9/internal/datadestination" + "github.com/launchdarkly/ld-relay/v9/internal/util" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/basictypes" - "github.com/launchdarkly/ld-relay/v8/internal/httpconfig" - st "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/basictypes" + "github.com/launchdarkly/ld-relay/v9/internal/httpconfig" + st "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" "github.com/launchdarkly/go-configtypes" "github.com/launchdarkly/go-sdk-common/v3/ldlog" diff --git a/internal/events/event_publisher.go b/internal/events/event_publisher.go index 833f40d6..73fe5796 100644 --- a/internal/events/event_publisher.go +++ b/internal/events/event_publisher.go @@ -10,9 +10,9 @@ import ( "sync" "time" - "github.com/launchdarkly/ld-relay/v8/internal/credential" + "github.com/launchdarkly/ld-relay/v9/internal/credential" - "github.com/launchdarkly/ld-relay/v8/internal/httpconfig" + "github.com/launchdarkly/ld-relay/v9/internal/httpconfig" "github.com/launchdarkly/go-sdk-common/v3/ldlog" ldevents "github.com/launchdarkly/go-sdk-events/v3" @@ -25,9 +25,7 @@ const ( defaultEventsURIPath = "/bulk" ) -var ( - defaultEventsBaseURI, _ = url.Parse("https://events.launchdarkly.com") //nolint:gochecknoglobals -) +var defaultEventsBaseURI, _ = url.Parse("https://events.launchdarkly.com") //nolint:gochecknoglobals // EventPublisher is the interface for the component that buffers events and delivers them to LaunchDarkly. // Events are treated as raw JSON data; the component does not do any parsing or transformation of them. diff --git a/internal/events/event_publisher_test.go b/internal/events/event_publisher_test.go index 308561b3..82a37fb5 100644 --- a/internal/events/event_publisher_test.go +++ b/internal/events/event_publisher_test.go @@ -10,9 +10,9 @@ import ( "testing" "time" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/httpconfig" - "github.com/launchdarkly/ld-relay/v8/internal/util" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/httpconfig" + "github.com/launchdarkly/ld-relay/v9/internal/util" "github.com/launchdarkly/go-sdk-common/v3/ldlog" "github.com/launchdarkly/go-sdk-common/v3/ldlogtest" diff --git a/internal/events/oldevents/translate_events_test.go b/internal/events/oldevents/translate_events_test.go index fc8f7170..f9032c27 100644 --- a/internal/events/oldevents/translate_events_test.go +++ b/internal/events/oldevents/translate_events_test.go @@ -4,7 +4,7 @@ import ( "errors" "testing" - st "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" + st "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" "github.com/launchdarkly/go-sdk-common/v3/ldcontext" "github.com/launchdarkly/go-sdk-common/v3/ldtime" diff --git a/internal/events/summarizing-relay.go b/internal/events/summarizing-relay.go index 055dc473..efaea8c7 100644 --- a/internal/events/summarizing-relay.go +++ b/internal/events/summarizing-relay.go @@ -8,12 +8,12 @@ import ( "time" "github.com/launchdarkly/go-server-sdk/v7/ldcomponents" - "github.com/launchdarkly/ld-relay/v8/internal/credential" - "github.com/launchdarkly/ld-relay/v8/internal/datadestination" + "github.com/launchdarkly/ld-relay/v9/internal/credential" + "github.com/launchdarkly/ld-relay/v9/internal/datadestination" - c "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/events/oldevents" - "github.com/launchdarkly/ld-relay/v8/internal/httpconfig" + c "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/events/oldevents" + "github.com/launchdarkly/ld-relay/v9/internal/httpconfig" "github.com/launchdarkly/go-sdk-common/v3/ldlog" ldevents "github.com/launchdarkly/go-sdk-events/v3" diff --git a/internal/events/summarizing-relay_test.go b/internal/events/summarizing-relay_test.go index 141b4561..d1bfe87b 100644 --- a/internal/events/summarizing-relay_test.go +++ b/internal/events/summarizing-relay_test.go @@ -11,10 +11,10 @@ import ( "github.com/launchdarkly/go-server-sdk/v7/subsystems" "github.com/launchdarkly/go-server-sdk/v7/subsystems/ldstoreimpl" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/basictypes" - st "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" - "github.com/launchdarkly/ld-relay/v8/internal/util" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/basictypes" + st "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" + "github.com/launchdarkly/ld-relay/v9/internal/util" ldevents "github.com/launchdarkly/go-sdk-events/v3" helpers "github.com/launchdarkly/go-test-helpers/v3" diff --git a/internal/filedata/archive_manager.go b/internal/filedata/archive_manager.go index cd7ca634..91e2df87 100644 --- a/internal/filedata/archive_manager.go +++ b/internal/filedata/archive_manager.go @@ -7,7 +7,7 @@ import ( "time" "github.com/launchdarkly/go-sdk-common/v3/ldlog" - "github.com/launchdarkly/ld-relay/v8/config" + "github.com/launchdarkly/ld-relay/v9/config" ) const ( diff --git a/internal/filedata/archive_manager_test_base_test.go b/internal/filedata/archive_manager_test_base_test.go index 073530eb..d16c5583 100644 --- a/internal/filedata/archive_manager_test_base_test.go +++ b/internal/filedata/archive_manager_test_base_test.go @@ -8,7 +8,7 @@ import ( "testing" "time" - "github.com/launchdarkly/ld-relay/v8/config" + "github.com/launchdarkly/ld-relay/v9/config" "github.com/launchdarkly/go-sdk-common/v3/ldlog" "github.com/launchdarkly/go-sdk-common/v3/ldlogtest" diff --git a/internal/filedata/archive_reader.go b/internal/filedata/archive_reader.go index f0527b53..6defafbc 100644 --- a/internal/filedata/archive_reader.go +++ b/internal/filedata/archive_reader.go @@ -15,8 +15,8 @@ import ( "sort" "strings" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/envfactory" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/envfactory" "github.com/launchdarkly/go-server-sdk/v7/subsystems/ldstoreimpl" "github.com/launchdarkly/go-server-sdk/v7/subsystems/ldstoretypes" diff --git a/internal/filedata/archive_reader_test.go b/internal/filedata/archive_reader_test.go index e24f4ec9..cdc27f29 100644 --- a/internal/filedata/archive_reader_test.go +++ b/internal/filedata/archive_reader_test.go @@ -5,7 +5,7 @@ import ( "sort" "testing" - "github.com/launchdarkly/ld-relay/v8/config" + "github.com/launchdarkly/ld-relay/v9/config" helpers "github.com/launchdarkly/go-test-helpers/v3" @@ -85,7 +85,7 @@ func TestEnvironmentHasMalformedMetadata(t *testing.T) { helpers.WithTempFile(func(filePath string) { writeArchive(t, filePath, false, func(dirPath string) { badData := []byte("whatever") - require.NoError(t, os.WriteFile(envMetadataFilePath(dirPath, testEnv1.id()), badData, 0600)) + require.NoError(t, os.WriteFile(envMetadataFilePath(dirPath, testEnv1.id()), badData, 0o600)) rehash(dirPath, testEnv1.id()) }, testEnv1) ar, err := newArchiveReader(filePath) diff --git a/internal/filedata/testdata_test.go b/internal/filedata/testdata_test.go index 1479b1eb..1e233513 100644 --- a/internal/filedata/testdata_test.go +++ b/internal/filedata/testdata_test.go @@ -13,8 +13,8 @@ import ( "testing" "time" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/envfactory" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/envfactory" "github.com/launchdarkly/go-server-sdk-evaluation/v3/ldbuilders" "github.com/launchdarkly/go-server-sdk/v7/subsystems/ldstoretypes" @@ -154,15 +154,15 @@ func withTestData(fn func(dirPath string), envs ...testEnv) { if err != nil { panic(err) } - os.WriteFile(envMetadataFilePath(dirPath, te.rep.EnvID), fileData, 0600) - os.WriteFile(envSDKDataFilePath(dirPath, te.rep.EnvID), te.sdkDataJSON(), 0600) + os.WriteFile(envMetadataFilePath(dirPath, te.rep.EnvID), fileData, 0o600) + os.WriteFile(envSDKDataFilePath(dirPath, te.rep.EnvID), te.sdkDataJSON(), 0o600) h.Write(fileData) } checksum, err := computeEnvironmentsChecksum(dirPath, envIDs) if err != nil { panic(err) } - err = os.WriteFile(checksumFilePath(dirPath), checksum, 0600) + err = os.WriteFile(checksumFilePath(dirPath), checksum, 0o600) if err != nil { panic(err) } @@ -181,7 +181,7 @@ func writeAtomicArchive(t *testing.T, filePath string, compressed bool, modifyFn func writeArchive(t *testing.T, filePath string, compressed bool, modifyFn func(dirPath string), envs ...testEnv) { _ = os.Remove(filePath) - destFile, err := os.OpenFile(filePath, os.O_CREATE|os.O_RDWR, 0600) + destFile, err := os.OpenFile(filePath, os.O_CREATE|os.O_RDWR, 0o600) require.NoError(t, err) var tarWriter *tar.Writer @@ -232,7 +232,7 @@ func writeArchive(t *testing.T, filePath string, compressed bool, modifyFn func( func writeMalformedArchive(filePath string) { _ = os.Remove(filePath) data := []byte("not valid") - err := os.WriteFile(filePath, data, 0600) + err := os.WriteFile(filePath, data, 0o600) if err != nil { panic(err) } @@ -247,7 +247,7 @@ func removeChecksumFileFromArchive(dirPath string) { } func makeChecksumFileInvalidInArchive(dirPath string) { - f, err := os.OpenFile(checksumFilePath(dirPath), os.O_APPEND|os.O_WRONLY, 0600) + f, err := os.OpenFile(checksumFilePath(dirPath), os.O_APPEND|os.O_WRONLY, 0o600) if err != nil { panic(err) } @@ -263,7 +263,7 @@ func rehash(dirPath string, envIDs ...config.EnvironmentID) { if err != nil { panic(err) } - err = os.WriteFile(checksumFilePath(dirPath), newHash, 0660) + err = os.WriteFile(checksumFilePath(dirPath), newHash, 0o660) if err != nil { panic(err) } diff --git a/internal/filedata/update_handler.go b/internal/filedata/update_handler.go index 27df6de0..5875fdd5 100644 --- a/internal/filedata/update_handler.go +++ b/internal/filedata/update_handler.go @@ -1,8 +1,8 @@ package filedata import ( - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/envfactory" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/envfactory" "github.com/launchdarkly/go-server-sdk/v7/subsystems/ldstoretypes" ) diff --git a/internal/httpconfig/httpconfig.go b/internal/httpconfig/httpconfig.go index 4ed0463a..4ba2ce02 100644 --- a/internal/httpconfig/httpconfig.go +++ b/internal/httpconfig/httpconfig.go @@ -5,9 +5,9 @@ import ( "errors" "net/http" - "github.com/launchdarkly/ld-relay/v8/internal/credential" + "github.com/launchdarkly/ld-relay/v9/internal/credential" - "github.com/launchdarkly/ld-relay/v8/config" + "github.com/launchdarkly/ld-relay/v9/config" "github.com/launchdarkly/go-sdk-common/v3/ldlog" "github.com/launchdarkly/go-server-sdk/v7/ldcomponents" diff --git a/internal/httpconfig/httpconfig_test.go b/internal/httpconfig/httpconfig_test.go index 65b63157..70409efd 100644 --- a/internal/httpconfig/httpconfig_test.go +++ b/internal/httpconfig/httpconfig_test.go @@ -8,7 +8,7 @@ import ( "os" "testing" - "github.com/launchdarkly/ld-relay/v8/config" + "github.com/launchdarkly/ld-relay/v9/config" "github.com/launchdarkly/go-configtypes" "github.com/launchdarkly/go-sdk-common/v3/ldlog" diff --git a/internal/metrics/metrics.go b/internal/metrics/metrics.go index 6a0e057a..23d4c48b 100644 --- a/internal/metrics/metrics.go +++ b/internal/metrics/metrics.go @@ -7,8 +7,8 @@ import ( "time" "github.com/launchdarkly/go-sdk-common/v3/ldlog" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/events" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/events" "github.com/pborman/uuid" "go.opentelemetry.io/contrib/instrumentation/runtime" diff --git a/internal/metrics/metrics_test.go b/internal/metrics/metrics_test.go index 3d4954f9..05c0e20b 100644 --- a/internal/metrics/metrics_test.go +++ b/internal/metrics/metrics_test.go @@ -5,7 +5,7 @@ import ( "testing" "time" - "github.com/launchdarkly/ld-relay/v8/config" + "github.com/launchdarkly/ld-relay/v9/config" "github.com/launchdarkly/go-sdk-common/v3/ldlog" diff --git a/internal/metrics/otlp.go b/internal/metrics/otlp.go index a006bb47..be6f89ba 100644 --- a/internal/metrics/otlp.go +++ b/internal/metrics/otlp.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/launchdarkly/go-sdk-common/v3/ldlog" - "github.com/launchdarkly/ld-relay/v8/config" + "github.com/launchdarkly/ld-relay/v9/config" "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc" "go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp" diff --git a/internal/metrics/relay_metrics_collector.go b/internal/metrics/relay_metrics_collector.go index d59b3c29..acf01069 100644 --- a/internal/metrics/relay_metrics_collector.go +++ b/internal/metrics/relay_metrics_collector.go @@ -7,7 +7,7 @@ import ( "github.com/launchdarkly/go-sdk-common/v3/ldlog" "github.com/launchdarkly/go-sdk-common/v3/ldtime" - "github.com/launchdarkly/ld-relay/v8/internal/events" + "github.com/launchdarkly/ld-relay/v9/internal/events" ) type currentConnectionsMetric struct { diff --git a/internal/metrics/test_utils_test.go b/internal/metrics/test_utils_test.go index af62dbb3..95be54e7 100644 --- a/internal/metrics/test_utils_test.go +++ b/internal/metrics/test_utils_test.go @@ -6,13 +6,13 @@ import ( "testing" "time" - "github.com/launchdarkly/ld-relay/v8/internal/credential" + "github.com/launchdarkly/ld-relay/v9/internal/credential" "github.com/pborman/uuid" "github.com/stretchr/testify/require" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/events" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/events" "github.com/launchdarkly/go-sdk-common/v3/ldlogtest" helpers "github.com/launchdarkly/go-test-helpers/v3" diff --git a/internal/metrics/usage.go b/internal/metrics/usage.go index 93052343..d0c313d3 100644 --- a/internal/metrics/usage.go +++ b/internal/metrics/usage.go @@ -5,7 +5,7 @@ import ( "time" "github.com/launchdarkly/go-sdk-common/v3/ldtime" - "github.com/launchdarkly/ld-relay/v8/internal/events" + "github.com/launchdarkly/ld-relay/v9/internal/events" ) const relayUsageKind = "relayUsage" @@ -50,8 +50,10 @@ type usageActivityMessage struct { tagsHeader string } -type usageActivityFlush struct{} -type usageActivityShutdown struct{} +type ( + usageActivityFlush struct{} + usageActivityShutdown struct{} +) // metricUsage is used to track usage information for a single // user+platform+instance combination. diff --git a/internal/middleware/context.go b/internal/middleware/context.go index 9b6feb74..d354bea7 100644 --- a/internal/middleware/context.go +++ b/internal/middleware/context.go @@ -3,9 +3,9 @@ package middleware import ( "context" - "github.com/launchdarkly/ld-relay/v8/internal/credential" + "github.com/launchdarkly/ld-relay/v9/internal/credential" - "github.com/launchdarkly/ld-relay/v8/internal/relayenv" + "github.com/launchdarkly/ld-relay/v9/internal/relayenv" ) type contextKeyType string diff --git a/internal/middleware/context_test.go b/internal/middleware/context_test.go index c3ca14f4..bcc1d8ba 100644 --- a/internal/middleware/context_test.go +++ b/internal/middleware/context_test.go @@ -4,8 +4,8 @@ import ( "context" "testing" - "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" - "github.com/launchdarkly/ld-relay/v8/internal/sharedtest/testenv" + "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" + "github.com/launchdarkly/ld-relay/v9/internal/sharedtest/testenv" "github.com/stretchr/testify/assert" ) diff --git a/internal/middleware/metrics_middleware.go b/internal/middleware/metrics_middleware.go index 602fdd59..0cfdaf15 100644 --- a/internal/middleware/metrics_middleware.go +++ b/internal/middleware/metrics_middleware.go @@ -6,10 +6,10 @@ import ( "sync/atomic" "time" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/credential" - "github.com/launchdarkly/ld-relay/v8/internal/metrics" - "github.com/launchdarkly/ld-relay/v8/internal/relayenv" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/credential" + "github.com/launchdarkly/ld-relay/v9/internal/metrics" + "github.com/launchdarkly/ld-relay/v9/internal/relayenv" "github.com/gorilla/mux" ) diff --git a/internal/middleware/metrics_middleware_test.go b/internal/middleware/metrics_middleware_test.go index 7696044c..ce9a11cd 100644 --- a/internal/middleware/metrics_middleware_test.go +++ b/internal/middleware/metrics_middleware_test.go @@ -9,11 +9,11 @@ import ( "testing" "time" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/metrics" - "github.com/launchdarkly/ld-relay/v8/internal/relayenv" - st "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" - "github.com/launchdarkly/ld-relay/v8/internal/sharedtest/testclient" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/metrics" + "github.com/launchdarkly/ld-relay/v9/internal/relayenv" + st "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" + "github.com/launchdarkly/ld-relay/v9/internal/sharedtest/testclient" "github.com/launchdarkly/go-sdk-common/v3/ldlogtest" diff --git a/internal/middleware/middleware.go b/internal/middleware/middleware.go index 26aedd22..97ab4c00 100644 --- a/internal/middleware/middleware.go +++ b/internal/middleware/middleware.go @@ -9,15 +9,15 @@ import ( ct "github.com/launchdarkly/go-configtypes" - "github.com/launchdarkly/ld-relay/v8/internal/sdkauth" - "github.com/launchdarkly/ld-relay/v8/internal/util" - - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/basictypes" - "github.com/launchdarkly/ld-relay/v8/internal/browser" - "github.com/launchdarkly/ld-relay/v8/internal/credential" - "github.com/launchdarkly/ld-relay/v8/internal/relayenv" - "github.com/launchdarkly/ld-relay/v8/internal/sdks" + "github.com/launchdarkly/ld-relay/v9/internal/sdkauth" + "github.com/launchdarkly/ld-relay/v9/internal/util" + + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/basictypes" + "github.com/launchdarkly/ld-relay/v9/internal/browser" + "github.com/launchdarkly/ld-relay/v9/internal/credential" + "github.com/launchdarkly/ld-relay/v9/internal/relayenv" + "github.com/launchdarkly/ld-relay/v9/internal/sdks" "github.com/launchdarkly/go-sdk-common/v3/ldcontext" ld "github.com/launchdarkly/go-server-sdk/v7" diff --git a/internal/middleware/middleware_test.go b/internal/middleware/middleware_test.go index fa074683..c1b44e7a 100644 --- a/internal/middleware/middleware_test.go +++ b/internal/middleware/middleware_test.go @@ -9,18 +9,18 @@ import ( "strings" "testing" - "github.com/launchdarkly/ld-relay/v8/config" + "github.com/launchdarkly/ld-relay/v9/config" - "github.com/launchdarkly/ld-relay/v8/internal/sdkauth" + "github.com/launchdarkly/ld-relay/v9/internal/sdkauth" - "github.com/launchdarkly/ld-relay/v8/internal/credential" + "github.com/launchdarkly/ld-relay/v9/internal/credential" - "github.com/launchdarkly/ld-relay/v8/internal/basictypes" - "github.com/launchdarkly/ld-relay/v8/internal/browser" - "github.com/launchdarkly/ld-relay/v8/internal/relayenv" - st "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" - "github.com/launchdarkly/ld-relay/v8/internal/sharedtest/testclient" - "github.com/launchdarkly/ld-relay/v8/internal/sharedtest/testenv" + "github.com/launchdarkly/ld-relay/v9/internal/basictypes" + "github.com/launchdarkly/ld-relay/v9/internal/browser" + "github.com/launchdarkly/ld-relay/v9/internal/relayenv" + st "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" + "github.com/launchdarkly/ld-relay/v9/internal/sharedtest/testclient" + "github.com/launchdarkly/ld-relay/v9/internal/sharedtest/testenv" "github.com/launchdarkly/go-sdk-common/v3/ldcontext" @@ -59,9 +59,11 @@ type testEnvironments struct { notInited bool } -var errNotReady = errors.New("not ready") -var errUnrecognized = errors.New("unrecognized environment") -var errPayloadFilterNotFound = errors.New("unrecognized payload filter") +var ( + errNotReady = errors.New("not ready") + errUnrecognized = errors.New("unrecognized environment") + errPayloadFilterNotFound = errors.New("unrecognized payload filter") +) func (t testEnvironments) GetEnvironment(c sdkauth.ScopedCredential) (relayenv.EnvContext, error) { if t.notInited { diff --git a/internal/middleware/usage_middleware.go b/internal/middleware/usage_middleware.go index 3da1f981..cab79656 100644 --- a/internal/middleware/usage_middleware.go +++ b/internal/middleware/usage_middleware.go @@ -4,7 +4,7 @@ import ( "net/http" "github.com/gorilla/mux" - "github.com/launchdarkly/ld-relay/v8/internal/events" + "github.com/launchdarkly/ld-relay/v9/internal/events" ) // DynamicTrackUsageActivity is like TrackUsageActivity but determines the platform category diff --git a/internal/projmanager/environment_manager.go b/internal/projmanager/environment_manager.go index 4529d592..b22108e1 100644 --- a/internal/projmanager/environment_manager.go +++ b/internal/projmanager/environment_manager.go @@ -4,8 +4,8 @@ import ( "fmt" "github.com/launchdarkly/go-sdk-common/v3/ldlog" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/envfactory" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/envfactory" ) type EnvironmentActions interface { diff --git a/internal/projmanager/environment_manager_test.go b/internal/projmanager/environment_manager_test.go index 08253f86..f56cc4e0 100644 --- a/internal/projmanager/environment_manager_test.go +++ b/internal/projmanager/environment_manager_test.go @@ -6,8 +6,8 @@ import ( "github.com/launchdarkly/go-sdk-common/v3/ldlog" "github.com/launchdarkly/go-sdk-common/v3/ldlogtest" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/envfactory" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/envfactory" "github.com/stretchr/testify/require" ) @@ -78,7 +78,6 @@ func TestEnvManager_NewManagerIsEmpty(t *testing.T) { } func TestEnvManager_AddFilters(t *testing.T) { - t.Run("adding filters is reflected in state", func(t *testing.T) { mockLog := ldlogtest.NewMockLog() defer mockLog.DumpIfTestFailed(t) @@ -136,11 +135,10 @@ func TestEnvManager_AddFilters(t *testing.T) { require.ElementsMatch(t, spy.added, expectedEnvs) } }) - } + func TestEnvManager_DeleteFilters(t *testing.T) { t.Run("after adding and removing same filters, state reflects no filters", func(t *testing.T) { - mockLog := ldlogtest.NewMockLog() defer mockLog.DumpIfTestFailed(t) mockLog.Loggers.SetMinLevel(ldlog.Debug) @@ -209,7 +207,6 @@ func TestEnvManager_DeleteFilters(t *testing.T) { func TestEnvironmentManager_AddEnvironment(t *testing.T) { t.Run("adding environments is reflected in state", func(t *testing.T) { - mockLog := ldlogtest.NewMockLog() defer mockLog.DumpIfTestFailed(t) mockLog.Loggers.SetMinLevel(ldlog.Debug) @@ -392,7 +389,6 @@ func TestEnvironmentManager_UpdateEnvironment(t *testing.T) { m.UpdateEnvironment(makeEnv("unknown", "proj")) require.Len(t, spy.updated, 0) }) - } func TestEnvironmentManager_SimpleFilterCombination(t *testing.T) { diff --git a/internal/projmanager/project_router.go b/internal/projmanager/project_router.go index 276cb278..f5f2f517 100644 --- a/internal/projmanager/project_router.go +++ b/internal/projmanager/project_router.go @@ -2,9 +2,9 @@ package projmanager import ( "github.com/launchdarkly/go-sdk-common/v3/ldlog" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/autoconfig" - "github.com/launchdarkly/ld-relay/v8/internal/envfactory" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/autoconfig" + "github.com/launchdarkly/ld-relay/v9/internal/envfactory" ) var _ autoconfig.MessageHandler = &ProjectRouter{} diff --git a/internal/projmanager/project_router_test.go b/internal/projmanager/project_router_test.go index 23e6482b..9538a6c6 100644 --- a/internal/projmanager/project_router_test.go +++ b/internal/projmanager/project_router_test.go @@ -7,9 +7,9 @@ import ( "github.com/launchdarkly/go-sdk-common/v3/ldlog" "github.com/launchdarkly/go-sdk-common/v3/ldlogtest" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/envfactory" - "github.com/launchdarkly/ld-relay/v8/internal/relayenv" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/envfactory" + "github.com/launchdarkly/ld-relay/v9/internal/relayenv" "github.com/stretchr/testify/require" ) @@ -50,7 +50,6 @@ type noopActions struct { } func (n *spyHandler) ReceivedAllEnvironments() { - } func TestProjectRouter_NewIsEmpty(t *testing.T) { @@ -68,7 +67,6 @@ func TestProjectRouter_NewIsEmpty(t *testing.T) { // 2. Every project currently managed by the router was a project that was seen by the router // (either via adding environments, or filters.) func TestProjectRouter_VerifySetProperty(t *testing.T) { - // Makes a list of unique project keys. makeProjects := func(count int) []string { var projects []string @@ -123,7 +121,6 @@ func TestProjectRouter_VerifySetProperty(t *testing.T) { t.Errorf("project (%s) seen by router was not in expected list", g) return false } - } return true } @@ -152,7 +149,6 @@ func TestProjectRouter_VerifySetProperty(t *testing.T) { // Since it's impractical to exhaustively verify the property with large amounts of environments/projects, // cherry-pick a few scenarios. t.Run("spot checks", func(t *testing.T) { - type scenario struct { environments int projects int diff --git a/internal/relayenv/env_context.go b/internal/relayenv/env_context.go index d768f125..7cd858c9 100644 --- a/internal/relayenv/env_context.go +++ b/internal/relayenv/env_context.go @@ -6,15 +6,15 @@ import ( "net/http" "time" - "github.com/launchdarkly/ld-relay/v8/internal/credential" - "github.com/launchdarkly/ld-relay/v8/internal/metrics" + "github.com/launchdarkly/ld-relay/v9/internal/credential" + "github.com/launchdarkly/ld-relay/v9/internal/metrics" "github.com/launchdarkly/go-server-sdk/v7/subsystems" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/bigsegments" - "github.com/launchdarkly/ld-relay/v8/internal/events" - "github.com/launchdarkly/ld-relay/v8/internal/sdks" - "github.com/launchdarkly/ld-relay/v8/internal/streams" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/bigsegments" + "github.com/launchdarkly/ld-relay/v9/internal/events" + "github.com/launchdarkly/ld-relay/v9/internal/sdks" + "github.com/launchdarkly/ld-relay/v9/internal/streams" "github.com/launchdarkly/go-sdk-common/v3/ldlog" ldeval "github.com/launchdarkly/go-server-sdk-evaluation/v3" diff --git a/internal/relayenv/env_context_impl.go b/internal/relayenv/env_context_impl.go index 1dfa46c8..c4960935 100644 --- a/internal/relayenv/env_context_impl.go +++ b/internal/relayenv/env_context_impl.go @@ -7,19 +7,19 @@ import ( "sync" "time" - "github.com/launchdarkly/ld-relay/v8/internal/datadestination" - "github.com/launchdarkly/ld-relay/v8/internal/metrics" - "github.com/launchdarkly/ld-relay/v8/internal/sdkauth" - - "github.com/launchdarkly/ld-relay/v8/internal/credential" - - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/bigsegments" - "github.com/launchdarkly/ld-relay/v8/internal/events" - "github.com/launchdarkly/ld-relay/v8/internal/httpconfig" - "github.com/launchdarkly/ld-relay/v8/internal/sdks" - "github.com/launchdarkly/ld-relay/v8/internal/streams" - "github.com/launchdarkly/ld-relay/v8/internal/util" + "github.com/launchdarkly/ld-relay/v9/internal/datadestination" + "github.com/launchdarkly/ld-relay/v9/internal/metrics" + "github.com/launchdarkly/ld-relay/v9/internal/sdkauth" + + "github.com/launchdarkly/ld-relay/v9/internal/credential" + + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/bigsegments" + "github.com/launchdarkly/ld-relay/v9/internal/events" + "github.com/launchdarkly/ld-relay/v9/internal/httpconfig" + "github.com/launchdarkly/ld-relay/v9/internal/sdks" + "github.com/launchdarkly/ld-relay/v9/internal/streams" + "github.com/launchdarkly/ld-relay/v9/internal/util" "github.com/launchdarkly/go-sdk-common/v3/ldlog" ldeval "github.com/launchdarkly/go-server-sdk-evaluation/v3" diff --git a/internal/relayenv/env_context_impl_test.go b/internal/relayenv/env_context_impl_test.go index cb9f71a5..c0b4b895 100644 --- a/internal/relayenv/env_context_impl_test.go +++ b/internal/relayenv/env_context_impl_test.go @@ -12,22 +12,22 @@ import ( "time" "github.com/launchdarkly/eventsource" - "github.com/launchdarkly/ld-relay/v8/internal/sdkauth" - "github.com/launchdarkly/ld-relay/v8/internal/streams" - "github.com/launchdarkly/ld-relay/v8/internal/util" + "github.com/launchdarkly/ld-relay/v9/internal/sdkauth" + "github.com/launchdarkly/ld-relay/v9/internal/streams" + "github.com/launchdarkly/ld-relay/v9/internal/util" - "github.com/launchdarkly/ld-relay/v8/internal/credential" + "github.com/launchdarkly/ld-relay/v9/internal/credential" "github.com/launchdarkly/go-server-sdk-evaluation/v3/ldbuilders" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/basictypes" - "github.com/launchdarkly/ld-relay/v8/internal/bigsegments" - "github.com/launchdarkly/ld-relay/v8/internal/events" - "github.com/launchdarkly/ld-relay/v8/internal/httpconfig" - "github.com/launchdarkly/ld-relay/v8/internal/metrics" - "github.com/launchdarkly/ld-relay/v8/internal/sdks" - st "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" - "github.com/launchdarkly/ld-relay/v8/internal/sharedtest/testclient" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/basictypes" + "github.com/launchdarkly/ld-relay/v9/internal/bigsegments" + "github.com/launchdarkly/ld-relay/v9/internal/events" + "github.com/launchdarkly/ld-relay/v9/internal/httpconfig" + "github.com/launchdarkly/ld-relay/v9/internal/metrics" + "github.com/launchdarkly/ld-relay/v9/internal/sdks" + st "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" + "github.com/launchdarkly/ld-relay/v9/internal/sharedtest/testclient" "github.com/launchdarkly/go-configtypes" "github.com/launchdarkly/go-sdk-common/v3/ldlog" @@ -54,7 +54,8 @@ func requireClientReady(t *testing.T, clientCh chan *testclient.FakeLDClient) *t } func makeBasicEnv(t *testing.T, envConfig config.EnvConfig, clientFactory sdks.ClientFactoryFunc, - loggers ldlog.Loggers, readyCh chan EnvContext) EnvContext { + loggers ldlog.Loggers, readyCh chan EnvContext, +) EnvContext { env, err := NewEnvContext(EnvContextImplParams{ Identifiers: EnvIdentifiers{ConfiguredName: envName}, EnvConfig: envConfig, @@ -66,14 +67,12 @@ func makeBasicEnv(t *testing.T, envConfig config.EnvConfig, clientFactory sdks.C return env } -type mockConnectionMapper struct { -} +type mockConnectionMapper struct{} func (m mockConnectionMapper) AddConnectionMapping(scopedCredential sdkauth.ScopedCredential, envContext EnvContext) { - } -func (m mockConnectionMapper) RemoveConnectionMapping(scopedCredential sdkauth.ScopedCredential) { +func (m mockConnectionMapper) RemoveConnectionMapping(scopedCredential sdkauth.ScopedCredential) { } func TestConstructorBasicProperties(t *testing.T) { diff --git a/internal/sdkauth/credential.go b/internal/sdkauth/credential.go index 1d3fd791..e4b714ea 100644 --- a/internal/sdkauth/credential.go +++ b/internal/sdkauth/credential.go @@ -17,8 +17,8 @@ package sdkauth import ( "fmt" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/credential" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/credential" ) // ScopedCredential scopes an SDKCredential to a filtered environment identified by FilterKey. diff --git a/internal/sdks/big_segments.go b/internal/sdks/big_segments.go index daccba99..9bf96b77 100644 --- a/internal/sdks/big_segments.go +++ b/internal/sdks/big_segments.go @@ -1,8 +1,8 @@ package sdks import ( - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/util" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/util" "github.com/launchdarkly/go-sdk-common/v3/ldlog" "github.com/launchdarkly/go-server-sdk/v7/ldcomponents" diff --git a/internal/sdks/big_segments_test.go b/internal/sdks/big_segments_test.go index 26c45367..0b62a472 100644 --- a/internal/sdks/big_segments_test.go +++ b/internal/sdks/big_segments_test.go @@ -3,7 +3,7 @@ package sdks import ( "testing" - "github.com/launchdarkly/ld-relay/v8/config" + "github.com/launchdarkly/ld-relay/v9/config" "github.com/launchdarkly/go-configtypes" "github.com/launchdarkly/go-sdk-common/v3/ldlog" diff --git a/internal/sdks/client_factory.go b/internal/sdks/client_factory.go index 6595dbce..39901c30 100644 --- a/internal/sdks/client_factory.go +++ b/internal/sdks/client_factory.go @@ -4,7 +4,7 @@ import ( "sync" "time" - "github.com/launchdarkly/ld-relay/v8/config" + "github.com/launchdarkly/ld-relay/v9/config" "github.com/launchdarkly/go-sdk-common/v3/ldcontext" ld "github.com/launchdarkly/go-server-sdk/v7" diff --git a/internal/sdks/client_factory_test.go b/internal/sdks/client_factory_test.go index 288d27c2..57490328 100644 --- a/internal/sdks/client_factory_test.go +++ b/internal/sdks/client_factory_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" + "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" ld "github.com/launchdarkly/go-server-sdk/v7" "github.com/launchdarkly/go-server-sdk/v7/interfaces" diff --git a/internal/sdks/data_stores.go b/internal/sdks/data_stores.go index 20370495..ef9982e9 100644 --- a/internal/sdks/data_stores.go +++ b/internal/sdks/data_stores.go @@ -5,8 +5,8 @@ import ( "errors" "strings" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/util" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/util" "github.com/launchdarkly/go-sdk-common/v3/ldlog" ldconsul "github.com/launchdarkly/go-server-sdk-consul/v3" diff --git a/internal/sdks/data_stores_test.go b/internal/sdks/data_stores_test.go index 4147becf..f655789b 100644 --- a/internal/sdks/data_stores_test.go +++ b/internal/sdks/data_stores_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - "github.com/launchdarkly/ld-relay/v8/config" + "github.com/launchdarkly/ld-relay/v9/config" "github.com/launchdarkly/go-configtypes" "github.com/launchdarkly/go-sdk-common/v3/ldlog" diff --git a/internal/sdks/sdk_kinds.go b/internal/sdks/sdk_kinds.go index faddce9b..3e9a8c34 100644 --- a/internal/sdks/sdk_kinds.go +++ b/internal/sdks/sdk_kinds.go @@ -5,10 +5,10 @@ import ( "net/http" "strings" - "github.com/launchdarkly/ld-relay/v8/internal/credential" + "github.com/launchdarkly/ld-relay/v9/internal/credential" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/basictypes" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/basictypes" "github.com/gorilla/mux" ) diff --git a/internal/sdks/sdk_kinds_test.go b/internal/sdks/sdk_kinds_test.go index 7a90f4ed..727a43a9 100644 --- a/internal/sdks/sdk_kinds_test.go +++ b/internal/sdks/sdk_kinds_test.go @@ -5,8 +5,8 @@ import ( "net/http/httptest" "testing" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/basictypes" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/basictypes" "github.com/gorilla/mux" "github.com/stretchr/testify/assert" diff --git a/internal/sharedtest/configs.go b/internal/sharedtest/configs.go index 349cc1fc..eed4a4aa 100644 --- a/internal/sharedtest/configs.go +++ b/internal/sharedtest/configs.go @@ -1,8 +1,8 @@ package sharedtest import ( - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/httpconfig" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/httpconfig" "github.com/launchdarkly/go-sdk-common/v3/ldlog" "github.com/launchdarkly/go-server-sdk/v7/subsystems" diff --git a/internal/sharedtest/endpoints.go b/internal/sharedtest/endpoints.go index 8655d537..37c7880f 100644 --- a/internal/sharedtest/endpoints.go +++ b/internal/sharedtest/endpoints.go @@ -5,7 +5,7 @@ import ( "fmt" "net/http" - "github.com/launchdarkly/ld-relay/v8/internal/basictypes" + "github.com/launchdarkly/ld-relay/v9/internal/basictypes" ) // These methods should be used by all test code that makes HTTP requests to Relay endpoints. diff --git a/internal/sharedtest/requests.go b/internal/sharedtest/requests.go index 10dc9217..2c4022ae 100644 --- a/internal/sharedtest/requests.go +++ b/internal/sharedtest/requests.go @@ -10,7 +10,7 @@ import ( "testing" "time" - "github.com/launchdarkly/ld-relay/v8/internal/credential" + "github.com/launchdarkly/ld-relay/v9/internal/credential" helpers "github.com/launchdarkly/go-test-helpers/v3" diff --git a/internal/sharedtest/testclient/fake_client.go b/internal/sharedtest/testclient/fake_client.go index dab9775d..61fd5c75 100644 --- a/internal/sharedtest/testclient/fake_client.go +++ b/internal/sharedtest/testclient/fake_client.go @@ -9,9 +9,9 @@ import ( "time" helpers "github.com/launchdarkly/go-test-helpers/v3" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/sdks" - "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/sdks" + "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" "github.com/launchdarkly/go-sdk-common/v3/ldcontext" ld "github.com/launchdarkly/go-server-sdk/v7" diff --git a/internal/sharedtest/testdata_envs.go b/internal/sharedtest/testdata_envs.go index adc81600..e8e4b23a 100644 --- a/internal/sharedtest/testdata_envs.go +++ b/internal/sharedtest/testdata_envs.go @@ -3,7 +3,7 @@ package sharedtest import ( "time" - "github.com/launchdarkly/ld-relay/v8/config" + "github.com/launchdarkly/ld-relay/v9/config" ct "github.com/launchdarkly/go-configtypes" "github.com/launchdarkly/go-sdk-common/v3/ldtime" diff --git a/internal/sharedtest/testenv/test_env_context.go b/internal/sharedtest/testenv/test_env_context.go index 6242d8e8..76b44649 100644 --- a/internal/sharedtest/testenv/test_env_context.go +++ b/internal/sharedtest/testenv/test_env_context.go @@ -5,10 +5,10 @@ package testenv import ( "time" - "github.com/launchdarkly/ld-relay/v8/internal/relayenv" - "github.com/launchdarkly/ld-relay/v8/internal/sdks" - "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" - "github.com/launchdarkly/ld-relay/v8/internal/sharedtest/testclient" + "github.com/launchdarkly/ld-relay/v9/internal/relayenv" + "github.com/launchdarkly/ld-relay/v9/internal/sdks" + "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" + "github.com/launchdarkly/ld-relay/v9/internal/sharedtest/testclient" "github.com/launchdarkly/go-sdk-common/v3/ldlog" "github.com/launchdarkly/go-server-sdk/v7/subsystems" diff --git a/internal/store/relay_feature_store_testdata_test.go b/internal/store/relay_feature_store_testdata_test.go index 85919a58..71a5249b 100644 --- a/internal/store/relay_feature_store_testdata_test.go +++ b/internal/store/relay_feature_store_testdata_test.go @@ -5,8 +5,8 @@ import ( "errors" "testing" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" "github.com/launchdarkly/go-server-sdk-evaluation/v3/ldbuilders" "github.com/launchdarkly/go-server-sdk/v7/subsystems" diff --git a/internal/streams/env_streams.go b/internal/streams/env_streams.go index bcb8fbca..b991babb 100644 --- a/internal/streams/env_streams.go +++ b/internal/streams/env_streams.go @@ -4,10 +4,10 @@ import ( "sync" "time" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/sdkauth" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/sdkauth" - "github.com/launchdarkly/ld-relay/v8/internal/credential" + "github.com/launchdarkly/ld-relay/v9/internal/credential" "github.com/launchdarkly/go-sdk-common/v3/ldlog" "github.com/launchdarkly/go-server-sdk/v7/subsystems" diff --git a/internal/streams/env_streams_test.go b/internal/streams/env_streams_test.go index 90bb7107..dac07db1 100644 --- a/internal/streams/env_streams_test.go +++ b/internal/streams/env_streams_test.go @@ -7,11 +7,11 @@ import ( "testing" "time" - "github.com/launchdarkly/ld-relay/v8/internal/sdkauth" + "github.com/launchdarkly/ld-relay/v9/internal/sdkauth" - "github.com/launchdarkly/ld-relay/v8/internal/credential" + "github.com/launchdarkly/ld-relay/v9/internal/credential" - "github.com/launchdarkly/ld-relay/v8/config" + "github.com/launchdarkly/ld-relay/v9/config" "github.com/launchdarkly/go-sdk-common/v3/ldlog" "github.com/launchdarkly/go-server-sdk/v7/subsystems" diff --git a/internal/streams/stream_events.go b/internal/streams/stream_events.go index d4ca7f3b..7beb605a 100644 --- a/internal/streams/stream_events.go +++ b/internal/streams/stream_events.go @@ -1,7 +1,7 @@ package streams import ( - "github.com/launchdarkly/ld-relay/v8/internal/util" + "github.com/launchdarkly/ld-relay/v9/internal/util" "github.com/launchdarkly/eventsource" "github.com/launchdarkly/go-jsonstream/v3/jwriter" diff --git a/internal/streams/stream_events_benchmark_test.go b/internal/streams/stream_events_benchmark_test.go index 0b9b5d00..c17e7763 100644 --- a/internal/streams/stream_events_benchmark_test.go +++ b/internal/streams/stream_events_benchmark_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" + "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" "github.com/launchdarkly/go-server-sdk-evaluation/v3/ldbuilders" "github.com/launchdarkly/go-server-sdk/v7/subsystems/ldstoreimpl" diff --git a/internal/streams/stream_events_test.go b/internal/streams/stream_events_test.go index 2b7b8b0a..1bb969b2 100644 --- a/internal/streams/stream_events_test.go +++ b/internal/streams/stream_events_test.go @@ -3,7 +3,7 @@ package streams import ( "testing" - "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" + "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" "github.com/launchdarkly/go-server-sdk/v7/subsystems/ldstoreimpl" "github.com/launchdarkly/go-server-sdk/v7/subsystems/ldstoretypes" @@ -101,7 +101,6 @@ func TestServerSidePatchEvents(t *testing.T) { assert.JSONEq(t, expectedJSON, event.Data()) assert.Equal(t, "", event.Id()) }) - } func TestServerSideDeleteEvents(t *testing.T) { diff --git a/internal/streams/stream_provider.go b/internal/streams/stream_provider.go index 91160187..441cbe2f 100644 --- a/internal/streams/stream_provider.go +++ b/internal/streams/stream_provider.go @@ -4,9 +4,9 @@ import ( "net/http" "time" - "github.com/launchdarkly/ld-relay/v8/internal/sdkauth" + "github.com/launchdarkly/ld-relay/v9/internal/sdkauth" - "github.com/launchdarkly/ld-relay/v8/internal/basictypes" + "github.com/launchdarkly/ld-relay/v9/internal/basictypes" "github.com/launchdarkly/eventsource" "github.com/launchdarkly/go-sdk-common/v3/ldlog" diff --git a/internal/streams/stream_provider_client_side_ping.go b/internal/streams/stream_provider_client_side_ping.go index 79c14d81..cdd06306 100644 --- a/internal/streams/stream_provider_client_side_ping.go +++ b/internal/streams/stream_provider_client_side_ping.go @@ -4,11 +4,11 @@ import ( "net/http" "sync" - "github.com/launchdarkly/ld-relay/v8/internal/sdkauth" + "github.com/launchdarkly/ld-relay/v9/internal/sdkauth" - "github.com/launchdarkly/ld-relay/v8/internal/credential" + "github.com/launchdarkly/ld-relay/v9/internal/credential" - "github.com/launchdarkly/ld-relay/v8/config" + "github.com/launchdarkly/ld-relay/v9/config" "github.com/launchdarkly/eventsource" "github.com/launchdarkly/go-sdk-common/v3/ldlog" diff --git a/internal/streams/stream_provider_client_side_ping_test.go b/internal/streams/stream_provider_client_side_ping_test.go index 8a1f094f..d2e516d7 100644 --- a/internal/streams/stream_provider_client_side_ping_test.go +++ b/internal/streams/stream_provider_client_side_ping_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/launchdarkly/ld-relay/v8/internal/sdkauth" + "github.com/launchdarkly/ld-relay/v9/internal/sdkauth" - "github.com/launchdarkly/ld-relay/v8/internal/basictypes" + "github.com/launchdarkly/ld-relay/v9/internal/basictypes" "github.com/launchdarkly/go-sdk-common/v3/ldlog" "github.com/launchdarkly/go-server-sdk-evaluation/v3/ldmodel" diff --git a/internal/streams/stream_provider_ping_jitter_test.go b/internal/streams/stream_provider_ping_jitter_test.go index e82e288b..e1156f33 100644 --- a/internal/streams/stream_provider_ping_jitter_test.go +++ b/internal/streams/stream_provider_ping_jitter_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/launchdarkly/ld-relay/v8/internal/basictypes" - "github.com/launchdarkly/ld-relay/v8/internal/sdkauth" - "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" + "github.com/launchdarkly/ld-relay/v9/internal/basictypes" + "github.com/launchdarkly/ld-relay/v9/internal/sdkauth" + "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" "github.com/launchdarkly/eventsource" "github.com/launchdarkly/go-sdk-common/v3/ldlog" diff --git a/internal/streams/stream_provider_server_side.go b/internal/streams/stream_provider_server_side.go index 7462be69..032fdf65 100644 --- a/internal/streams/stream_provider_server_side.go +++ b/internal/streams/stream_provider_server_side.go @@ -5,9 +5,9 @@ import ( "sync" "github.com/launchdarkly/go-jsonstream/v3/jwriter" - "github.com/launchdarkly/ld-relay/v8/internal/sdkauth" + "github.com/launchdarkly/ld-relay/v9/internal/sdkauth" - "github.com/launchdarkly/ld-relay/v8/config" + "github.com/launchdarkly/ld-relay/v9/config" "golang.org/x/sync/singleflight" "github.com/launchdarkly/eventsource" diff --git a/internal/streams/stream_provider_server_side_flags.go b/internal/streams/stream_provider_server_side_flags.go index 20d60a20..cd565531 100644 --- a/internal/streams/stream_provider_server_side_flags.go +++ b/internal/streams/stream_provider_server_side_flags.go @@ -4,9 +4,9 @@ import ( "net/http" "sync" - "github.com/launchdarkly/ld-relay/v8/internal/sdkauth" + "github.com/launchdarkly/ld-relay/v9/internal/sdkauth" - "github.com/launchdarkly/ld-relay/v8/config" + "github.com/launchdarkly/ld-relay/v9/config" "golang.org/x/sync/singleflight" "github.com/launchdarkly/eventsource" diff --git a/internal/streams/stream_provider_server_side_flags_test.go b/internal/streams/stream_provider_server_side_flags_test.go index 345c3a5b..6d719042 100644 --- a/internal/streams/stream_provider_server_side_flags_test.go +++ b/internal/streams/stream_provider_server_side_flags_test.go @@ -4,10 +4,10 @@ import ( "testing" "time" - "github.com/launchdarkly/ld-relay/v8/internal/sdkauth" + "github.com/launchdarkly/ld-relay/v9/internal/sdkauth" - "github.com/launchdarkly/ld-relay/v8/internal/basictypes" - "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" + "github.com/launchdarkly/ld-relay/v9/internal/basictypes" + "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" "github.com/launchdarkly/go-sdk-common/v3/ldlog" "github.com/launchdarkly/go-server-sdk-evaluation/v3/ldmodel" diff --git a/internal/streams/stream_provider_server_side_test.go b/internal/streams/stream_provider_server_side_test.go index 8f32e771..35acb2d9 100644 --- a/internal/streams/stream_provider_server_side_test.go +++ b/internal/streams/stream_provider_server_side_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" - "github.com/launchdarkly/ld-relay/v8/internal/sdkauth" + "github.com/launchdarkly/ld-relay/v9/internal/sdkauth" - "github.com/launchdarkly/ld-relay/v8/internal/basictypes" - "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" + "github.com/launchdarkly/ld-relay/v9/internal/basictypes" + "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" "github.com/launchdarkly/eventsource" "github.com/launchdarkly/go-sdk-common/v3/ldlog" diff --git a/internal/streams/stream_provider_test.go b/internal/streams/stream_provider_test.go index 8000968c..4ec80525 100644 --- a/internal/streams/stream_provider_test.go +++ b/internal/streams/stream_provider_test.go @@ -6,9 +6,9 @@ import ( "testing" "time" - "github.com/launchdarkly/ld-relay/v8/internal/sdkauth" + "github.com/launchdarkly/ld-relay/v9/internal/sdkauth" - "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" + "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" helpers "github.com/launchdarkly/go-test-helpers/v3" diff --git a/internal/streams/stream_testdata_test.go b/internal/streams/stream_testdata_test.go index 7e672710..4fc73c2e 100644 --- a/internal/streams/stream_testdata_test.go +++ b/internal/streams/stream_testdata_test.go @@ -4,8 +4,8 @@ import ( "errors" "sync" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" "github.com/launchdarkly/go-server-sdk-evaluation/v3/ldbuilders" "github.com/launchdarkly/go-server-sdk-evaluation/v3/ldmodel" diff --git a/ld-relay.go b/ld-relay.go index 0e208a61..cb0c6743 100644 --- a/ld-relay.go +++ b/ld-relay.go @@ -5,11 +5,11 @@ import ( _ "github.com/kardianos/minwinsvc" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/application" - "github.com/launchdarkly/ld-relay/v8/internal/logging" - "github.com/launchdarkly/ld-relay/v8/relay" - "github.com/launchdarkly/ld-relay/v8/relay/version" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/application" + "github.com/launchdarkly/ld-relay/v9/internal/logging" + "github.com/launchdarkly/ld-relay/v9/relay" + "github.com/launchdarkly/ld-relay/v9/relay/version" ) func main() { diff --git a/relay/autoconfig_actions.go b/relay/autoconfig_actions.go index 044317f2..79080afa 100644 --- a/relay/autoconfig_actions.go +++ b/relay/autoconfig_actions.go @@ -1,10 +1,10 @@ package relay import ( - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/envfactory" - "github.com/launchdarkly/ld-relay/v8/internal/relayenv" - "github.com/launchdarkly/ld-relay/v8/internal/sdkauth" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/envfactory" + "github.com/launchdarkly/ld-relay/v9/internal/relayenv" + "github.com/launchdarkly/ld-relay/v9/internal/sdkauth" ) const ( diff --git a/relay/autoconfig_actions_test.go b/relay/autoconfig_actions_test.go index ead34955..e63ab3b2 100644 --- a/relay/autoconfig_actions_test.go +++ b/relay/autoconfig_actions_test.go @@ -9,10 +9,10 @@ import ( "github.com/launchdarkly/go-server-sdk/v7/testhelpers/ldservices" "github.com/launchdarkly/go-server-sdk/v7/testhelpers/ldservicesv2" - "github.com/launchdarkly/ld-relay/v8/internal/envfactory" + "github.com/launchdarkly/ld-relay/v9/internal/envfactory" - c "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/sharedtest/testclient" + c "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/sharedtest/testclient" "github.com/launchdarkly/go-configtypes" "github.com/launchdarkly/go-sdk-common/v3/ldlogtest" diff --git a/relay/autoconfig_key_change_test.go b/relay/autoconfig_key_change_test.go index 36e709af..ac32671b 100644 --- a/relay/autoconfig_key_change_test.go +++ b/relay/autoconfig_key_change_test.go @@ -5,16 +5,16 @@ import ( "testing" "time" - "github.com/launchdarkly/ld-relay/v8/internal/envfactory" - "github.com/launchdarkly/ld-relay/v8/internal/util" + "github.com/launchdarkly/ld-relay/v9/internal/envfactory" + "github.com/launchdarkly/ld-relay/v9/internal/util" - "github.com/launchdarkly/ld-relay/v8/internal/sdkauth" + "github.com/launchdarkly/ld-relay/v9/internal/sdkauth" - "github.com/launchdarkly/ld-relay/v8/internal/credential" + "github.com/launchdarkly/ld-relay/v9/internal/credential" "github.com/launchdarkly/go-sdk-common/v3/ldtime" "github.com/launchdarkly/go-sdk-common/v3/ldvalue" - st "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" + st "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" helpers "github.com/launchdarkly/go-test-helpers/v3" diff --git a/relay/autoconfig_testdata_test.go b/relay/autoconfig_testdata_test.go index aa0e3dbc..42be2a6d 100644 --- a/relay/autoconfig_testdata_test.go +++ b/relay/autoconfig_testdata_test.go @@ -3,9 +3,9 @@ package relay import ( "encoding/json" - c "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/autoconfig" - "github.com/launchdarkly/ld-relay/v8/internal/envfactory" + c "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/autoconfig" + "github.com/launchdarkly/ld-relay/v9/internal/envfactory" "github.com/launchdarkly/go-test-helpers/v3/httphelpers" ) @@ -75,7 +75,8 @@ func (e testAutoConfEnv) params() envfactory.EnvironmentParams { func makeAutoConfPutEvent(envs ...testAutoConfEnv) httphelpers.SSEEvent { data := autoconfig.PutMessageData{Path: "/", Data: autoconfig.PutContent{ - Environments: make(map[c.EnvironmentID]envfactory.EnvironmentRep)}} + Environments: make(map[c.EnvironmentID]envfactory.EnvironmentRep), + }} for _, e := range envs { data.Data.Environments[e.id] = e.toEnvironmentRep() } diff --git a/relay/client_side_helpers.go b/relay/client_side_helpers.go index aae30c01..e725129a 100644 --- a/relay/client_side_helpers.go +++ b/relay/client_side_helpers.go @@ -7,11 +7,11 @@ import ( "net/http/httptest" "strconv" - "github.com/launchdarkly/ld-relay/v8/internal/basictypes" - "github.com/launchdarkly/ld-relay/v8/internal/browser" - "github.com/launchdarkly/ld-relay/v8/internal/events" - "github.com/launchdarkly/ld-relay/v8/internal/middleware" - "github.com/launchdarkly/ld-relay/v8/internal/util" + "github.com/launchdarkly/ld-relay/v9/internal/basictypes" + "github.com/launchdarkly/ld-relay/v9/internal/browser" + "github.com/launchdarkly/ld-relay/v9/internal/events" + "github.com/launchdarkly/ld-relay/v9/internal/middleware" + "github.com/launchdarkly/ld-relay/v9/internal/util" ldevents "github.com/launchdarkly/go-sdk-events/v3" ) diff --git a/relay/endpoint_tests_base_test.go b/relay/endpoint_tests_base_test.go index fd93e47d..a847db36 100644 --- a/relay/endpoint_tests_base_test.go +++ b/relay/endpoint_tests_base_test.go @@ -5,10 +5,10 @@ import ( "net/http" "strings" - "github.com/launchdarkly/ld-relay/v8/internal/credential" + "github.com/launchdarkly/ld-relay/v9/internal/credential" - "github.com/launchdarkly/ld-relay/v8/config" - st "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" + "github.com/launchdarkly/ld-relay/v9/config" + st "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" m "github.com/launchdarkly/go-test-helpers/v3/matchers" ) diff --git a/relay/endpoints_eval_test.go b/relay/endpoints_eval_test.go index 58634294..b4ed90fd 100644 --- a/relay/endpoints_eval_test.go +++ b/relay/endpoints_eval_test.go @@ -5,9 +5,9 @@ import ( "net/http" "testing" - c "github.com/launchdarkly/ld-relay/v8/config" - st "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" - "github.com/launchdarkly/ld-relay/v8/internal/sharedtest/testclient" + c "github.com/launchdarkly/ld-relay/v9/config" + st "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" + "github.com/launchdarkly/ld-relay/v9/internal/sharedtest/testclient" "github.com/launchdarkly/go-sdk-common/v3/ldcontext" "github.com/launchdarkly/go-sdk-common/v3/lduser" @@ -21,9 +21,11 @@ import ( // we are evaluating, which reference a user key. This just proves that the evaluation endpoints // are able to unmarshal either old-style user JSON or new context JSON, and that the resulting // context is being passed to a version of the evaluation engine that understands contexts. -var basicUserJSON = jsonhelpers.ToJSON(st.BasicUserForTestFlags) -var basicContextJSON = jsonhelpers.ToJSON( - ldcontext.NewMulti(ldcontext.NewWithKind("other", "wrongkey"), st.BasicUserForTestFlags)) +var ( + basicUserJSON = jsonhelpers.ToJSON(st.BasicUserForTestFlags) + basicContextJSON = jsonhelpers.ToJSON( + ldcontext.NewMulti(ldcontext.NewWithKind("other", "wrongkey"), st.BasicUserForTestFlags)) +) func TestEndpointsEvalServerSide(t *testing.T) { env := st.EnvMain @@ -32,14 +34,22 @@ func TestEndpointsEvalServerSide(t *testing.T) { expectedServerEvalxBodyWithReasons := st.ExpectJSONBody(st.MakeEvalBody(st.AllFlags, true)) specs := []endpointMultiTestParams{ - {"server-side context report evalx", "REPORT", "/sdk/evalx/context", sdkKey, - makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedServerEvalxBody)}, - {"server-side context report evalx with reasons", "REPORT", "/sdk/evalx/context?withReasons=true", sdkKey, - makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedServerEvalxBodyWithReasons)}, - {"server-side user report evalx", "REPORT", "/sdk/evalx/user", sdkKey, - makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedServerEvalxBody)}, - {"server-side user report evalx with reasons", "REPORT", "/sdk/evalx/user?withReasons=true", sdkKey, - makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedServerEvalxBodyWithReasons)}, + { + "server-side context report evalx", "REPORT", "/sdk/evalx/context", sdkKey, + makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedServerEvalxBody), + }, + { + "server-side context report evalx with reasons", "REPORT", "/sdk/evalx/context?withReasons=true", sdkKey, + makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedServerEvalxBodyWithReasons), + }, + { + "server-side user report evalx", "REPORT", "/sdk/evalx/user", sdkKey, + makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedServerEvalxBody), + }, + { + "server-side user report evalx with reasons", "REPORT", "/sdk/evalx/user?withReasons=true", sdkKey, + makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedServerEvalxBodyWithReasons), + }, } var config c.Config config.Environment = st.MakeEnvConfigs(env) @@ -92,22 +102,38 @@ func TestEndpointsEvalMobile(t *testing.T) { expectedMobileEvalxBodyWithReasons := st.ExpectJSONBody(st.MakeEvalBody(st.MobileFlags, true)) specs := []endpointMultiTestParams{ - {"mobile context report evalx", "REPORT", "/msdk/evalx/context", mobileKey, - makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedMobileEvalxBody)}, - {"mobile context report evalx with reasons", "REPORT", "/msdk/evalx/context?withReasons=true", mobileKey, - makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedMobileEvalxBodyWithReasons)}, - {"mobile user report evalx", "REPORT", "/msdk/evalx/user", mobileKey, - makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedMobileEvalxBody)}, - {"mobile user report evalx with reasons", "REPORT", "/msdk/evalx/user?withReasons=true", mobileKey, - makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedMobileEvalxBodyWithReasons)}, - {"mobile context get evalx", "GET", "/msdk/evalx/contexts/$USER", mobileKey, - makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedMobileEvalxBody)}, - {"mobile context get evalx with reasons", "GET", "/msdk/evalx/contexts/$USER?withReasons=true", mobileKey, - makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedMobileEvalxBodyWithReasons)}, - {"mobile user get evalx", "GET", "/msdk/evalx/users/$USER", mobileKey, - makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedMobileEvalxBody)}, - {"mobile user get evalx with reasons", "GET", "/msdk/evalx/users/$USER?withReasons=true", mobileKey, - makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedMobileEvalxBodyWithReasons)}, + { + "mobile context report evalx", "REPORT", "/msdk/evalx/context", mobileKey, + makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedMobileEvalxBody), + }, + { + "mobile context report evalx with reasons", "REPORT", "/msdk/evalx/context?withReasons=true", mobileKey, + makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedMobileEvalxBodyWithReasons), + }, + { + "mobile user report evalx", "REPORT", "/msdk/evalx/user", mobileKey, + makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedMobileEvalxBody), + }, + { + "mobile user report evalx with reasons", "REPORT", "/msdk/evalx/user?withReasons=true", mobileKey, + makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedMobileEvalxBodyWithReasons), + }, + { + "mobile context get evalx", "GET", "/msdk/evalx/contexts/$USER", mobileKey, + makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedMobileEvalxBody), + }, + { + "mobile context get evalx with reasons", "GET", "/msdk/evalx/contexts/$USER?withReasons=true", mobileKey, + makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedMobileEvalxBodyWithReasons), + }, + { + "mobile user get evalx", "GET", "/msdk/evalx/users/$USER", mobileKey, + makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedMobileEvalxBody), + }, + { + "mobile user get evalx with reasons", "GET", "/msdk/evalx/users/$USER?withReasons=true", mobileKey, + makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedMobileEvalxBodyWithReasons), + }, } var config c.Config @@ -164,22 +190,38 @@ func TestEndpointsEvalJSClient(t *testing.T) { expectedJSEvalxBodyWithReasons := st.ExpectJSONBody(st.MakeEvalBody(st.ClientSideFlags, true)) specs := []endpointMultiTestParams{ - {"report context evalx", "REPORT", "/sdk/evalx/$ENV/context", envID, - makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedJSEvalxBody)}, - {"report context evalx with reasons", "REPORT", "/sdk/evalx/$ENV/context?withReasons=true", envID, - makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedJSEvalxBodyWithReasons)}, - {"report user evalx", "REPORT", "/sdk/evalx/$ENV/user", envID, - makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedJSEvalxBody)}, - {"report user evalx with reasons", "REPORT", "/sdk/evalx/$ENV/user?withReasons=true", envID, - makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedJSEvalxBodyWithReasons)}, - {"get context evalx", "GET", "/sdk/evalx/$ENV/contexts/$USER", envID, - makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedJSEvalxBody)}, - {"get context evalx with reasons", "GET", "/sdk/evalx/$ENV/contexts/$USER?withReasons=true", envID, - makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedJSEvalxBodyWithReasons)}, - {"get user evalx", "GET", "/sdk/evalx/$ENV/users/$USER", envID, - makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedJSEvalxBody)}, - {"get user evalx with reasons", "GET", "/sdk/evalx/$ENV/users/$USER?withReasons=true", envID, - makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedJSEvalxBodyWithReasons)}, + { + "report context evalx", "REPORT", "/sdk/evalx/$ENV/context", envID, + makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedJSEvalxBody), + }, + { + "report context evalx with reasons", "REPORT", "/sdk/evalx/$ENV/context?withReasons=true", envID, + makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedJSEvalxBodyWithReasons), + }, + { + "report user evalx", "REPORT", "/sdk/evalx/$ENV/user", envID, + makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedJSEvalxBody), + }, + { + "report user evalx with reasons", "REPORT", "/sdk/evalx/$ENV/user?withReasons=true", envID, + makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedJSEvalxBodyWithReasons), + }, + { + "get context evalx", "GET", "/sdk/evalx/$ENV/contexts/$USER", envID, + makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedJSEvalxBody), + }, + { + "get context evalx with reasons", "GET", "/sdk/evalx/$ENV/contexts/$USER?withReasons=true", envID, + makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedJSEvalxBodyWithReasons), + }, + { + "get user evalx", "GET", "/sdk/evalx/$ENV/users/$USER", envID, + makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedJSEvalxBody), + }, + { + "get user evalx with reasons", "GET", "/sdk/evalx/$ENV/users/$USER?withReasons=true", envID, + makeEndpointTestPerRequestParams(basicUserJSON, basicContextJSON, expectedJSEvalxBodyWithReasons), + }, } var config c.Config diff --git a/relay/endpoints_events_test.go b/relay/endpoints_events_test.go index 951e32a2..5228900c 100644 --- a/relay/endpoints_events_test.go +++ b/relay/endpoints_events_test.go @@ -10,11 +10,11 @@ import ( "testing" "time" - c "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/browser" - "github.com/launchdarkly/ld-relay/v8/internal/events" - st "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" - "github.com/launchdarkly/ld-relay/v8/internal/util" + c "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/browser" + "github.com/launchdarkly/ld-relay/v9/internal/events" + st "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" + "github.com/launchdarkly/ld-relay/v9/internal/util" ct "github.com/launchdarkly/go-configtypes" helpers "github.com/launchdarkly/go-test-helpers/v3" @@ -217,8 +217,10 @@ func TestEndpointsEventProxyJSClient(t *testing.T) { specs := []endpointTestParams{ {"post events", "POST", "/events/bulk/$ENV", eventData, envID, http.StatusAccepted, st.ExpectNoBody()}, - {"get events image", "GET", "/a/$ENV.gif?d=$DATA", eventData, envID, http.StatusOK, - st.ExpectBody(string(browser.Transparent1PixelImageData))}, + { + "get events image", "GET", "/a/$ENV.gif?d=$DATA", eventData, envID, http.StatusOK, + st.ExpectBody(string(browser.Transparent1PixelImageData)), + }, } var config c.Config diff --git a/relay/endpoints_fdv2_client_poll_test.go b/relay/endpoints_fdv2_client_poll_test.go index a0a4934c..2eea1d6b 100644 --- a/relay/endpoints_fdv2_client_poll_test.go +++ b/relay/endpoints_fdv2_client_poll_test.go @@ -8,8 +8,8 @@ import ( "github.com/launchdarkly/go-server-sdk/v7/subsystems" - c "github.com/launchdarkly/ld-relay/v8/config" - st "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" + c "github.com/launchdarkly/ld-relay/v9/config" + st "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/relay/endpoints_fdv2_client_stream_test.go b/relay/endpoints_fdv2_client_stream_test.go index f799246c..63ecf11a 100644 --- a/relay/endpoints_fdv2_client_stream_test.go +++ b/relay/endpoints_fdv2_client_stream_test.go @@ -7,8 +7,8 @@ import ( "testing" "time" - c "github.com/launchdarkly/ld-relay/v8/config" - st "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" + c "github.com/launchdarkly/ld-relay/v9/config" + st "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" "github.com/launchdarkly/eventsource" ct "github.com/launchdarkly/go-configtypes" diff --git a/relay/endpoints_fdv2_poll_test.go b/relay/endpoints_fdv2_poll_test.go index 0637857d..d94262ee 100644 --- a/relay/endpoints_fdv2_poll_test.go +++ b/relay/endpoints_fdv2_poll_test.go @@ -5,8 +5,8 @@ import ( "net/http" "testing" - c "github.com/launchdarkly/ld-relay/v8/config" - st "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" + c "github.com/launchdarkly/ld-relay/v9/config" + st "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" "github.com/stretchr/testify/assert" ) diff --git a/relay/endpoints_fdv2_streams_test.go b/relay/endpoints_fdv2_streams_test.go index c2f61e24..40f64afb 100644 --- a/relay/endpoints_fdv2_streams_test.go +++ b/relay/endpoints_fdv2_streams_test.go @@ -8,11 +8,11 @@ import ( "github.com/launchdarkly/go-server-sdk-evaluation/v3/ldmodel" "github.com/launchdarkly/go-server-sdk/v7/subsystems" - "github.com/launchdarkly/ld-relay/v8/internal/credential" - "github.com/launchdarkly/ld-relay/v8/internal/sdkauth" + "github.com/launchdarkly/ld-relay/v9/internal/credential" + "github.com/launchdarkly/ld-relay/v9/internal/sdkauth" - c "github.com/launchdarkly/ld-relay/v8/config" - st "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" + c "github.com/launchdarkly/ld-relay/v9/config" + st "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" "github.com/launchdarkly/eventsource" ct "github.com/launchdarkly/go-configtypes" diff --git a/relay/endpoints_js_cors_test.go b/relay/endpoints_js_cors_test.go index 286931cd..e143760f 100644 --- a/relay/endpoints_js_cors_test.go +++ b/relay/endpoints_js_cors_test.go @@ -5,9 +5,9 @@ import ( "net/http" "testing" - c "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/browser" - st "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" + c "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/browser" + st "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" "github.com/launchdarkly/go-configtypes" "github.com/launchdarkly/go-sdk-common/v3/lduser" diff --git a/relay/endpoints_other_test.go b/relay/endpoints_other_test.go index 8f72583a..98ca6771 100644 --- a/relay/endpoints_other_test.go +++ b/relay/endpoints_other_test.go @@ -7,8 +7,8 @@ import ( "net/http/httptest" "testing" - c "github.com/launchdarkly/ld-relay/v8/config" - st "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" + c "github.com/launchdarkly/ld-relay/v9/config" + st "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" ct "github.com/launchdarkly/go-configtypes" m "github.com/launchdarkly/go-test-helpers/v3/matchers" diff --git a/relay/endpoints_php_test.go b/relay/endpoints_php_test.go index 5f1fcd27..627f1b37 100644 --- a/relay/endpoints_php_test.go +++ b/relay/endpoints_php_test.go @@ -5,8 +5,8 @@ import ( "net/http" "testing" - c "github.com/launchdarkly/ld-relay/v8/config" - st "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" + c "github.com/launchdarkly/ld-relay/v9/config" + st "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" m "github.com/launchdarkly/go-test-helpers/v3/matchers" @@ -18,16 +18,26 @@ func TestEndpointsPHPPolling(t *testing.T) { sdkKeyWithTTL := st.EnvWithTTL.Config.SDKKey specs := []endpointTestParams{ - {"get flag", "GET", fmt.Sprintf("/sdk/flags/%s", st.Flag1ServerSide.Flag.Key), nil, sdkKeyMain, - http.StatusOK, st.ExpectJSONEntity(st.Flag1ServerSide.Flag)}, - {"get unknown flag", "GET", "/sdk/flags/no-such-flag", nil, sdkKeyMain, - http.StatusNotFound, st.ExpectNoBody()}, - {"get all flags", "GET", "/sdk/flags", nil, sdkKeyMain, - http.StatusOK, st.ExpectJSONEntity(st.FlagsMap(st.AllFlags))}, - {"get segment", "GET", fmt.Sprintf("/sdk/segments/%s", st.Segment1.Key), nil, sdkKeyMain, - http.StatusOK, st.ExpectJSONEntity(st.Segment1)}, - {"get unknown segment", "GET", "/sdk/segments/no-such-segment", nil, sdkKeyMain, - http.StatusNotFound, st.ExpectNoBody()}, + { + "get flag", "GET", fmt.Sprintf("/sdk/flags/%s", st.Flag1ServerSide.Flag.Key), nil, sdkKeyMain, + http.StatusOK, st.ExpectJSONEntity(st.Flag1ServerSide.Flag), + }, + { + "get unknown flag", "GET", "/sdk/flags/no-such-flag", nil, sdkKeyMain, + http.StatusNotFound, st.ExpectNoBody(), + }, + { + "get all flags", "GET", "/sdk/flags", nil, sdkKeyMain, + http.StatusOK, st.ExpectJSONEntity(st.FlagsMap(st.AllFlags)), + }, + { + "get segment", "GET", fmt.Sprintf("/sdk/segments/%s", st.Segment1.Key), nil, sdkKeyMain, + http.StatusOK, st.ExpectJSONEntity(st.Segment1), + }, + { + "get unknown segment", "GET", "/sdk/segments/no-such-segment", nil, sdkKeyMain, + http.StatusNotFound, st.ExpectNoBody(), + }, } var config c.Config diff --git a/relay/endpoints_status.go b/relay/endpoints_status.go index 68f284b1..7b8f741b 100644 --- a/relay/endpoints_status.go +++ b/relay/endpoints_status.go @@ -5,10 +5,10 @@ import ( "net/http" "time" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/api" - "github.com/launchdarkly/ld-relay/v8/internal/relayenv" - "github.com/launchdarkly/ld-relay/v8/internal/sdks" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/api" + "github.com/launchdarkly/ld-relay/v9/internal/relayenv" + "github.com/launchdarkly/ld-relay/v9/internal/sdks" "github.com/gorilla/mux" "github.com/launchdarkly/go-sdk-common/v3/ldtime" diff --git a/relay/endpoints_status_autoconfig_test.go b/relay/endpoints_status_autoconfig_test.go index b09a9817..b8979a72 100644 --- a/relay/endpoints_status_autoconfig_test.go +++ b/relay/endpoints_status_autoconfig_test.go @@ -7,12 +7,12 @@ import ( "testing" "time" - c "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/autoconfig" - "github.com/launchdarkly/ld-relay/v8/internal/envfactory" - "github.com/launchdarkly/ld-relay/v8/internal/sdks" - st "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" - "github.com/launchdarkly/ld-relay/v8/internal/sharedtest/testclient" + c "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/autoconfig" + "github.com/launchdarkly/ld-relay/v9/internal/envfactory" + "github.com/launchdarkly/ld-relay/v9/internal/sdks" + st "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" + "github.com/launchdarkly/ld-relay/v9/internal/sharedtest/testclient" "github.com/launchdarkly/go-configtypes" "github.com/launchdarkly/go-sdk-common/v3/ldlog" @@ -86,7 +86,8 @@ func withStartedAutoConfigRelay(t *testing.T, configWithEnvs c.Config, action fu func transformEnvConfigsToAutoConfig(config c.Config) httphelpers.SSEEvent { data := autoconfig.PutMessageData{Path: "/", Data: autoconfig.PutContent{ - Environments: make(map[c.EnvironmentID]envfactory.EnvironmentRep)}} + Environments: make(map[c.EnvironmentID]envfactory.EnvironmentRep), + }} for _, envConfig := range config.Environment { env, ok := autoConfigTestEnvs[envConfig.EnvID] if !ok { diff --git a/relay/endpoints_status_single_test.go b/relay/endpoints_status_single_test.go index ce5efd26..426bb271 100644 --- a/relay/endpoints_status_single_test.go +++ b/relay/endpoints_status_single_test.go @@ -5,9 +5,9 @@ import ( "net/http" "testing" - c "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/sdks" - st "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" + c "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/sdks" + st "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" "github.com/launchdarkly/go-sdk-common/v3/ldvalue" diff --git a/relay/endpoints_status_test.go b/relay/endpoints_status_test.go index ffbcdad7..e1a19eba 100644 --- a/relay/endpoints_status_test.go +++ b/relay/endpoints_status_test.go @@ -5,12 +5,12 @@ import ( "testing" "time" - "github.com/launchdarkly/ld-relay/v8/internal/sdkauth" + "github.com/launchdarkly/ld-relay/v9/internal/sdkauth" - c "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/sdks" - st "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" - "github.com/launchdarkly/ld-relay/v8/internal/sharedtest/testclient" + c "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/sdks" + st "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" + "github.com/launchdarkly/ld-relay/v9/internal/sharedtest/testclient" ct "github.com/launchdarkly/go-configtypes" "github.com/launchdarkly/go-sdk-common/v3/ldtime" diff --git a/relay/endpoints_streams_test.go b/relay/endpoints_streams_test.go index adfdf12b..b4015306 100644 --- a/relay/endpoints_streams_test.go +++ b/relay/endpoints_streams_test.go @@ -7,14 +7,14 @@ import ( "testing" "time" - "github.com/launchdarkly/ld-relay/v8/internal/sdkauth" + "github.com/launchdarkly/ld-relay/v9/internal/sdkauth" - "github.com/launchdarkly/ld-relay/v8/internal/credential" + "github.com/launchdarkly/ld-relay/v9/internal/credential" - c "github.com/launchdarkly/ld-relay/v8/config" - st "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" - "github.com/launchdarkly/ld-relay/v8/internal/sharedtest/testclient" - "github.com/launchdarkly/ld-relay/v8/internal/streams" + c "github.com/launchdarkly/ld-relay/v9/config" + st "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" + "github.com/launchdarkly/ld-relay/v9/internal/sharedtest/testclient" + "github.com/launchdarkly/ld-relay/v9/internal/streams" "github.com/launchdarkly/eventsource" ct "github.com/launchdarkly/go-configtypes" @@ -174,12 +174,18 @@ func TestEndpointsStreamingMobile(t *testing.T) { userJSON := []byte(`{"key":"me"}`) specs := []streamEndpointTestParams{ - {endpointTestParams{"mobile ping", "GET", "/mping", nil, env.Config.MobileKey, 200, st.ExpectNoBody()}, - "ping", nil}, - {endpointTestParams{"mobile stream GET", "GET", "/meval/$DATA", userJSON, env.Config.MobileKey, 200, st.ExpectNoBody()}, - "ping", nil}, - {endpointTestParams{"mobile stream REPORT", "REPORT", "/meval", userJSON, env.Config.MobileKey, 200, st.ExpectNoBody()}, - "ping", nil}, + { + endpointTestParams{"mobile ping", "GET", "/mping", nil, env.Config.MobileKey, 200, st.ExpectNoBody()}, + "ping", nil, + }, + { + endpointTestParams{"mobile stream GET", "GET", "/meval/$DATA", userJSON, env.Config.MobileKey, 200, st.ExpectNoBody()}, + "ping", nil, + }, + { + endpointTestParams{"mobile stream REPORT", "REPORT", "/meval", userJSON, env.Config.MobileKey, 200, st.ExpectNoBody()}, + "ping", nil, + }, } var config c.Config @@ -198,12 +204,18 @@ func TestEndpointsStreamingJSClient(t *testing.T) { userJSON, _ := json.Marshal(user) specs := []streamEndpointTestParams{ - {endpointTestParams{"client-side get ping", "GET", "/ping/$ENV", nil, envID, 200, st.ExpectNoBody()}, - "ping", nil}, - {endpointTestParams{"client-side get eval stream", "GET", "/eval/$ENV/$DATA", userJSON, envID, 200, st.ExpectNoBody()}, - "ping", nil}, - {endpointTestParams{"client-side report eval stream", "REPORT", "/eval/$ENV", userJSON, envID, 200, st.ExpectNoBody()}, - "ping", nil}, + { + endpointTestParams{"client-side get ping", "GET", "/ping/$ENV", nil, envID, 200, st.ExpectNoBody()}, + "ping", nil, + }, + { + endpointTestParams{"client-side get eval stream", "GET", "/eval/$ENV/$DATA", userJSON, envID, 200, st.ExpectNoBody()}, + "ping", nil, + }, + { + endpointTestParams{"client-side report eval stream", "REPORT", "/eval/$ENV", userJSON, envID, 200, st.ExpectNoBody()}, + "ping", nil, + }, } var config c.Config diff --git a/relay/environment_lookup.go b/relay/environment_lookup.go index e3deb59f..1f615dd7 100644 --- a/relay/environment_lookup.go +++ b/relay/environment_lookup.go @@ -4,10 +4,10 @@ import ( "strings" "sync" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/sdkauth" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/sdkauth" - "github.com/launchdarkly/ld-relay/v8/internal/relayenv" + "github.com/launchdarkly/ld-relay/v9/internal/relayenv" ) // EnvironmentLookup is responsible for maintaining a mapping between incoming requests from SDKs, and diff --git a/relay/environment_lookup_identifier_test.go b/relay/environment_lookup_identifier_test.go index 5cf16bdc..61c4b586 100644 --- a/relay/environment_lookup_identifier_test.go +++ b/relay/environment_lookup_identifier_test.go @@ -3,9 +3,9 @@ package relay import ( "testing" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/sdkauth" - st "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/sdkauth" + st "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/relay/filedata_actions.go b/relay/filedata_actions.go index fb002e26..b2a46f7c 100644 --- a/relay/filedata_actions.go +++ b/relay/filedata_actions.go @@ -1,14 +1,14 @@ package relay import ( - "github.com/launchdarkly/ld-relay/v8/internal/relayenv" + "github.com/launchdarkly/ld-relay/v9/internal/relayenv" - "github.com/launchdarkly/ld-relay/v8/internal/sdkauth" + "github.com/launchdarkly/ld-relay/v9/internal/sdkauth" - "github.com/launchdarkly/ld-relay/v8/internal/envfactory" + "github.com/launchdarkly/ld-relay/v9/internal/envfactory" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/filedata" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/filedata" ld "github.com/launchdarkly/go-server-sdk/v7" "github.com/launchdarkly/go-server-sdk/v7/ldcomponents" diff --git a/relay/filedata_actions_test.go b/relay/filedata_actions_test.go index 55f558ed..bb6ae483 100644 --- a/relay/filedata_actions_test.go +++ b/relay/filedata_actions_test.go @@ -4,11 +4,11 @@ import ( "testing" "time" - "github.com/launchdarkly/ld-relay/v8/internal/credential" + "github.com/launchdarkly/ld-relay/v9/internal/credential" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/filedata" - "github.com/launchdarkly/ld-relay/v8/internal/sharedtest/testclient" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/filedata" + "github.com/launchdarkly/ld-relay/v9/internal/sharedtest/testclient" "github.com/launchdarkly/go-sdk-common/v3/ldlog" "github.com/launchdarkly/go-sdk-common/v3/ldlogtest" @@ -65,7 +65,8 @@ func offlineModeTest( loggers: mockLog.Loggers, clientFactory: testclient.RealLDClientFactoryWithChannel(true, clientsCreatedCh), archiveManagerFactory: func(filename string, monitoringInterval time.Duration, handler filedata.UpdateHandler, loggers ldlog.Loggers) ( - filedata.ArchiveManagerInterface, error) { + filedata.ArchiveManagerInterface, error, + ) { p.updateHandler = handler return stubArchiveManager{}, nil }, @@ -208,7 +209,6 @@ func TestOfflineModeDeprecatedSDKKeyIsRespectedIfExpiryInFuture(t *testing.T) { // would happen when Relay is starting up at time T if the key was deprecated at a time before T. offlineModeTest(t, config.Config{}, func(p offlineModeTestParams) { - envData := RotateSDKKeyWithGracePeriod("primary-key", "deprecated-key", time.Now().Add(1*time.Hour)) p.updateHandler.AddEnvironment(envData) diff --git a/relay/filedata_testdata_test.go b/relay/filedata_testdata_test.go index d097a4ce..803090ff 100644 --- a/relay/filedata_testdata_test.go +++ b/relay/filedata_testdata_test.go @@ -3,19 +3,21 @@ package relay import ( "time" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/envfactory" - "github.com/launchdarkly/ld-relay/v8/internal/filedata" - "github.com/launchdarkly/ld-relay/v8/internal/relayenv" - "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/envfactory" + "github.com/launchdarkly/ld-relay/v9/internal/filedata" + "github.com/launchdarkly/ld-relay/v9/internal/relayenv" + "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" "github.com/launchdarkly/go-server-sdk-evaluation/v3/ldbuilders" "github.com/launchdarkly/go-server-sdk/v7/subsystems/ldstoreimpl" "github.com/launchdarkly/go-server-sdk/v7/subsystems/ldstoretypes" ) -var testFileDataFlag1 = ldbuilders.NewFlagBuilder("flag1").Version(1).Build() -var testFileDataFlag2 = ldbuilders.NewFlagBuilder("flag2").Version(1).Build() +var ( + testFileDataFlag1 = ldbuilders.NewFlagBuilder("flag1").Version(1).Build() + testFileDataFlag2 = ldbuilders.NewFlagBuilder("flag2").Version(1).Build() +) var testFileDataEnv1 = filedata.ArchiveEnvironment{ Params: envfactory.EnvironmentParams{ @@ -88,5 +90,6 @@ func RotateSDKKeyWithGracePeriod(primary config.SDKKey, expiring config.SDKKey, {Key: testFileDataFlag1.Key, Item: sharedtest.FlagDesc(testFileDataFlag1)}, }, }, - }} + }, + } } diff --git a/relay/relay.go b/relay/relay.go index 73db81d8..e263ecac 100644 --- a/relay/relay.go +++ b/relay/relay.go @@ -10,21 +10,21 @@ import ( "sync" "time" - "github.com/launchdarkly/ld-relay/v8/internal/sdkauth" - - "github.com/launchdarkly/ld-relay/v8/internal/projmanager" - - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/autoconfig" - "github.com/launchdarkly/ld-relay/v8/internal/basictypes" - "github.com/launchdarkly/ld-relay/v8/internal/filedata" - "github.com/launchdarkly/ld-relay/v8/internal/httpconfig" - "github.com/launchdarkly/ld-relay/v8/internal/metrics" - "github.com/launchdarkly/ld-relay/v8/internal/relayenv" - "github.com/launchdarkly/ld-relay/v8/internal/sdks" - "github.com/launchdarkly/ld-relay/v8/internal/streams" - "github.com/launchdarkly/ld-relay/v8/internal/util" - "github.com/launchdarkly/ld-relay/v8/relay/version" + "github.com/launchdarkly/ld-relay/v9/internal/sdkauth" + + "github.com/launchdarkly/ld-relay/v9/internal/projmanager" + + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/autoconfig" + "github.com/launchdarkly/ld-relay/v9/internal/basictypes" + "github.com/launchdarkly/ld-relay/v9/internal/filedata" + "github.com/launchdarkly/ld-relay/v9/internal/httpconfig" + "github.com/launchdarkly/ld-relay/v9/internal/metrics" + "github.com/launchdarkly/ld-relay/v9/internal/relayenv" + "github.com/launchdarkly/ld-relay/v9/internal/sdks" + "github.com/launchdarkly/ld-relay/v9/internal/streams" + "github.com/launchdarkly/ld-relay/v9/internal/util" + "github.com/launchdarkly/ld-relay/v9/relay/version" "github.com/launchdarkly/go-sdk-common/v3/ldlog" ld "github.com/launchdarkly/go-server-sdk/v7" diff --git a/relay/relay_end_to_end_redis_test.go b/relay/relay_end_to_end_redis_test.go index dfd20f67..8a676fb7 100644 --- a/relay/relay_end_to_end_redis_test.go +++ b/relay/relay_end_to_end_redis_test.go @@ -16,12 +16,14 @@ import ( "github.com/launchdarkly/go-server-sdk/v7/subsystems" "github.com/launchdarkly/go-server-sdk/v7/testhelpers/ldservices" "github.com/launchdarkly/go-server-sdk/v7/testhelpers/ldservicesv2" - c "github.com/launchdarkly/ld-relay/v8/config" - st "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" + c "github.com/launchdarkly/ld-relay/v9/config" + st "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" ) -var basicRedisConfig = c.RedisConfig{Host: "localhost", LocalTTL: configtypes.NewOptDuration(time.Minute)} -var uncachedRedisConfig = c.RedisConfig{Host: "localhost", LocalTTL: configtypes.NewOptDuration(0)} +var ( + basicRedisConfig = c.RedisConfig{Host: "localhost", LocalTTL: configtypes.NewOptDuration(time.Minute)} + uncachedRedisConfig = c.RedisConfig{Host: "localhost", LocalTTL: configtypes.NewOptDuration(0)} +) func TestRelayEndToEndRedisSuccessWithCache(t *testing.T) { initialData := ldservicesv2.NewServerSDKData().Flags(testFlag) diff --git a/relay/relay_end_to_end_test.go b/relay/relay_end_to_end_test.go index a240e481..bb45f35e 100644 --- a/relay/relay_end_to_end_test.go +++ b/relay/relay_end_to_end_test.go @@ -12,9 +12,9 @@ import ( "github.com/launchdarkly/eventsource" "github.com/launchdarkly/go-server-sdk/v7/testhelpers/ldservices" - c "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/basictypes" - st "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" + c "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/basictypes" + st "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" "github.com/launchdarkly/go-configtypes" "github.com/launchdarkly/go-sdk-common/v3/ldlog" diff --git a/relay/relay_endpoints.go b/relay/relay_endpoints.go index 39642a5c..32036191 100644 --- a/relay/relay_endpoints.go +++ b/relay/relay_endpoints.go @@ -13,14 +13,14 @@ import ( ldeval "github.com/launchdarkly/go-server-sdk-evaluation/v3" - "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/basictypes" - "github.com/launchdarkly/ld-relay/v8/internal/credential" - "github.com/launchdarkly/ld-relay/v8/internal/logging" - "github.com/launchdarkly/ld-relay/v8/internal/middleware" - "github.com/launchdarkly/ld-relay/v8/internal/relayenv" - "github.com/launchdarkly/ld-relay/v8/internal/streams" - "github.com/launchdarkly/ld-relay/v8/internal/util" + "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/basictypes" + "github.com/launchdarkly/ld-relay/v9/internal/credential" + "github.com/launchdarkly/ld-relay/v9/internal/logging" + "github.com/launchdarkly/ld-relay/v9/internal/middleware" + "github.com/launchdarkly/ld-relay/v9/internal/relayenv" + "github.com/launchdarkly/ld-relay/v9/internal/streams" + "github.com/launchdarkly/ld-relay/v9/internal/util" "github.com/launchdarkly/go-jsonstream/v3/jwriter" "github.com/launchdarkly/go-sdk-common/v3/ldcontext" diff --git a/relay/relay_endpoints_benchmark_test.go b/relay/relay_endpoints_benchmark_test.go index 9b588906..ae24bf9d 100644 --- a/relay/relay_endpoints_benchmark_test.go +++ b/relay/relay_endpoints_benchmark_test.go @@ -6,9 +6,9 @@ import ( "net/http/httptest" "testing" - "github.com/launchdarkly/ld-relay/v8/internal/basictypes" - "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" - "github.com/launchdarkly/ld-relay/v8/internal/sharedtest/testenv" + "github.com/launchdarkly/ld-relay/v9/internal/basictypes" + "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" + "github.com/launchdarkly/ld-relay/v9/internal/sharedtest/testenv" "github.com/launchdarkly/go-sdk-common/v3/lduser" "github.com/launchdarkly/go-sdk-common/v3/ldvalue" diff --git a/relay/relay_endpoints_test.go b/relay/relay_endpoints_test.go index e4a746ba..c613fe7b 100644 --- a/relay/relay_endpoints_test.go +++ b/relay/relay_endpoints_test.go @@ -6,11 +6,11 @@ import ( "net/http/httptest" "testing" - "github.com/launchdarkly/ld-relay/v8/internal/basictypes" - "github.com/launchdarkly/ld-relay/v8/internal/middleware" - "github.com/launchdarkly/ld-relay/v8/internal/relayenv" - st "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" - "github.com/launchdarkly/ld-relay/v8/internal/sharedtest/testenv" + "github.com/launchdarkly/ld-relay/v9/internal/basictypes" + "github.com/launchdarkly/ld-relay/v9/internal/middleware" + "github.com/launchdarkly/ld-relay/v9/internal/relayenv" + st "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" + "github.com/launchdarkly/ld-relay/v9/internal/sharedtest/testenv" "github.com/launchdarkly/go-test-helpers/v3/jsonhelpers" diff --git a/relay/relay_environments_test.go b/relay/relay_environments_test.go index 7de28839..2ef3ce49 100644 --- a/relay/relay_environments_test.go +++ b/relay/relay_environments_test.go @@ -7,18 +7,18 @@ import ( "testing" "time" - "github.com/launchdarkly/ld-relay/v8/internal/sdkauth" + "github.com/launchdarkly/ld-relay/v9/internal/sdkauth" "github.com/launchdarkly/eventsource" "github.com/launchdarkly/go-sdk-common/v3/ldlog" ld "github.com/launchdarkly/go-server-sdk/v7" helpers "github.com/launchdarkly/go-test-helpers/v3" - c "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/basictypes" - "github.com/launchdarkly/ld-relay/v8/internal/relayenv" - "github.com/launchdarkly/ld-relay/v8/internal/sdks" - st "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" - "github.com/launchdarkly/ld-relay/v8/internal/sharedtest/testclient" + c "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/basictypes" + "github.com/launchdarkly/ld-relay/v9/internal/relayenv" + "github.com/launchdarkly/ld-relay/v9/internal/sdks" + st "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" + "github.com/launchdarkly/ld-relay/v9/internal/sharedtest/testclient" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/relay/relay_routes.go b/relay/relay_routes.go index de0809f9..0323c665 100644 --- a/relay/relay_routes.go +++ b/relay/relay_routes.go @@ -3,13 +3,13 @@ package relay import ( "net/http" - "github.com/launchdarkly/ld-relay/v8/internal/sdkauth" + "github.com/launchdarkly/ld-relay/v9/internal/sdkauth" - "github.com/launchdarkly/ld-relay/v8/internal/basictypes" - "github.com/launchdarkly/ld-relay/v8/internal/logging" - "github.com/launchdarkly/ld-relay/v8/internal/metrics" - "github.com/launchdarkly/ld-relay/v8/internal/middleware" - "github.com/launchdarkly/ld-relay/v8/internal/relayenv" + "github.com/launchdarkly/ld-relay/v9/internal/basictypes" + "github.com/launchdarkly/ld-relay/v9/internal/logging" + "github.com/launchdarkly/ld-relay/v9/internal/metrics" + "github.com/launchdarkly/ld-relay/v9/internal/middleware" + "github.com/launchdarkly/ld-relay/v9/internal/relayenv" "github.com/launchdarkly/go-sdk-common/v3/ldlog" ldevents "github.com/launchdarkly/go-sdk-events/v3" diff --git a/relay/relay_test.go b/relay/relay_test.go index 2c575c54..693fdacf 100644 --- a/relay/relay_test.go +++ b/relay/relay_test.go @@ -13,7 +13,7 @@ import ( "testing" "time" - c "github.com/launchdarkly/ld-relay/v8/config" + c "github.com/launchdarkly/ld-relay/v9/config" "github.com/launchdarkly/go-configtypes" "github.com/launchdarkly/go-sdk-common/v3/ldlog" diff --git a/relay/relay_test_base_test.go b/relay/relay_test_base_test.go index bb6ed63b..032374a7 100644 --- a/relay/relay_test_base_test.go +++ b/relay/relay_test_base_test.go @@ -4,8 +4,8 @@ import ( "testing" "time" - c "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/sharedtest/testclient" + c "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/sharedtest/testclient" "github.com/launchdarkly/go-sdk-common/v3/ldlog" "github.com/launchdarkly/go-sdk-common/v3/ldlogtest" diff --git a/relay/request_logging_test.go b/relay/request_logging_test.go index 86e4bfac..5c00abae 100644 --- a/relay/request_logging_test.go +++ b/relay/request_logging_test.go @@ -4,8 +4,8 @@ import ( "net/http" "testing" - c "github.com/launchdarkly/ld-relay/v8/config" - st "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" + c "github.com/launchdarkly/ld-relay/v9/config" + st "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" "github.com/launchdarkly/go-sdk-common/v3/ldlog" ) diff --git a/relay/testutils_test.go b/relay/testutils_test.go index 8d1d3685..7ba4e293 100644 --- a/relay/testutils_test.go +++ b/relay/testutils_test.go @@ -7,15 +7,15 @@ import ( "testing" "time" - "github.com/launchdarkly/ld-relay/v8/internal/sdkauth" + "github.com/launchdarkly/ld-relay/v9/internal/sdkauth" - "github.com/launchdarkly/ld-relay/v8/internal/credential" + "github.com/launchdarkly/ld-relay/v9/internal/credential" - "github.com/launchdarkly/ld-relay/v8/config" - c "github.com/launchdarkly/ld-relay/v8/config" - "github.com/launchdarkly/ld-relay/v8/internal/envfactory" - "github.com/launchdarkly/ld-relay/v8/internal/relayenv" - "github.com/launchdarkly/ld-relay/v8/internal/sharedtest" + "github.com/launchdarkly/ld-relay/v9/config" + c "github.com/launchdarkly/ld-relay/v9/config" + "github.com/launchdarkly/ld-relay/v9/internal/envfactory" + "github.com/launchdarkly/ld-relay/v9/internal/relayenv" + "github.com/launchdarkly/ld-relay/v9/internal/sharedtest" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require"