fix：rename configmapName

apolloconfig · Oct 23, 2024 · 9252a93 · 9252a93
1 parent 79ae56a
commit 9252a93
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 19 deletions.
diff --git a/...ient/src/main/java/com/ctrip/framework/apollo/internals/K8sConfigMapConfigRepository.java b/...ient/src/main/java/com/ctrip/framework/apollo/internals/K8sConfigMapConfigRepository.java
@@ -94,17 +94,8 @@ void setConfigMapKey(String cluster, String namespace) {
         configMapKey = Joiner.on(ConfigConsts.CLUSTER_NAMESPACE_SEPARATOR).join(cluster, namespace);
     }
 
-    public String getConfigMapKey() {
-        return configMapKey;
-    }
-
-    public String getConfigMapName() {
-        return configMapName;
-    }
-
     void setConfigMapName(String appId, boolean syncImmediately) {
-        //configMapName = ConfigConsts.APOLLO_CONFIG_CACHE + appId;
-        configMapName = appId;
+        configMapName = ConfigConsts.APOLLO_CONFIG_CACHE + appId;
         // 初始化configmap
         this.checkConfigMapName(configMapName);
         if (syncImmediately) {
@@ -274,8 +265,8 @@ public void onRepositoryChange(String namespace, Properties newProperties) {
 
     public void persistConfigMap(Properties properties) {
         Transaction transaction = Tracer.newTransaction("Apollo.ConfigService", "persistK8sConfigMap");
-        transaction.addData("configMapName", configUtil.getAppId());
-        transaction.addData("k8sNamespace", configUtil.getK8sNamespace());
+        transaction.addData("configMapName", configMapName);
+        transaction.addData("k8sNamespace", k8sNamespace);
         try {
             // Convert properties to a JSON string using Gson
             Gson gson = new Gson();
@@ -284,7 +275,7 @@ public void persistConfigMap(Properties properties) {
             data.put(configMapKey, jsonConfig);
 
             // update configmap
-            kubernetesManager.updateConfigMap(configUtil.getK8sNamespace(), configUtil.getAppId(), data);
+            kubernetesManager.updateConfigMap(k8sNamespace, configMapName, data);
             transaction.setStatus(Transaction.SUCCESS);
         } catch (Exception ex) {
             ApolloConfigException exception =

diff --git a/.../src/test/java/com/ctrip/framework/apollo/internals/K8sConfigMapConfigRepositoryTest.java b/.../src/test/java/com/ctrip/framework/apollo/internals/K8sConfigMapConfigRepositoryTest.java
@@ -112,12 +112,6 @@ public void tearDown() throws Exception {
 //        assertEquals(someCluster +"-"+ someNamespace, configmapRepo.getConfigMapKey());
 //    }
 //
-//    @Test
-//    public void testSetConfigMapName() {
-//        K8sConfigMapConfigRepository repo = new K8sConfigMapConfigRepository(someNamespace);
-//        repo.setConfigMapName(someAppId, false);
-//        assertEquals(someAppId, repo.getConfigMapName());
-//    }
 
     @Test(expected = IllegalArgumentException.class)
     public void testSetConfigMapNameWithNullAppId() {