From 53b5b443cf22e2b95beadebc118d6a36f33dfecf Mon Sep 17 00:00:00 2001 From: pulak-opti Date: Sat, 20 Jan 2024 00:19:15 +0600 Subject: [PATCH] use go-sdk v2 --- cmd/optimizely/main.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- pkg/handlers/activate.go | 4 ++-- pkg/handlers/activate_test.go | 2 +- pkg/handlers/decide.go | 8 +++---- pkg/handlers/decide_test.go | 8 +++---- pkg/handlers/lookup_test.go | 2 +- pkg/handlers/notification.go | 4 ++-- pkg/handlers/notification_test.go | 6 ++--- pkg/handlers/optimizely_config_test.go | 2 +- pkg/handlers/override_test.go | 4 ++-- pkg/handlers/save.go | 2 +- pkg/handlers/save_test.go | 2 +- pkg/handlers/send_odp_event.go | 2 +- pkg/handlers/send_odp_event_test.go | 8 +++---- pkg/handlers/track.go | 2 +- pkg/handlers/track_test.go | 8 +++---- pkg/middleware/cached_test.go | 2 +- pkg/middleware/utils.go | 2 +- pkg/middleware/utils_test.go | 2 +- pkg/optimizely/cache.go | 22 +++++++++---------- pkg/optimizely/cache_test.go | 8 +++---- pkg/optimizely/client.go | 8 +++---- pkg/optimizely/client_test.go | 10 ++++----- pkg/optimizely/interface.go | 2 +- pkg/optimizely/logger.go | 2 +- pkg/optimizely/logger_test.go | 2 +- pkg/optimizely/metrics.go | 2 +- pkg/optimizely/optimizelytest/client.go | 18 +++++++-------- pkg/optimizely/optimizelytest/config.go | 4 ++-- .../optimizelytest/event_api_manager.go | 2 +- pkg/optimizely/optimizelytest/processor.go | 2 +- pkg/syncer/syncer.go | 2 +- pkg/syncer/syncer_test.go | 2 +- plugins/odpcache/registry.go | 2 +- plugins/odpcache/registry_test.go | 2 +- plugins/odpcache/services/in_memory_cache.go | 2 +- plugins/odpcache/services/redis_cache.go | 2 +- plugins/userprofileservice/registry.go | 2 +- plugins/userprofileservice/registry_test.go | 2 +- .../services/in_memory_ups.go | 2 +- .../services/in_memory_ups_test.go | 2 +- .../userprofileservice/services/redis_ups.go | 2 +- .../services/redis_ups_test.go | 2 +- .../userprofileservice/services/rest_ups.go | 6 ++--- .../services/rest_ups_test.go | 6 ++--- plugins/userprofileservice/services/utils.go | 2 +- 48 files changed, 99 insertions(+), 99 deletions(-) diff --git a/cmd/optimizely/main.go b/cmd/optimizely/main.go index 73ba4ba9..5784a5d1 100644 --- a/cmd/optimizely/main.go +++ b/cmd/optimizely/main.go @@ -50,7 +50,7 @@ import ( _ "github.com/optimizely/agent/plugins/interceptors/all" // Initiate the loading of the userprofileservice plugins _ "github.com/optimizely/agent/plugins/odpcache/all" // Initiate the loading of the odpCache plugins _ "github.com/optimizely/agent/plugins/userprofileservice/all" // Initiate the loading of the interceptor plugins - "github.com/optimizely/go-sdk/pkg/logging" + "github.com/optimizely/go-sdk/v2/pkg/logging" ) // Version holds the admin version diff --git a/go.mod b/go.mod index a877f093..a4700dd4 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/golang-jwt/jwt/v4 v4.5.0 github.com/google/uuid v1.3.1 github.com/lestrrat-go/jwx v0.9.0 - github.com/optimizely/go-sdk v1.8.4-0.20240118173841-4adb1affdb93 + github.com/optimizely/go-sdk/v2 v2.0.0-beta.0.20240119164342-26cf04dc89f1 github.com/orcaman/concurrent-map v1.0.0 github.com/prometheus/client_golang v1.11.0 github.com/rakyll/statik v0.1.7 diff --git a/go.sum b/go.sum index bf526eec..fdd4d238 100644 --- a/go.sum +++ b/go.sum @@ -244,8 +244,8 @@ github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE= github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= -github.com/optimizely/go-sdk v1.8.4-0.20240118173841-4adb1affdb93 h1:aySLExk0xgvlquiBwTnmir49OIAoP8tjYTCaYgm9JqY= -github.com/optimizely/go-sdk v1.8.4-0.20240118173841-4adb1affdb93/go.mod h1:v1+k17OkqjhWuvTGiFhvaq6KDYRiVFsWrpqr0PnlKAU= +github.com/optimizely/go-sdk/v2 v2.0.0-beta.0.20240119164342-26cf04dc89f1 h1:E0MH/YqLpKeEbLIXJWxjR+HxvA58eMHJywSCGymHupQ= +github.com/optimizely/go-sdk/v2 v2.0.0-beta.0.20240119164342-26cf04dc89f1/go.mod h1:MusRCFsU7+XzJCoCTgheLoENJSf1iiFYm4KbJqz6BYA= github.com/orcaman/concurrent-map v1.0.0 h1:I/2A2XPCb4IuQWcQhBhSwGfiuybl/J0ev9HDbW65HOY= github.com/orcaman/concurrent-map v1.0.0/go.mod h1:Lu3tH6HLW3feq74c2GC+jIMS/K2CFcDWnWD9XkenwhI= github.com/pelletier/go-toml/v2 v2.0.6 h1:nrzqCb7j9cDFj2coyLNLaZuJTLjWjlaz6nvTvIwycIU= diff --git a/pkg/handlers/activate.go b/pkg/handlers/activate.go index 8781c6c0..ce05d385 100644 --- a/pkg/handlers/activate.go +++ b/pkg/handlers/activate.go @@ -26,8 +26,8 @@ import ( "github.com/optimizely/agent/pkg/middleware" "github.com/optimizely/agent/pkg/optimizely" - "github.com/optimizely/go-sdk/pkg/config" - "github.com/optimizely/go-sdk/pkg/entities" + "github.com/optimizely/go-sdk/v2/pkg/config" + "github.com/optimizely/go-sdk/v2/pkg/entities" ) type keyMap map[string]string diff --git a/pkg/handlers/activate_test.go b/pkg/handlers/activate_test.go index 0e24e08c..bc50b2ba 100644 --- a/pkg/handlers/activate_test.go +++ b/pkg/handlers/activate_test.go @@ -26,7 +26,7 @@ import ( "testing" "github.com/go-chi/chi/v5" - "github.com/optimizely/go-sdk/pkg/entities" + "github.com/optimizely/go-sdk/v2/pkg/entities" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" diff --git a/pkg/handlers/decide.go b/pkg/handlers/decide.go index 6ccf4daf..713ac8f4 100644 --- a/pkg/handlers/decide.go +++ b/pkg/handlers/decide.go @@ -24,10 +24,10 @@ import ( "github.com/go-chi/render" "github.com/optimizely/agent/pkg/middleware" - "github.com/optimizely/go-sdk/pkg/client" - "github.com/optimizely/go-sdk/pkg/decide" - "github.com/optimizely/go-sdk/pkg/decision" - "github.com/optimizely/go-sdk/pkg/odp/segment" + "github.com/optimizely/go-sdk/v2/pkg/client" + "github.com/optimizely/go-sdk/v2/pkg/decide" + "github.com/optimizely/go-sdk/v2/pkg/decision" + "github.com/optimizely/go-sdk/v2/pkg/odp/segment" ) // DecideBody defines the request body for decide API diff --git a/pkg/handlers/decide_test.go b/pkg/handlers/decide_test.go index 7eef55c2..b0fd194a 100644 --- a/pkg/handlers/decide_test.go +++ b/pkg/handlers/decide_test.go @@ -33,10 +33,10 @@ import ( "github.com/optimizely/agent/pkg/middleware" "github.com/optimizely/agent/pkg/optimizely" "github.com/optimizely/agent/pkg/optimizely/optimizelytest" - "github.com/optimizely/go-sdk/pkg/client" - "github.com/optimizely/go-sdk/pkg/decide" - "github.com/optimizely/go-sdk/pkg/entities" - "github.com/optimizely/go-sdk/pkg/odp/segment" + "github.com/optimizely/go-sdk/v2/pkg/client" + "github.com/optimizely/go-sdk/v2/pkg/decide" + "github.com/optimizely/go-sdk/v2/pkg/entities" + "github.com/optimizely/go-sdk/v2/pkg/odp/segment" ) type DecideTestSuite struct { diff --git a/pkg/handlers/lookup_test.go b/pkg/handlers/lookup_test.go index 6a6e0891..0654c9a1 100644 --- a/pkg/handlers/lookup_test.go +++ b/pkg/handlers/lookup_test.go @@ -26,7 +26,7 @@ import ( "testing" "github.com/go-chi/chi/v5" - "github.com/optimizely/go-sdk/pkg/decision" + "github.com/optimizely/go-sdk/v2/pkg/decision" "github.com/stretchr/testify/suite" "github.com/optimizely/agent/pkg/middleware" diff --git a/pkg/handlers/notification.go b/pkg/handlers/notification.go index 356a4f9a..ce2d1515 100644 --- a/pkg/handlers/notification.go +++ b/pkg/handlers/notification.go @@ -28,8 +28,8 @@ import ( "github.com/optimizely/agent/config" "github.com/optimizely/agent/pkg/middleware" "github.com/optimizely/agent/pkg/syncer" - "github.com/optimizely/go-sdk/pkg/notification" - "github.com/optimizely/go-sdk/pkg/registry" + "github.com/optimizely/go-sdk/v2/pkg/notification" + "github.com/optimizely/go-sdk/v2/pkg/registry" "github.com/rs/zerolog" ) diff --git a/pkg/handlers/notification_test.go b/pkg/handlers/notification_test.go index 457564b8..e8e2cbda 100644 --- a/pkg/handlers/notification_test.go +++ b/pkg/handlers/notification_test.go @@ -35,9 +35,9 @@ import ( "github.com/optimizely/agent/pkg/optimizely" "github.com/optimizely/agent/pkg/optimizely/optimizelytest" "github.com/optimizely/agent/pkg/syncer" - "github.com/optimizely/go-sdk/pkg/entities" - "github.com/optimizely/go-sdk/pkg/notification" - "github.com/optimizely/go-sdk/pkg/registry" + "github.com/optimizely/go-sdk/v2/pkg/entities" + "github.com/optimizely/go-sdk/v2/pkg/notification" + "github.com/optimizely/go-sdk/v2/pkg/registry" ) type NotificationTestSuite struct { diff --git a/pkg/handlers/optimizely_config_test.go b/pkg/handlers/optimizely_config_test.go index 3febefb3..d35ed0ac 100644 --- a/pkg/handlers/optimizely_config_test.go +++ b/pkg/handlers/optimizely_config_test.go @@ -29,7 +29,7 @@ import ( "github.com/optimizely/agent/pkg/middleware" "github.com/optimizely/agent/pkg/optimizely" "github.com/optimizely/agent/pkg/optimizely/optimizelytest" - "github.com/optimizely/go-sdk/pkg/config" + "github.com/optimizely/go-sdk/v2/pkg/config" ) type OptimizelyConfigTestSuite struct { diff --git a/pkg/handlers/override_test.go b/pkg/handlers/override_test.go index 59b85957..f9df1812 100644 --- a/pkg/handlers/override_test.go +++ b/pkg/handlers/override_test.go @@ -29,8 +29,8 @@ import ( "github.com/optimizely/agent/pkg/optimizely" "github.com/optimizely/agent/pkg/optimizely/optimizelytest" - "github.com/optimizely/go-sdk/pkg/decision" - "github.com/optimizely/go-sdk/pkg/entities" + "github.com/optimizely/go-sdk/v2/pkg/decision" + "github.com/optimizely/go-sdk/v2/pkg/entities" "github.com/go-chi/chi/v5" "github.com/stretchr/testify/suite" diff --git a/pkg/handlers/save.go b/pkg/handlers/save.go index 2281aab7..37799753 100644 --- a/pkg/handlers/save.go +++ b/pkg/handlers/save.go @@ -23,7 +23,7 @@ import ( "github.com/go-chi/render" "github.com/optimizely/agent/pkg/middleware" - "github.com/optimizely/go-sdk/pkg/decision" + "github.com/optimizely/go-sdk/v2/pkg/decision" ) type saveBody struct { diff --git a/pkg/handlers/save_test.go b/pkg/handlers/save_test.go index 261515d2..0b208208 100644 --- a/pkg/handlers/save_test.go +++ b/pkg/handlers/save_test.go @@ -32,7 +32,7 @@ import ( "github.com/optimizely/agent/pkg/optimizely" "github.com/optimizely/agent/pkg/optimizely/optimizelytest" userprofileservices "github.com/optimizely/agent/plugins/userprofileservice/services" - "github.com/optimizely/go-sdk/pkg/decision" + "github.com/optimizely/go-sdk/v2/pkg/decision" ) type SaveTestSuite struct { diff --git a/pkg/handlers/send_odp_event.go b/pkg/handlers/send_odp_event.go index 14cb704f..bcfcd833 100644 --- a/pkg/handlers/send_odp_event.go +++ b/pkg/handlers/send_odp_event.go @@ -25,7 +25,7 @@ import ( "github.com/optimizely/agent/pkg/middleware" "github.com/optimizely/agent/pkg/optimizely" - "github.com/optimizely/go-sdk/pkg/odp/event" + "github.com/optimizely/go-sdk/v2/pkg/odp/event" ) // SendOdpEvent sends event to ODP platform diff --git a/pkg/handlers/send_odp_event_test.go b/pkg/handlers/send_odp_event_test.go index 63cc3e6c..95bf5336 100644 --- a/pkg/handlers/send_odp_event_test.go +++ b/pkg/handlers/send_odp_event_test.go @@ -27,10 +27,10 @@ import ( "testing" "github.com/go-chi/chi" - "github.com/optimizely/go-sdk/pkg/config" - "github.com/optimizely/go-sdk/pkg/notification" - "github.com/optimizely/go-sdk/pkg/odp/event" - "github.com/optimizely/go-sdk/pkg/registry" + "github.com/optimizely/go-sdk/v2/pkg/config" + "github.com/optimizely/go-sdk/v2/pkg/notification" + "github.com/optimizely/go-sdk/v2/pkg/odp/event" + "github.com/optimizely/go-sdk/v2/pkg/registry" "github.com/stretchr/testify/suite" "github.com/optimizely/agent/pkg/middleware" diff --git a/pkg/handlers/track.go b/pkg/handlers/track.go index 010431df..2d0b2cce 100644 --- a/pkg/handlers/track.go +++ b/pkg/handlers/track.go @@ -24,7 +24,7 @@ import ( "github.com/go-chi/render" "github.com/optimizely/agent/pkg/middleware" - "github.com/optimizely/go-sdk/pkg/entities" + "github.com/optimizely/go-sdk/v2/pkg/entities" ) type trackBody struct { diff --git a/pkg/handlers/track_test.go b/pkg/handlers/track_test.go index 09d9e419..47b69479 100644 --- a/pkg/handlers/track_test.go +++ b/pkg/handlers/track_test.go @@ -27,10 +27,10 @@ import ( "testing" "github.com/go-chi/chi/v5" - "github.com/optimizely/go-sdk/pkg/client" - "github.com/optimizely/go-sdk/pkg/config" - "github.com/optimizely/go-sdk/pkg/entities" - "github.com/optimizely/go-sdk/pkg/notification" + "github.com/optimizely/go-sdk/v2/pkg/client" + "github.com/optimizely/go-sdk/v2/pkg/config" + "github.com/optimizely/go-sdk/v2/pkg/entities" + "github.com/optimizely/go-sdk/v2/pkg/notification" "github.com/stretchr/testify/suite" "github.com/optimizely/agent/pkg/middleware" diff --git a/pkg/middleware/cached_test.go b/pkg/middleware/cached_test.go index 6e3a2c17..6eec9111 100644 --- a/pkg/middleware/cached_test.go +++ b/pkg/middleware/cached_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" - "github.com/optimizely/go-sdk/pkg/entities" + "github.com/optimizely/go-sdk/v2/pkg/entities" "github.com/optimizely/agent/pkg/optimizely" "github.com/optimizely/agent/pkg/optimizely/optimizelytest" diff --git a/pkg/middleware/utils.go b/pkg/middleware/utils.go index cf45b041..4c5ad136 100644 --- a/pkg/middleware/utils.go +++ b/pkg/middleware/utils.go @@ -29,7 +29,7 @@ import ( "go.opentelemetry.io/otel/trace" "github.com/optimizely/agent/pkg/optimizely" - "github.com/optimizely/go-sdk/pkg/config" + "github.com/optimizely/go-sdk/v2/pkg/config" ) // ErrorResponse Model diff --git a/pkg/middleware/utils_test.go b/pkg/middleware/utils_test.go index 799477a3..d2b3606b 100644 --- a/pkg/middleware/utils_test.go +++ b/pkg/middleware/utils_test.go @@ -30,7 +30,7 @@ import ( "go.opentelemetry.io/otel/propagation" "github.com/optimizely/agent/pkg/optimizely" - "github.com/optimizely/go-sdk/pkg/config" + "github.com/optimizely/go-sdk/v2/pkg/config" ) // GetOptlyClient is a utility to extract the OptlyClient from the http request context. diff --git a/pkg/optimizely/cache.go b/pkg/optimizely/cache.go index 22a2db22..093f6585 100644 --- a/pkg/optimizely/cache.go +++ b/pkg/optimizely/cache.go @@ -33,17 +33,17 @@ import ( "github.com/optimizely/agent/pkg/syncer" "github.com/optimizely/agent/plugins/odpcache" "github.com/optimizely/agent/plugins/userprofileservice" - "github.com/optimizely/go-sdk/pkg/client" - sdkconfig "github.com/optimizely/go-sdk/pkg/config" - "github.com/optimizely/go-sdk/pkg/decision" - "github.com/optimizely/go-sdk/pkg/event" - "github.com/optimizely/go-sdk/pkg/logging" - "github.com/optimizely/go-sdk/pkg/odp" - odpCachePkg "github.com/optimizely/go-sdk/pkg/odp/cache" - odpEventPkg "github.com/optimizely/go-sdk/pkg/odp/event" - odpSegmentPkg "github.com/optimizely/go-sdk/pkg/odp/segment" - "github.com/optimizely/go-sdk/pkg/tracing" - "github.com/optimizely/go-sdk/pkg/utils" + "github.com/optimizely/go-sdk/v2/pkg/client" + sdkconfig "github.com/optimizely/go-sdk/v2/pkg/config" + "github.com/optimizely/go-sdk/v2/pkg/decision" + "github.com/optimizely/go-sdk/v2/pkg/event" + "github.com/optimizely/go-sdk/v2/pkg/logging" + "github.com/optimizely/go-sdk/v2/pkg/odp" + odpCachePkg "github.com/optimizely/go-sdk/v2/pkg/odp/cache" + odpEventPkg "github.com/optimizely/go-sdk/v2/pkg/odp/event" + odpSegmentPkg "github.com/optimizely/go-sdk/v2/pkg/odp/segment" + "github.com/optimizely/go-sdk/v2/pkg/tracing" + "github.com/optimizely/go-sdk/v2/pkg/utils" ) // User plugin strings required for internal usage diff --git a/pkg/optimizely/cache_test.go b/pkg/optimizely/cache_test.go index 5ceaa378..2865f29a 100644 --- a/pkg/optimizely/cache_test.go +++ b/pkg/optimizely/cache_test.go @@ -34,10 +34,10 @@ import ( odpCacheServices "github.com/optimizely/agent/plugins/odpcache/services" "github.com/optimizely/agent/plugins/userprofileservice" "github.com/optimizely/agent/plugins/userprofileservice/services" - sdkconfig "github.com/optimizely/go-sdk/pkg/config" - "github.com/optimizely/go-sdk/pkg/decision" - "github.com/optimizely/go-sdk/pkg/event" - "github.com/optimizely/go-sdk/pkg/odp/cache" + sdkconfig "github.com/optimizely/go-sdk/v2/pkg/config" + "github.com/optimizely/go-sdk/v2/pkg/decision" + "github.com/optimizely/go-sdk/v2/pkg/event" + "github.com/optimizely/go-sdk/v2/pkg/odp/cache" ) var counter int diff --git a/pkg/optimizely/client.go b/pkg/optimizely/client.go index a0c31bd1..374171c1 100644 --- a/pkg/optimizely/client.go +++ b/pkg/optimizely/client.go @@ -24,10 +24,10 @@ import ( "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" - optimizelyclient "github.com/optimizely/go-sdk/pkg/client" - "github.com/optimizely/go-sdk/pkg/decision" - "github.com/optimizely/go-sdk/pkg/entities" - "github.com/optimizely/go-sdk/pkg/odp/cache" + optimizelyclient "github.com/optimizely/go-sdk/v2/pkg/client" + "github.com/optimizely/go-sdk/v2/pkg/decision" + "github.com/optimizely/go-sdk/v2/pkg/entities" + "github.com/optimizely/go-sdk/v2/pkg/odp/cache" ) // ErrEntityNotFound is returned when no entity exists with a given key diff --git a/pkg/optimizely/client_test.go b/pkg/optimizely/client_test.go index 91cd61e9..9f994b5d 100644 --- a/pkg/optimizely/client_test.go +++ b/pkg/optimizely/client_test.go @@ -26,11 +26,11 @@ import ( "github.com/stretchr/testify/suite" "github.com/optimizely/agent/pkg/optimizely/optimizelytest" - "github.com/optimizely/go-sdk/pkg/client" - "github.com/optimizely/go-sdk/pkg/config" - "github.com/optimizely/go-sdk/pkg/decision" - "github.com/optimizely/go-sdk/pkg/entities" - "github.com/optimizely/go-sdk/pkg/notification" + "github.com/optimizely/go-sdk/v2/pkg/client" + "github.com/optimizely/go-sdk/v2/pkg/config" + "github.com/optimizely/go-sdk/v2/pkg/decision" + "github.com/optimizely/go-sdk/v2/pkg/entities" + "github.com/optimizely/go-sdk/v2/pkg/notification" ) type ClientTestSuite struct { diff --git a/pkg/optimizely/interface.go b/pkg/optimizely/interface.go index 3c981ef1..4b8dbbdc 100644 --- a/pkg/optimizely/interface.go +++ b/pkg/optimizely/interface.go @@ -18,7 +18,7 @@ package optimizely import ( - optimizelyconfig "github.com/optimizely/go-sdk/pkg/config" + optimizelyconfig "github.com/optimizely/go-sdk/v2/pkg/config" ) // Cache defines a basic interface for retrieving an instance of the OptlyClient keyed off of the SDK Key diff --git a/pkg/optimizely/logger.go b/pkg/optimizely/logger.go index 0d6ea7c8..13495e71 100644 --- a/pkg/optimizely/logger.go +++ b/pkg/optimizely/logger.go @@ -21,7 +21,7 @@ import ( "github.com/rs/zerolog" "github.com/rs/zerolog/log" - "github.com/optimizely/go-sdk/pkg/logging" + "github.com/optimizely/go-sdk/v2/pkg/logging" ) var levelMap = map[logging.LogLevel]zerolog.Level{ diff --git a/pkg/optimizely/logger_test.go b/pkg/optimizely/logger_test.go index fdd7cd8a..2ef224f4 100644 --- a/pkg/optimizely/logger_test.go +++ b/pkg/optimizely/logger_test.go @@ -21,7 +21,7 @@ import ( "bytes" "testing" - "github.com/optimizely/go-sdk/pkg/logging" + "github.com/optimizely/go-sdk/v2/pkg/logging" "github.com/rs/zerolog" "github.com/stretchr/testify/assert" diff --git a/pkg/optimizely/metrics.go b/pkg/optimizely/metrics.go index d615bcc2..d7e725df 100644 --- a/pkg/optimizely/metrics.go +++ b/pkg/optimizely/metrics.go @@ -19,7 +19,7 @@ package optimizely import ( "github.com/optimizely/agent/pkg/metrics" - go_sdk_metrics "github.com/optimizely/go-sdk/pkg/metrics" + go_sdk_metrics "github.com/optimizely/go-sdk/v2/pkg/metrics" ) // MetricsRegistry initializes metrics registry diff --git a/pkg/optimizely/optimizelytest/client.go b/pkg/optimizely/optimizelytest/client.go index ce3540e5..8aae4034 100644 --- a/pkg/optimizely/optimizelytest/client.go +++ b/pkg/optimizely/optimizelytest/client.go @@ -20,15 +20,15 @@ package optimizelytest import ( "time" - "github.com/optimizely/go-sdk/pkg/client" - "github.com/optimizely/go-sdk/pkg/config" - "github.com/optimizely/go-sdk/pkg/decision" - "github.com/optimizely/go-sdk/pkg/entities" - "github.com/optimizely/go-sdk/pkg/event" - "github.com/optimizely/go-sdk/pkg/logging" - "github.com/optimizely/go-sdk/pkg/odp" - pkgOdpEvent "github.com/optimizely/go-sdk/pkg/odp/event" - "github.com/optimizely/go-sdk/pkg/odp/segment" + "github.com/optimizely/go-sdk/v2/pkg/client" + "github.com/optimizely/go-sdk/v2/pkg/config" + "github.com/optimizely/go-sdk/v2/pkg/decision" + "github.com/optimizely/go-sdk/v2/pkg/entities" + "github.com/optimizely/go-sdk/v2/pkg/event" + "github.com/optimizely/go-sdk/v2/pkg/logging" + "github.com/optimizely/go-sdk/v2/pkg/odp" + pkgOdpEvent "github.com/optimizely/go-sdk/v2/pkg/odp/event" + "github.com/optimizely/go-sdk/v2/pkg/odp/segment" ) // TestClient encapsulates both the ProjectConfig interface and the OptimizelyClient diff --git a/pkg/optimizely/optimizelytest/config.go b/pkg/optimizely/optimizelytest/config.go index 8d656f34..f8bde648 100644 --- a/pkg/optimizely/optimizelytest/config.go +++ b/pkg/optimizely/optimizelytest/config.go @@ -22,8 +22,8 @@ import ( "fmt" "strconv" - optlyconfig "github.com/optimizely/go-sdk/pkg/config" - "github.com/optimizely/go-sdk/pkg/entities" + optlyconfig "github.com/optimizely/go-sdk/v2/pkg/config" + "github.com/optimizely/go-sdk/v2/pkg/entities" ) // TestProjectConfig is a project config backed by a datafile diff --git a/pkg/optimizely/optimizelytest/event_api_manager.go b/pkg/optimizely/optimizelytest/event_api_manager.go index ce05d4c6..44253e00 100644 --- a/pkg/optimizely/optimizelytest/event_api_manager.go +++ b/pkg/optimizely/optimizelytest/event_api_manager.go @@ -5,7 +5,7 @@ import ( "errors" "sync" - "github.com/optimizely/go-sdk/pkg/odp/event" + "github.com/optimizely/go-sdk/v2/pkg/odp/event" ) // TestEventAPIManager implements Event API Manager to aid in testing diff --git a/pkg/optimizely/optimizelytest/processor.go b/pkg/optimizely/optimizelytest/processor.go index eb757f66..e39f31f3 100644 --- a/pkg/optimizely/optimizelytest/processor.go +++ b/pkg/optimizely/optimizelytest/processor.go @@ -20,7 +20,7 @@ package optimizelytest import ( "errors" - "github.com/optimizely/go-sdk/pkg/event" + "github.com/optimizely/go-sdk/v2/pkg/event" ) // ErrNotImplemented indicates that the error was returned since the functionality was not implemented diff --git a/pkg/syncer/syncer.go b/pkg/syncer/syncer.go index 93ad6fb4..7f2f35f1 100644 --- a/pkg/syncer/syncer.go +++ b/pkg/syncer/syncer.go @@ -24,7 +24,7 @@ import ( "sync" "github.com/optimizely/agent/config" - "github.com/optimizely/go-sdk/pkg/notification" + "github.com/optimizely/go-sdk/v2/pkg/notification" "github.com/rs/zerolog" "github.com/rs/zerolog/log" ) diff --git a/pkg/syncer/syncer_test.go b/pkg/syncer/syncer_test.go index c03d6553..01f407f7 100644 --- a/pkg/syncer/syncer_test.go +++ b/pkg/syncer/syncer_test.go @@ -24,7 +24,7 @@ import ( "github.com/optimizely/agent/config" "github.com/optimizely/agent/pkg/syncer/pubsub" - "github.com/optimizely/go-sdk/pkg/notification" + "github.com/optimizely/go-sdk/v2/pkg/notification" "github.com/rs/zerolog" "github.com/rs/zerolog/log" "github.com/stretchr/testify/assert" diff --git a/plugins/odpcache/registry.go b/plugins/odpcache/registry.go index 1a351614..20573067 100644 --- a/plugins/odpcache/registry.go +++ b/plugins/odpcache/registry.go @@ -20,7 +20,7 @@ package odpcache import ( "fmt" - "github.com/optimizely/go-sdk/pkg/odp/cache" + "github.com/optimizely/go-sdk/v2/pkg/odp/cache" ) // Creator type defines a function for creating an instance of a Cache diff --git a/plugins/odpcache/registry_test.go b/plugins/odpcache/registry_test.go index 69836010..08e8b315 100644 --- a/plugins/odpcache/registry_test.go +++ b/plugins/odpcache/registry_test.go @@ -20,7 +20,7 @@ package odpcache import ( "testing" - "github.com/optimizely/go-sdk/pkg/odp/cache" + "github.com/optimizely/go-sdk/v2/pkg/odp/cache" "github.com/stretchr/testify/assert" ) diff --git a/plugins/odpcache/services/in_memory_cache.go b/plugins/odpcache/services/in_memory_cache.go index 9b04c7f8..dad28fda 100644 --- a/plugins/odpcache/services/in_memory_cache.go +++ b/plugins/odpcache/services/in_memory_cache.go @@ -20,7 +20,7 @@ package services import ( "github.com/optimizely/agent/plugins/odpcache" "github.com/optimizely/agent/plugins/utils" - "github.com/optimizely/go-sdk/pkg/odp/cache" + "github.com/optimizely/go-sdk/v2/pkg/odp/cache" ) // InMemoryCache represents the in-memory implementation of Cache interface diff --git a/plugins/odpcache/services/redis_cache.go b/plugins/odpcache/services/redis_cache.go index f1ecdefe..73612670 100644 --- a/plugins/odpcache/services/redis_cache.go +++ b/plugins/odpcache/services/redis_cache.go @@ -24,7 +24,7 @@ import ( "github.com/go-redis/redis/v8" "github.com/optimizely/agent/plugins/odpcache" "github.com/optimizely/agent/plugins/utils" - "github.com/optimizely/go-sdk/pkg/odp/cache" + "github.com/optimizely/go-sdk/v2/pkg/odp/cache" "github.com/rs/zerolog/log" ) diff --git a/plugins/userprofileservice/registry.go b/plugins/userprofileservice/registry.go index c7158298..ca836363 100644 --- a/plugins/userprofileservice/registry.go +++ b/plugins/userprofileservice/registry.go @@ -20,7 +20,7 @@ package userprofileservice import ( "fmt" - "github.com/optimizely/go-sdk/pkg/decision" + "github.com/optimizely/go-sdk/v2/pkg/decision" ) // Creator type defines a function for creating an instance of a UserProfileService diff --git a/plugins/userprofileservice/registry_test.go b/plugins/userprofileservice/registry_test.go index ad7f6706..2a6b1fae 100644 --- a/plugins/userprofileservice/registry_test.go +++ b/plugins/userprofileservice/registry_test.go @@ -20,7 +20,7 @@ package userprofileservice import ( "testing" - "github.com/optimizely/go-sdk/pkg/decision" + "github.com/optimizely/go-sdk/v2/pkg/decision" "github.com/stretchr/testify/assert" ) diff --git a/plugins/userprofileservice/services/in_memory_ups.go b/plugins/userprofileservice/services/in_memory_ups.go index 17036a89..4d03cf28 100644 --- a/plugins/userprofileservice/services/in_memory_ups.go +++ b/plugins/userprofileservice/services/in_memory_ups.go @@ -21,7 +21,7 @@ import ( "sync" "github.com/optimizely/agent/plugins/userprofileservice" - "github.com/optimizely/go-sdk/pkg/decision" + "github.com/optimizely/go-sdk/v2/pkg/decision" ) const userIDKey = "user_id" diff --git a/plugins/userprofileservice/services/in_memory_ups_test.go b/plugins/userprofileservice/services/in_memory_ups_test.go index c4c1b41e..a1f916be 100644 --- a/plugins/userprofileservice/services/in_memory_ups_test.go +++ b/plugins/userprofileservice/services/in_memory_ups_test.go @@ -22,7 +22,7 @@ import ( "sync" "testing" - "github.com/optimizely/go-sdk/pkg/decision" + "github.com/optimizely/go-sdk/v2/pkg/decision" "github.com/stretchr/testify/suite" ) diff --git a/plugins/userprofileservice/services/redis_ups.go b/plugins/userprofileservice/services/redis_ups.go index 4e08b991..d57ab2dd 100644 --- a/plugins/userprofileservice/services/redis_ups.go +++ b/plugins/userprofileservice/services/redis_ups.go @@ -24,7 +24,7 @@ import ( "github.com/go-redis/redis/v8" "github.com/optimizely/agent/plugins/userprofileservice" - "github.com/optimizely/go-sdk/pkg/decision" + "github.com/optimizely/go-sdk/v2/pkg/decision" "github.com/rs/zerolog/log" ) diff --git a/plugins/userprofileservice/services/redis_ups_test.go b/plugins/userprofileservice/services/redis_ups_test.go index 03547e56..3e212f3b 100644 --- a/plugins/userprofileservice/services/redis_ups_test.go +++ b/plugins/userprofileservice/services/redis_ups_test.go @@ -20,7 +20,7 @@ package services import ( "testing" - "github.com/optimizely/go-sdk/pkg/decision" + "github.com/optimizely/go-sdk/v2/pkg/decision" "github.com/stretchr/testify/suite" ) diff --git a/plugins/userprofileservice/services/rest_ups.go b/plugins/userprofileservice/services/rest_ups.go index de4d58fb..f36a7bda 100644 --- a/plugins/userprofileservice/services/rest_ups.go +++ b/plugins/userprofileservice/services/rest_ups.go @@ -26,9 +26,9 @@ import ( "net/url" "github.com/optimizely/agent/plugins/userprofileservice" - "github.com/optimizely/go-sdk/pkg/decision" - "github.com/optimizely/go-sdk/pkg/logging" - "github.com/optimizely/go-sdk/pkg/utils" + "github.com/optimizely/go-sdk/v2/pkg/decision" + "github.com/optimizely/go-sdk/v2/pkg/logging" + "github.com/optimizely/go-sdk/v2/pkg/utils" "github.com/rs/zerolog/log" ) diff --git a/plugins/userprofileservice/services/rest_ups_test.go b/plugins/userprofileservice/services/rest_ups_test.go index 4223b6c7..8653cd38 100644 --- a/plugins/userprofileservice/services/rest_ups_test.go +++ b/plugins/userprofileservice/services/rest_ups_test.go @@ -26,9 +26,9 @@ import ( "github.com/go-chi/render" "github.com/optimizely/agent/pkg/handlers" - "github.com/optimizely/go-sdk/pkg/decision" - "github.com/optimizely/go-sdk/pkg/logging" - "github.com/optimizely/go-sdk/pkg/utils" + "github.com/optimizely/go-sdk/v2/pkg/decision" + "github.com/optimizely/go-sdk/v2/pkg/logging" + "github.com/optimizely/go-sdk/v2/pkg/utils" "github.com/stretchr/testify/suite" ) diff --git a/plugins/userprofileservice/services/utils.go b/plugins/userprofileservice/services/utils.go index 23a7f696..49cfad22 100644 --- a/plugins/userprofileservice/services/utils.go +++ b/plugins/userprofileservice/services/utils.go @@ -18,7 +18,7 @@ package services import ( - "github.com/optimizely/go-sdk/pkg/decision" + "github.com/optimizely/go-sdk/v2/pkg/decision" ) // convertUserProfileToMap converts User Profile object to map