Merge pull request #395 from suligap/snapd-version-update-oct-2022

Update the snapd dependency

Author: suligap

.github/workflows/pr-golang.yaml

@@ -3,7 +3,7 @@ on: [pull_request]
 jobs:
   build:
     name: Test
-    runs-on: ubuntu-16.04
+    runs-on: ubuntu-20.04
     steps:
     - name: Set up Go
       uses: actions/setup-go@v1

Makefile

@@ -59,7 +59,7 @@ install:
 	GOBIN=$(GOBIN) $(GO) install $(GOFLAGS) -ldflags "$(LDFLAGS) -w" -v github.com/CanonicalLtd/serial-vault/cmd/serial-vault
 	GOBIN=$(GOBIN) $(GO) install $(GOFLAGS) -ldflags "$(LDFLAGS) -w" -v github.com/CanonicalLtd/serial-vault/cmd/serial-vault-admin
 	GOBIN=$(GOBIN) $(GO) install $(GOFLAGS) -ldflags "$(LDFLAGS) -w" -v github.com/CanonicalLtd/serial-vault/cmd/factory
-	
+
 .PHONY: build-static
 build-static:
 	$(info # Building ${SERVICE_NAME} binaries)
@@ -98,9 +98,10 @@ vendor:
 vendoring-ci: mkdir-tmp
 	rm -rf ${VENDOR_TMP}
 	${GO} mod vendor
+	${GO} mod tidy
 	mv ${VENDOR} ${VENDOR_TMP}
 	git clone $(VENDOR_BRANCH_URL) $(VENDOR)
-	cp -r ${VENDOR_TMP} .
+	@rsync -a -m --ignore-times --exclude /README --exclude /.git --delete "${VENDOR_TMP}/" "${VENDOR}/"
 	cd ${VENDOR} && git add . && git checkout -b vendoring-$(JOBDATE)
 	@echo "\n!!! Please go to $(VENDOR) folder check the changes and create a MP !!!\n"
 

datastore/mock_keystore.go

@@ -45,6 +45,10 @@ func (emkdb *errorMockKeypairManager) Put(privKey asserts.PrivateKey) error {
 	return errors.New("MOCK error saving the private key")
 }
 
+func (emkdb *errorMockKeypairManager) Delete(keyID string) error {
+	return errors.New("MOCK error deleting the private key")
+}
+
 // GetErrorMockKeyStore creates a mocked keystore
 func GetErrorMockKeyStore(config config.Settings) (*KeypairDatabase, error) {
 	mockStore := new(errorMockKeypairManager)

go.mod

@@ -3,36 +3,28 @@ module github.com/CanonicalLtd/serial-vault
 go 1.13
 
 require (
-	github.com/CloudyKit/jet v2.1.3-0.20180809161101-62edd43e4f88+incompatible // indirect
-	github.com/Joker/jade v1.0.1-0.20190614124447-d475f43051e7 // indirect
 	github.com/Masterminds/squirrel v1.2.0
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
-	github.com/flosch/pongo2 v0.0.0-20190707114632-bbf5a6c351f4 // indirect
 	github.com/getsentry/sentry-go v0.8.0
 	github.com/godbus/dbus v4.1.0+incompatible // indirect
 	github.com/gorilla/context v1.1.1 // indirect
 	github.com/gorilla/csrf v1.0.3-0.20161122164500-69581736821c
-	github.com/gorilla/mux v1.6.1
+	github.com/gorilla/mux v1.7.4-0.20190701202633-d83b6ffe499a
 	github.com/gorilla/securecookie v1.1.1 // indirect
-	github.com/iris-contrib/i18n v0.0.0-20171121225848-987a633949d0 // indirect
-	github.com/jessevdk/go-flags v1.4.0
-	github.com/juju/ratelimit v1.0.1 // indirect
+	github.com/jessevdk/go-flags v1.5.1-0.20210607101731-3927b71304df
+	github.com/juju/loggo v0.0.0-20180524022052-584905176618 // indirect
+	github.com/juju/testing v0.0.0-20180920084828-472a3e8b2073 // indirect
 	github.com/juju/usso v0.0.0-20160418121039-5b79b358f4bb
 	github.com/lib/pq v0.0.0-20180327071824-d34b9ff171c2
 	github.com/mattn/go-sqlite3 v1.6.0
-	github.com/mediocregopher/mediocre-go-lib v0.0.0-20181029021733-cb65787f37ed // indirect
-	github.com/ojii/gettext.go v0.0.0-20170120061437-b6dae1d7af8a // indirect
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
 	github.com/prometheus/client_golang v1.1.0
-	github.com/snapcore/bolt v1.3.1 // indirect
-	github.com/snapcore/go-gettext v0.0.0-20191107141714-82bbea49e785 // indirect
-	github.com/snapcore/snapd v0.0.0-20200317200833-16631e228c07
+	github.com/snapcore/snapd v0.0.0-20221025171519-3c05e535e5cf
 	github.com/yohcop/openid-go v0.0.0-20170901155220-cfc72ed89575 // indirect
-	golang.org/x/crypto v0.0.0-20201117144127-c1f2f97bffc9
-	gopkg.in/check.v1 v1.0.0-20161208181325-20d25e280405
+	golang.org/x/crypto v0.0.0-20220829220503-c86fa9a7ed90
+	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
 	gopkg.in/errgo.v1 v1.0.0-20161222125816-442357a80af5
 	gopkg.in/macaroon.v1 v1.0.0-20170816141150-ab101776739e
-	gopkg.in/retry.v1 v1.0.0 // indirect
-	gopkg.in/tomb.v2 v2.0.0-20161208151619-d5d1b5820637 // indirect
-	gopkg.in/yaml.v2 v2.2.4
+	gopkg.in/yaml.v2 v2.4.0
+	launchpad.net/gocheck v0.0.0-20140225173054-000000000087 // indirect
 )