Skip to content

Commit 5503aec

Browse files
rileyfiretailrileyfiretail
authored
Merge pull request #13 from FireTail-io/add-account-id-and-region-name
Add account id and region name to logs
2 parents d8046f3 + 9bb6dbf commit 5503aec

11 files changed

+118
-22
lines changed

‎.github/workflows/deploy-sandbox.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ env:
77
CFN_TEMPLATES_BUCKET: firetail-sandbox-us-east-1-cf-templates
88
CFN_TEMPLATES_BUCKET_REGION: us-east-1
99
APP_NAME: aws-appsync-logging-lambda
10-
SEMANTIC_VERSION: 1.1.39
10+
SEMANTIC_VERSION: 1.2.1
1111
name: Deploy to Sandbox
1212
run-name: "@${{ github.triggering_actor }}: ${{ github.ref_name }}: ${{ github.event_name }}"
1313
on:

‎src/extract_firetail_logs.go

+3-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,9 @@ func ExtractFiretailLogs(logsData *events.CloudwatchLogsData) (map[string]*Firet
4444
firetailLog, firetailLogExists := firetailLogs[requestID]
4545
if !firetailLogExists {
4646
firetailLog = &FiretailLog{
47-
RequestID: requestID,
47+
RequestID: requestID,
48+
RegionName: regionName,
49+
AccountID: accountID,
4850
}
4951
}
5052

‎src/firetail_log.go

+2
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ type FiretailLog struct {
3838
RequestSummary *json.RawMessage `json:"requestSummary,omitempty"`
3939
ResponseHeaders *json.RawMessage `json:"responseHeaders,omitempty"`
4040
ResponseMappings *[]json.RawMessage `json:"responseMappings,omitempty"`
41+
RegionName string `json:"regionName"`
42+
AccountID string `json:"accountId"`
4143
}
4244

4345
func (f *FiretailLog) IsPopulated() bool {

‎src/go.mod

+19-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,31 @@
11
module aws-golang-simple-http-endpoint
22

3-
go 1.18
3+
go 1.22
4+
5+
toolchain go1.23.9
46

57
require (
68
github.com/aws/aws-lambda-go v1.35.0
9+
github.com/aws/aws-sdk-go-v2/config v1.29.14
10+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.19
711
github.com/pkg/errors v0.9.1
812
github.com/stretchr/testify v1.8.1
913
)
1014

11-
require github.com/hashicorp/errwrap v1.0.0 // indirect
15+
require (
16+
github.com/aws/aws-sdk-go-v2 v1.36.3 // indirect
17+
github.com/aws/aws-sdk-go-v2/credentials v1.17.67 // indirect
18+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 // indirect
19+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 // indirect
20+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 // indirect
21+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
22+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 // indirect
23+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 // indirect
24+
github.com/aws/aws-sdk-go-v2/service/sso v1.25.3 // indirect
25+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.1 // indirect
26+
github.com/aws/smithy-go v1.22.2 // indirect
27+
github.com/hashicorp/errwrap v1.0.0 // indirect
28+
)
1229

1330
require (
1431
github.com/davecgh/go-spew v1.1.1 // indirect

‎src/go.sum

+26
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,31 @@
11
github.com/aws/aws-lambda-go v1.35.0 h1:iocVDy5Cw5SCRrKOPHwarkdFwwy48OkfmHoE6SJ3ATg=
22
github.com/aws/aws-lambda-go v1.35.0/go.mod h1:jwFe2KmMsHmffA1X2R09hH6lFzJQxzI8qK17ewzbQMM=
3+
github.com/aws/aws-sdk-go-v2 v1.36.3 h1:mJoei2CxPutQVxaATCzDUjcZEjVRdpsiiXi2o38yqWM=
4+
github.com/aws/aws-sdk-go-v2 v1.36.3/go.mod h1:LLXuLpgzEbD766Z5ECcRmi8AzSwfZItDtmABVkRLGzg=
5+
github.com/aws/aws-sdk-go-v2/config v1.29.14 h1:f+eEi/2cKCg9pqKBoAIwRGzVb70MRKqWX4dg1BDcSJM=
6+
github.com/aws/aws-sdk-go-v2/config v1.29.14/go.mod h1:wVPHWcIFv3WO89w0rE10gzf17ZYy+UVS1Geq8Iei34g=
7+
github.com/aws/aws-sdk-go-v2/credentials v1.17.67 h1:9KxtdcIA/5xPNQyZRgUSpYOE6j9Bc4+D7nZua0KGYOM=
8+
github.com/aws/aws-sdk-go-v2/credentials v1.17.67/go.mod h1:p3C44m+cfnbv763s52gCqrjaqyPikj9Sg47kUVaNZQQ=
9+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 h1:x793wxmUWVDhshP8WW2mlnXuFrO4cOd3HLBroh1paFw=
10+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30/go.mod h1:Jpne2tDnYiFascUEs2AWHJL9Yp7A5ZVy3TNyxaAjD6M=
11+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 h1:ZK5jHhnrioRkUNOc+hOgQKlUL5JeC3S6JgLxtQ+Rm0Q=
12+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34/go.mod h1:p4VfIceZokChbA9FzMbRGz5OV+lekcVtHlPKEO0gSZY=
13+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 h1:SZwFm17ZUNNg5Np0ioo/gq8Mn6u9w19Mri8DnJ15Jf0=
14+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34/go.mod h1:dFZsC0BLo346mvKQLWmoJxT+Sjp+qcVR1tRVHQGOH9Q=
15+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo=
16+
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo=
17+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 h1:eAh2A4b5IzM/lum78bZ590jy36+d/aFLgKF/4Vd1xPE=
18+
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3/go.mod h1:0yKJC/kb8sAnmlYa6Zs3QVYqaC8ug2AbnNChv5Ox3uA=
19+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 h1:dM9/92u2F1JbDaGooxTq18wmmFzbJRfXfVfy96/1CXM=
20+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15/go.mod h1:SwFBy2vjtA0vZbjjaFtfN045boopadnoVPhu4Fv66vY=
21+
github.com/aws/aws-sdk-go-v2/service/sso v1.25.3 h1:1Gw+9ajCV1jogloEv1RRnvfRFia2cL6c9cuKV2Ps+G8=
22+
github.com/aws/aws-sdk-go-v2/service/sso v1.25.3/go.mod h1:qs4a9T5EMLl/Cajiw2TcbNt2UNo/Hqlyp+GiuG4CFDI=
23+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.1 h1:hXmVKytPfTy5axZ+fYbR5d0cFmC3JvwLm5kM83luako=
24+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.1/go.mod h1:MlYRNmYu/fGPoxBQVvBYr9nyr948aY/WLUvwBMBJubs=
25+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.19 h1:1XuUZ8mYJw9B6lzAkXhqHlJd/XvaX32evhproijJEZY=
26+
github.com/aws/aws-sdk-go-v2/service/sts v1.33.19/go.mod h1:cQnB8CUnxbMU82JvlqjKR2HBOm3fe9pWorWBza6MBJ4=
27+
github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
28+
github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
329
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
430
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
531
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

‎src/handler.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ func Handler(ctx context.Context, event events.CloudwatchLogsEvent) error {
1919
if err != nil {
2020
log.Println("Errs extracting Firetail logs:", err.Error())
2121
}
22-
if firetailLogs == nil || len(firetailLogs) == 0 {
22+
if len(firetailLogs) == 0 {
2323
log.Println("Generated no Firetail logs from this batch. Exiting...")
2424
return nil
2525
}
@@ -33,5 +33,5 @@ func Handler(ctx context.Context, event events.CloudwatchLogsEvent) error {
3333
log.Println(string(logBytes))
3434
}
3535

36-
return SendToFiretail(firetailLogs, firetailApiUrl, firetailApiToken)
36+
return SendToFiretail(firetailLogs, firetailApiUrl, firetailTokenHeaderName, firetailToken)
3737
}

0 commit comments

Comments
 (0)