Skip to content

Add account id and region name to logs #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
May 7, 2025
Merged

Add account id and region name to logs #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6c53f5a
go get github.com/aws/aws-sdk-go-v2/config github.com/aws/aws-sdk-go-…
TheTeaCat May 7, 2025
e591673
Add RegionName and AccountID to FiretailLog struct
TheTeaCat May 7, 2025
22f561c
Implement getting account ID and region name from STS and env vars re…
TheTeaCat May 7, 2025
ab6d855
Add RegionName and AccountID to initialisation of FireTail log structs
TheTeaCat May 7, 2025
1e76d47
Remove redundant nil check
TheTeaCat May 7, 2025
40e2a29
update expected logs in tests
TheTeaCat May 7, 2025
7ff2196
Merge branch 'dev' into add-account-id-and-region-name
TheTeaCat May 7, 2025
cb5c6d3
bump semantic version in sandbox workflow
TheTeaCat May 7, 2025
2428596
load app token from FIRETAIL_APP_TOKEN
TheTeaCat May 7, 2025
59ac886
update SendToFiretail to take header name for token as arg
TheTeaCat May 7, 2025
9bb6dbf
update tests
TheTeaCat May 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/deploy-sandbox.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ env:
CFN_TEMPLATES_BUCKET: firetail-sandbox-us-east-1-cf-templates
CFN_TEMPLATES_BUCKET_REGION: us-east-1
APP_NAME: aws-appsync-logging-lambda
SEMANTIC_VERSION: 1.1.39
SEMANTIC_VERSION: 1.2.1
name: Deploy to Sandbox
run-name: "@${{ github.triggering_actor }}: ${{ github.ref_name }}: ${{ github.event_name }}"
on:
Expand Down
4 changes: 3 additions & 1 deletion src/extract_firetail_logs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ func ExtractFiretailLogs(logsData *events.CloudwatchLogsData) (map[string]*Firet
firetailLog, firetailLogExists := firetailLogs[requestID]
if !firetailLogExists {
firetailLog = &FiretailLog{
RequestID: requestID,
RequestID: requestID,
RegionName: regionName,
AccountID: accountID,
}
}

Expand Down
2 changes: 2 additions & 0 deletions src/firetail_log.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ type FiretailLog struct {
RequestSummary *json.RawMessage `json:"requestSummary,omitempty"`
ResponseHeaders *json.RawMessage `json:"responseHeaders,omitempty"`
ResponseMappings *[]json.RawMessage `json:"responseMappings,omitempty"`
RegionName string `json:"regionName"`
AccountID string `json:"accountId"`
}

func (f *FiretailLog) IsPopulated() bool {
Expand Down
21 changes: 19 additions & 2 deletions src/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,31 @@
module aws-golang-simple-http-endpoint

go 1.18
go 1.22

toolchain go1.23.9

require (
github.com/aws/aws-lambda-go v1.35.0
github.com/aws/aws-sdk-go-v2/config v1.29.14
github.com/aws/aws-sdk-go-v2/service/sts v1.33.19
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.8.1
)

require github.com/hashicorp/errwrap v1.0.0 // indirect
require (
github.com/aws/aws-sdk-go-v2 v1.36.3 // indirect
github.com/aws/aws-sdk-go-v2/credentials v1.17.67 // indirect
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 // indirect
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 // indirect
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 // indirect
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 // indirect
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 // indirect
github.com/aws/aws-sdk-go-v2/service/sso v1.25.3 // indirect
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.1 // indirect
github.com/aws/smithy-go v1.22.2 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
)

require (
github.com/davecgh/go-spew v1.1.1 // indirect
Expand Down
26 changes: 26 additions & 0 deletions src/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,31 @@
github.com/aws/aws-lambda-go v1.35.0 h1:iocVDy5Cw5SCRrKOPHwarkdFwwy48OkfmHoE6SJ3ATg=
github.com/aws/aws-lambda-go v1.35.0/go.mod h1:jwFe2KmMsHmffA1X2R09hH6lFzJQxzI8qK17ewzbQMM=
github.com/aws/aws-sdk-go-v2 v1.36.3 h1:mJoei2CxPutQVxaATCzDUjcZEjVRdpsiiXi2o38yqWM=
github.com/aws/aws-sdk-go-v2 v1.36.3/go.mod h1:LLXuLpgzEbD766Z5ECcRmi8AzSwfZItDtmABVkRLGzg=
github.com/aws/aws-sdk-go-v2/config v1.29.14 h1:f+eEi/2cKCg9pqKBoAIwRGzVb70MRKqWX4dg1BDcSJM=
github.com/aws/aws-sdk-go-v2/config v1.29.14/go.mod h1:wVPHWcIFv3WO89w0rE10gzf17ZYy+UVS1Geq8Iei34g=
github.com/aws/aws-sdk-go-v2/credentials v1.17.67 h1:9KxtdcIA/5xPNQyZRgUSpYOE6j9Bc4+D7nZua0KGYOM=
github.com/aws/aws-sdk-go-v2/credentials v1.17.67/go.mod h1:p3C44m+cfnbv763s52gCqrjaqyPikj9Sg47kUVaNZQQ=
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30 h1:x793wxmUWVDhshP8WW2mlnXuFrO4cOd3HLBroh1paFw=
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.30/go.mod h1:Jpne2tDnYiFascUEs2AWHJL9Yp7A5ZVy3TNyxaAjD6M=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34 h1:ZK5jHhnrioRkUNOc+hOgQKlUL5JeC3S6JgLxtQ+Rm0Q=
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.34/go.mod h1:p4VfIceZokChbA9FzMbRGz5OV+lekcVtHlPKEO0gSZY=
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34 h1:SZwFm17ZUNNg5Np0ioo/gq8Mn6u9w19Mri8DnJ15Jf0=
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.34/go.mod h1:dFZsC0BLo346mvKQLWmoJxT+Sjp+qcVR1tRVHQGOH9Q=
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 h1:bIqFDwgGXXN1Kpp99pDOdKMTTb5d2KyU5X/BZxjOkRo=
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3/go.mod h1:H5O/EsxDWyU+LP/V8i5sm8cxoZgc2fdNR9bxlOFrQTo=
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3 h1:eAh2A4b5IzM/lum78bZ590jy36+d/aFLgKF/4Vd1xPE=
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.3/go.mod h1:0yKJC/kb8sAnmlYa6Zs3QVYqaC8ug2AbnNChv5Ox3uA=
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15 h1:dM9/92u2F1JbDaGooxTq18wmmFzbJRfXfVfy96/1CXM=
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.15/go.mod h1:SwFBy2vjtA0vZbjjaFtfN045boopadnoVPhu4Fv66vY=
github.com/aws/aws-sdk-go-v2/service/sso v1.25.3 h1:1Gw+9ajCV1jogloEv1RRnvfRFia2cL6c9cuKV2Ps+G8=
github.com/aws/aws-sdk-go-v2/service/sso v1.25.3/go.mod h1:qs4a9T5EMLl/Cajiw2TcbNt2UNo/Hqlyp+GiuG4CFDI=
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.1 h1:hXmVKytPfTy5axZ+fYbR5d0cFmC3JvwLm5kM83luako=
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.30.1/go.mod h1:MlYRNmYu/fGPoxBQVvBYr9nyr948aY/WLUvwBMBJubs=
github.com/aws/aws-sdk-go-v2/service/sts v1.33.19 h1:1XuUZ8mYJw9B6lzAkXhqHlJd/XvaX32evhproijJEZY=
github.com/aws/aws-sdk-go-v2/service/sts v1.33.19/go.mod h1:cQnB8CUnxbMU82JvlqjKR2HBOm3fe9pWorWBza6MBJ4=
github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
Expand Down
4 changes: 2 additions & 2 deletions src/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func Handler(ctx context.Context, event events.CloudwatchLogsEvent) error {
if err != nil {
log.Println("Errs extracting Firetail logs:", err.Error())
}
if firetailLogs == nil || len(firetailLogs) == 0 {
if len(firetailLogs) == 0 {
log.Println("Generated no Firetail logs from this batch. Exiting...")
return nil
}
Expand All @@ -33,5 +33,5 @@ func Handler(ctx context.Context, event events.CloudwatchLogsEvent) error {
log.Println(string(logBytes))
}

return SendToFiretail(firetailLogs, firetailApiUrl, firetailApiToken)
return SendToFiretail(firetailLogs, firetailApiUrl, firetailTokenHeaderName, firetailToken)
}
Loading
Loading