Tweaked workflows

.github/workflows/ci.yaml

@@ -13,7 +13,9 @@ jobs:
   #   continue-on-error: true
   #   steps:
   #     - uses: actions/checkout@v3
-  #     - uses: ./.github/workflows/setupgo118amd64
+  #     - uses: actions/setup-go@v4
+  #       with:
+  #         go-version-file: 'go.mod'
   #     - name: golangci-lint
   #       uses: golangci/golangci-lint-action@v3
   #       with:
@@ -27,25 +29,14 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v3
-      - uses: ./.github/workflows/setupgo118amd64
+      - uses: actions/setup-go@v4
+        with:
+          go-version-file: 'go.mod'
       - name: Install dependencies
         run: sudo apt-get update -y && sudo apt-get install -y gcc git-core gnupg build-essential
       - name: Remove installed mongodb
         run: sudo apt purge mongodb-org && sudo apt autoremove
       - run: sudo snap install juju-db --channel 4.4/stable
-      - name: Pull candid repo for test environment
-        run: |
-          git clone https://github.com/canonical/candid.git ./tmp/candid
-          cd ./tmp/candid
-          DOCKER_BUILDKIT=1 \
-          docker build \
-          --cache-from candid:latest \
-          . -f ./Dockerfile -t candid
-          docker image ls candid
-      - name: Add volume files
-        run: |
-          touch ./local/vault/approle.json
-          touch ./local/vault/roleid.txt
       - name: Start test environment
         run: docker compose up -d
       - name: Build and Test

.github/workflows/oci-image.yaml

@@ -8,7 +8,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - run: git fetch --prune --unshallow
-      - uses: ./.github/workflows/setupgo118amd64
+      - uses: actions/setup-go@v4
+        with:
+          go-version-file: 'go.mod'
       - uses: docker/setup-qemu-action@v2
       - uses: docker/setup-buildx-action@v2
       - name: Setup version and commit

.github/workflows/snap.yaml

@@ -12,10 +12,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - run: git fetch --prune --unshallow
-      - uses: ./.github/workflows/setupgo118amd64
+      - uses: actions/setup-go@v4
         with:
-          user: ${{ secrets.GH_USER }}
-          pat: ${{ secrets.GH_AUTH }}
+          go-version-file: 'go.mod'
       - run: sudo snap install snapcraft --channel=7.x/stable --classic
       - run: mkdir -p snap
       - run: cp ./snaps/jimm/snapcraft.yaml ./snap/snapcraft.yaml

Makefile

@@ -47,7 +47,7 @@ clean:
 	-$(RM) -r jimm-release/
 	-$(RM) jimm-*.tar.xz
 
-# Reformat source files.
+# Reformat all source files.
 format:
 	gofmt -w -l .
 

docker-compose.yaml

@@ -4,6 +4,7 @@ services:
   traefik:
     image: "traefik:2.9"
     container_name: traefik
+    profiles: ["dev"]
     ports:
       - "80:80"
       - "443:443"
@@ -93,6 +94,7 @@ services:
   vault:
     image: hashicorp/vault:latest
     container_name: vault
+    profiles: ["dev"]
     ports:
       - 8200:8200
     environment:
@@ -124,6 +126,7 @@ services:
     image: candid:latest
     container_name: candid
     entrypoint: "/candid.sh"
+    profiles: ["dev"]
     expose:
       - 8081
     ports:

go.mod

@@ -1,6 +1,6 @@
 module github.com/canonical/jimm
 
-go 1.18
+go 1.20
 
 require (
 	github.com/canonical/candid v1.12.2

internal/rpc/client_test.go

@@ -27,7 +27,7 @@ func TestDialError(t *testing.T) {
 	d := *srv.dialer
 	d.TLSConfig = nil
 	_, err := d.Dial(context.Background(), srv.URL)
-	c.Assert(err, qt.ErrorMatches, `x509: certificate signed by unknown authority`)
+	c.Assert(err, qt.ErrorMatches, `.*x509: certificate signed by unknown authority`)
 }
 
 func TestDial(t *testing.T) {