Fix import paths after CMAB revert

When reverting CMAB, Git incorrectly changed some import paths:
- Fix plugins/odpcache/registry.go: use pkg/cache instead of pkg/odp/cache
- Fix pkg/optimizely/cache.go: use odpCachePkg from pkg/cache
- Fix pkg/optimizely/client.go: use pkg/cache import
- Add missing GetAttributeKeyByID method to TestProjectConfig

These changes align with go-sdk PR #420 which reorganized cache packages.

Author: Mat001

pkg/optimizely/cache.go

@@ -33,13 +33,13 @@ import (
 	"github.com/optimizely/agent/pkg/syncer"
 	"github.com/optimizely/agent/plugins/odpcache"
 	"github.com/optimizely/agent/plugins/userprofileservice"
+	odpCachePkg "github.com/optimizely/go-sdk/v2/pkg/cache"
 	"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"

pkg/optimizely/client.go

@@ -24,10 +24,10 @@ import (
 	"go.opentelemetry.io/otel"
 	"go.opentelemetry.io/otel/attribute"
 
+	"github.com/optimizely/go-sdk/v2/pkg/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

pkg/optimizely/optimizelytest/config.go

@@ -117,6 +117,11 @@ func (c *TestProjectConfig) GetEnvironmentKey() string {
 	return c.environmentKey
 }
 
+// GetRegion returns the region for the project
+func (c *TestProjectConfig) GetRegion() string {
+	return "us-east-1" // default test region
+}
+
 // GetEvents returns all events
 func (c *TestProjectConfig) GetEvents() (eventList []entities.Event) {
 	for _, event := range c.EventMap {
@@ -518,6 +523,26 @@ func (c *TestProjectConfig) GetFlagVariationsMap() map[string][]entities.Variati
 	return c.flagVariationsMap
 }
 
+// GetAttributeKeyByID returns the attribute key for the given ID
+func (c *TestProjectConfig) GetAttributeKeyByID(id string) (string, error) {
+	for _, attr := range c.AttributeMap {
+		if attr.ID == id {
+			return attr.Key, nil
+		}
+	}
+	return "", fmt.Errorf(`attribute with ID "%s" not found`, id)
+}
+
+// GetExperimentByID returns the experiment with the given ID
+func (c *TestProjectConfig) GetExperimentByID(experimentID string) (entities.Experiment, error) {
+	for _, experiment := range c.ExperimentMap {
+		if experiment.ID == experimentID {
+			return experiment, nil
+		}
+	}
+	return entities.Experiment{}, fmt.Errorf(`experiment with ID "%s" not found`, experimentID)
+}
+
 // NewConfig initializes a new datafile from a json byte array using the default JSON datafile parser
 func NewConfig() *TestProjectConfig {
 	config := &TestProjectConfig{

plugins/odpcache/registry.go

@@ -20,7 +20,7 @@ package odpcache
 import (
 	"fmt"
 
-	"github.com/optimizely/go-sdk/v2/pkg/odp/cache"
+	"github.com/optimizely/go-sdk/v2/pkg/cache"
 )
 
 // Creator type defines a function for creating an instance of a Cache

plugins/odpcache/registry_test.go

@@ -20,7 +20,7 @@ package odpcache
 import (
 	"testing"
 
-	"github.com/optimizely/go-sdk/v2/pkg/odp/cache"
+	"github.com/optimizely/go-sdk/v2/pkg/cache"
 	"github.com/stretchr/testify/assert"
 )
 

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/v2/pkg/odp/cache"
+	"github.com/optimizely/go-sdk/v2/pkg/cache"
 )
 
 // InMemoryCache represents the in-memory implementation of Cache interface