Merge pull request #1 from skpr/al2

Al2

.github/workflows/lint.yml

@@ -1,16 +1,24 @@
-name: Lint
+name: 📋 Lint
 
 on:
   push
 
+permissions:
+  contents: read
+
 jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v3
-        with:
-          go-version: '1.17'
-      - uses: golangci/golangci-lint-action@v3
+      - name: ⬇️ Git clone the repository
+        uses: actions/checkout@v3
+
+      - name: 📦 Install Go
+        uses: actions/setup-go@v3
         with:
-          args: --timeout=5m
+          go-version: '1.23'
+
+      - name: 📋 Lint
+        run: |
+          go install golang.org/x/lint/golint@latest
+          make lint

.github/workflows/publish.yml

@@ -1,9 +1,9 @@
-name: Publish Artifacts
+name: ☁️ Publish Artifacts
 
 on:
   push:
     tags:
-      - v0.*
+      - v1.*
 
 jobs:
   artifacts:
@@ -13,13 +13,18 @@ jobs:
       contents: write
 
     steps:
-      - name: Checkout repository
+      - name: ⬇️ Git clone the repository
         uses: actions/checkout@v3
 
-      - name: Build package
+      - name: 📦 Install Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: '1.23'
+
+      - name: 📦 Build package
         run: make package
 
-      - name: Release
+      - name: ☁️ Release
         uses: softprops/action-gh-release@v1
         with:
-          files: function.zip
+          files: lambda-handler.zip

.github/workflows/test.yml

@@ -1,4 +1,4 @@
-name: Test
+name: 🧪 Test
 
 on:
   push
@@ -7,8 +7,13 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-go@v3
+      - name: ⬇️ Git clone the repository
+        uses: actions/checkout@v3
+
+      - name: 📦 Install Go
+        uses: actions/setup-go@v3
         with:
-          go-version: '1.17'
-      - run: go test ./...
+          go-version: '1.23'
+
+      - name: 🧪 Test
+        run: go test ./...

Makefile

@@ -3,7 +3,7 @@
 export CGO_ENABLED=0
 export GO111MODULE=on
 
-OUTPUT=bin/main
+OUTPUT=bootstrap
 
 default: lint test build
 
@@ -20,10 +20,8 @@ test:
 	go test -cover ./...
 
 build:
-	GOOS=linux go build -o ${OUTPUT} main.go
+	GOARCH=amd64 GOOS=linux go build -tags lambda.norpc -o ${OUTPUT} main.go
 
-# https://docs.aws.amazon.com/lambda/latest/dg/golang-package.html
+# https://github.com/aws/aws-lambda-go#building-your-function
 package: build
-	zip -j function.zip ${OUTPUT}
-
-.PHONY: *
+	zip lambda-handler.zip bootstrap defaults.env

go.mod

@@ -1,39 +1,30 @@
 module github.com/skpr/cloudtrail-filter
 
-go 1.17
+go 1.23.3
 
 require (
-	github.com/aws/aws-lambda-go v1.34.1
-	github.com/aws/aws-sdk-go-v2 v1.16.16
-	github.com/aws/aws-sdk-go-v2/config v1.17.7
-	github.com/aws/aws-sdk-go-v2/service/iam v1.18.19
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.27.11
-	github.com/codedropau/cloudfront-cloudwatchlogs v0.0.5
-	github.com/prometheus/common v0.6.0
+	github.com/aws/aws-lambda-go v1.47.0
+	github.com/aws/aws-sdk-go-v2 v1.33.0
+	github.com/aws/aws-sdk-go-v2/config v1.29.0
+	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.17.50
+	github.com/aws/aws-sdk-go-v2/service/iam v1.38.6
+	github.com/aws/aws-sdk-go-v2/service/s3 v1.73.0
 )
 
 require (
-	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect
-	github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15 // indirect
-	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.4.8 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.12.20 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.17 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/s3/manager v1.4.0 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.23 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.17 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/ini v1.3.24 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.0.14 // indirect
-	github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.5.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.9.9 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.1.18 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.17 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.13.17 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.11.23 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.13.5 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.16.19 // indirect
-	github.com/aws/smithy-go v1.13.3 // indirect
-	github.com/jmespath/go-jmespath v0.4.0 // indirect
-	github.com/sirupsen/logrus v1.8.1 // indirect
-	golang.org/x/sys v0.0.0-20210816183151-1e6c022a8912 // indirect
-	gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
+	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.53 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.24 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.28 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.28 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.28 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.5.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.9 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.9 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.24.10 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.9 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.33.8 // indirect
+	github.com/aws/smithy-go v1.22.1 // indirect
 )