chore: move log messages and fix iam integration tests for multi-az environments

Author: karenc-bq

common/lib/utils/messages.ts

@@ -374,7 +374,9 @@ const MESSAGES: Record<string, string> = {
     "Blue/Green Deployment switchover is still in progress and a corresponding host for '%s' is not found after %s ms. Try to connect again later.",
   "Bgd.correspondingHostFoundContinueWithConnect":
     "A corresponding host for '%s' is found. Continue with connect call. The call was suspended for %s ms.",
-  "Bgd.completedContinueWithConnect": "Blue/Green Deployment status is completed. Continue with 'connect' call. The call was suspended for %s ms."
+  "Bgd.completedContinueWithConnect": "Blue/Green Deployment status is completed. Continue with 'connect' call. The call was suspended for %s ms.",
+  "StorageService.itemClassNotRegistered": "StorageServiceImpl: Item class not registered: %s",
+  "StorageService.unexpectedValueMismatch": "StorageServiceImpl: Unexpected value mismatch for %s: %s"
 };
 
 export class Messages {

common/lib/utils/storage/storage_service.ts

@@ -15,9 +15,10 @@
  */
 
 import { Constructor, ItemDisposalFunc, ShouldDisposeFunc } from "../../types";
-import { logger } from "../../../logutils";
 import { ExpirationCache } from "./expiration_cache";
 import { Topology } from "../../host_list_provider/topology";
+import { AwsWrapperError } from "../errors";
+import { Messages } from "../messages";
 
 const DEFAULT_CLEANUP_INTERVAL_NANOS = 5 * 60 * 1_000_000_000; // 5 minutes
 
@@ -165,7 +166,7 @@ export class StorageServiceImpl implements StorageService {
     if (!cache) {
       const supplier = StorageServiceImpl.defaultCacheSuppliers.get(itemClass);
       if (!supplier) {
-        throw new Error(`StorageServiceImpl: Item class not registered: ${itemClass.name}`);
+        throw new AwsWrapperError(Messages.get("StorageService.itemClassNotRegistered", itemClass.name));
       }
       cache = supplier();
       this.caches.set(itemClass, cache);
@@ -174,18 +175,10 @@ export class StorageServiceImpl implements StorageService {
     try {
       cache.put(key, item);
     } catch (error) {
-      throw new Error(`StorageServiceImpl: Unexpected value mismatch for ${itemClass.name}: ${error}`);
+      throw new AwsWrapperError(Messages.get("StorageService.unexpectedValueMismatch", itemClass.name, String(error)));
     }
   }
 
-  getAll<V>(itemClass: Constructor<V>): ExpirationCache<unknown, unknown> | null {
-    const cache = this.caches.get(itemClass);
-    if (!cache) {
-      return null;
-    }
-    return cache;
-  }
-
   get<V>(itemClass: Constructor<V>, key?: unknown): V | null {
     const cache = this.caches.get(itemClass);
     if (!cache) {
@@ -201,7 +194,6 @@ export class StorageServiceImpl implements StorageService {
       return value as V;
     }
 
-    logger.debug(`StorageServiceImpl: Item class mismatch for key ${String(key)}: ` + `expected ${itemClass.name}, got ${value.constructor.name}`);
     return null;
   }
 

tests/integration/host/src/test/java/integration/host/util/AuroraTestUtility.java

@@ -1117,6 +1117,7 @@ public void addAuroraAwsIamUser(
           } else {
             stmt.execute("GRANT ALL PRIVILEGES ON `%`.* TO '" + dbUser + "'@'%';");
           }
+          stmt.execute("GRANT REPLICATION CLIENT ON *.* TO '" + dbUser + "'@'%';");
 
           // BG switchover status needs it.
           stmt.execute("GRANT SELECT ON mysql.* TO '" + dbUser + "'@'%';");