Merge pull request #945 from nyaruka/devcontainer

Add devcontainer configuration

Author: rowanseymour

.devcontainer/devcontainer.json

@@ -0,0 +1,23 @@
+{
+    "name": "Courier",
+    "image": "mcr.microsoft.com/devcontainers/go:dev-1.25-trixie",
+    "features": {},
+    "runArgs": [
+        "--name=dev-courier",
+        "--network=textit_default"
+    ],
+    "customizations": {
+        "vscode": {
+            "extensions": [
+                "netcorext.uuid-generator"
+            ],
+            "settings": {
+                "terminal.integrated.defaultProfile.linux": "zsh",
+                "editor.formatOnSave": true,
+                "editor.rulers": [
+                    120
+                ]
+            }
+        }
+    }
+}

.github/workflows/ci.yml

@@ -1,11 +1,11 @@
 name: CI
 on: [push, pull_request]
-env:
-  go-version: "1.25.x"
 jobs:
   test:
     name: Test
     runs-on: ubuntu-latest
+    container:
+      image: golang:1.25-trixie
 
     services:
       valkey:
@@ -21,23 +21,17 @@ jobs:
         ports:
           - 5432:5432
         options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+      localstack:
+        image: localstack/localstack:latest
+        env:
+          SERVICES: s3,dynamodb,cloudwatch
+        ports:
+          - 4566:4566
 
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Install Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: ${{ env.go-version }}
-
-      - name: Start LocalStack
-        uses: LocalStack/[email protected]
-        with:
-          image-tag: 'latest'
-          configuration: |
-            SERVICES=s3,dynamodb,cloudwatch
-
       - name: Run tests
         run: go test -p=1 -coverprofile=coverage.text -covermode=atomic ./...
 
@@ -53,17 +47,15 @@ jobs:
     needs: [test]
     if: startsWith(github.ref, 'refs/tags/')
     runs-on: ubuntu-latest
+    container:
+      image: golang:1.25-trixie
+
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
-      - name: Install Go
-        uses: actions/setup-go@v5
-        with:
-          go-version: ${{ env.go-version }}
-
       - name: Publish release
         uses: goreleaser/goreleaser-action@v6
         if: ${{ !contains(github.ref, '-') }}

backends/rapidpro/backend_test.go

@@ -1053,7 +1053,7 @@ func (ts *BackendTestSuite) TestSaveAttachment() {
 
 	newURL, err := ts.b.SaveAttachment(ctx, knChannel, "image/jpeg", testJPG, "jpg")
 	ts.NoError(err)
-	ts.Equal("http://localhost:4566/test-attachments/attachments/1/c00e/5d67/c00e5d67-c275-4389-aded-7d8b151cbd5b.jpg", newURL)
+	ts.Equal("http://localstack:4566/test-attachments/attachments/1/c00e/5d67/c00e5d67-c275-4389-aded-7d8b151cbd5b.jpg", newURL)
 }
 
 func (ts *BackendTestSuite) TestWriteMsg() {
@@ -1175,7 +1175,7 @@ func (ts *BackendTestSuite) TestWriteMsgWithAttachments() {
 	// should have actually fetched and saved it to storage, with the correct content type
 	err = ts.b.WriteMsg(ctx, msg2, clog)
 	ts.NoError(err)
-	ts.Equal([]string{"image/jpeg:http://localhost:4566/test-attachments/attachments/1/37c5/fddb/37c5fddb-8512-4a80-8c21-38b6e22ef940.jpg"}, msg2.Attachments())
+	ts.Equal([]string{"image/jpeg:http://localstack:4566/test-attachments/attachments/1/37c5/fddb/37c5fddb-8512-4a80-8c21-38b6e22ef940.jpg"}, msg2.Attachments())
 
 	// try an invalid embedded attachment
 	msg3 := ts.b.NewIncomingMsg(ctx, knChannel, urn, "invalid embedded attachment data", "", clog).(*MsgIn)

handlers/jiochat/handler_test.go

@@ -262,8 +262,8 @@ func newServer(backend courier.Backend) courier.Server {
 	logger := slog.Default()
 	log.SetOutput(io.Discard)
 	cfg := runtime.NewDefaultConfig()
-	cfg.DB = "postgres://courier_test:temba@localhost:5432/courier_test?sslmode=disable"
-	cfg.Valkey = "valkey://localhost:6379/0"
+	cfg.DB = "postgres://courier_test:temba@postgres:5432/courier_test?sslmode=disable"
+	cfg.Valkey = "valkey://valkey:6379/0"
 	return courier.NewServerWithLogger(cfg, backend, logger)
 }
 

handlers/wechat/handler_test.go

@@ -215,8 +215,8 @@ func newServer(backend courier.Backend) courier.Server {
 	logger := slog.Default()
 	log.SetOutput(io.Discard)
 	cfg := runtime.NewDefaultConfig()
-	cfg.DB = "postgres://courier_test:temba@localhost:5432/courier_test?sslmode=disable"
-	cfg.Valkey = "valkey://localhost:6379/0"
+	cfg.DB = "postgres://courier_test:temba@postgres:5432/courier_test?sslmode=disable"
+	cfg.Valkey = "valkey://valkey:6379/0"
 	return courier.NewServerWithLogger(cfg, backend, logger)
 }
 

runtime/config.go

@@ -66,8 +66,8 @@ type Config struct {
 func NewDefaultConfig() *Config {
 	hostname, _ := os.Hostname()
 	return &Config{
-		DB:       "postgres://temba:temba@localhost/temba?sslmode=disable",
-		Valkey:   "valkey://localhost:6379/15",
+		DB:       "postgres://temba:temba@postgres/temba?sslmode=disable",
+		Valkey:   "valkey://valkey:6379/15",
 		SpoolDir: "/var/spool/courier",
 
 		Domain:  "localhost",

runtime/config_test.go

@@ -11,9 +11,9 @@ var invalidConfigTestCases = []struct {
 	config        *runtime.Config
 	expectedError string
 }{
-	{config: &runtime.Config{DB: ":foo", Valkey: "valkey:localhost/23"}, expectedError: "Field validation for 'DB' failed on the 'url' tag"},
-	{config: &runtime.Config{DB: "mysql:test", Valkey: "valkey:localhost/23"}, expectedError: "Field validation for 'DB' failed on the 'startswith' tag"},
-	{config: &runtime.Config{DB: "postgres://courier:courier@localhost:5432/courier", Valkey: ":foo"}, expectedError: "Field validation for 'Valkey' failed on the 'url' tag"},
+	{config: &runtime.Config{DB: ":foo", Valkey: "valkey:valkey/23"}, expectedError: "Field validation for 'DB' failed on the 'url' tag"},
+	{config: &runtime.Config{DB: "mysql:test", Valkey: "valkey:valkey/23"}, expectedError: "Field validation for 'DB' failed on the 'startswith' tag"},
+	{config: &runtime.Config{DB: "postgres://courier:courier@postgres:5432/courier", Valkey: ":foo"}, expectedError: "Field validation for 'Valkey' failed on the 'url' tag"},
 }
 
 func TestConfigValidate(t *testing.T) {

server_test.go

@@ -24,8 +24,8 @@ import (
 
 func testConfig() *runtime.Config {
 	cfg := runtime.NewDefaultConfig()
-	cfg.DB = "postgres://courier_test:temba@localhost:5432/courier_test?sslmode=disable"
-	cfg.Valkey = "valkey://localhost:6379/0"
+	cfg.DB = "postgres://courier_test:temba@postgres:5432/courier_test?sslmode=disable"
+	cfg.Valkey = "valkey://valkey:6379/0"
 	cfg.Port = 8081
 	return cfg
 }

test/backend.go

@@ -58,7 +58,7 @@ func NewMockBackend() *MockBackend {
 		MaxIdle:     2,                 // only keep up to 2 idle
 		IdleTimeout: 240 * time.Second, // how long to wait before reaping a connection
 		Dial: func() (redis.Conn, error) {
-			conn, err := redis.Dial("tcp", "localhost:6379")
+			conn, err := redis.Dial("tcp", "valkey:6379")
 			if err != nil {
 				return nil, err
 			}

testsuite/runtime.go

@@ -20,17 +20,17 @@ const (
 
 func Runtime(t *testing.T) (context.Context, *runtime.Runtime) {
 	cfg := runtime.NewDefaultConfig()
-	cfg.DB = "postgres://courier_test:temba@localhost:5432/courier_test?sslmode=disable"
-	cfg.Valkey = "valkey://localhost:6379/0"
+	cfg.DB = "postgres://courier_test:temba@postgres:5432/courier_test?sslmode=disable"
+	cfg.Valkey = "valkey://valkey:6379/0"
 	cfg.MediaDomain = "nyaruka.s3.com"
 
 	// configure S3 to use a localstack instance
 	cfg.AWSAccessKeyID = "root"
 	cfg.AWSSecretAccessKey = "tembatemba"
-	cfg.S3Endpoint = "http://localhost:4566"
+	cfg.S3Endpoint = "http://localstack:4566"
 	cfg.S3AttachmentsBucket = "test-attachments"
 	cfg.S3PathStyle = true
-	cfg.DynamoEndpoint = "http://localhost:4566"
+	cfg.DynamoEndpoint = "http://localstack:4566"
 	cfg.DynamoTablePrefix = "Test"
 	cfg.SpoolDir = absPath("./_test_spool")