minimal set of changes to bring things up to date.

It's no longer necessary (or even useful) to go get the files as
go modules takes care of that for us.

.github/workflows/build.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        go: [ '1.14' ]
+        go: [ '1.18' ]
     name: Build ${{ matrix.go }}
     steps:
     - uses: aws-actions/configure-aws-credentials@v1

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.14-alpine
+FROM golang:1.18-alpine
 
 COPY goroot/ /go/
 # this is used to lint and build tarball

README.md

@@ -20,7 +20,19 @@ git remote set-head origin -a
 ```
 
 ## Installation
-`go get github.com/signalsciences/sigsci-module-golang`
+
+```console
+cd $(go env GOPATH)/src/github.com/signalsciences
+git clone https://github.com/signalsciences/sigsci-module-golang.git
+```
+
+## Running tests
+
+Must be logged into our ECR repo
+
+```console
+aws ecr get-login-password --region us-west-2 --profile sigsci_prod | docker login --username AWS --password-stdin 803688608479.dkr.ecr.us-west-2.amazonaws.com
+```
 
 ## Example Code Snippet
 ```go

go.mod

@@ -1,9 +1,8 @@
 module github.com/signalsciences/sigsci-module-golang
 
-go 1.12
+go 1.18
 
 require (
-	github.com/mitchellh/mapstructure v1.1.2 // indirect
 	github.com/philhofer/fwd v1.0.0 // indirect
 	github.com/signalsciences/tlstext v1.2.0
 	github.com/tinylib/msgp v1.1.0

go.sum

@@ -1,5 +1,3 @@
-github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
-github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/philhofer/fwd v1.0.0 h1:UbZqGr5Y38ApvM/V/jEljVxwocdweyH+vmYvRPBnbqQ=
 github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU=
 github.com/signalsciences/tlstext v1.2.0 h1:ps1ZCoDz93oMK0ySe7G/2J0dpTT32cN20U+/xy0S7uk=

scripts/test

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+set -ex
+
+(cd ./scripts/test-golang118 && ./test.sh)
+(cd ./scripts/test-golang119 && ./test.sh)

scripts/test-golang114/Dockerfile → scripts/test-golang118/Dockerfile

@@ -1,6 +1,4 @@
-FROM golang:1.14-alpine
-
-COPY goroot/ /go/
+FROM golang:1.18-alpine
 
 # we will mount the current directory here
 VOLUME [ "/go/src/github.com/signalsciences/sigsci-module-golang" ]

scripts/test-golang114/test.sh → scripts/test-golang118/test.sh

@@ -40,6 +40,5 @@ $DOCKERCOMPOSE pull --ignore-pull-failures
 if [ -d "goroot" ]; then
     rm -rf goroot
 fi
-docker run -v ${PWD}/goroot:/go/ --rm golang:1.14-alpine /bin/sh -c 'apk --update add git && go get github.com/signalsciences/tlstext && go get github.com/tinylib/msgp && go get github.com/alecthomas/gometalinter'
 $DOCKERCOMPOSE up --no-color --build  --abort-on-container-exit --exit-code-from mtest > /dev/null
 

scripts/test-golang110/Dockerfile → scripts/test-golang119/Dockerfile

@@ -1,6 +1,4 @@
-FROM golang:1.10.6-alpine3.8
-
-COPY goroot/ /go/
+FROM golang:1.19-alpine
 
 # we will mount the current directory here
 VOLUME [ "/go/src/github.com/signalsciences/sigsci-module-golang" ]

scripts/test-golang111/docker-compose.yml → scripts/test-golang119/docker-compose.yml

@@ -53,5 +53,6 @@ services:
       - DISABLE_NOCOOKIE=1
       - MTEST_BASEURL=web:8085
       - MTEST_AGENT=agent:12345
+      - "MTEST_RUN_TEST_BLOCK_VIA_REDIRECT=true"
     command: [ "/bin/wait-for", "web:8085", "--", "/bin/mtest", "-test.v" ]
 

scripts/test-golang111/test.sh → scripts/test-golang119/test.sh

@@ -37,9 +37,5 @@ $DOCKERCOMPOSE pull --ignore-pull-failures
 # > /dev/null  --> output of all servers is mixed together and ugly
 #                  we get the individual logs at end
 #
-if [ -d "goroot" ]; then
-    rm -rf goroot
-fi
-docker run -v ${PWD}/goroot:/go/ --rm golang:1.11.3-alpine3.8 /bin/sh -c 'apk --update add git && go get github.com/signalsciences/tlstext && go get github.com/tinylib/msgp && go get github.com/alecthomas/gometalinter'
 $DOCKERCOMPOSE up --no-color --build  --abort-on-container-exit --exit-code-from mtest > /dev/null
 

scripts/test.sh

@@ -2,6 +2,5 @@
 
 set -ex
 
-(cd ./scripts/test-golang110 && ./test.sh)
-(cd ./scripts/test-golang111 && ./test.sh)
-(cd ./scripts/test-golang114 && ./test.sh)
+(cd ./scripts/test-golang118 && ./test.sh)
+(cd ./scripts/test-golang119 && ./test.sh)