From 69c7bc2ebef1c08cd274439e6e8a9fc40f1849f8 Mon Sep 17 00:00:00 2001
From: Akhil Dangore <akhil.dangore.ctr@sumologic.com>
Date: Wed, 17 Jul 2024 17:59:36 +0530
Subject: [PATCH] Regression CF testcases fixes for awso 2.9.0

---
 .../templates/test/TestTemplate.yaml          | 89 +++++++++----------
 1 file changed, 40 insertions(+), 49 deletions(-)

diff --git a/aws-observability/templates/test/TestTemplate.yaml b/aws-observability/templates/test/TestTemplate.yaml
index 12dba354..a8417c59 100644
--- a/aws-observability/templates/test/TestTemplate.yaml
+++ b/aws-observability/templates/test/TestTemplate.yaml
@@ -110,16 +110,16 @@ Tests:
             - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources
             - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.AutoEnableAlbLogEventsInvokePermission
             - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.AutoEnableAlbLogEventsRuleTrigger
-            - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableExistingAWSResourcesLambda
+            - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableExisitngAWSResourcesLambda
             - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableNewAWSResourcesLambda
-            - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableAccessLogsForExistingAWSResources
+            - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.ExistingAWSResources
             - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.SumoLambdaRole
             - AutoEnableOptions.AutoEnableS3LogsElbAWSResources
             - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.AutoEnableElbLogEventsInvokePermission
             - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.AutoEnableElbLogEventsRuleTrigger
-            - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableExistingAWSResourcesLambda
+            - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableExisitngAWSResourcesLambda
             - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableNewAWSResourcesLambda
-            - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableAccessLogsForExistingAWSResources
+            - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.ExistingAWSResources
             - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.SumoLambdaRole
             - AutoEnableOptions.AutoSubscribeLambdaLogGroupsAWSResources
             - AutoEnableOptions.AutoSubscribeLambdaLogGroupsAWSResources.InvokeLambdaConnector
@@ -191,9 +191,9 @@ Tests:
             - CreateCommonResources.Namespaces
             - CreateCommonResources.LambdaRoleARN
             - CreateCommonResources.BucketName
-            - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableExistingAWSResourcesLambda
+            - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableExisitngAWSResourcesLambda
             - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableNewAWSResourcesLambda
-            - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableExistingAWSResourcesLambda
+            - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableExisitngAWSResourcesLambda
             - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableNewAWSResourcesLambda
             - CreateCommonResources.KinesisMetricsRoleARN
             - CreateCommonResources.KinesisMetricsDeliveryStreamARN
@@ -435,16 +435,16 @@ Tests:
             - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources
             - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.AutoEnableAlbLogEventsInvokePermission
             - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.AutoEnableAlbLogEventsRuleTrigger
-            - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableExistingAWSResourcesLambda
+            - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableExisitngAWSResourcesLambda
             - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableNewAWSResourcesLambda
-            - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableAccessLogsForExistingAWSResources
+            - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.ExistingAWSResources
             - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.SumoLambdaRole
             - AutoEnableOptions.AutoEnableS3LogsElbAWSResources
             - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.AutoEnableElbLogEventsInvokePermission
             - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.AutoEnableElbLogEventsRuleTrigger
-            - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableExistingAWSResourcesLambda
+            - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableExisitngAWSResourcesLambda
             - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableNewAWSResourcesLambda
-            - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableAccessLogsForExistingAWSResources
+            - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.ExistingAWSResources
             - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.SumoLambdaRole
             - AutoEnableOptions.AutoSubscribeLambdaLogGroupsAWSResources
             - AutoEnableOptions.AutoSubscribeLambdaLogGroupsAWSResources.InvokeLambdaConnector
@@ -516,9 +516,9 @@ Tests:
             - CreateCommonResources.Namespaces
             - CreateCommonResources.LambdaRoleARN
             - CreateCommonResources.BucketName
-            - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableExistingAWSResourcesLambda
+            - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableExisitngAWSResourcesLambda
             - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableNewAWSResourcesLambda
-            - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableExistingAWSResourcesLambda
+            - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableExisitngAWSResourcesLambda
             - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableNewAWSResourcesLambda
             - CreateCommonResources.KinesisMetricsRoleARN
             - CreateCommonResources.KinesisMetricsDeliveryStreamARN
@@ -772,16 +772,16 @@ Tests:
             - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources
             - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.AutoEnableAlbLogEventsInvokePermission
             - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.AutoEnableAlbLogEventsRuleTrigger
-            - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableExistingAWSResourcesLambda
+            - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableExisitngAWSResourcesLambda
             - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableNewAWSResourcesLambda
-            - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableAccessLogsForExistingAWSResources
+            - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.ExistingAWSResources
             - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.SumoLambdaRole
             - AutoEnableOptions.AutoEnableS3LogsElbAWSResources
             - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.AutoEnableElbLogEventsInvokePermission
             - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.AutoEnableElbLogEventsRuleTrigger
-            - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableExistingAWSResourcesLambda
+            - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableExisitngAWSResourcesLambda
             - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableNewAWSResourcesLambda
-            - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableAccessLogsForExistingAWSResources
+            - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.ExistingAWSResources
             - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.SumoLambdaRole
             - AutoEnableOptions.AutoSubscribeLambdaLogGroupsAWSResources
             - AutoEnableOptions.AutoSubscribeLambdaLogGroupsAWSResources.InvokeLambdaConnector
@@ -849,9 +849,9 @@ Tests:
             - CreateCommonResources.Namespaces
             - CreateCommonResources.LambdaRoleARN
             - CreateCommonResources.BucketName
-            - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableExistingAWSResourcesLambda
+            - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableExisitngAWSResourcesLambda
             - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableNewAWSResourcesLambda
-            - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableExistingAWSResourcesLambda
+            - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableExisitngAWSResourcesLambda
             - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableNewAWSResourcesLambda
             - CreateCommonResources.KinesisMetricsRoleARN
             - CreateCommonResources.KinesisMetricsDeliveryStreamARN
@@ -1023,6 +1023,10 @@ Tests:
       - AssertType: ResourceExistence
         Assert:
           Resources:
+            - LambdaRole
+            - LambdaPermission
+            - PrimerInvoke
+            - TelemetryLambda
             - CreateCommonResources
             - sumoEC2MetricsAppStack
             - sumoAlbMetricsAppStack
@@ -1040,19 +1044,7 @@ Tests:
             - CreateCommonResources.AddRegionField
             - CreateCommonResources.AddNamespaceField
             - CreateCommonResources.AddAccountIdField
-            - sumoDynamoDBMetricsAppStack.AddTableNameField
-            - sumoAlbMetricsAppStack.AddLoadBalancerField
-            - sumoElbMetricsAppStack.AddLoadBalancerNameField
-            - sumoLambdaMetricsAppStack.AddFunctionNameField
-            - sumoApiGatewayMetricsAppStack.AddApiNameField
-            - sumoApiGatewayMetricsAppStack.AddApiIdField
             - sumoApiGatewayMetricsAppStack.MetricRule
-            - sumoSNSAppStack.AddTopicNameField
-            - sumoSQSAppStack.AddQueueNameField
-            - sumoRdsMetricsAppStack.AddDBIdentifierField
-            - sumoEC2MetricsAppStack.AddInstanceIdField
-            - sumoECSMetricsAppStack.AddClusterNameField
-            - sumoElasticCacheMetricsAppStack.AddCacheClusterIdField
             - CreateCommonResources.LambdaRole
             - CreateCommonResources.LambdaHelper
             - CreateCommonResources.AccountCheck
@@ -1062,7 +1054,6 @@ Tests:
             - sumoRdsMetricsAppStack.ClusterMetricRule
             - sumoRdsMetricsAppStack.InstanceMetricRule
             - sumoNlbMetricsAppStack
-            - sumoNlbMetricsAppStack.AddLoadBalancerField
             - sumoNlbMetricsAppStack.MetricRule
             - CreateCommonResources.AccountAliasValue
             - RootCauseAppStack.AccountAliasValue
@@ -1771,8 +1762,8 @@ Tests:
             - CreateCommonResources.CloudTrailSource
             - CreateCommonResources.CloudTrailSNSSubscription
             - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources
-            - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableExistingAWSResourcesLambda
-            - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableAccessLogsForExistingAWSResources
+            - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableExisitngAWSResourcesLambda
+            - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.ExistingAWSResources
             - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.SumoLambdaRole
             - sumoAlbMetricsAppStack.SumoALBMetricsUpdateSource
             - sumoRdsMetricsAppStack.ClusterMetricRule
@@ -1819,7 +1810,7 @@ Tests:
             - CreateCommonResources.Namespaces
             - CreateCommonResources.LambdaRoleARN
             - CreateCommonResources.BucketName
-            - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableExistingAWSResourcesLambda
+            - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableExisitngAWSResourcesLambda
             - sumoLambdaMetricsAppStack.ExistingCloudWatchLogSourceName
             - sumoAlbMetricsAppStack.ExistingMetricSourceName
             - CreateCommonResources.CollectorName
@@ -1989,8 +1980,8 @@ Tests:
             - CreateCommonResources.CloudTrailSource
             - CreateCommonResources.CloudTrailSNSSubscription
             - AutoEnableOptions.AutoEnableS3LogsElbAWSResources
-            - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableExistingAWSResourcesLambda
-            - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableAccessLogsForExistingAWSResources
+            - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableExisitngAWSResourcesLambda
+            - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.ExistingAWSResources
             - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.SumoLambdaRole
             - sumoRdsMetricsAppStack.ClusterMetricRule
             - sumoRdsMetricsAppStack.InstanceMetricRule
@@ -2039,7 +2030,7 @@ Tests:
             - CreateCommonResources.LambdaRoleARN
             - CreateCommonResources.BucketName
             - sumoAlbMetricsAppStack.ExistingMetricSourceName
-            - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableExistingAWSResourcesLambda
+            - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableExisitngAWSResourcesLambda
             - sumoLambdaMetricsAppStack.ExistingCloudWatchLogSourceName
             - CreateCommonResources.CollectorName
             - CreateCommonResources.AccountAlias
@@ -2428,9 +2419,9 @@ Tests:
             - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources
             - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.AutoEnableAlbLogEventsInvokePermission
             - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.AutoEnableAlbLogEventsRuleTrigger
-            - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableExistingAWSResourcesLambda
+            - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableExisitngAWSResourcesLambda
             - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableNewAWSResourcesLambda
-            - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableAccessLogsForExistingAWSResources
+            - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.ExistingAWSResources
             - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.SumoLambdaRole
             - sumoEC2MetricsAppStack.sumoApp
             - sumoEC2MetricsAppStack.sumoOverview
@@ -2508,7 +2499,7 @@ Tests:
             - CreateCommonResources.LambdaRoleARN
             - sumoLambdaMetricsAppStack.ExistingCloudTrailLogSourceName
             - sumoAlbMetricsAppStack.ExistingLogSourceName
-            - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableExistingAWSResourcesLambda
+            - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableExisitngAWSResourcesLambda
             - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableNewAWSResourcesLambda
             - CreateCommonResources.KinesisMetricsRoleARN
             - CreateCommonResources.KinesisMetricsDeliveryStreamARN
@@ -2688,9 +2679,9 @@ Tests:
             - AutoEnableOptions.AutoEnableS3LogsElbAWSResources
             - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.AutoEnableElbLogEventsInvokePermission
             - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.AutoEnableElbLogEventsRuleTrigger
-            - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableExistingAWSResourcesLambda
+            - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableExisitngAWSResourcesLambda
             - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableNewAWSResourcesLambda
-            - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableAccessLogsForExistingAWSResources
+            - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.ExistingAWSResources
             - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.SumoLambdaRole
             - sumoEC2MetricsAppStack.sumoApp
             - sumoEC2MetricsAppStack.sumoOverview
@@ -2768,7 +2759,7 @@ Tests:
             - CreateCommonResources.LambdaRoleARN
             - sumoLambdaMetricsAppStack.ExistingCloudTrailLogSourceName
             - sumoElbMetricsAppStack.ExistingLogSourceName
-            - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableExistingAWSResourcesLambda
+            - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableExisitngAWSResourcesLambda
             - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableNewAWSResourcesLambda
             - CreateCommonResources.KinesisMetricsRoleARN
             - CreateCommonResources.KinesisMetricsDeliveryStreamARN
@@ -3269,16 +3260,16 @@ Tests:
             - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources
             - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.AutoEnableAlbLogEventsInvokePermission
             - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.AutoEnableAlbLogEventsRuleTrigger
-            - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableExistingAWSResourcesLambda
+            - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableExisitngAWSResourcesLambda
             - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableNewAWSResourcesLambda
-            - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableAccessLogsForExistingAWSResources
+            - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.ExistingAWSResources
             - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.SumoLambdaRole
             - AutoEnableOptions.AutoEnableS3LogsElbAWSResources
             - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.AutoEnableElbLogEventsInvokePermission
             - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.AutoEnableElbLogEventsRuleTrigger
-            - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableExistingAWSResourcesLambda
+            - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableExisitngAWSResourcesLambda
             - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableNewAWSResourcesLambda
-            - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableAccessLogsForExistingAWSResources
+            - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.ExistingAWSResources
             - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.SumoLambdaRole
             - AutoEnableOptions.AutoSubscribeLambdaLogGroupsAWSResources
             - AutoEnableOptions.AutoSubscribeLambdaLogGroupsAWSResources.InvokeLambdaConnector
@@ -3354,9 +3345,9 @@ Tests:
             - CreateCommonResources.Namespaces
             - CreateCommonResources.LambdaRoleARN
             - CreateCommonResources.BucketName
-            - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableExistingAWSResourcesLambda
+            - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableExisitngAWSResourcesLambda
             - AutoEnableOptions.AutoEnableS3LogsAlbAWSResources.EnableNewAWSResourcesLambda
-            - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableExistingAWSResourcesLambda
+            - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableExisitngAWSResourcesLambda
             - AutoEnableOptions.AutoEnableS3LogsElbAWSResources.EnableNewAWSResourcesLambda
             - CreateCommonResources.KinesisMetricsRoleARN
             - CreateCommonResources.KinesisMetricsDeliveryStreamARN