Skip to content

Commit 1dc2c4c

Browse files
phzietsmanphzietsman
authored
Requested updatet 20220402 (#8)
* Update to new layer, losing support for Gov and CN * Updated exclusion list New exclusions: - sso.amazonaws.com:CreateToken - signin.amazonaws.com:CredentialVerification - signin.amazonaws.com:CredentialChallenge - cloudtrail.amazonaws.com:StartQuery * Linting error
1 parent 145a62f commit 1dc2c4c

File tree

6 files changed

+45
-57
lines changed

6 files changed

+45
-57
lines changed

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ crash.log
1212
# .tfvars files are managed as part of configuration and so should be included in
1313
# version control.
1414
#
15-
# example.tfvars
15+
terraform.tfvars
1616

1717
# Ignore override files as they are usually used to override resources locally and so
1818
# are not checked in

‎data.tf‎

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,24 @@
11
locals {
2-
// https://aws.amazon.com/blogs/compute/upcoming-changes-to-the-python-sdk-in-aws-lambda/
2+
// https://github.com/phzietsman/aws-lambda-layer-common
33
python_layers = {
4-
"ap-northeast-1" = "arn:aws:lambda:ap-northeast-1:249908578461:layer:AWSLambda-Python-AWS-SDK:4"
5-
"us-east-1" = "arn:aws:lambda:us-east-1:668099181075:layer:AWSLambda-Python-AWS-SDK:4"
6-
"ap-southeast-1" = "arn:aws:lambda:ap-southeast-1:468957933125:layer:AWSLambda-Python-AWS-SDK:4"
7-
"eu-west-1" = "arn:aws:lambda:eu-west-1:399891621064:layer:AWSLambda-Python-AWS-SDK:4"
8-
"us-west-1" = "arn:aws:lambda:us-west-1:325793726646:layer:AWSLambda-Python-AWS-SDK:4"
9-
"ap-east-1" = "arn:aws:lambda:ap-east-1:118857876118:layer:AWSLambda-Python-AWS-SDK:4"
10-
"ap-northeast-2" = "arn:aws:lambda:ap-northeast-2:296580773974:layer:AWSLambda-Python-AWS-SDK:4"
11-
"ap-northeast-3" = "arn:aws:lambda:ap-northeast-3:961244031340:layer:AWSLambda-Python-AWS-SDK:4"
12-
"ap-south-1" = "arn:aws:lambda:ap-south-1:631267018583:layer:AWSLambda-Python-AWS-SDK:4"
13-
"ap-southeast-2" = "arn:aws:lambda:ap-southeast-2:817496625479:layer:AWSLambda-Python-AWS-SDK:4"
14-
"ca-central-1" = "arn:aws:lambda:ca-central-1:778625758767:layer:AWSLambda-Python-AWS-SDK:4"
15-
"eu-central-1" = "arn:aws:lambda:eu-central-1:292169987271:layer:AWSLambda-Python-AWS-SDK:4"
16-
"eu-north-1" = "arn:aws:lambda:eu-north-1:642425348156:layer:AWSLambda-Python-AWS-SDK:4"
17-
"eu-west-2" = "arn:aws:lambda:eu-west-2:142628438157:layer:AWSLambda-Python-AWS-SDK:4"
18-
"eu-west-3" = "arn:aws:lambda:eu-west-3:959311844005:layer:AWSLambda-Python-AWS-SDK:4"
19-
"sa-east-1" = "arn:aws:lambda:sa-east-1:640010853179:layer:AWSLambda-Python-AWS-SDK:4"
20-
"us-east-2" = "arn:aws:lambda:us-east-2:259788987135:layer:AWSLambda-Python-AWS-SDK:4"
21-
"us-west-2" = "arn:aws:lambda:us-west-2:420165488524:layer:AWSLambda-Python-AWS-SDK:5"
22-
"cn-north-1" = "arn:aws-cn:lambda:cn-north-1:683298794825:layer:AWSLambda-Python-AWS-SDK:4"
23-
"cn-northwest-1" = "arn:aws-cn:lambda:cn-northwest-1:382066503313:layer:AWSLambda-Python-AWS-SDK:4"
24-
"us-gov-west" = "arn:aws-us-gov:lambda:us-gov-west-1:556739011827:layer:AWSLambda-Python-AWS-SDK:4"
25-
"us-gov-east" = "arn:aws-us-gov:lambda:us-gov-east-1:138526772879:layer:AWSLambda-Python-AWS-SDK:4"
4+
"ap-northeast-1" = "arn:aws:lambda:ap-northeast-1:306986787463:layer:common-python-libraries:1"
5+
"us-east-1" = "arn:aws:lambda:us-east-1:306986787463:layer:common-python-libraries:1"
6+
"ap-southeast-1" = "arn:aws:lambda:ap-southeast-1:306986787463:layer:common-python-libraries:1"
7+
"eu-west-1" = "arn:aws:lambda:eu-west-1:306986787463:layer:common-python-libraries:1"
8+
"us-west-1" = "arn:aws:lambda:us-west-1:306986787463:layer:common-python-libraries:1"
9+
"ap-east-1" = "arn:aws:lambda:ap-east-1:306986787463:layer:common-python-libraries:1"
10+
"ap-northeast-2" = "arn:aws:lambda:ap-northeast-2:306986787463:layer:common-python-libraries:1"
11+
"ap-northeast-3" = "arn:aws:lambda:ap-northeast-3:306986787463:layer:common-python-libraries:1"
12+
"ap-south-1" = "arn:aws:lambda:ap-south-1:306986787463:layer:common-python-libraries:1"
13+
"ap-southeast-2" = "arn:aws:lambda:ap-southeast-2:306986787463:layer:common-python-libraries:1"
14+
"ca-central-1" = "arn:aws:lambda:ca-central-1:306986787463:layer:common-python-libraries:1"
15+
"eu-central-1" = "arn:aws:lambda:eu-central-1:306986787463:layer:common-python-libraries:1"
16+
"eu-north-1" = "arn:aws:lambda:eu-north-1:306986787463:layer:common-python-libraries:1"
17+
"eu-west-2" = "arn:aws:lambda:eu-west-2:306986787463:layer:common-python-libraries:1"
18+
"eu-west-3" = "arn:aws:lambda:eu-west-3:306986787463:layer:common-python-libraries:1"
19+
"sa-east-1" = "arn:aws:lambda:sa-east-1:306986787463:layer:common-python-libraries:1"
20+
"us-east-2" = "arn:aws:lambda:us-east-2:306986787463:layer:common-python-libraries:1"
21+
"us-west-2" = "arn:aws:lambda:us-west-2:306986787463:layer:common-python-libraries:1"
2622
}
2723
}
2824

‎lambda/app/clickops.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,17 @@ def __init__(self, event: CloudTrailEvent) -> None:
5555
"sso.amazonaws.com:Logout",
5656
"sso.amazonaws.com:SearchUsers",
5757
"sso.amazonaws.com:SearchGroups",
58+
"sso.amazonaws.com:CreateToken",
5859

5960
"signin.amazonaws.com:UserAuthentication",
6061
"signin.amazonaws.com:SwitchRole",
6162
"signin.amazonaws.com:RenewRole",
6263
"signin.amazonaws.com:ExternalIdPDirectoryLogin",
64+
"signin.amazonaws.com:CredentialVerification",
65+
"signin.amazonaws.com:CredentialChallenge",
6366

6467
"logs.amazonaws.com:StartQuery",
68+
"cloudtrail.amazonaws.com:StartQuery",
6569

6670
"iam.amazonaws.com:SimulatePrincipalPolicy",
6771
"iam.amazonaws.com:GenerateServiceLastAccessedDetails",

‎lambda/app/messenger.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
import json
3-
from botocore.vendored import requests
3+
import requests
44

55

66
class Messenger:

‎sam/template.yaml‎

Lines changed: 19 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Metadata:
1111
ReadmeUrl: README.md
1212
Labels: ['clickops', 'report', 'automation', 'devops', 'cloudandthings']
1313
HomePageUrl: https://github.com/cloudandthings/terraform-aws-clickops-notifier
14-
SemanticVersion: 1.0.6
14+
SemanticVersion: 1.0.7
1515
SourceCodeUrl: https://github.com/cloudandthings/terraform-aws-clickops-notifier
1616

1717
Parameters:
@@ -74,49 +74,41 @@ Parameters:
7474
Mappings:
7575
RegionMap:
7676
ap-northeast-1:
77-
Layer: arn:aws:lambda:ap-northeast-1:249908578461:layer:AWSLambda-Python-AWS-SDK:4
77+
Layer: arn:aws:lambda:ap-northeast-1:306986787463:layer:common-python-libraries:1
7878
us-east-1:
79-
Layer: arn:aws:lambda:us-east-1:668099181075:layer:AWSLambda-Python-AWS-SDK:4
79+
Layer: arn:aws:lambda:us-east-1:306986787463:layer:common-python-libraries:1
8080
ap-southeast-1:
81-
Layer: arn:aws:lambda:ap-southeast-1:468957933125:layer:AWSLambda-Python-AWS-SDK:4
81+
Layer: arn:aws:lambda:ap-southeast-1:306986787463:layer:common-python-libraries:1
8282
eu-west-1:
83-
Layer: arn:aws:lambda:eu-west-1:399891621064:layer:AWSLambda-Python-AWS-SDK:4
83+
Layer: arn:aws:lambda:eu-west-1:306986787463:layer:common-python-libraries:1
8484
us-west-1:
85-
Layer: arn:aws:lambda:us-west-1:325793726646:layer:AWSLambda-Python-AWS-SDK:4
85+
Layer: arn:aws:lambda:us-west-1:306986787463:layer:common-python-libraries:1
8686
ap-east-1:
87-
Layer: arn:aws:lambda:ap-east-1:118857876118:layer:AWSLambda-Python-AWS-SDK:4
87+
Layer: arn:aws:lambda:ap-east-1:306986787463:layer:common-python-libraries:1
8888
ap-northeast-2:
89-
Layer: arn:aws:lambda:ap-northeast-2:296580773974:layer:AWSLambda-Python-AWS-SDK:4
89+
Layer: arn:aws:lambda:ap-northeast-2:306986787463:layer:common-python-libraries:1
9090
ap-northeast-3:
91-
Layer: arn:aws:lambda:ap-northeast-3:961244031340:layer:AWSLambda-Python-AWS-SDK:4
91+
Layer: arn:aws:lambda:ap-northeast-3:306986787463:layer:common-python-libraries:1
9292
ap-south-1:
93-
Layer: arn:aws:lambda:ap-south-1:631267018583:layer:AWSLambda-Python-AWS-SDK:4
93+
Layer: arn:aws:lambda:ap-south-1:306986787463:layer:common-python-libraries:1
9494
ap-southeast-2:
95-
Layer: arn:aws:lambda:ap-southeast-2:817496625479:layer:AWSLambda-Python-AWS-SDK:4
95+
Layer: arn:aws:lambda:ap-southeast-2:306986787463:layer:common-python-libraries:1
9696
ca-central-1:
97-
Layer: arn:aws:lambda:ca-central-1:778625758767:layer:AWSLambda-Python-AWS-SDK:4
97+
Layer: arn:aws:lambda:ca-central-1:306986787463:layer:common-python-libraries:1
9898
eu-central-1:
99-
Layer: arn:aws:lambda:eu-central-1:292169987271:layer:AWSLambda-Python-AWS-SDK:4
99+
Layer: arn:aws:lambda:eu-central-1:306986787463:layer:common-python-libraries:1
100100
eu-north-1:
101-
Layer: arn:aws:lambda:eu-north-1:642425348156:layer:AWSLambda-Python-AWS-SDK:4
101+
Layer: arn:aws:lambda:eu-north-1:306986787463:layer:common-python-libraries:1
102102
eu-west-2:
103-
Layer: arn:aws:lambda:eu-west-2:142628438157:layer:AWSLambda-Python-AWS-SDK:4
103+
Layer: arn:aws:lambda:eu-west-2:306986787463:layer:common-python-libraries:1
104104
eu-west-3:
105-
Layer: arn:aws:lambda:eu-west-3:959311844005:layer:AWSLambda-Python-AWS-SDK:4
105+
Layer: arn:aws:lambda:eu-west-3:306986787463:layer:common-python-libraries:1
106106
sa-east-1:
107-
Layer: arn:aws:lambda:sa-east-1:640010853179:layer:AWSLambda-Python-AWS-SDK:4
107+
Layer: arn:aws:lambda:sa-east-1:306986787463:layer:common-python-libraries:1
108108
us-east-2:
109-
Layer: arn:aws:lambda:us-east-2:259788987135:layer:AWSLambda-Python-AWS-SDK:4
109+
Layer: arn:aws:lambda:us-east-2:306986787463:layer:common-python-libraries:1
110110
us-west-2:
111-
Layer: arn:aws:lambda:us-west-2:420165488524:layer:AWSLambda-Python-AWS-SDK:5
112-
cn-north-1:
113-
Layer: arn:aws-cn:lambda:cn-north-1:683298794825:layer:AWSLambda-Python-AWS-SDK:4
114-
cn-northwest-1:
115-
Layer: arn:aws-cn:lambda:cn-northwest-1:382066503313:layer:AWSLambda-Python-AWS-SDK:4
116-
us-gov-west:
117-
Layer: arn:aws-us-gov:lambda:us-gov-west-1:556739011827:layer:AWSLambda-Python-AWS-SDK:4
118-
us-gov-east:
119-
Layer: arn:aws-us-gov:lambda:us-gov-east-1:138526772879:layer:AWSLambda-Python-AWS-SDK:4
111+
Layer: arn:aws:lambda:us-west-2:306986787463:layer:common-python-libraries:1
120112

121113
Resources:
122114
WebhookSSMParameter:

‎variables.tf‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,7 @@ variable "region" {
3333
"eu-west-3",
3434
"sa-east-1",
3535
"us-east-2",
36-
"us-west-2",
37-
"cn-north-1",
38-
"cn-northwest-1",
39-
"us-gov-west",
40-
"us-gov-east"
36+
"us-west-2"
4137
], var.region)
4238
error_message = "Invalid region provided."
4339
}

0 commit comments

Comments
 (0)