Skip to content

Commit 072f9b8

Browse files
himsharma01himsharma01
authored
Merge pull request #182 from SumoLogic/python-eol
SAM apps python 3.7 eol
2 parents 07b2a2a + 002461a commit 072f9b8

File tree

10 files changed

+61
-33
lines changed

10 files changed

+61
-33
lines changed

‎cloudtrailbenchmark/packaged.yaml‎

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ Metadata:
4343
- benchmark
4444
- cloudtrail
4545
Name: sumologic-aws-cloudtrail-benchmark
46-
LicenseUrl: s3://appdevstore/cloudtrailbenchmark/v1.0.11/cac1a6df52c685e0f6ebe4ae72078c80
47-
ReadmeUrl: s3://appdevstore/cloudtrailbenchmark/v1.0.11/8a901bb4fbbe82f128fc502dd3077508
48-
SemanticVersion: 1.0.11
46+
LicenseUrl: s3://appdevstore/cloudtrailbenchmark/v1.0.12/cac1a6df52c685e0f6ebe4ae72078c80
47+
ReadmeUrl: s3://appdevstore/cloudtrailbenchmark/v1.0.12/8a901bb4fbbe82f128fc502dd3077508
48+
SemanticVersion: 1.0.12
4949
SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/master/cloudtrailbenchmark
5050
Parameters:
5151
CollectorName:
@@ -127,7 +127,9 @@ Resources:
127127
Properties:
128128
Location:
129129
ApplicationId: arn:aws:serverlessrepo:us-east-1:956882708938:applications/sumologic-app-utils
130-
SemanticVersion: 2.0.1
130+
SemanticVersion: 2.0.11
131+
Metadata:
132+
SamResourceId: SumoAppUtils
131133
SumoRole:
132134
Condition: SetupSumoResources
133135
Type: AWS::IAM::Role
@@ -164,6 +166,8 @@ Resources:
164166
- arn:aws:s3:::${CloudTrailTargetS3BucketName}/*
165167
- S3bucketName:
166168
Ref: CloudTrailTargetS3BucketName
169+
Metadata:
170+
SamResourceId: SumoRole
167171
SumoCloudTrailExportPolicy:
168172
Condition: SetUpCloudTrail
169173
Type: AWS::S3::BucketPolicy
@@ -198,6 +202,8 @@ Resources:
198202
- Fn::Sub: arn:aws:s3:::${CloudTrailTargetS3BucketName}
199203
DependsOn:
200204
- TargetS3Bucket
205+
Metadata:
206+
SamResourceId: SumoCloudTrailExportPolicy
201207
SumoCloudTrail:
202208
Condition: SetUpCloudTrail
203209
Type: Custom::AWSTrail
@@ -215,6 +221,8 @@ Resources:
215221
Ref: CloudTrailTargetS3BucketName
216222
TrailName:
217223
Fn::Sub: SumoCloudTrail-${AWS::StackName}
224+
Metadata:
225+
SamResourceId: SumoCloudTrail
218226
TargetS3Bucket:
219227
Condition: SetUpCloudTrail
220228
Type: AWS::S3::Bucket
@@ -228,12 +236,16 @@ Resources:
228236
- Event: s3:ObjectCreated:Put
229237
Topic:
230238
Ref: SumoSNSTopic
239+
Metadata:
240+
SamResourceId: TargetS3Bucket
231241
SumoSNSTopic:
232242
Condition: SetupSumoResources
233243
Type: AWS::SNS::Topic
234244
Properties:
235245
TopicName:
236246
Fn::Sub: SumoSNSTopic-${AWS::StackName}
247+
Metadata:
248+
SamResourceId: SumoSNSTopic
237249
SumoSNSSubscription:
238250
Condition: SetupSumoResources
239251
Type: AWS::SNS::Subscription
@@ -254,6 +266,8 @@ Resources:
254266
numMaxDelayRetries: 5
255267
numNoDelayRetries: 0
256268
backoffFunction: exponential
269+
Metadata:
270+
SamResourceId: SumoSNSSubscription
257271
SumoSNSpolicy:
258272
Condition: SetupSumoResources
259273
Type: AWS::SNS::TopicPolicy
@@ -277,6 +291,8 @@ Resources:
277291
- Ref: SumoSNSTopic
278292
Topics:
279293
- Ref: SumoSNSTopic
294+
Metadata:
295+
SamResourceId: SumoSNSpolicy
280296
SumoHostedCollector:
281297
Condition: SetupSumoResources
282298
Type: Custom::Collector
@@ -300,6 +316,8 @@ Resources:
300316
Ref: SumoDeployment
301317
DependsOn:
302318
- SumoAppUtils
319+
Metadata:
320+
SamResourceId: SumoHostedCollector
303321
SumoS3Source:
304322
Condition: SetupSumoResources
305323
Type: Custom::AWSSource
@@ -337,6 +355,8 @@ Resources:
337355
- Arn
338356
DependsOn:
339357
- SumoAppUtils
358+
Metadata:
359+
SamResourceId: SumoS3Source
340360
SumoCloudTrailBenchmarkApp:
341361
Type: Custom::App
342362
Properties:
@@ -363,6 +383,8 @@ Resources:
363383
Ref: SumoDeployment
364384
DependsOn:
365385
- SumoAppUtils
386+
Metadata:
387+
SamResourceId: SumoCloudTrailBenchmarkApp
366388
SumoGISCloudTrailDevOpsApp:
367389
Type: Custom::App
368390
Properties:
@@ -389,6 +411,8 @@ Resources:
389411
Ref: SumoDeployment
390412
DependsOn:
391413
- SumoAppUtils
414+
Metadata:
415+
SamResourceId: SumoGISCloudTrailDevOpsApp
392416
Outputs:
393417
CloudTrailBenchmarkAppFolder:
394418
Description: Folder Name

‎cloudtrailbenchmark/template.yaml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Metadata:
4949
Name: sumologic-aws-cloudtrail-benchmark
5050
LicenseUrl: ./LICENSE
5151
ReadmeUrl: ./README.md
52-
SemanticVersion: 1.0.11
52+
SemanticVersion: 1.0.12
5353
SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/master/cloudtrailbenchmark
5454

5555

@@ -123,7 +123,7 @@ Resources:
123123
Properties:
124124
Location:
125125
ApplicationId: arn:aws:serverlessrepo:us-east-1:956882708938:applications/sumologic-app-utils
126-
SemanticVersion: 2.0.1
126+
SemanticVersion: 2.0.11
127127

128128
SumoRole:
129129
Condition: SetupSumoResources
@@ -257,7 +257,7 @@ Resources:
257257
- sns:Publish
258258
Condition:
259259
StringEquals:
260-
aws:SourceAccount: !Ref "AWS::AccountId"
260+
aws:SourceAccount: !Ref AWS::AccountId
261261
ArnLike:
262262
aws:SourceArn: !Sub "arn:aws:s3:::${CloudTrailTargetS3BucketName}"
263263
Effect: Allow
@@ -273,7 +273,7 @@ Resources:
273273
Type: Custom::Collector
274274
Properties:
275275
ServiceToken: !GetAtt SumoAppUtils.Outputs.SumoAppUtilsFunction
276-
Region: !Ref "AWS::Region"
276+
Region: !Ref AWS::Region
277277
CollectorType: Hosted
278278
RemoveOnDeleteStack: !Ref RemoveSumoResourcesOnDeleteStack
279279
CollectorName: !Ref CollectorName
@@ -290,7 +290,7 @@ Resources:
290290
Properties:
291291
SourceType: AwsCloudTrailBucket
292292
ServiceToken: !GetAtt SumoAppUtils.Outputs.SumoAppUtilsFunction
293-
Region: !Ref "AWS::Region"
293+
Region: !Ref AWS::Region
294294
SourceName: !Ref SourceName
295295
TargetBucketName: !Ref CloudTrailTargetS3BucketName
296296
RemoveOnDeleteStack: !Ref RemoveSumoResourcesOnDeleteStack
@@ -309,7 +309,7 @@ Resources:
309309
Type: Custom::App
310310
Properties:
311311
ServiceToken: !GetAtt SumoAppUtils.Outputs.SumoAppUtilsFunction
312-
Region: !Ref "AWS::Region"
312+
Region: !Ref AWS::Region
313313
AppName: "Global Intelligence for AWS CloudTrail"
314314
AppId: "570bdc0d-f824-4fcb-96b2-3230d4497180"
315315
RemoveOnDeleteStack: !Ref RemoveSumoResourcesOnDeleteStack
@@ -328,7 +328,7 @@ Resources:
328328
Type: Custom::App
329329
Properties:
330330
ServiceToken: !GetAtt SumoAppUtils.Outputs.SumoAppUtilsFunction
331-
Region: !Ref "AWS::Region"
331+
Region: !Ref AWS::Region
332332
AppName: "Global Intelligence for CloudTrail DevOps"
333333
AppId: "c7e195de-f169-460a-8e8b-7bb23af0ee5e"
334334
RemoveOnDeleteStack: !Ref RemoveSumoResourcesOnDeleteStack

‎cloudtrailbenchmark/testdeploy.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/bin/bash
22

3+
export AWS_PROFILE="prod"
4+
export AWS_REGION="us-east-1"
35
if [ "$AWS_PROFILE" == "prod" ]
46
then
57
SAM_S3_BUCKET="appdevstore"
@@ -10,9 +12,9 @@ else
1012
fi
1113
uid=$(cat /dev/random | LC_CTYPE=C tr -dc "[:lower:]" | head -c 6)
1214

13-
version="1.0.11"
15+
version="1.0.12"
1416

15-
sam package --template-file template.yaml --s3-bucket $SAM_S3_BUCKET --output-template-file packaged.yaml --s3-prefix "cloudtrailbenchmark/v$version"
17+
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
1618

1719
sam publish --template packaged.yaml --region $AWS_REGION --semantic-version $version
1820

‎cloudwatchevents/guarddutybenchmark/deploy.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/bash
22

33
export AWS_PROFILE="prod"
4+
export AWS_REGION="us-east-1"
45
if [ "$AWS_PROFILE" == "prod" ]
56
then
67
SAM_S3_BUCKET="appdevstore"
@@ -10,7 +11,7 @@ else
1011
AWS_REGION="us-east-2"
1112
fi
1213

13-
version="1.0.12"
14+
version="1.0.13"
1415

1516
echo "Creating package.yaml"
1617
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

‎cloudwatchevents/guarddutybenchmark/packaged.yaml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ Transform: AWS::Serverless-2016-10-31
33
Description: 'This function is invoked by AWS CloudWatch events in response to state
44
change in your AWS resources which matches a event target definition. The event
55
payload received is then forwarded to Sumo Logic HTTP source endpoint.
6-
76
'
87
Globals:
98
Function:
@@ -53,9 +52,9 @@ Metadata:
5352
- benchmark
5453
- guardduty
5554
Name: sumologic-guardduty-benchmark
56-
LicenseUrl: s3://appdevstore/guarddutybenchmark/v1.0.12/6092dd6c323e33634657102f570628e0
57-
ReadmeUrl: s3://appdevstore/guarddutybenchmark/v1.0.12/cab012d7fb7887671b751e6f5c0d2062
58-
SemanticVersion: 1.0.12
55+
LicenseUrl: s3://appdevstore/guarddutybenchmark/v1.0.13/6092dd6c323e33634657102f570628e0
56+
ReadmeUrl: s3://appdevstore/guarddutybenchmark/v1.0.13/cab012d7fb7887671b751e6f5c0d2062
57+
SemanticVersion: 1.0.13
5958
SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/master/cloudwatchevents/guarddutybenchmark
6059
SpdxLicenseId: Apache-2.0
6160
Parameters:
@@ -96,7 +95,7 @@ Parameters:
9695
Resources:
9796
CloudWatchEventFunction:
9897
Properties:
99-
CodeUri: s3://appdevstore/guarddutybenchmark/v1.0.12/22b7b226ca9ec3b9dbb28b94c0e5f824
98+
CodeUri: s3://appdevstore/guarddutybenchmark/v1.0.13/22b7b226ca9ec3b9dbb28b94c0e5f824
10099
Environment:
101100
Variables:
102101
SUMO_ENDPOINT:
@@ -120,7 +119,7 @@ Resources:
120119
Properties:
121120
Location:
122121
ApplicationId: arn:aws:serverlessrepo:us-east-1:956882708938:applications/sumologic-app-utils
123-
SemanticVersion: 2.0.6
122+
SemanticVersion: 2.0.11
124123
Metadata:
125124
SamResourceId: SumoAppUtils
126125
SumoHostedCollector:

‎cloudwatchevents/guarddutybenchmark/template_v2.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Metadata:
5656
Name: sumologic-guardduty-benchmark
5757
LicenseUrl: ../LICENSE
5858
ReadmeUrl: ./README.md
59-
SemanticVersion: 1.0.12
59+
SemanticVersion: 1.0.13
6060
SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/master/cloudwatchevents/guarddutybenchmark
6161
SpdxLicenseId: Apache-2.0
6262

@@ -118,13 +118,13 @@ Resources:
118118
Properties:
119119
Location:
120120
ApplicationId: arn:aws:serverlessrepo:us-east-1:956882708938:applications/sumologic-app-utils
121-
SemanticVersion: 2.0.6
121+
SemanticVersion: 2.0.11
122122

123123
SumoHostedCollector:
124124
Type: Custom::Collector
125125
Properties:
126126
ServiceToken: !GetAtt SumoAppUtils.Outputs.SumoAppUtilsFunction
127-
Region: !Ref "AWS::Region"
127+
Region: !Ref AWS::Region
128128
CollectorType: Hosted
129129
RemoveOnDeleteStack: !Ref RemoveSumoResourcesOnDeleteStack
130130
CollectorName: !Ref CollectorName
@@ -136,7 +136,7 @@ Resources:
136136
Type: Custom::HTTPSource
137137
Properties:
138138
ServiceToken: !GetAtt SumoAppUtils.Outputs.SumoAppUtilsFunction
139-
Region: !Ref "AWS::Region"
139+
Region: !Ref AWS::Region
140140
SourceName: !Ref SourceName
141141
RemoveOnDeleteStack: !Ref RemoveSumoResourcesOnDeleteStack
142142
SourceCategory: !Ref SourceCategoryName
@@ -151,7 +151,7 @@ Resources:
151151
Type: Custom::App
152152
Properties:
153153
ServiceToken: !GetAtt SumoAppUtils.Outputs.SumoAppUtilsFunction
154-
Region: !Ref "AWS::Region"
154+
Region: !Ref AWS::Region
155155
AppName: "Global Intelligence for Amazon GuardDuty"
156156
AppId: "8e7efcb3-040a-4a92-9f8d-922fafb24afb"
157157
RemoveOnDeleteStack: !Ref RemoveSumoResourcesOnDeleteStack

‎sumologic-app-utils/deploy.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#!/bin/bash
22

3+
export AWS_PROFILE="prod"
4+
export AWS_REGION="us-east-1"
35
if [ "$AWS_PROFILE" == "prod" ]
46
then
57
SAM_S3_BUCKET="appdevstore"
@@ -26,7 +28,7 @@ if [ ! -f sumo_app_utils.zip ]; then
2628
rm -r python
2729
fi
2830

29-
version="2.0.15"
31+
version="2.0.11"
3032

3133
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
3234

‎sumologic-app-utils/packaged_sumo_app_utils.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@ Metadata:
2020
- sumologic
2121
- serverless
2222
Name: sumologic-app-utils
23-
SemanticVersion: 2.0.10
23+
SemanticVersion: 2.0.11
2424
SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/master/sumologic-app-utils
2525
SpdxLicenseId: Apache-2.0
26-
ReadmeUrl: s3://appdevstore/sumo_app_utils/v2.0.10/4d5a92c06a7fa9d956a900e51a1f6be4
26+
ReadmeUrl: s3://appdevstore/sumo_app_utils/v2.0.11/4d5a92c06a7fa9d956a900e51a1f6be4
2727
Resources:
2828
SumoAppUtilsFunction:
2929
Type: AWS::Serverless::Function
3030
Properties:
3131
Handler: main.handler
32-
Runtime: python3.7
33-
CodeUri: s3://appdevstore/sumo_app_utils/v2.0.10/sumo_app_utils.zip
32+
Runtime: python3.11
33+
CodeUri: s3://appdevstore/sumo_app_utils/v2.0.11/sumo_app_utils.zip
3434
MemorySize: 128
3535
Timeout: 300
3636
Policies:

‎sumologic-app-utils/sumo_app_utils.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Metadata:
1717
- sumologic
1818
- serverless
1919
Name: sumologic-app-utils
20-
SemanticVersion: 2.0.10
20+
SemanticVersion: 2.0.11
2121
SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/master/sumologic-app-utils
2222
SpdxLicenseId: Apache-2.0
2323
ReadmeUrl: ./README.md
@@ -28,8 +28,8 @@ Resources:
2828
Type: 'AWS::Serverless::Function'
2929
Properties:
3030
Handler: main.handler
31-
Runtime: python3.7
32-
CodeUri: s3://appdevstore/sumo_app_utils/v2.0.10/sumo_app_utils.zip
31+
Runtime: python3.11
32+
CodeUri: s3://appdevstore/sumo_app_utils/v2.0.11/sumo_app_utils.zip
3333
MemorySize: 128
3434
Timeout: 300
3535
Policies:

‎sumologic-app-utils/sumo_app_utils.zip‎

-49.1 KB
Binary file not shown.

0 commit comments

Comments
 (0)