Have the config files match changes

aws · Jan 24, 2025 · 6293de5 · 6293de5
1 parent 5ae23eb
commit 6293de5
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/test/cloudwatchlogs/publish_logs_test.go b/test/cloudwatchlogs/publish_logs_test.go
@@ -249,6 +249,9 @@ func TestLogGroupClass(t *testing.T) {
 
 	for _, param := range cloudWatchLogGroupClassTestParameters {
 		t.Run(param.testName, func(t *testing.T) {
+			// add instance id to ensure that running integration tests concurrently doesn't cause tests
+			// to operate and validate with the same log groups and lead to flaky results
+			param.logGroupName += "-" + instanceId
 			defer awsservice.DeleteLogGroupAndStream(param.logGroupName, instanceId)
 			common.DeleteFile(common.AgentLogFile)
 			common.TouchFile(common.AgentLogFile)

diff --git a/test/cloudwatchlogs/resources/config_log_infrequent_access.json b/test/cloudwatchlogs/resources/config_log_infrequent_access.json
@@ -9,7 +9,7 @@
         "collect_list": [
           {
             "file_path": "/tmp/cwagent_log_test.log",
-            "log_group_name": "infrequent_access",
+            "log_group_name": "infrequent_access-{instance_id}",
             "log_stream_name": "{instance_id}",
             "timezone": "UTC",
             "log_group_class": "INFREQUENT_ACCESS"

diff --git a/test/cloudwatchlogs/resources/config_log_no_class_specification.json b/test/cloudwatchlogs/resources/config_log_no_class_specification.json
@@ -9,7 +9,7 @@
         "collect_list": [
           {
             "file_path": "/tmp/cwagent_log_test.log",
-            "log_group_name": "standard-no-specification",
+            "log_group_name": "standard-no-specification-{instance_id}",
             "log_stream_name": "{instance_id}",
             "timezone": "UTC"
           }

diff --git a/test/cloudwatchlogs/resources/config_log_standard_access.json b/test/cloudwatchlogs/resources/config_log_standard_access.json
@@ -9,7 +9,7 @@
         "collect_list": [
           {
             "file_path": "/tmp/cwagent_log_test.log",
-            "log_group_name": "standard-with-specification",
+            "log_group_name": "standard-with-specification-{instance_id}",
             "log_stream_name": "{instance_id}",
             "timezone": "UTC",
             "log_group_class": "STANDARD"