From 74cf100c1ad318265c0bac2cfcd3c3c30dc5b037 Mon Sep 17 00:00:00 2001 From: aryansharma9917 Date: Sat, 16 Sep 2023 00:54:13 +0530 Subject: [PATCH 1/2] Updated Go to 1.21, and update relevant pkgs --- .github/workflows/ci.yml | 6 +++--- .github/workflows/multi-platform.yml | 2 +- Dockerfile | 2 +- Makefile | 2 +- go.mod | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3e30504..492294e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -18,7 +18,7 @@ jobs: with: fetch-depth: 1 - name: Setup Go - uses: actions/setup-go@v1 + uses: actions/setup-go@v4 with: go-version: ${{ secrets.GO_VERSION }} - run: GOPROXY=direct GOSUMDB=off go get -u golang.org/x/lint/golint; go list ./istio/... | grep -v /vendor/ | xargs -L1 /home/runner/go/bin/golint -set_exit_status @@ -31,7 +31,7 @@ jobs: with: fetch-depth: 1 - name: Setup Go - uses: actions/setup-go@v1 + uses: actions/setup-go@v4 with: go-version: ${{ secrets.GO_VERSION }} - run: GOPROXY=direct GOSUMDB=off GO111MODULE=on go get -u github.com/kisielk/errcheck; /home/runner/go/bin/errcheck -tags draft ./... @@ -44,7 +44,7 @@ jobs: with: fetch-depth: 1 - name: Setup Go - uses: actions/setup-go@v1 + uses: actions/setup-go@v4 with: go-version: ${{ secrets.GO_VERSION }} - run: GOPROXY=direct GOSUMDB=off GO111MODULE=on go get -u honnef.co/go/tools/cmd/staticcheck; /home/runner/go/bin/staticcheck -tags draft -checks all ./istio/... # https://staticcheck.io/docs/checks diff --git a/.github/workflows/multi-platform.yml b/.github/workflows/multi-platform.yml index ee7381f..134d655 100644 --- a/.github/workflows/multi-platform.yml +++ b/.github/workflows/multi-platform.yml @@ -49,7 +49,7 @@ jobs: steps: - name: Checkout repo - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Identify Release Values if: "${{ github.event.inputs.release-ver}} != 'v' }}" diff --git a/Dockerfile b/Dockerfile index a6bf652..7982e2e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.17 as bd +FROM golang:1.21 as bd ARG VERSION ARG GIT_COMMITSHA diff --git a/Makefile b/Makefile index 3aa1b28..ce03b6d 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ docker-run: layer5/meshery-cpx run: - go mod tidy; \ + go$(v) mod tidy; \ DEBUG=true GOPROXY=direct GOSUMDB=off go run main.go error: diff --git a/go.mod b/go.mod index 3b53be2..196d533 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/layer5io/meshery-cpx -go 1.13 +go 1.21 require ( github.com/Azure/go-autorest/autorest/adal v0.6.0 // indirect From f025f22da23a133d22b37bbab33dc079a62b3fa0 Mon Sep 17 00:00:00 2001 From: Pranav Singh Date: Sun, 22 Oct 2023 17:55:32 +0530 Subject: [PATCH 2/2] update go.sum Signed-off-by: Pranav Singh --- go.mod | 39 ++++++++++++++++++++++++++++++--------- go.sum | 2 -- 2 files changed, 30 insertions(+), 11 deletions(-) diff --git a/go.mod b/go.mod index 196d533..bd026ea 100644 --- a/go.mod +++ b/go.mod @@ -3,33 +3,54 @@ module github.com/layer5io/meshery-cpx go 1.21 require ( - github.com/Azure/go-autorest/autorest/adal v0.6.0 // indirect github.com/aspenmesh/istio-client-go v0.0.0-20190426173040-3e73c27b9ace github.com/aspenmesh/istio-vet v0.0.0-20190708155745-fac74e54e2e6 - github.com/cnf/structhash v0.0.0-20180104161610-62a607eb0224 // indirect github.com/ghodss/yaml v1.0.0 + github.com/golang/protobuf v1.5.2 + github.com/pkg/errors v0.9.1 + github.com/sirupsen/logrus v1.8.1 + golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 + google.golang.org/grpc v1.37.1 + k8s.io/apimachinery v0.0.0-20190313205120-d7deff9243b1 + k8s.io/client-go v11.0.0+incompatible +) + +require ( + cloud.google.com/go v0.34.0 // indirect + github.com/Azure/go-autorest/autorest v0.9.0 // indirect + github.com/Azure/go-autorest/autorest/adal v0.6.0 // indirect + github.com/Azure/go-autorest/autorest/date v0.2.0 // indirect + github.com/Azure/go-autorest/logger v0.1.0 // indirect + github.com/Azure/go-autorest/tracing v0.5.0 // indirect + github.com/cnf/structhash v0.0.0-20180104161610-62a607eb0224 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/dgrijalva/jwt-go v3.2.0+incompatible // indirect github.com/gogo/protobuf v1.3.0 // indirect + github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/protobuf v1.5.2 + github.com/google/gofuzz v1.0.0 // indirect github.com/googleapis/gnostic v0.3.1 // indirect github.com/gophercloud/gophercloud v0.4.0 // indirect github.com/hashicorp/golang-lru v0.5.3 // indirect github.com/imdario/mergo v0.3.7 // indirect github.com/json-iterator/go v1.1.7 // indirect + github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect github.com/modern-go/reflect2 v1.0.1 // indirect + github.com/onsi/ginkgo v1.16.2 // indirect github.com/onsi/gomega v1.12.0 // indirect - github.com/pkg/errors v0.9.1 - github.com/sirupsen/logrus v1.8.1 github.com/spf13/pflag v1.0.3 // indirect - golang.org/x/net v0.0.0-20210428140749-89ef3d95e781 + golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 // indirect + golang.org/x/sys v0.0.0-20210423082822-04245dca01da // indirect + golang.org/x/text v0.3.6 // indirect golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 // indirect - google.golang.org/grpc v1.37.1 + google.golang.org/appengine v1.4.0 // indirect + google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect + google.golang.org/protobuf v1.26.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect istio.io/api v0.0.0-20190905172106-906cbe6415a5 // indirect k8s.io/api v0.0.0-20190313235455-40a48860b5ab // indirect - k8s.io/apimachinery v0.0.0-20190313205120-d7deff9243b1 - k8s.io/client-go v11.0.0+incompatible k8s.io/klog v0.4.0 // indirect k8s.io/utils v0.0.0-20190829053155-3a4a5477acf8 // indirect sigs.k8s.io/yaml v1.1.0 // indirect diff --git a/go.sum b/go.sum index 7db00d7..0f178bc 100644 --- a/go.sum +++ b/go.sum @@ -108,8 +108,6 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE 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/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/sirupsen/logrus v1.7.0 h1:ShrD1U9pZB12TX0cVy0DtePoCH97K8EtX+mg7ZARUtM= -github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=