Merge pull request #195 from SumoLogic/sumo_241508

Upgrade the requests library to stable version for your Python SAM applications
SumoLogic · Jun 5, 2024 · 12db613 · 12db613
2 parents 150e69c + 652e8a8
commit 12db613
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 28 deletions.
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.9
+    SemanticVersion: 1.0.10
     SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/main/awsautoenableS3Logging
-    LicenseUrl: s3://appdevstore/AutoEnableS3Logs/v1.0.9/978602b5b9ec16f8bab0e38fd6b3998f
-    ReadmeUrl: s3://appdevstore/AutoEnableS3Logs/v1.0.9/d05d411471e0bb4db3389f2523f515f0
+    LicenseUrl: s3://appdevstore/AutoEnableS3Logs/v1.0.10/978602b5b9ec16f8bab0e38fd6b3998f
+    ReadmeUrl: s3://appdevstore/AutoEnableS3Logs/v1.0.10/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.14/sumo_app_utils.zip
+      CodeUri: s3://appdevstore/sumo_app_utils/v2.0.15/sumo_app_utils.zip
       Handler: awsresource.enable_s3_logs
       Runtime: python3.11
       Role:
@@ -467,7 +467,7 @@ Resources:
     Properties:
       Handler: main.handler
       Runtime: python3.11
-      CodeUri: s3://appdevstore/sumo_app_utils/v2.0.14/sumo_app_utils.zip
+      CodeUri: s3://appdevstore/sumo_app_utils/v2.0.15/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.9
+    SemanticVersion: 1.0.10
     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.14/sumo_app_utils.zip
+      CodeUri: s3://appdevstore/sumo_app_utils/v2.0.15/sumo_app_utils.zip
       Handler: "awsresource.enable_s3_logs"
       Runtime: python3.11
       Role: !GetAtt SumoLambdaRole.Arn
@@ -385,7 +385,7 @@ Resources:
     Properties:
       Handler: main.handler
       Runtime: python3.11
-      CodeUri: s3://appdevstore/sumo_app_utils/v2.0.14/sumo_app_utils.zip
+      CodeUri: s3://appdevstore/sumo_app_utils/v2.0.15/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.14/cac1a6df52c685e0f6ebe4ae72078c80
-    ReadmeUrl: s3://appdevstore/cloudtrailbenchmark/v1.0.14/8a901bb4fbbe82f128fc502dd3077508
-    SemanticVersion: 1.0.14
+    LicenseUrl: s3://appdevstore/cloudtrailbenchmark/v1.0.15/cac1a6df52c685e0f6ebe4ae72078c80
+    ReadmeUrl: s3://appdevstore/cloudtrailbenchmark/v1.0.15/8a901bb4fbbe82f128fc502dd3077508
+    SemanticVersion: 1.0.15
     SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/main/cloudtrailbenchmark
 Parameters:
   CollectorName:
@@ -127,7 +127,7 @@ Resources:
     Properties:
       Location:
         ApplicationId: arn:aws:serverlessrepo:us-east-1:956882708938:applications/sumologic-app-utils
-        SemanticVersion: 2.0.14
+        SemanticVersion: 2.0.15
     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.14
+    SemanticVersion: 1.0.15
     SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/main/cloudtrailbenchmark
 
 
@@ -123,7 +123,7 @@ Resources:
     Properties:
       Location:
         ApplicationId: arn:aws:serverlessrepo:us-east-1:956882708938:applications/sumologic-app-utils
-        SemanticVersion: 2.0.14
+        SemanticVersion: 2.0.15
 
   SumoRole:
     Condition: SetupSumoResources

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.14"
+version="1.0.15"
 
 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/securityhub-org/sumologic-securityhub-collector-awsorg/sam/create_src.sh b/securityhub-org/sumologic-securityhub-collector-awsorg/sam/create_src.sh
diff --git a/securityhub-org/sumologic-securityhub-collector-awsorg/sam/packaged.yaml b/securityhub-org/sumologic-securityhub-collector-awsorg/sam/packaged.yaml
@@ -21,9 +21,9 @@ Metadata:
     - cloudwatchevents
     - securityhub
     Name: sumologic-securityhub-connector-aws-org
-    LicenseUrl: s3://appdevstore/SecurityHubCollectorAWSOrg/v1.0.6/6092dd6c323e33634657102f570628e0
-    ReadmeUrl: s3://appdevstore/SecurityHubCollectorAWSOrg/v1.0.6/eb911876461845db8f3113dbace6d454
-    SemanticVersion: 1.0.6
+    LicenseUrl: s3://appdevstore/SecurityHubCollectorAWSOrg/v1.0.7/6092dd6c323e33634657102f570628e0
+    ReadmeUrl: s3://appdevstore/SecurityHubCollectorAWSOrg/v1.0.7/eb911876461845db8f3113dbace6d454
+    SemanticVersion: 1.0.7
     SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/main/securityhub-org/sumologic-securityhub-collector-awsorg/src
     SpdxLicenseId: Apache-2.0
 Parameters:
@@ -43,7 +43,7 @@ Resources:
     Properties:
       Handler: securityhub_collector_org.lambda_handler
       Runtime: python3.11
-      CodeUri: s3://appdevstore/SecurityHubCollectorAWSOrg/v1.0.6/d929328200cab65ee011cd8170063848
+      CodeUri: s3://appdevstore/SecurityHubCollectorAWSOrg/v1.0.7/72d8a9923335d52f948cbd3f99d8b91d
       MemorySize: 128
       Timeout: 300
       Environment:

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.31.0
+# boto3==1.27.1
+requests==2.32.2
diff --git a/securityhub-org/sumologic-securityhub-collector-awsorg/sam/sam_package.sh b/securityhub-org/sumologic-securityhub-collector-awsorg/sam/sam_package.sh
@@ -1,3 +1,6 @@
+#!/bin/bash
+
+export AWS_PROFILE="prod"
 if [ "$AWS_PROFILE" == "prod" ]
 then
     SAM_S3_BUCKET="appdevstore"

diff --git a/securityhub-org/sumologic-securityhub-collector-awsorg/sam/template.yaml b/securityhub-org/sumologic-securityhub-collector-awsorg/sam/template.yaml
@@ -20,7 +20,7 @@ Metadata:
     Name: sumologic-securityhub-connector-aws-org
     LicenseUrl: ../LICENSE
     ReadmeUrl: ../README.md
-    SemanticVersion: 1.0.6
+    SemanticVersion: 1.0.7
     SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/main/securityhub-org/sumologic-securityhub-collector-awsorg/src
     SpdxLicenseId: Apache-2.0
 

diff --git a/securityhub-org/sumologic-securityhub-collector-awsorg/src/src.zip b/securityhub-org/sumologic-securityhub-collector-awsorg/src/src.zip
diff --git a/sumologic-app-utils/deploy.sh b/sumologic-app-utils/deploy.sh
@@ -28,7 +28,7 @@ if [ ! -f sumo_app_utils.zip ]; then
     rm -r python
 fi
 
-version="2.0.14"
+version="2.0.15"
 
 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.14
+    SemanticVersion: 2.0.15
     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.14/4d5a92c06a7fa9d956a900e51a1f6be4
+    ReadmeUrl: s3://appdevstore/sumo_app_utils/v2.0.15/4d5a92c06a7fa9d956a900e51a1f6be4
 Resources:
   SumoAppUtilsFunction:
     Type: AWS::Serverless::Function
     Properties:
       Handler: main.handler
       Runtime: python3.11
-      CodeUri: s3://appdevstore/sumo_app_utils/v2.0.14/sumo_app_utils.zip
+      CodeUri: s3://appdevstore/sumo_app_utils/v2.0.15/sumo_app_utils.zip
       MemorySize: 128
       Timeout: 300
       Policies:

diff --git a/sumologic-app-utils/sumo_app_utils.yaml b/sumologic-app-utils/sumo_app_utils.yaml
@@ -17,7 +17,7 @@ Metadata:
       - sumologic
       - serverless
     Name: sumologic-app-utils
-    SemanticVersion: 2.0.14
+    SemanticVersion: 2.0.15
     SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/main/sumologic-app-utils
     SpdxLicenseId: Apache-2.0
     ReadmeUrl: ./README.md
@@ -29,7 +29,7 @@ Resources:
     Properties:
       Handler: main.handler
       Runtime: python3.11
-      CodeUri: s3://appdevstore/sumo_app_utils/v2.0.14/sumo_app_utils.zip
+      CodeUri: s3://appdevstore/sumo_app_utils/v2.0.15/sumo_app_utils.zip
       MemorySize: 128
       Timeout: 300
       Policies:

diff --git a/sumologic-app-utils/sumo_app_utils.zip b/sumologic-app-utils/sumo_app_utils.zip