Merge remote-tracking branch 'origin/internal' into internal

CDCgov · Oct 21, 2024 · e3e994c · e3e994c
2 parents 6df6a93 + bcc1ea8
commit e3e994c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/app/src/main/java/gov/hhs/cdc/trustedintermediary/auth/RequestSessionTokenUsecase.java b/app/src/main/java/gov/hhs/cdc/trustedintermediary/auth/RequestSessionTokenUsecase.java
@@ -88,13 +88,14 @@ protected String retrieveTiPrivateKey() throws SecretRetrievalException {
     }
 
     private String retrieveKey(String keyId) throws SecretRetrievalException {
-        String key = cache.get(keyId);
-        if (key != null) {
-            return key;
-        }
-
-        key = secrets.getKey(keyId);
-        cache.put(keyId, key);
+        //        String key = cache.get(keyId);
+        //        if (key != null) {
+        //            return key;
+        //        }
+
+        String key = secrets.getKey(keyId);
+        logger.logInfo("Successfully got secret {}", keyId);
+        //        cache.put(keyId, key);
 
         return key;
     }

diff --git a/operations/template/app.tf b/operations/template/app.tf
@@ -82,7 +82,7 @@ resource "azurerm_service_plan" "plan" {
   location               = data.azurerm_resource_group.group.location
   os_type                = "Linux"
   sku_name               = local.higher_environment_level ? "P1v3" : "P0v3"
-  zone_balancing_enabled = local.higher_environment_level
+  zone_balancing_enabled = false
 
   #   below tags are managed by CDC
   lifecycle {
@@ -270,9 +270,9 @@ resource "azurerm_monitor_autoscale_setting" "api_autoscale" {
     name = "defaultProfile"
 
     capacity {
-      default = local.higher_environment_level ? 3 : 1
-      minimum = local.higher_environment_level ? 3 : 1
-      maximum = local.higher_environment_level ? 10 : 1
+      default = 3
+      minimum = 3
+      maximum = 10
     }
 
     rule {