added test suite for v2 api keys

Author: Aya Lubbad

.github/workflows/on-pull-request.yml

@@ -87,7 +87,9 @@ jobs:
       contents: read
       pull-requests: read
     env:
-      MOMENTO_API_KEY: ${{ secrets.ALPHA_TEST_AUTH_TOKEN }}
+      MOMENTO_API_KEY: ${{ secrets.ALPHA_API_KEYS_V2 }}
+      MOMENTO_ENDPOINT: "cell-alpha-dev.preprod.a.momentohq.com"
+      V1_API_KEY: ${{ secrets.ALPHA_TEST_AUTH_TOKEN }}
     steps:
       - name: Setup repo
         uses: actions/checkout@v3

README.md

@@ -52,7 +52,7 @@ import (
 func main() {
 	context := context.Background()
 	configuration := config.LaptopLatestWithLogger(logger.NewNoopMomentoLoggerFactory()).WithClientTimeout(15 * time.Second)
-	credentialProvider, err := auth.NewEnvMomentoV2TokenProvider()
+	credentialProvider, err := auth.NewEnvMomentoTokenProvider("MOMENTO_API_KEY")
 	if err != nil {
 		panic(err)
 	}

batchutils/batch_operations_test.go

@@ -28,7 +28,7 @@ var _ = Describe("batch-utils", Label("cache-service"), func() {
 	BeforeEach(func() {
 		ctx = context.Background()
 		cacheName = fmt.Sprintf("golang-%s", uuid.NewString())
-		credentialProvider, err := auth.FromEnvironmentVariablesV2()
+		credentialProvider, err := auth.FromEnvironmentVariable("V1_API_KEY")
 		if err != nil {
 			panic(err)
 		}

batchutils/batch_set_test.go

@@ -27,7 +27,7 @@ var _ = Describe("batch-utils", Label("cache-service"), func() {
 	BeforeEach(func() {
 		ctx = context.Background()
 		cacheName = fmt.Sprintf("golang-%s", uuid.NewString())
-		credentialProvider, err := auth.FromEnvironmentVariablesV2()
+		credentialProvider, err := auth.FromEnvironmentVariable("V1_API_KEY")
 		if err != nil {
 			panic(err)
 		}

config/middleware/impl/compression_test.go

@@ -34,7 +34,7 @@ func cleanup() {
 
 // Each test may use a different compression middleware in the config
 func createCacheClient(config config.Configuration) {
-	credentialProvider, err := auth.FromEnvironmentVariablesV2()
+	credentialProvider, err := auth.FromEnvironmentVariable("V1_API_KEY")
 	Expect(err).To(BeNil())
 
 	cacheClient, err = NewCacheClient(

momento/momento_suite_test.go

@@ -19,6 +19,7 @@ var CACHE_SERVICE_LABEL = "cache-service"
 var LEADERBOARD_SERVICE_LABEL = "leaderboard-service"
 var TOPICS_SERVICE_LABEL = "topics-service"
 var MOMENTO_LOCAL_LABEL = "momento-local"
+var V2_API_LABEL = "v2-api-key"
 var RETRY_LABEL = "retry"
 
 func TestMomento(t *testing.T) {
@@ -28,7 +29,7 @@ func TestMomento(t *testing.T) {
 
 var _ = BeforeSuite(func() {
 	sharedContext = helpers.NewSharedContext(
-		helpers.SharedContextProps{IsMomentoLocal: includesMomentoLocalTests()})
+		helpers.SharedContextProps{IsMomentoLocal: includesMomentoLocalTests(), IsV2ApiKey: includesV2ApiKeyTests()})
 	sharedContext.CreateDefaultCaches()
 })
 
@@ -51,6 +52,16 @@ func includesMomentoLocalTests() bool {
 	}
 	return true
 }
+func includesV2ApiKeyTests() bool {
+	labelFilter := GinkgoLabelFilter()
+	r := regexp.MustCompile(`(!?)` + V2_API_LABEL)
+	matches := r.FindStringSubmatch(labelFilter)
+	if len(matches) == 0 || (len(matches) == 2 && matches[1] == "!") {
+		// the momento local label is not present, or it is present but is negated
+		return false
+	}
+	return true
+}
 
 func HaveMomentoErrorCode(code string) types.GomegaMatcher {
 	return WithTransform(

momento/test_helpers/shared_context.go

@@ -50,6 +50,7 @@ type SharedContext struct {
 
 type SharedContextProps struct {
 	IsMomentoLocal bool
+	IsV2ApiKey     bool
 }
 
 func NewSharedContext(props SharedContextProps) SharedContext {
@@ -74,9 +75,16 @@ func NewSharedContext(props SharedContextProps) SharedContext {
 			panic(err)
 		}
 	} else {
-		credentialProvider, err = auth.NewEnvMomentoV2TokenProvider()
-		if err != nil {
-			panic(err)
+		if props.IsV2ApiKey {
+			credentialProvider, err = auth.NewEnvMomentoV2TokenProvider()
+			if err != nil {
+				panic(err)
+			}
+		} else {
+			credentialProvider, err = auth.NewEnvMomentoTokenProvider("V1_API_KEY")
+			if err != nil {
+				panic(err)
+			}
 		}
 	}
 	shared.CredentialProvider = credentialProvider