refactor: move config topic to tes class and rename for better user understanding

Author: rauthsuj

src/main/java/com/aws/greengrass/tes/CredentialRequestHandler.java

@@ -73,10 +73,6 @@ public class CredentialRequestHandler implements HttpHandler {
     public static final int CLOUD_5XX_ERROR_CACHE_IN_SEC = 60;
     public static final int UNKNOWN_ERROR_CACHE_IN_SEC = 300;
 
-    public static final String CLOUD_4XX_ERROR_CACHE_TOPIC = "cloud4xxErrorCacheInSec";
-    public static final String CLOUD_5XX_ERROR_CACHE_TOPIC = "cloud5xxErrorCacheInSec";
-    public static final String UNKNOWN_ERROR_CACHE_TOPIC = "unknownErrorCacheInSec";
-
     private int cloud4xxErrorCacheInSec = CLOUD_4XX_ERROR_CACHE_IN_SEC;
     private int cloud5xxErrorCacheInSec = CLOUD_5XX_ERROR_CACHE_IN_SEC;
     private int unknownErrorCacheInSec = UNKNOWN_ERROR_CACHE_IN_SEC;

src/main/java/com/aws/greengrass/tes/TokenExchangeService.java

@@ -41,10 +41,13 @@ public class TokenExchangeService extends GreengrassService implements AwsCreden
     private String iotRoleAlias;
     private HttpServerImpl server;
 
+    public static final String CLOUD_4XX_ERROR_CACHE_TOPIC = "error4xxCredentialRetryInSec";
+    public static final String CLOUD_5XX_ERROR_CACHE_TOPIC = "error5xxCredentialRetryInSec";
+    public static final String UNKNOWN_ERROR_CACHE_TOPIC = "errorUnknownCredentialRetryInSec";
+    private static final int MINIMUM_ERROR_CACHE_IN_SEC = 10;
     private int cloud4xxErrorCache;
     private int cloud5xxErrorCache;
     private int unknownErrorCache;
-    private static final int MINIMUM_ERROR_CACHE_IN_SEC = 10;
 
     private final AuthorizationHandler authZHandler;
     private final CredentialRequestHandler credentialRequestHandler;
@@ -82,35 +85,35 @@ public TokenExchangeService(Topics topics,
         this.credentialRequestHandler = credentialRequestHandler;
 
         cloud4xxErrorCache = validateCacheConfig(Coerce.toInt(config.lookup(
-                        CONFIGURATION_CONFIG_KEY, CredentialRequestHandler.CLOUD_4XX_ERROR_CACHE_TOPIC).dflt(
+                        CONFIGURATION_CONFIG_KEY, CLOUD_4XX_ERROR_CACHE_TOPIC).dflt(
                         CredentialRequestHandler.CLOUD_4XX_ERROR_CACHE_IN_SEC)),
                 CredentialRequestHandler.CLOUD_4XX_ERROR_CACHE_IN_SEC);
         cloud5xxErrorCache = validateCacheConfig(Coerce.toInt(config.lookup(
-                        CONFIGURATION_CONFIG_KEY, CredentialRequestHandler.CLOUD_5XX_ERROR_CACHE_TOPIC).dflt(
+                        CONFIGURATION_CONFIG_KEY, CLOUD_5XX_ERROR_CACHE_TOPIC).dflt(
                         CredentialRequestHandler.CLOUD_5XX_ERROR_CACHE_IN_SEC)),
                 CredentialRequestHandler.CLOUD_5XX_ERROR_CACHE_IN_SEC);
         unknownErrorCache = validateCacheConfig(Coerce.toInt(config.lookup(
-                        CONFIGURATION_CONFIG_KEY, CredentialRequestHandler.UNKNOWN_ERROR_CACHE_TOPIC).dflt(
+                        CONFIGURATION_CONFIG_KEY, UNKNOWN_ERROR_CACHE_TOPIC).dflt(
                         CredentialRequestHandler.UNKNOWN_ERROR_CACHE_IN_SEC)),
                 CredentialRequestHandler.UNKNOWN_ERROR_CACHE_IN_SEC);
 
         credentialRequestHandler.configureCacheSettings(cloud4xxErrorCache, cloud5xxErrorCache, unknownErrorCache);
 
         // Subscribe to cache configuration changes
         config.subscribe((why, node) -> {
-            if (node != null && (node.childOf(CredentialRequestHandler.CLOUD_4XX_ERROR_CACHE_TOPIC)
-                    || node.childOf(CredentialRequestHandler.CLOUD_5XX_ERROR_CACHE_TOPIC)
-                    || node.childOf(CredentialRequestHandler.UNKNOWN_ERROR_CACHE_TOPIC))) {
+            if (node != null && (node.childOf(CLOUD_4XX_ERROR_CACHE_TOPIC)
+                    || node.childOf(CLOUD_5XX_ERROR_CACHE_TOPIC)
+                    || node.childOf(UNKNOWN_ERROR_CACHE_TOPIC))) {
                 logger.atDebug("tes-cache-config-change").kv("node", node).kv("why", why).log();
 
                 int newCloud4xxErrorCache = validateCacheConfig(Coerce.toInt(config.lookup(
-                        CONFIGURATION_CONFIG_KEY, CredentialRequestHandler.CLOUD_4XX_ERROR_CACHE_TOPIC).dflt(
+                        CONFIGURATION_CONFIG_KEY, CLOUD_4XX_ERROR_CACHE_TOPIC).dflt(
                         CredentialRequestHandler.CLOUD_4XX_ERROR_CACHE_IN_SEC)), cloud4xxErrorCache);
                 int newCloud5xxErrorCache = validateCacheConfig(Coerce.toInt(config.lookup(
-                        CONFIGURATION_CONFIG_KEY, CredentialRequestHandler.CLOUD_5XX_ERROR_CACHE_TOPIC).dflt(
+                        CONFIGURATION_CONFIG_KEY, CLOUD_5XX_ERROR_CACHE_TOPIC).dflt(
                         CredentialRequestHandler.CLOUD_5XX_ERROR_CACHE_IN_SEC)), cloud5xxErrorCache);
                 int newUnknownErrorCache = validateCacheConfig(Coerce.toInt(config.lookup(
-                        CONFIGURATION_CONFIG_KEY, CredentialRequestHandler.UNKNOWN_ERROR_CACHE_TOPIC).dflt(
+                        CONFIGURATION_CONFIG_KEY, UNKNOWN_ERROR_CACHE_TOPIC).dflt(
                         CredentialRequestHandler.UNKNOWN_ERROR_CACHE_IN_SEC)), unknownErrorCache);
 
                 if (cloud4xxErrorCache != newCloud4xxErrorCache

src/test/java/com/aws/greengrass/tes/TokenExchangeServiceTest.java

@@ -48,16 +48,16 @@
 import static com.aws.greengrass.lifecyclemanager.GreengrassService.SETENV_CONFIG_NAMESPACE;
 import static com.aws.greengrass.lifecyclemanager.Kernel.SERVICE_TYPE_TOPIC_KEY;
 import static com.aws.greengrass.lifecyclemanager.KernelCommandLine.MAIN_SERVICE_NAME;
-import static com.aws.greengrass.tes.CredentialRequestHandler.CLOUD_4XX_ERROR_CACHE_TOPIC;
-import static com.aws.greengrass.tes.CredentialRequestHandler.CLOUD_5XX_ERROR_CACHE_TOPIC;
-import static com.aws.greengrass.tes.CredentialRequestHandler.UNKNOWN_ERROR_CACHE_TOPIC;
 import static com.aws.greengrass.tes.CredentialRequestHandler.CLOUD_4XX_ERROR_CACHE_IN_SEC;
 import static com.aws.greengrass.tes.CredentialRequestHandler.CLOUD_5XX_ERROR_CACHE_IN_SEC;
 import static com.aws.greengrass.tes.CredentialRequestHandler.UNKNOWN_ERROR_CACHE_IN_SEC;
 import static com.aws.greengrass.tes.TokenExchangeService.ACTIVE_PORT_TOPIC;
+import static com.aws.greengrass.tes.TokenExchangeService.CLOUD_4XX_ERROR_CACHE_TOPIC;
+import static com.aws.greengrass.tes.TokenExchangeService.CLOUD_5XX_ERROR_CACHE_TOPIC;
 import static com.aws.greengrass.tes.TokenExchangeService.PORT_TOPIC;
 import static com.aws.greengrass.tes.TokenExchangeService.TES_URI_ENV_VARIABLE_NAME;
 import static com.aws.greengrass.tes.TokenExchangeService.TOKEN_EXCHANGE_SERVICE_TOPICS;
+import static com.aws.greengrass.tes.TokenExchangeService.UNKNOWN_ERROR_CACHE_TOPIC;
 import static com.aws.greengrass.testcommons.testutilities.ExceptionLogProtector.ignoreExceptionUltimateCauseOfType;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;