Skip to content

Commit e210b31

Browse files
akhil-sumologicakhil-sumologic
authored
Merge pull request #207 from SumoLogic/awso_2_10
Added support korea deployment s3-logging-auto-enable, guardduty-benchmark, sumologic-app-utils
2 parents 6f3b819 + 485075b commit e210b31

File tree

10 files changed

+35
-31
lines changed

10 files changed

+35
-31
lines changed

‎awsautoenableS3Logging/packaged.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ Metadata:
2424
- s3logging
2525
- flowlogs
2626
Name: sumologic-s3-logging-auto-enable
27-
SemanticVersion: 1.0.13
27+
SemanticVersion: 1.0.14
2828
SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/main/awsautoenableS3Logging
29-
LicenseUrl: s3://appdevstore/AutoEnableS3Logs/v1.0.13/978602b5b9ec16f8bab0e38fd6b3998f
30-
ReadmeUrl: s3://appdevstore/AutoEnableS3Logs/v1.0.13/d05d411471e0bb4db3389f2523f515f0
29+
LicenseUrl: s3://appdevstore/AutoEnableS3Logs/v1.0.14/978602b5b9ec16f8bab0e38fd6b3998f
30+
ReadmeUrl: s3://appdevstore/AutoEnableS3Logs/v1.0.14/d05d411471e0bb4db3389f2523f515f0
3131
SpdxLicenseId: Apache-2.0
3232
Mappings:
3333
Region2ELBAccountId:
@@ -229,7 +229,7 @@ Resources:
229229
Type: AWS::Serverless::Function
230230
Condition: auto_enable_new
231231
Properties:
232-
CodeUri: s3://appdevstore/sumo_app_utils/v2.0.16/sumo_app_utils.zip
232+
CodeUri: s3://appdevstore/sumo_app_utils/v2.0.17/sumo_app_utils.zip
233233
Handler: awsresource.enable_s3_logs
234234
Runtime: python3.12
235235
Role:
@@ -467,7 +467,7 @@ Resources:
467467
Properties:
468468
Handler: main.handler
469469
Runtime: python3.12
470-
CodeUri: s3://appdevstore/sumo_app_utils/v2.0.16/sumo_app_utils.zip
470+
CodeUri: s3://appdevstore/sumo_app_utils/v2.0.17/sumo_app_utils.zip
471471
MemorySize: 128
472472
Timeout: 900
473473
Role:

‎awsautoenableS3Logging/sumologic-s3-logging-auto-enable.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Metadata:
2424
- s3logging
2525
- flowlogs
2626
Name: sumologic-s3-logging-auto-enable
27-
SemanticVersion: 1.0.13
27+
SemanticVersion: 1.0.14
2828
SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/main/awsautoenableS3Logging
2929
LicenseUrl: ./LICENSE
3030
ReadmeUrl: ./README.md
@@ -208,7 +208,7 @@ Resources:
208208
Type: 'AWS::Serverless::Function'
209209
Condition: auto_enable_new
210210
Properties:
211-
CodeUri: s3://appdevstore/sumo_app_utils/v2.0.16/sumo_app_utils.zip
211+
CodeUri: s3://appdevstore/sumo_app_utils/v2.0.17/sumo_app_utils.zip
212212
Handler: "awsresource.enable_s3_logs"
213213
Runtime: python3.12
214214
Role: !GetAtt SumoLambdaRole.Arn
@@ -385,7 +385,7 @@ Resources:
385385
Properties:
386386
Handler: main.handler
387387
Runtime: python3.12
388-
CodeUri: s3://appdevstore/sumo_app_utils/v2.0.16/sumo_app_utils.zip
388+
CodeUri: s3://appdevstore/sumo_app_utils/v2.0.17/sumo_app_utils.zip
389389
MemorySize: 128
390390
Timeout: 900
391391
Role:

‎cloudwatchevents/guarddutybenchmark/deploy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ else
1111
AWS_REGION="us-east-2"
1212
fi
1313

14-
version="1.0.14"
14+
version="1.0.16"
1515

1616
echo "Creating package.yaml"
1717
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: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ Metadata:
5353
- benchmark
5454
- guardduty
5555
Name: sumologic-guardduty-benchmark
56-
LicenseUrl: s3://appdevstore/guarddutybenchmark/v1.0.15/6092dd6c323e33634657102f570628e0
57-
ReadmeUrl: s3://appdevstore/guarddutybenchmark/v1.0.15/cab012d7fb7887671b751e6f5c0d2062
58-
SemanticVersion: 1.0.15
56+
LicenseUrl: s3://appdevstore/guarddutybenchmark/v1.0.16/6092dd6c323e33634657102f570628e0
57+
ReadmeUrl: s3://appdevstore/guarddutybenchmark/v1.0.16/cab012d7fb7887671b751e6f5c0d2062
58+
SemanticVersion: 1.0.16
5959
SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/main/cloudwatchevents/guarddutybenchmark
6060
SpdxLicenseId: Apache-2.0
6161
Parameters:
@@ -72,19 +72,21 @@ Parameters:
7272
Type: String
7373
SumoAccessKey:
7474
Type: String
75+
NoEcho: true
7576
SumoDeployment:
7677
Type: String
7778
AllowedValues:
7879
- au
7980
- ca
8081
- de
8182
- eu
83+
- fed
84+
- in
8285
- jp
83-
- us2
86+
- kr
8487
- us1
85-
- in
86-
- fed
87-
Description: Enter in, fed, au, ca, de, eu, jp, us2, or us1
88+
- us2
89+
Description: Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2
8890
RemoveSumoResourcesOnDeleteStack:
8991
AllowedValues:
9092
- true
@@ -96,7 +98,7 @@ Parameters:
9698
Resources:
9799
CloudWatchEventFunction:
98100
Properties:
99-
CodeUri: s3://appdevstore/guarddutybenchmark/v1.0.15/22b7b226ca9ec3b9dbb28b94c0e5f824
101+
CodeUri: s3://appdevstore/guarddutybenchmark/v1.0.16/22b7b226ca9ec3b9dbb28b94c0e5f824
100102
Environment:
101103
Variables:
102104
SUMO_ENDPOINT:
@@ -120,7 +122,7 @@ Resources:
120122
Properties:
121123
Location:
122124
ApplicationId: arn:aws:serverlessrepo:us-east-1:956882708938:applications/sumologic-app-utils
123-
SemanticVersion: 2.0.16
125+
SemanticVersion: 2.0.17
124126
Metadata:
125127
SamResourceId: SumoAppUtils
126128
SumoHostedCollector:

‎cloudwatchevents/guarddutybenchmark/template_v2.yaml

Lines changed: 8 additions & 6 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.15
59+
SemanticVersion: 1.0.16
6060
SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/main/cloudwatchevents/guarddutybenchmark
6161
SpdxLicenseId: Apache-2.0
6262

@@ -74,19 +74,21 @@ Parameters:
7474
Type: String
7575
SumoAccessKey:
7676
Type: String
77+
NoEcho: true
7778
SumoDeployment:
7879
Type: String
7980
AllowedValues:
8081
- au
8182
- ca
8283
- de
8384
- eu
85+
- fed
86+
- in
8487
- jp
85-
- us2
88+
- kr
8689
- us1
87-
- in
88-
- fed
89-
Description: "Enter in, fed, au, ca, de, eu, jp, us2, or us1"
90+
- us2
91+
Description: "Enter au, ca, de, eu, fed, in, jp, kr, us1 or us2"
9092
RemoveSumoResourcesOnDeleteStack:
9193
AllowedValues:
9294
- true
@@ -118,7 +120,7 @@ Resources:
118120
Properties:
119121
Location:
120122
ApplicationId: arn:aws:serverlessrepo:us-east-1:956882708938:applications/sumologic-app-utils
121-
SemanticVersion: 2.0.16
123+
SemanticVersion: 2.0.17
122124

123125
SumoHostedCollector:
124126
Type: Custom::Collector

‎cloudwatchevents/test/test-guardduty-benchmark.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ def __init__(self, source_category, finding_types, delay):
9797
def api_endpoint(self):
9898
if SUMO_DEPLOYMENT == "us1":
9999
return "https://api.sumologic.com/api"
100-
elif SUMO_DEPLOYMENT in ["ca", "au", "de", "eu", "jp", "us2", "fed", "in"]:
100+
elif SUMO_DEPLOYMENT in ['au', 'ca', 'de', 'eu', 'fed', 'in', 'jp', 'kr', 'us1', 'us2']:
101101
return "https://api.%s.sumologic.com/api" % SUMO_DEPLOYMENT
102102
else:
103103
return 'https://%s-api.sumologic.net/api' % SUMO_DEPLOYMENT

‎sumologic-app-utils/packaged_sumo_app_utils.yaml

Lines changed: 3 additions & 3 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.16
23+
SemanticVersion: 2.0.17
2424
SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/main/sumologic-app-utils
2525
SpdxLicenseId: Apache-2.0
26-
ReadmeUrl: s3://appdevstore/sumo_app_utils/v2.0.16/4d5a92c06a7fa9d956a900e51a1f6be4
26+
ReadmeUrl: s3://appdevstore/sumo_app_utils/v2.0.17/4d5a92c06a7fa9d956a900e51a1f6be4
2727
Resources:
2828
SumoAppUtilsFunction:
2929
Type: AWS::Serverless::Function
3030
Properties:
3131
Handler: main.handler
3232
Runtime: python3.12
33-
CodeUri: s3://appdevstore/sumo_app_utils/v2.0.16/sumo_app_utils.zip
33+
CodeUri: s3://appdevstore/sumo_app_utils/v2.0.17/sumo_app_utils.zip
3434
MemorySize: 128
3535
Timeout: 300
3636
Policies:

‎sumologic-app-utils/src/sumoresource.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def extract_params(self, event):
4242
def api_endpoint(self):
4343
if self.deployment == "us1":
4444
return "https://api.sumologic.com/api"
45-
elif self.deployment in ["ca", "au", "de", "eu", "jp", "us2", "fed", "in"]:
45+
elif self.deployment in ["ca", "au", "de", "eu", "jp", "us2", "fed", "in", 'kr']:
4646
return "https://api.%s.sumologic.com/api" % self.deployment
4747
else:
4848
return 'https://%s-api.sumologic.net/api' % self.deployment

‎sumologic-app-utils/sumo_app_utils.yaml

Lines changed: 2 additions & 2 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.16
20+
SemanticVersion: 2.0.17
2121
SourceCodeUrl: https://github.com/SumoLogic/sumologic-aws-lambda/tree/main/sumologic-app-utils
2222
SpdxLicenseId: Apache-2.0
2323
ReadmeUrl: ./README.md
@@ -29,7 +29,7 @@ Resources:
2929
Properties:
3030
Handler: main.handler
3131
Runtime: python3.12
32-
CodeUri: s3://appdevstore/sumo_app_utils/v2.0.16/sumo_app_utils.zip
32+
CodeUri: s3://appdevstore/sumo_app_utils/v2.0.17/sumo_app_utils.zip
3333
MemorySize: 128
3434
Timeout: 300
3535
Policies:

‎sumologic-app-utils/sumo_app_utils.zip

-4 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)