chore: switch to moved goamqp

Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.7.5 to 1.8.0.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](https://github.com/stretchr/testify/compare/v1.7.5...v1.8.0)

.gitlab-ci.yml

@@ -1,41 +1,30 @@
+include:
+- template: 'Workflows/MergeRequest-Pipelines.gitlab-ci.yml'
+
+image: golang:1.18
+
 variables:
-  GOCACHE: "${CI_PROJECT_DIR}/_go/cache"
+  GOFLAGS: -mod=readonly
-
-before_script:
-  - mkdir -p ${CI_PROJECT_DIR}/_go/{pkg,bin,cache}
-  - rm -rf /go/pkg || true
-  - mkdir -p /go
-  - ln -s ${CI_PROJECT_DIR}/_go/pkg /go/pkg
-  - ln -s ${CI_PROJECT_DIR}/_go/bin /go/bin
-
-cache:
-  key: "$CI_COMMIT_REF_NAME"
-  paths:
-    - _go
-  untracked: true
 
 stages:
-  - deps
+- deps
-  - test
+- test
 
 deps:
   stage: deps
-  image: golang:1.14
   script:
-    - go mod download
+  - go mod download
 
 test:
   stage: test
   dependencies:
-    - deps
+  - deps
-  image: golang:1.14
   script:
-    - go fmt $(go list ./...)
+  - go fmt $(go list ./...)
-    - go vet $(go list ./...)
+  - go vet $(go list ./...)
-    - unset "${!CI@}"
+  - CGO_ENABLED=1 go test -mod=readonly -race -coverprofile=coverage.txt -covermode=atomic -coverpkg=$(go list ./... | tr '\n' , | sed 's/,$//') ./...
-    - CGO_ENABLED=1 go test -p 1 -mod=readonly -race -coverprofile=.testCoverage.txt -covermode=atomic -coverpkg=$(go list ./... | tr '\n' , | sed 's/,$//') ./...
+  - go tool cover -html=coverage.txt -o coverage.html
-    - go tool cover -html=.testCoverage.txt -o coverage.html
+  - go tool cover -func=coverage.txt
-    - go tool cover -func=.testCoverage.txt
+  - curl -Os https://uploader.codecov.io/latest/linux/codecov
-  artifacts:
+  - chmod +x codecov
-    paths:
+  - ./codecov -t ${CODECOV_TOKEN} -R $CI_PROJECT_DIR -C $CI_COMMIT_SHA -r $CI_PROJECT_PATH
-      - coverage.html

.gitlab/dependabot.yml

@@ -0,0 +1,12 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+- package-ecosystem: "gomod"
+  directory: "/"
+  schedule:
+    interval: "daily"
+  open-pull-requests-limit: 20

README.md

@@ -1,3 +1,4 @@
 # Shiny authz-client
 
-[![Build Status](https://gitlab.com/unboundsoftware/shiny/authz_client/badges/master/pipeline.svg)](https://gitlab.com/unboundsoftware/shiny/authz_client/commits/master)[![coverage report](https://gitlab.com/unboundsoftware/shiny/authz_client/badges/master/coverage.svg)](https://gitlab.com/unboundsoftware/shiny/authz_client/commits/master)
+[![Build Status](https://gitlab.com/unboundsoftware/shiny/authz_client/badges/main/pipeline.svg)](https://gitlab.com/unboundsoftware/shiny/authz_client/commits/main)
+[![codecov](https://codecov.io/gl/unboundsoftware:shiny/authz_client/branch/main/graph/badge.svg?token=AQS7QVLCEQ)](https://codecov.io/gl/unboundsoftware:shiny/authz_client)

client.go

@@ -6,6 +6,8 @@ import (
 	"io/ioutil"
 	"net/http"
 	"reflect"
+
+	"github.com/sparetimecoders/goamqp"
 )
 
 // CompanyPrivileges contains the privileges for a combination of email address and company id
@@ -69,7 +71,7 @@ func (h *PrivilegeHandler) Fetch() error {
 }
 
 // Process privilege-related events and update the internal state
-func (h *PrivilegeHandler) Process(msg interface{}) bool {
+func (h *PrivilegeHandler) Process(msg interface{}, _ goamqp.Headers) (interface{}, error) {
 	switch ev := msg.(type) {
 	case *UserAdded:
 		if priv, exists := h.privileges[ev.Email]; exists {
@@ -79,21 +81,21 @@ func (h *PrivilegeHandler) Process(msg interface{}) bool {
 				ev.CompanyID: {},
 			}
 		}
-		return true
+		return nil, nil
 	case *UserRemoved:
 		if priv, exists := h.privileges[ev.Email]; exists {
 			delete(priv, ev.CompanyID)
 		}
-		return true
+		return nil, nil
 	case *PrivilegeAdded:
 		h.setPrivileges(ev.Email, ev.CompanyID, ev.Privilege, true)
-		return true
+		return nil, nil
 	case *PrivilegeRemoved:
 		h.setPrivileges(ev.Email, ev.CompanyID, ev.Privilege, false)
-		return true
+		return nil, nil
 	default:
 		fmt.Printf("Got unexpected message type (%s): '%+v'\n", reflect.TypeOf(msg).String(), msg)
-		return false
+		return nil, fmt.Errorf("unexpected event type: '%s'", reflect.TypeOf(msg))
 	}
 }
 

client_test.go

@@ -2,30 +2,34 @@ package client
 
 import (
 	"fmt"
-	"github.com/stretchr/testify/assert"
 	"net/http"
 	"net/http/httptest"
 	"sort"
 	"testing"
+
+	"github.com/sparetimecoders/goamqp"
+	"github.com/stretchr/testify/assert"
 )
 
 func TestPrivilegeHandler_Process_InvalidType(t *testing.T) {
 	handler := New(WithBaseURL("base"))
 
-	result := handler.Process("abc")
+	result, err := handler.Process("abc", goamqp.Headers{})
 
-	assert.False(t, result)
+	assert.Nil(t, result)
+	assert.EqualError(t, err, "unexpected event type: 'string'")
 }
 
 func TestPrivilegeHandler_Process_PrivilegeRemoved(t *testing.T) {
 	handler := New(WithBaseURL("base"))
 
-	result := handler.Process(&PrivilegeAdded{
+	result, err := handler.Process(&PrivilegeAdded{
 		Email:     "jim@example.org",
 		CompanyID: "abc-123",
 		Privilege: PrivilegeAdmin,
-	})
+	}, goamqp.Headers{})
-	assert.True(t, result)
+	assert.Nil(t, result)
+	assert.NoError(t, err)
 
 	companies := handler.CompaniesByUser("jim@example.org", func(privileges CompanyPrivileges) bool {
 		return privileges.Admin
@@ -33,12 +37,13 @@ func TestPrivilegeHandler_Process_PrivilegeRemoved(t *testing.T) {
 
 	assert.Equal(t, []string{"abc-123"}, companies)
 
-	result = handler.Process(&PrivilegeRemoved{
+	result, err = handler.Process(&PrivilegeRemoved{
 		Email:     "jim@example.org",
 		CompanyID: "abc-123",
 		Privilege: PrivilegeAdmin,
-	})
+	}, goamqp.Headers{})
-	assert.True(t, result)
+	assert.Nil(t, result)
+	assert.NoError(t, err)
 
 	companies = handler.CompaniesByUser("jim@example.org", func(privileges CompanyPrivileges) bool {
 		return privileges.Admin
@@ -50,17 +55,19 @@ func TestPrivilegeHandler_Process_PrivilegeRemoved(t *testing.T) {
 func TestPrivilegeHandler_Process_UserAdded_And_UserRemoved(t *testing.T) {
 	handler := New(WithBaseURL("base"))
 
-	result := handler.Process(&UserAdded{
+	result, err := handler.Process(&UserAdded{
 		Email:     "jim@example.org",
 		CompanyID: "abc-123",
-	})
+	}, goamqp.Headers{})
-	assert.True(t, result)
+	assert.Nil(t, result)
+	assert.NoError(t, err)
 
-	result = handler.Process(&UserAdded{
+	result, err = handler.Process(&UserAdded{
 		Email:     "jim@example.org",
 		CompanyID: "abc-456",
-	})
+	}, goamqp.Headers{})
-	assert.True(t, result)
+	assert.Nil(t, result)
+	assert.NoError(t, err)
 
 	companies := handler.CompaniesByUser("jim@example.org", func(privileges CompanyPrivileges) bool {
 		return true
@@ -68,17 +75,19 @@ func TestPrivilegeHandler_Process_UserAdded_And_UserRemoved(t *testing.T) {
 	sort.Strings(companies)
 	assert.Equal(t, []string{"abc-123", "abc-456"}, companies)
 
-	result = handler.Process(&UserRemoved{
+	result, err = handler.Process(&UserRemoved{
 		Email:     "jim@example.org",
 		CompanyID: "abc-123",
-	})
+	}, goamqp.Headers{})
-	assert.True(t, result)
+	assert.Nil(t, result)
+	assert.NoError(t, err)
 
-	result = handler.Process(&UserRemoved{
+	result, err = handler.Process(&UserRemoved{
 		Email:     "jim@example.org",
 		CompanyID: "abc-456",
-	})
+	}, goamqp.Headers{})
-	assert.True(t, result)
+	assert.Nil(t, result)
+	assert.NoError(t, err)
 
 	companies = handler.CompaniesByUser("jim@example.org", func(privileges CompanyPrivileges) bool {
 		return true
@@ -99,11 +108,12 @@ func TestPrivilegeHandler_GetCompanies_Email_Not_Found(t *testing.T) {
 func TestPrivilegeHandler_GetCompanies_No_Companies_Found(t *testing.T) {
 	handler := New(WithBaseURL("base"))
 
-	result := handler.Process(&UserAdded{
+	result, err := handler.Process(&UserAdded{
 		Email:     "jim@example.org",
 		CompanyID: "abc-123",
-	})
+	}, goamqp.Headers{})
-	assert.True(t, result)
+	assert.Nil(t, result)
+	assert.NoError(t, err)
 
 	companies := handler.CompaniesByUser("jim@example.org", func(privileges CompanyPrivileges) bool {
 		return privileges.Admin
@@ -117,11 +127,12 @@ func TestPrivilegeHandler_GetCompanies_No_Companies_Found(t *testing.T) {
 
 	assert.Equal(t, []string{"abc-123"}, companies)
 
-	result = handler.Process(&UserRemoved{
+	result, err = handler.Process(&UserRemoved{
 		Email:     "jim@example.org",
 		CompanyID: "abc-123",
-	})
+	}, goamqp.Headers{})
-	assert.True(t, result)
+	assert.Nil(t, result)
+	assert.NoError(t, err)
 
 	companies = handler.CompaniesByUser("jim@example.org", func(privileges CompanyPrivileges) bool {
 		return true
@@ -132,12 +143,13 @@ func TestPrivilegeHandler_GetCompanies_No_Companies_Found(t *testing.T) {
 func TestPrivilegeHandler_GetCompanies_Company_With_Company_Access_Found(t *testing.T) {
 	handler := New(WithBaseURL("base"))
 
-	result := handler.Process(&PrivilegeAdded{
+	result, err := handler.Process(&PrivilegeAdded{
 		Email:     "jim@example.org",
 		CompanyID: "abc-123",
 		Privilege: PrivilegeCompany,
-	})
+	}, goamqp.Headers{})
-	assert.True(t, result)
+	assert.Nil(t, result)
+	assert.NoError(t, err)
 
 	companies := handler.CompaniesByUser("jim@example.org", func(privileges CompanyPrivileges) bool {
 		return privileges.Company
@@ -149,12 +161,13 @@ func TestPrivilegeHandler_GetCompanies_Company_With_Company_Access_Found(t *test
 func TestPrivilegeHandler_GetCompanies_Company_With_Admin_Access_Found(t *testing.T) {
 	handler := New(WithBaseURL("base"))
 
-	result := handler.Process(&PrivilegeAdded{
+	result, err := handler.Process(&PrivilegeAdded{
 		Email:     "jim@example.org",
 		CompanyID: "abc-123",
 		Privilege: PrivilegeConsumer,
-	})
+	}, goamqp.Headers{})
-	assert.True(t, result)
+	assert.Nil(t, result)
+	assert.NoError(t, err)
 
 	companies := handler.CompaniesByUser("jim@example.org", func(privileges CompanyPrivileges) bool {
 		return privileges.Consumer
@@ -176,11 +189,11 @@ func TestPrivilegeHandler_IsAllowed_Return_False_If_No_Privileges(t *testing.T)
 func TestPrivilegeHandler_IsAllowed_Return_True_If_Privilege_Exists(t *testing.T) {
 	handler := New(WithBaseURL("base"))
 
-	handler.Process(&PrivilegeAdded{
+	_, _ = handler.Process(&PrivilegeAdded{
 		Email:     "jim@example.org",
 		CompanyID: "abc-123",
 		Privilege: PrivilegeTime,
-	})
+	}, goamqp.Headers{})
 
 	result := handler.IsAllowed("jim@example.org", "abc-123", func(privileges CompanyPrivileges) bool {
 		return privileges.Time
@@ -188,11 +201,11 @@ func TestPrivilegeHandler_IsAllowed_Return_True_If_Privilege_Exists(t *testing.T
 
 	assert.True(t, result)
 
-	handler.Process(&PrivilegeAdded{
+	_, _ = handler.Process(&PrivilegeAdded{
 		Email:     "jim@example.org",
 		CompanyID: "abc-123",
 		Privilege: PrivilegeInvoicing,
-	})
+	}, goamqp.Headers{})
 
 	result = handler.IsAllowed("jim@example.org", "abc-123", func(privileges CompanyPrivileges) bool {
 		return privileges.Invoicing
@@ -200,11 +213,11 @@ func TestPrivilegeHandler_IsAllowed_Return_True_If_Privilege_Exists(t *testing.T
 
 	assert.True(t, result)
 
-	handler.Process(&PrivilegeAdded{
+	_, _ = handler.Process(&PrivilegeAdded{
 		Email:     "jim@example.org",
 		CompanyID: "abc-123",
 		Privilege: PrivilegeAccounting,
-	})
+	}, goamqp.Headers{})
 
 	result = handler.IsAllowed("jim@example.org", "abc-123", func(privileges CompanyPrivileges) bool {
 		return privileges.Accounting
@@ -212,11 +225,11 @@ func TestPrivilegeHandler_IsAllowed_Return_True_If_Privilege_Exists(t *testing.T
 
 	assert.True(t, result)
 
-	handler.Process(&PrivilegeAdded{
+	_, _ = handler.Process(&PrivilegeAdded{
 		Email:     "jim@example.org",
 		CompanyID: "abc-123",
 		Privilege: PrivilegeSupplier,
-	})
+	}, goamqp.Headers{})
 
 	result = handler.IsAllowed("jim@example.org", "abc-123", func(privileges CompanyPrivileges) bool {
 		return privileges.Supplier

go.mod

@@ -1,5 +1,17 @@
 module gitlab.com/unboundsoftware/shiny/authz_client
 
-go 1.13
+go 1.18
 
-require github.com/stretchr/testify v1.4.0
+require (
+	github.com/sparetimecoders/goamqp v0.1.1
+	github.com/stretchr/testify v1.8.0
+)
+
+require (
+	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/rabbitmq/amqp091-go v1.3.4 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+)

go.sum

@@ -1,11 +1,24 @@
-github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/caarlos0/env v3.5.0+incompatible h1:Yy0UN8o9Wtr/jGHZDpCBLpNrzcFLLM2yixi/rBrKyJs=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rabbitmq/amqp091-go v1.3.4 h1:tXuIslN1nhDqs2t6Jrz3BAoqvt4qIZzxvdbdcxWtHYU=
+github.com/rabbitmq/amqp091-go v1.3.4/go.mod h1:ogQDLSOACsLPsIq0NpbtiifNZi2YOz0VTJ0kHRghqbM=
+github.com/sparetimecoders/goamqp v0.1.1 h1:+TSwlrrnfJIyM+MKpnzk+4mnIvt6M8gdEFNRN4Q0wQA=
+github.com/sparetimecoders/goamqp v0.1.1/go.mod h1:JIydmIgCqETEHIiGYmN03gNSs2bghWBHEqnR/Lfmzb0=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
-github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=