From bb87bc7ef788fb07cc521d0dd6c65a1f3e371538 Mon Sep 17 00:00:00 2001 From: Paulo Gomes Date: Tue, 28 Feb 2023 19:52:33 +0000 Subject: [PATCH 1/2] Bump dependencies Signed-off-by: Paulo Gomes --- go.mod | 2 +- go.sum | 4 ++-- tests/e2e/go.mod | 4 ++-- tests/e2e/go.sum | 5 +++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 4c188ea..b645091 100644 --- a/go.mod +++ b/go.mod @@ -4,5 +4,5 @@ go 1.18 require ( github.com/go-logr/logr v1.2.3 - golang.org/x/sys v0.0.0-20221013171732-95e765b1cc43 + golang.org/x/sys v0.5.0 ) diff --git a/go.sum b/go.sum index 206bbd3..0d6e23c 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,4 @@ github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -golang.org/x/sys v0.0.0-20221013171732-95e765b1cc43 h1:OK7RB6t2WQX54srQQYSXMW8dF5C6/8+oA/s5QBmmto4= -golang.org/x/sys v0.0.0-20221013171732-95e765b1cc43/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/tests/e2e/go.mod b/tests/e2e/go.mod index 8a1428e..d70e4b3 100644 --- a/tests/e2e/go.mod +++ b/tests/e2e/go.mod @@ -6,11 +6,11 @@ replace github.com/pjbgf/go-apparmor => ../.. require ( github.com/bombsimon/logrusr/v2 v2.0.1 - github.com/pjbgf/go-apparmor v0.0.9 + github.com/pjbgf/go-apparmor v0.1.1 github.com/sirupsen/logrus v1.9.0 ) require ( github.com/go-logr/logr v1.2.3 // indirect - golang.org/x/sys v0.0.0-20221013171732-95e765b1cc43 // indirect + golang.org/x/sys v0.5.0 // indirect ) diff --git a/tests/e2e/go.sum b/tests/e2e/go.sum index b425feb..896148a 100644 --- a/tests/e2e/go.sum +++ b/tests/e2e/go.sum @@ -4,6 +4,7 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3 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/go-logr/logr v1.0.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= @@ -24,8 +25,8 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210608053332-aa57babbf139/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20221013171732-95e765b1cc43 h1:OK7RB6t2WQX54srQQYSXMW8dF5C6/8+oA/s5QBmmto4= -golang.org/x/sys v0.0.0-20221013171732-95e765b1cc43/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= From 45d34054dad1feb79d523543c5893b110b20acd2 Mon Sep 17 00:00:00 2001 From: Paulo Gomes Date: Tue, 28 Feb 2023 19:53:15 +0000 Subject: [PATCH 2/2] Bump Go version to 1.20 Signed-off-by: Paulo Gomes --- Dockerfile | 2 +- go.mod | 2 +- tests/e2e/go.mod | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3a4c7dc..79784eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.19-alpine +FROM golang:1.20-alpine RUN apk add gcc build-base \ apparmor-utils libapparmor libapparmor-dev diff --git a/go.mod b/go.mod index b645091..7ba52ee 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/pjbgf/go-apparmor -go 1.18 +go 1.20 require ( github.com/go-logr/logr v1.2.3 diff --git a/tests/e2e/go.mod b/tests/e2e/go.mod index d70e4b3..19c58ee 100644 --- a/tests/e2e/go.mod +++ b/tests/e2e/go.mod @@ -1,6 +1,6 @@ module github.com/pjbgf/go-apparmor/tests/e2e -go 1.18 +go 1.20 replace github.com/pjbgf/go-apparmor => ../..