Latest

Author: daemonl

.github/workflows/docker-publish.yml .github/workflows/docker-ghcr.yaml.github/workflows/docker-publish.yml renamed to .github/workflows/docker-ghcr.yaml

@@ -1,10 +1,45 @@
-name: Publish Docker image
-
+name: Docker
 on: [push]
 
 jobs:
+  define-matrix:
+    runs-on: ubuntu-latest
+
+    outputs:
+      images: ${{ steps.images.outputs.images }}
+
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v4
+
+      - name: Define Images
+        id: images
+        env:
+          DEFAULT_NAME: ${{ github.repository }}
+          OWNER: ${{ github.repository_owner }}
+        run: |
+          ls Dockerfile* \
+          | jq -R -s -c '
+            split("\n")[:-1]
+            | map({
+                "name": (
+                  if . == "Dockerfile"
+                  then env.DEFAULT_NAME
+                  else ( env.OWNER + "/" + ltrimstr("Dockerfile.") )
+                  end
+                ),
+                "file": .
+              }) ' \
+          | awk '{print "images="$1}' \
+          >> "$GITHUB_OUTPUT"
+
   push_to_registries:
-    name: Push Docker image to multiple registries
+    needs: define-matrix
+    strategy:
+      matrix:
+        image: ${{ fromJSON(needs.define-matrix.outputs.images) }}
+
+    name: Build and Push Docker Image
     runs-on: ubuntu-latest
     permissions:
       packages: write
@@ -24,7 +59,7 @@ jobs:
         id: meta
         uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
         with:
-          images: ghcr.io/${{ github.repository }}
+          images: ghcr.io/${{ matrix.image.name }}
           tags: |
             type=sha,format=long,prefix=
             type=raw,value=latest,enable={{is_default_branch}}
@@ -34,6 +69,7 @@ jobs:
         with:
           context: .
           push: true
+          file: ${{ matrix.image.file }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |

.github/workflows/lint.yaml

@@ -10,16 +10,19 @@ permissions:
   contents: read
 
 jobs:
-  golangci:
-    name: lint
+  lint:
+    name: Linting
     runs-on: ubuntu-latest
+
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.24'
+          go-version: stable
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v6
+        uses: golangci/golangci-lint-action@v7
         with:
-          version: v1.64
+          version: v2.0
           args: --timeout=5m

.golangci.yml

@@ -1,28 +1,48 @@
----
-
+version: "2"
 run:
   tests: true
-
 linters:
   enable:
-    - errcheck
-    - gofmt
-    - gosimple
-    - govet
-    - ineffassign
+    - asciicheck
+    - bidichk
+    - gocheckcompilerdirectives
     - misspell
     - rowserrcheck
     - sqlclosecheck
-    - staticcheck
-    - typecheck
-    - unused
+    - forbidigo
   disable:
-    - wsl
-    - prealloc
     - gochecknoglobals
-  disable-all: false
-  presets:
-    - bugs
-    - unused
-  fast: true
-
+    - prealloc
+    - wsl
+  exclusions:
+    generated: lax
+    presets:
+      - comments
+      - common-false-positives
+      - legacy
+      - std-error-handling
+    paths:
+      - third_party$
+      - builtin$
+      - examples$
+    rules:
+      - path: cmd
+        linters:
+          - forbidigo
+  settings:
+    forbidigo:
+      forbid:
+        - pattern: ^proto\.GetExtension.*$
+          msg: "Use protosrc.GetExtension instead of proto.GetExtension"
+        - pattern: ^protojson.*
+          msg: "Use j5codec instead of protojson"
+        - pattern: ^(fmt\.Print(|f|ln))$
+formatters:
+  enable:
+    - gofmt
+  exclusions:
+    generated: lax
+    paths:
+      - third_party$
+      - builtin$
+      - examples$

cmd/lambda/lambda.go

@@ -11,10 +11,9 @@ import (
 	"github.com/aws/aws-sdk-go-v2/config"
 	"github.com/aws/aws-sdk-go-v2/service/eventbridge"
 	"github.com/aws/aws-sdk-go-v2/service/secretsmanager"
-	"github.com/aws/aws-sdk-go-v2/service/sns"
 	"github.com/pentops/log.go/log"
 	"github.com/pentops/o5-github-lambda/internal/github"
-	"github.com/pentops/o5-runtime-sidecar/awsmsg"
+	sceb "github.com/pentops/o5-runtime-sidecar/adapters/eventbridge"
 )
 
 var Version string
@@ -76,21 +75,20 @@ func do(ctx context.Context) error {
 		return fmt.Errorf("decoding secret: %w", err)
 	}
 
-	publishers := []awsmsg.Publisher{}
-
-	targetTopicARN := os.Getenv("TARGET_TOPIC_ARN")
-	if targetTopicARN != "" {
-		snsClient := sns.NewFromConfig(awsConfig)
-		snsPublisher := awsmsg.NewSNSPublisher(snsClient, targetTopicARN)
-		publishers = append(publishers, snsPublisher)
-	}
+	publishers := []github.Publisher{}
 
 	targetEventBusARN := os.Getenv("TARGET_EVENT_BUS_ARN")
-	if targetEventBusARN != "" {
-		eventBridgeClient := eventbridge.NewFromConfig(awsConfig)
-		eventBridgePublisher := awsmsg.NewEventBridgePublisher(eventBridgeClient, targetEventBusARN)
-		publishers = append(publishers, eventBridgePublisher)
+	if targetEventBusARN == "" {
+		return fmt.Errorf("TARGET_EVENT_BUS_ARN is required")
+	}
+	eventBridgeClient := eventbridge.NewFromConfig(awsConfig)
+	eventBridgePublisher, err := sceb.NewEventBridgePublisher(eventBridgeClient, sceb.EventBridgeConfig{
+		BusARN: targetEventBusARN,
+	})
+	if err != nil {
+		return fmt.Errorf("creating eventbridge publisher: %w", err)
 	}
+	publishers = append(publishers, eventBridgePublisher)
 
 	webhook, err := github.NewWebhookWorker(secretVal.GithubWebhookSecret, sourceConfig, publishers...)
 	if err != nil {

go.mod

@@ -1,47 +1,50 @@
 module github.com/pentops/o5-github-lambda
 
-go 1.22.4
+go 1.24.0
+
+toolchain go1.24.4
 
 require (
 	github.com/aws/aws-lambda-go v1.47.0
-	github.com/aws/aws-sdk-go-v2 v1.30.5
-	github.com/aws/aws-sdk-go-v2/config v1.27.33
+	github.com/aws/aws-sdk-go-v2 v1.36.5
+	github.com/aws/aws-sdk-go-v2/config v1.29.9
 	github.com/aws/aws-sdk-go-v2/service/eventbridge v1.33.3
 	github.com/aws/aws-sdk-go-v2/service/secretsmanager v1.29.3
 	github.com/aws/aws-sdk-go-v2/service/sns v1.31.3
 	github.com/google/go-github/v47 v47.1.0
-	github.com/pentops/log.go v0.0.0-20240806161938-2742d05b4c24
-	github.com/pentops/o5-messaging v0.0.0-20240917175438-554bc6c7bc73
-	github.com/pentops/o5-runtime-sidecar v0.0.0-20240810015839-4cbad3cb2923
+	github.com/pentops/log.go v0.0.16
+	github.com/pentops/o5-messaging v0.0.0-20250804183335-7df32a9e4659
+	github.com/pentops/o5-runtime-sidecar v0.0.0-20250802182415-22432fd531ae
 )
 
 require (
-	buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.34.2-20240717164558-a6c49f84cc0f.2 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.17.32 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.13 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.17 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.17 // 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.17 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.11.4 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.11.19 // indirect
+	buf.build/gen/go/bufbuild/protovalidate/protocolbuffers/go v1.36.6-20250603165357-b52ab10f4468.1 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.17.62 // 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.36 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.36 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.3 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.36 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.4 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.17 // indirect
 	github.com/aws/aws-sdk-go-v2/service/sqs v1.34.3 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.22.7 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.7 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.30.7 // indirect
-	github.com/aws/smithy-go v1.20.4 // indirect
-	github.com/fatih/color v1.17.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.25.1 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.29.1 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.33.17 // indirect
+	github.com/aws/smithy-go v1.22.4 // indirect
+	github.com/fatih/color v1.18.0 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/iancoleman/strcase v0.3.0 // indirect
+	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/pentops/j5 v0.0.0-20240923235006-4e9cc847f113 // indirect
-	golang.org/x/crypto v0.26.0 // indirect
-	golang.org/x/exp v0.0.0-20240904232852-e7e105dedf7e // indirect
-	golang.org/x/net v0.28.0 // indirect
-	golang.org/x/sys v0.25.0 // indirect
-	golang.org/x/text v0.18.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
-	google.golang.org/grpc v1.66.0 // indirect
-	google.golang.org/protobuf v1.34.2 // indirect
+	github.com/pentops/j5 v0.0.0-20250804180511-490f30d7c098 // indirect
+	github.com/shopspring/decimal v1.4.0 // indirect
+	golang.org/x/crypto v0.39.0 // indirect
+	golang.org/x/net v0.40.0 // indirect
+	golang.org/x/sys v0.33.0 // indirect
+	golang.org/x/text v0.26.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
+	google.golang.org/grpc v1.73.0 // indirect
+	google.golang.org/protobuf v1.36.6 // indirect
 )