Merge branch 'main' into codecommit-delete-event

Author: bmoffatt

.github/workflows/tests.yml

@@ -5,11 +5,12 @@ on:
 
 jobs:
   test:
-    name: run tests with code coverage
+    name: run tests
     runs-on: ubuntu-latest
     strategy:
       matrix:
         go:
+          - "1.21"
           - "1.20"
           - "1.19"
           - "1.18"
@@ -24,12 +25,43 @@ jobs:
         uses: actions/setup-go@v3
         with:
           go-version: ${{ matrix.go }}
-      
+
       - run: go version
 
       - name: install lambda runtime interface emulator
         run: curl -L -o /usr/local/bin/aws-lambda-rie https://github.com/aws/aws-lambda-runtime-interface-emulator/releases/latest/download/aws-lambda-rie-x86_64
-      - run: chmod +x /usr/local/bin/aws-lambda-rie 
+      - run: chmod +x /usr/local/bin/aws-lambda-rie
+
+      - name: Check out code into the Go module directory
+        uses: actions/checkout@v3
+
+      - name: Edit the go.mod file to allow tests to run for versions of go before 1.16
+        run: >
+          if [[ ${{ matrix.go }} < "1.16" ]]; then 
+            sed -i.bak 's/^.*retract.*$//' go.mod
+          else
+            echo "no edit required"
+          fi
+
+      - name: go test
+        run: go test -v -race ./...
+
+  coverage:
+    name: run tests with coverage
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        go:
+          - "1.21"
+    steps:
+      - name: Set up Go ${{ matrix.go }}
+        uses: actions/setup-go@v3
+        with:
+          go-version: ${{ matrix.go }}
+
+      - name: install lambda runtime interface emulator
+        run: curl -L -o /usr/local/bin/aws-lambda-rie https://github.com/aws/aws-lambda-runtime-interface-emulator/releases/latest/download/aws-lambda-rie-x86_64
+      - run: chmod +x /usr/local/bin/aws-lambda-rie
 
       - name: Check out code into the Go module directory
         uses: actions/checkout@v3

events/README_SecretsManager_SecretRotationEvent.md

@@ -0,0 +1,38 @@
+# Sample Function
+
+The following is a sample Lambda function that handles a SecretsManager secret rotation event.
+
+```go
+package main
+
+import (
+    "fmt"
+	"context"
+
+	"github.com/aws/aws-lambda-go/lambda"
+	"github.com/aws/aws-lambda-go/events"
+)
+
+func handler(ctx context.Context, event SecretsManagerSecretRotationEvent) error {
+	fmt.Printf("rotating secret %s with token %s\n", 
+        event.SecretID, event.ClientRequestToken)
+
+    switch event.Step {
+	case "createSecret":
+		// create
+	case "setSecret":
+		// set
+	case "finishSecret":
+		// finish
+	case "testSecret":
+		// test
+	}
+
+    return nil
+}
+
+
+func main() {
+	lambda.Start(handler)
+}
+```

events/secretsmanager.go

@@ -0,0 +1,11 @@
+package events
+
+// SecretsManagerSecretRotationEvent is the event passed to a Lambda function to handle
+// automatic secret rotation.
+//
+// https://docs.aws.amazon.com/secretsmanager/latest/userguide/rotating-secrets.html#rotate-secrets_how
+type SecretsManagerSecretRotationEvent struct {
+	Step               string `json:"Step"`
+	SecretID           string `json:"SecretId"`
+	ClientRequestToken string `json:"ClientRequestToken"`
+}

events/secretsmanager_test.go

@@ -0,0 +1,30 @@
+package events
+
+import (
+	"encoding/json"
+	"testing"
+
+	"github.com/aws/aws-lambda-go/events/test"
+	"github.com/stretchr/testify/assert"
+)
+
+func TestSecretsManagerSecretRotationEventMarshaling(t *testing.T) {
+
+	// 1. read JSON from file
+	inputJSON := test.ReadJSONFromFile(t, "./testdata/secretsmanager-secret-rotation-event.json")
+
+	// 2. de-serialize into Go object
+	var inputEvent SecretsManagerSecretRotationEvent
+	if err := json.Unmarshal(inputJSON, &inputEvent); err != nil {
+		t.Errorf("could not unmarshal event. details: %v", err)
+	}
+
+	// 3. serialize to JSON
+	outputJSON, err := json.Marshal(inputEvent)
+	if err != nil {
+		t.Errorf("could not marshal event. details: %v", err)
+	}
+
+	// 4. check result
+	assert.JSONEq(t, string(inputJSON), string(outputJSON))
+}

events/testdata/secretsmanager-secret-rotation-event.json

@@ -0,0 +1,5 @@
+{
+  "Step": "createSecret",
+  "SecretId": "arn:aws:secretsmanager:us-east-1:111122223333:secret:id-ABCD1E",
+  "ClientRequestToken": "1ab23456-cde7-8912-34fg-h56i78j9k12l"
+}

go.mod

@@ -9,3 +9,5 @@ require (
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
+
+retract v1.39.0