fix the issue that access key doesn't work if appid passed is in diff…

…erent case (apolloconfig#3627)
liqipeng · Apr 7, 2021 · 32a2a97 · 32a2a97
1 parent 943bbb4
commit 32a2a97
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/...main/java/com/ctrip/framework/apollo/configservice/service/AccessKeyServiceWithCache.java b/...main/java/com/ctrip/framework/apollo/configservice/service/AccessKeyServiceWithCache.java
@@ -63,7 +63,7 @@ private void initialize() {
         ApolloThreadFactory.create("AccessKeyServiceWithCache", true));
     lastTimeScanned = new Date(0L);
 
-    ListMultimap<String, AccessKey> multimap = ListMultimapBuilder.hashKeys(128)
+    ListMultimap<String, AccessKey> multimap = ListMultimapBuilder.treeKeys(String.CASE_INSENSITIVE_ORDER)
         .arrayListValues().build();
     accessKeyCache = Multimaps.synchronizedListMultimap(multimap);
     accessKeyIdCache = Maps.newConcurrentMap();

diff --git a/.../java/com/ctrip/framework/apollo/configservice/service/AccessKeyServiceWithCacheTest.java b/.../java/com/ctrip/framework/apollo/configservice/service/AccessKeyServiceWithCacheTest.java
@@ -81,6 +81,11 @@ public void testGetAvailableSecrets() throws Exception {
 
     await().untilAsserted(() -> assertThat(accessKeyServiceWithCache.getAvailableSecrets(appId))
         .containsExactly("secret-1", "secret-2"));
+    // should also work with appid in different case
+    assertThat(accessKeyServiceWithCache.getAvailableSecrets(appId.toUpperCase()))
+        .containsExactly("secret-1", "secret-2");
+    assertThat(accessKeyServiceWithCache.getAvailableSecrets(appId.toLowerCase()))
+        .containsExactly("secret-1", "secret-2");
 
     // Update access key, disable the first one
     firstAccessKey = assembleAccessKey(1L, appId, "secret-1", false, false, 1577808004000L);