Merge pull request #223 from SumoLogic/fy26q3

akhil-sumologic · web-flow · commit a683dbd5cde9 · 2025-10-07T15:56:33.000+05:30
AWSO 2.13.0: Fixed app install to Admin Recommended Folder and CVE fixes
diff --git a/awsautoenableS3Logging/packaged.yaml b/awsautoenableS3Logging/packaged.yaml
@@ -24,10 +24,10 @@ Metadata:
     - s3logging
     - flowlogs
     Name: sumologic-s3-logging-auto-enable
-    SemanticVersion: 1.0.17
+    SemanticVersion: 1.0.18
     SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/main/awsautoenableS3Logging
-    LicenseUrl: s3://appdevstore/AutoEnableS3Logs/v1.0.17/978602b5b9ec16f8bab0e38fd6b3998f
-    ReadmeUrl: s3://appdevstore/AutoEnableS3Logs/v1.0.17/d05d411471e0bb4db3389f2523f515f0
+    LicenseUrl: s3://appdevstore/AutoEnableS3Logs/v1.0.18/978602b5b9ec16f8bab0e38fd6b3998f
+    ReadmeUrl: s3://appdevstore/AutoEnableS3Logs/v1.0.18/d05d411471e0bb4db3389f2523f515f0
     SpdxLicenseId: Apache-2.0
 Mappings:
   Region2ELBAccountId:
@@ -229,7 +229,7 @@ Resources:
     Type: AWS::Serverless::Function
     Condition: auto_enable_new
     Properties:
-      CodeUri: s3://appdevstore/sumo_app_utils/v2.0.20/sumo_app_utils.zip
+      CodeUri: s3://appdevstore/sumo_app_utils/v2.0.21/sumo_app_utils.zip
       Handler: awsresource.enable_s3_logs
       Runtime: python3.13
       Role:
@@ -467,7 +467,7 @@ Resources:
     Properties:
       Handler: main.handler
       Runtime: python3.13
-      CodeUri: s3://appdevstore/sumo_app_utils/v2.0.20/sumo_app_utils.zip
+      CodeUri: s3://appdevstore/sumo_app_utils/v2.0.21/sumo_app_utils.zip
       MemorySize: 128
       Timeout: 900
       Role:
diff --git a/awsautoenableS3Logging/sumologic-s3-logging-auto-enable.yaml b/awsautoenableS3Logging/sumologic-s3-logging-auto-enable.yaml
@@ -24,7 +24,7 @@ Metadata:
       - s3logging
       - flowlogs
     Name: sumologic-s3-logging-auto-enable
-    SemanticVersion: 1.0.17
+    SemanticVersion: 1.0.18
     SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/main/awsautoenableS3Logging
     LicenseUrl: ./LICENSE
     ReadmeUrl: ./README.md
@@ -208,7 +208,7 @@ Resources:
     Type: 'AWS::Serverless::Function'
     Condition: auto_enable_new
     Properties:
-      CodeUri: s3://appdevstore/sumo_app_utils/v2.0.20/sumo_app_utils.zip
+      CodeUri: s3://appdevstore/sumo_app_utils/v2.0.21/sumo_app_utils.zip
       Handler: "awsresource.enable_s3_logs"
       Runtime: python3.13
       Role: !GetAtt SumoLambdaRole.Arn
@@ -385,7 +385,7 @@ Resources:
     Properties:
       Handler: main.handler
       Runtime: python3.13
-      CodeUri: s3://appdevstore/sumo_app_utils/v2.0.20/sumo_app_utils.zip
+      CodeUri: s3://appdevstore/sumo_app_utils/v2.0.21/sumo_app_utils.zip
       MemorySize: 128
       Timeout: 900
       Role:
diff --git a/cloudtrailbenchmark/packaged.yaml b/cloudtrailbenchmark/packaged.yaml
@@ -43,9 +43,9 @@ Metadata:
     - benchmark
     - cloudtrail
     Name: sumologic-aws-cloudtrail-benchmark
-    LicenseUrl: s3://appdevstore/cloudtrailbenchmark/v1.0.20/cac1a6df52c685e0f6ebe4ae72078c80
-    ReadmeUrl: s3://appdevstore/cloudtrailbenchmark/v1.0.20/8a901bb4fbbe82f128fc502dd3077508
-    SemanticVersion: 1.0.20
+    LicenseUrl: s3://appdevstore/cloudtrailbenchmark/v1.0.21/cac1a6df52c685e0f6ebe4ae72078c80
+    ReadmeUrl: s3://appdevstore/cloudtrailbenchmark/v1.0.21/8a901bb4fbbe82f128fc502dd3077508
+    SemanticVersion: 1.0.21
     SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/main/cloudtrailbenchmark
 Parameters:
   CollectorName:
@@ -128,7 +128,7 @@ Resources:
     Properties:
       Location:
         ApplicationId: arn:aws:serverlessrepo:us-east-1:956882708938:applications/sumologic-app-utils
-        SemanticVersion: 2.0.20
+        SemanticVersion: 2.0.21
     Metadata:
       SamResourceId: SumoAppUtils
   SumoRole:
diff --git a/cloudtrailbenchmark/template.yaml b/cloudtrailbenchmark/template.yaml
@@ -49,7 +49,7 @@ Metadata:
     Name: sumologic-aws-cloudtrail-benchmark
     LicenseUrl: ./LICENSE
     ReadmeUrl: ./README.md
-    SemanticVersion: 1.0.20
+    SemanticVersion: 1.0.21
     SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/main/cloudtrailbenchmark
 
 
@@ -124,7 +124,7 @@ Resources:
     Properties:
       Location:
         ApplicationId: arn:aws:serverlessrepo:us-east-1:956882708938:applications/sumologic-app-utils
-        SemanticVersion: 2.0.20
+        SemanticVersion: 2.0.21
 
 
   SumoRole:
diff --git a/cloudtrailbenchmark/testdeploy.sh b/cloudtrailbenchmark/testdeploy.sh
@@ -12,7 +12,7 @@ else
 fi
 uid=$(cat /dev/random | LC_CTYPE=C tr -dc "[:lower:]" | head -c 6)
 
-version="1.0.19"
+version="1.0.21"
 
 sam package --template-file template.yaml --s3-bucket $SAM_S3_BUCKET  --output-template-file packaged.yaml --s3-prefix "cloudtrailbenchmark/v$version" --region $AWS_REGION --profile $AWS_PROFILE
 
diff --git a/cloudwatchevents/guarddutybenchmark/deploy.sh b/cloudwatchevents/guarddutybenchmark/deploy.sh
@@ -11,7 +11,7 @@ else
     AWS_REGION="us-east-2"
 fi
 
-version="1.0.17"
+version="1.0.18"
 
 echo "Creating package.yaml"
 sam package --template-file template_v2.yaml --s3-bucket $SAM_S3_BUCKET  --output-template-file packaged.yaml --s3-prefix "guarddutybenchmark/v"$version --region $AWS_REGION --profile $AWS_PROFILE
diff --git a/cloudwatchevents/guarddutybenchmark/packaged.yaml b/cloudwatchevents/guarddutybenchmark/packaged.yaml
@@ -53,9 +53,9 @@ Metadata:
     - benchmark
     - guardduty
     Name: sumologic-guardduty-benchmark
-    LicenseUrl: s3://appdevstore/guarddutybenchmark/v1.0.17/6092dd6c323e33634657102f570628e0
-    ReadmeUrl: s3://appdevstore/guarddutybenchmark/v1.0.17/cab012d7fb7887671b751e6f5c0d2062
-    SemanticVersion: 1.0.17
+    LicenseUrl: s3://appdevstore/guarddutybenchmark/v1.0.18/6092dd6c323e33634657102f570628e0
+    ReadmeUrl: s3://appdevstore/guarddutybenchmark/v1.0.18/cab012d7fb7887671b751e6f5c0d2062
+    SemanticVersion: 1.0.18
     SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/main/cloudwatchevents/guarddutybenchmark
     SpdxLicenseId: Apache-2.0
 Parameters:
@@ -97,7 +97,7 @@ Parameters:
 Resources:
   CloudWatchEventFunction:
     Properties:
-      CodeUri: s3://appdevstore/guarddutybenchmark/v1.0.17/22b7b226ca9ec3b9dbb28b94c0e5f824
+      CodeUri: s3://appdevstore/guarddutybenchmark/v1.0.18/22b7b226ca9ec3b9dbb28b94c0e5f824
       Environment:
         Variables:
           SUMO_ENDPOINT:
@@ -121,7 +121,7 @@ Resources:
     Properties:
       Location:
         ApplicationId: arn:aws:serverlessrepo:us-east-1:956882708938:applications/sumologic-app-utils
-        SemanticVersion: 2.0.20
+        SemanticVersion: 2.0.21
     Metadata:
       SamResourceId: SumoAppUtils
   SumoHostedCollector:
diff --git a/cloudwatchevents/guarddutybenchmark/template_v2.yaml b/cloudwatchevents/guarddutybenchmark/template_v2.yaml
@@ -56,7 +56,7 @@ Metadata:
     Name: sumologic-guardduty-benchmark
     LicenseUrl: ../LICENSE
     ReadmeUrl: ./README.md
-    SemanticVersion: 1.0.17
+    SemanticVersion: 1.0.18
     SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/main/cloudwatchevents/guarddutybenchmark
     SpdxLicenseId: Apache-2.0
 
@@ -119,7 +119,7 @@ Resources:
     Properties:
       Location:
         ApplicationId: arn:aws:serverlessrepo:us-east-1:956882708938:applications/sumologic-app-utils
-        SemanticVersion: 2.0.20
+        SemanticVersion: 2.0.21
 
   SumoHostedCollector:
     Type: Custom::Collector
diff --git a/cloudwatchevents/test/requirements.txt b/cloudwatchevents/test/requirements.txt
@@ -1,3 +1,3 @@
-requests==2.32.3
+requests==2.32.5
 boto3==1.36.11
 sumologic-sdk==0.1.17
diff --git a/cloudwatchlogs-with-dlq/requirements.txt b/cloudwatchlogs-with-dlq/requirements.txt
@@ -1,2 +1,2 @@
-requests==2.32.3
+requests==2.32.5
 boto3==1.36.11
diff --git a/loggroup-lambda-connector/test/requirements.txt b/loggroup-lambda-connector/test/requirements.txt
@@ -1,3 +1,3 @@
-requests==2.32.3
+requests>=2.32.4
 boto3==1.36.11
 cfn-flip>=1.3.0
diff --git a/securityhub-org/sumologic-securityhub-collector-awsorg/sam/requirements.txt b/securityhub-org/sumologic-securityhub-collector-awsorg/sam/requirements.txt
@@ -1,2 +1,2 @@
 # boto3==1.27.1
-requests==2.32.2
+requests==2.32.5
diff --git a/sumologic-app-utils/Test/SampleTemplate.yaml b/sumologic-app-utils/Test/SampleTemplate.yaml
@@ -48,7 +48,7 @@ Resources:
     Properties:
       Location:
         ApplicationId: arn:aws:serverlessrepo:us-east-1:956882708938:applications/sumologic-app-utils
-        SemanticVersion: 2.0.7
+        SemanticVersion: 2.0.21
 
   SumoLogicHelperPolicy:
     Type: AWS::IAM::Policy
@@ -118,7 +118,7 @@ Resources:
     DependsOn: SumoLogicHelperPolicy
     Type: AWS::S3::BucketPolicy
     Properties:
-      Bucket: "cf-templates-1qpf3unpuo1hw-us-east-2"
+      Bucket: "cf-templates-1xa70np4sllja-us-east-1"
       PolicyDocument:
         Statement:
           - Sid: AWSCloudTrailAclCheck
@@ -127,14 +127,14 @@ Resources:
               Service: cloudtrail.amazonaws.com
             Action: s3:GetBucketAcl
             Resource:
-              - "arn:aws:s3:::cf-templates-1qpf3unpuo1hw-us-east-2"
+              - "arn:aws:s3:::cf-templates-1xa70np4sllja-us-east-1"
           - Sid: AWSCloudTrailWrite
             Effect: Allow
             Principal:
               Service: cloudtrail.amazonaws.com
             Action: s3:PutObject
             Resource:
-              - "arn:aws:s3:::cf-templates-1qpf3unpuo1hw-us-east-2/*"
+              - "arn:aws:s3:::cf-templates-1xa70np4sllja-us-east-1/*"
             Condition:
               StringEquals:
                 s3:x-amz-acl: bucket-owner-full-control
@@ -144,7 +144,7 @@ Resources:
               Service: cloudtrail.amazonaws.com
             Action: s3:ListBucket
             Resource:
-              - "arn:aws:s3:::cf-templates-1qpf3unpuo1hw-us-east-2"
+              - "arn:aws:s3:::cf-templates-1xa70np4sllja-us-east-1"
 
   SumoCloudTrail:
     Type: Custom::AWSTrail
@@ -153,7 +153,7 @@ Resources:
       ServiceToken: !GetAtt SumoAppUtils.Outputs.SumoAppUtilsFunction
       IsLogging: true
       IsMultiRegionTrail: false
-      S3BucketName: "cf-templates-1qpf3unpuo1hw-us-east-2"
+      S3BucketName: "cf-templates-1xa70np4sllja-us-east-1"
       TrailName: "Aws-Observability-onemoreupdae"
       RemoveOnDeleteStack: !Ref Section1eRemoveSumoResourcesOnDeleteStack
 
@@ -260,7 +260,7 @@ Resources:
       SumoAccessID: !Ref Section1bSumoAccessID
       SumoAccessKey: !Ref Section1cSumoAccessKey
       SumoDeployment: !Ref Section1aSumoDeployment
-      TargetBucketName: "cf-templates-1qpf3unpuo1hw-us-east-1"
+      TargetBucketName: "cf-templates-1xa70np4sllja-us-east-1"
       PathExpression: "asdasd"
       DateFormat: "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"
       DateLocatorRegex: '.*"updatedAt":"(.*)".*'
@@ -279,6 +279,7 @@ Resources:
       SumoAccessID: !Ref Section1bSumoAccessID
       SumoAccessKey: !Ref Section1cSumoAccessKey
       SumoDeployment: !Ref Section1aSumoDeployment
+      orgid: !Ref Section1dSumoOrganizationId
 
   sumoAppWithCustomURL:
     Type: Custom::App
@@ -291,7 +292,8 @@ Resources:
       SumoAccessID: !Ref Section1bSumoAccessID
       SumoAccessKey: !Ref Section1cSumoAccessKey
       SumoDeployment: !Ref Section1aSumoDeployment
-      AppJsonS3Url: "https://sumologic-appdev-aws-sam-apps.s3.amazonaws.com/aws-observability-versions/v2.1.0/appjson/Alb-App.json"
+      AppJsonS3Url: "https://sumologic-appdev-aws-sam-apps.s3.amazonaws.com/aws-observability-versions/v2.13.0/appjson/Alb-App.json"
+      orgid: !Ref Section1dSumoOrganizationId
 
   sumoAppwithUID:
     Type: Custom::App
@@ -308,6 +310,7 @@ Resources:
       SumoAccessID: !Ref Section1bSumoAccessID
       SumoAccessKey: !Ref Section1cSumoAccessKey
       SumoDeployment: !Ref Section1aSumoDeployment
+      orgid: !Ref Section1dSumoOrganizationId
 
   CreateSumoLogicAWSExplorerView:
     Type: Custom::SumoLogicAWSExplorer
@@ -339,14 +342,14 @@ Resources:
     Properties:
       ServiceToken: !GetAtt SumoAppUtils.Outputs.SumoAppUtilsFunction
       Region: !Ref "AWS::Region"
-      SourceApiUrl: "https://api.us2.sumologic.com/api/v1/collectors/194268335/sources/1135631121"
+      SourceApiUrl: "https://api.sumologic.com/api/v1/collectors/268544623/sources/1621987448"
       RemoveOnDeleteStack: !Ref Section1eRemoveSumoResourcesOnDeleteStack
       SumoAccessID: !Ref Section1bSumoAccessID
       SumoAccessKey: !Ref Section1cSumoAccessKey
       SumoDeployment: !Ref Section1aSumoDeployment
       Fields:
-        account: "fsdsd"
-        region: "asfasf"
+        account: "sumo1"
+        region: "us-test-1"
 
   APIGatewayFieldExtractionRule:
     Type: Custom::SumoLogicFieldExtractionRule
@@ -399,9 +402,9 @@ Resources:
     Properties:
       ServiceToken: !GetAtt SumoAppUtils.Outputs.SumoAppUtilsFunction
       AWSResource: "vpc"
-      BucketName: "cf-templates-1qpf3unpuo1hw-us-east-1"
+      BucketName: "cf-templates-1xa70np4sllja-us-east-1"
       Filter: ".*"
-      BucketPrefix: "djvsdvsbdjb"
+      BucketPrefix: "vpc/logs"
       AccountID: !Ref "AWS::AccountId"
       RemoveOnDeleteStack: !Ref Section1eRemoveSumoResourcesOnDeleteStack
 
diff --git a/sumologic-app-utils/deploy.sh b/sumologic-app-utils/deploy.sh
@@ -31,7 +31,7 @@ rm sumo_app_utils.zip
 
 ./build.sh
 
-version="2.0.20"
+version="2.0.21"
 
 aws s3 cp sumo_app_utils.zip s3://$SAM_S3_BUCKET/sumo_app_utils/v"$version"/sumo_app_utils.zip --region $AWS_REGION --acl public-read
 
diff --git a/sumologic-app-utils/packaged_sumo_app_utils.yaml b/sumologic-app-utils/packaged_sumo_app_utils.yaml
@@ -20,17 +20,17 @@ Metadata:
     - sumologic
     - serverless
     Name: sumologic-app-utils
-    SemanticVersion: 2.0.20
+    SemanticVersion: 2.0.21
     SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/main/sumologic-app-utils
     SpdxLicenseId: Apache-2.0
-    ReadmeUrl: s3://appdevstore/sumo_app_utils/v2.0.20/4d5a92c06a7fa9d956a900e51a1f6be4
+    ReadmeUrl: s3://appdevstore/sumo_app_utils/v2.0.21/4d5a92c06a7fa9d956a900e51a1f6be4
 Resources:
   SumoAppUtilsFunction:
     Type: AWS::Serverless::Function
     Properties:
       Handler: main.handler
       Runtime: python3.13
-      CodeUri: s3://appdevstore/sumo_app_utils/v2.0.20/sumo_app_utils.zip
+      CodeUri: s3://appdevstore/sumo_app_utils/v2.0.21/sumo_app_utils.zip
       MemorySize: 128
       Timeout: 300
       Policies:
diff --git a/sumologic-app-utils/src/sumologic.py b/sumologic-app-utils/src/sumologic.py
diff --git a/sumologic-app-utils/src/sumoresource.py b/sumologic-app-utils/src/sumoresource.py
diff --git a/sumologic-app-utils/sumo_app_utils.yaml b/sumologic-app-utils/sumo_app_utils.yaml
diff --git a/sumologic-app-utils/sumo_app_utils.zip b/sumologic-app-utils/sumo_app_utils.zip

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-requests==2.32.3`
	`1`	`+requests==2.32.5`
`2`	`2`	`boto3==1.36.11`