Skip to content

Commit

Permalink
Merge pull request #443 from devhindo/master
Browse files Browse the repository at this point in the history
Updating Meshery Adapter for Kuma to Go version to 1.23
  • Loading branch information
leecalcote authored Dec 13, 2024
2 parents 87cc418 + 5eaeb45 commit 097bdff
Show file tree
Hide file tree
Showing 9 changed files with 64 additions and 25 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
with:
fetch-depth: 1
- name: Setup Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: 1.19
go-version: 1.23
- run: GOPROXY=direct GOSUMDB=off GO111MODULE=on go build .
docker:
name: Docker build and push
Expand Down
30 changes: 15 additions & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,15 @@ jobs:
name: golangci-lint
runs-on: ubuntu-22.04
steps:
- uses: actions/setup-go@v3
- uses: actions/setup-go@v5
with:
go-version: 1.19
go-version: 1.23
- uses: actions/checkout@v3
- name: golangci-lint
uses: golangci/golangci-lint-action@v3
uses: golangci/golangci-lint-action@v6
with:
# Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
version: v1.49
version: v1.62

# Optional: working directory, useful for monorepos
# working-directory: somedir
Expand All @@ -44,9 +44,9 @@ jobs:
with:
fetch-depth: 1
- name: Setup Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: 1.19
go-version: 1.23
- run: GOPROXY=https://proxy.golang.org,direct GOSUMDB=off GO111MODULE=on go install github.com/kisielk/errcheck@latest; /home/runner/go/bin/errcheck -tags draft ./...
error_code_check:
name: Error code utility check
Expand All @@ -59,7 +59,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v3
with:
go-version: 1.19
go-version: 1.23
- run: |
errWillHave="level=error"
GOPROXY=https://proxy.golang.org,direct GOSUMDB=off GO111MODULE=on go install github.com/layer5io/meshkit/cmd/errorutil;
Expand All @@ -79,13 +79,13 @@ jobs:
with:
fetch-depth: 1
- name: Setup Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: 1.19
- uses: dominikh/staticcheck-action@v1.2.0
go-version: 1.23
- uses: dominikh/staticcheck-action@v1
with:
install-go: false
version: "2022.1"
version: "2024.1"
vet:
name: Vet
runs-on: ubuntu-22.04
Expand All @@ -95,9 +95,9 @@ jobs:
with:
fetch-depth: 1
- name: Setup Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: 1.19
go-version: 1.23
- run: GOPROXY=https://proxy.golang.org,direct GOSUMDB=off GO111MODULE=on go vet -tags draft ./...
sec_check:
name: Security check
Expand Down Expand Up @@ -125,9 +125,9 @@ jobs:
with:
fetch-depth: 1
- name: Setup Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: 1.19
go-version: 1.23
- name: Create cluster using KinD
uses: engineerd/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2etest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
yq e -i '.services.kuma.version="${{ steps.gettag.outputs.release }}"' ./.github/install/deploy.yaml
cat ./.github/install/deploy.yaml
- name: Uploading file
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: patternfile
path: ./.github/install/deploy.yaml
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/error-ref-publisher.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
ref: 'master'

- name: Setup Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: 1.19
go-version: 1.23

- name: Run utility
run: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/update-oam-defs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ jobs:
token: ${{ secrets.GH_ACCESS_TOKEN }}
ref: "master"
- name: Setup Go
uses: actions/setup-go@v3
uses: actions/setup-go@v5
with:
go-version: 1.19
go-version: 1.23
- name: Run adapter to create components
run: |
touch log.txt
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.19 as builder
FROM golang:1.23 as builder

ARG VERSION
ARG GIT_COMMITSHA
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/layer5io/meshery-kuma

go 1.19
go 1.23

replace github.com/kudobuilder/kuttl => github.com/layer5io/kuttl v0.4.1-0.20200723152044-916f10574334

Expand Down
39 changes: 39 additions & 0 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion kuma/oam.go
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ func mergeErrors(errs []error) error {
errMsgs = append(errMsgs, err.Error())
}

return fmt.Errorf(strings.Join(errMsgs, "\n"))
return fmt.Errorf("%s", strings.Join(errMsgs, "\n"))
}

func mergeMsgs(strs []string) string {
Expand Down

0 comments on commit 097bdff

Please sign in to comment.