From 4222c15566ebeba307c641cb9a8946bc46e00d1d Mon Sep 17 00:00:00 2001
From: Mingjie Shao <mingjs@amazon.com>
Date: Wed, 26 Jun 2024 22:06:10 +0100
Subject: [PATCH 1/2] feat: Supports remoteResourceType and
 remoteResourceIdentifier filter when fetching from Logs

---
 .../java/com/amazon/aoc/validators/CWLogValidator.java | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/validator/src/main/java/com/amazon/aoc/validators/CWLogValidator.java b/validator/src/main/java/com/amazon/aoc/validators/CWLogValidator.java
index 401281cb0..521be6a6c 100644
--- a/validator/src/main/java/com/amazon/aoc/validators/CWLogValidator.java
+++ b/validator/src/main/java/com/amazon/aoc/validators/CWLogValidator.java
@@ -66,9 +66,11 @@ public void validate() throws Exception {
           String operation = (String) expectedAttributes.get("Operation");
           String remoteService = (String) expectedAttributes.get("RemoteService");
           String remoteOperation = (String) expectedAttributes.get("RemoteOperation");
+          String remoteResourceType = (String) expectedAttributes.get("RemoteResourceType");
+          String remoteResourceIdentifier = (String) expectedAttributes.get("RemoteResourceIdentifier");
 
           Map<String, Object> actualLog =
-                  this.getActualLog(operation, remoteService, remoteOperation);
+                  this.getActualLog(operation, remoteService, remoteOperation, remoteResourceType, remoteResourceIdentifier);
           log.info("Value of an actual log: {}", actualLog);
 
           if (actualLog == null) throw new BaseException(ExceptionCode.EXPECTED_LOG_NOT_FOUND);
@@ -126,7 +128,7 @@ private JsonifyArrayList<Map<String, Object>> getExpectedAttributes() throws Exc
   }
 
   private Map<String, Object> getActualLog(
-      String operation, String remoteService, String remoteOperation) throws Exception {
+      String operation, String remoteService, String remoteOperation, String remoteResourceType, String remoteResourceIdentifier) throws Exception {
     String dependencyFilter = null;
 
     // Dependency calls will have the remoteService and remoteOperation attribute, but service calls
@@ -139,6 +141,10 @@ private Map<String, Object> getActualLog(
       dependencyFilter = String.format("&& ($.RemoteService = \"%s\") && ($.RemoteOperation = \"%s\")", remoteService, remoteOperation);
     }
 
+    if (remoteResourceType != null && remoteResourceIdentifier != null) {
+      dependencyFilter += String.format(" && ($.RemoteResourceType = %%%s%%) && ($.RemoteResourceIdentifier = %%%s%%)", remoteResourceType, remoteResourceIdentifier);
+    }
+
     String filterPattern = String.format("{ ($.Service = %s) && ($.Operation = \"%s\") %s }", context.getServiceName(), operation, dependencyFilter);
     log.info("Filter Pattern for Log Search: " + filterPattern);
 

From bd6a8266a9a97ba0708873331a48fbe22fa0e1f7 Mon Sep 17 00:00:00 2001
From: Omar Balih <omarnsr@amazon.com>
Date: Tue, 27 Aug 2024 15:04:42 +0100
Subject: [PATCH 2/2] migrating MySQL to 8.4

---
 sample-apps/springboot/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sample-apps/springboot/build.gradle.kts b/sample-apps/springboot/build.gradle.kts
index 242e72135..c14ede174 100644
--- a/sample-apps/springboot/build.gradle.kts
+++ b/sample-apps/springboot/build.gradle.kts
@@ -37,7 +37,7 @@ dependencies {
   implementation("io.opentelemetry:opentelemetry-api:1.34.1")
   implementation("software.amazon.awssdk:s3")
   implementation("software.amazon.awssdk:sts")
-  implementation("com.mysql:mysql-connector-j:8.0.33")
+  implementation("com.mysql:mysql-connector-j:8.4.0")
 }
 
 jib {