Skip to content

Commit

Permalink
Bump up dependencies to fix CVEs (#154)
Browse files Browse the repository at this point in the history
  • Loading branch information
kezhenxu94 authored Jul 11, 2024
1 parent 4ec9b49 commit 5f104ea
Show file tree
Hide file tree
Showing 18 changed files with 89 additions and 80 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build-and-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ jobs:
timeout-minutes: 30
strategy:
matrix:
go-version: [ 1.19 ]
runner: [ ubuntu, macos, windows ]
go-version: [ 1.21 ]
runner: [ ubuntu, windows ]
fail-fast: true
steps:
- name: Set up Go ${{ matrix.go-version }}
Expand Down
11 changes: 6 additions & 5 deletions .github/workflows/e2e-istio.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ jobs:
ISTIO_VERSION: ${{ matrix.istio_version }}
ALS_ANALYZER: ${{ matrix.analyzer }}
steps:
- name: Set up Go 1.17
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: 1.21
id: go
- uses: actions/checkout@v2
with:
Expand All @@ -66,10 +66,10 @@ jobs:
env:
ISTIO_VERSION: ${{ matrix.istio_version }}
steps:
- name: Set up Go 1.17
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: 1.21
id: go
- uses: actions/checkout@v2
with:
Expand All @@ -85,4 +85,5 @@ jobs:
name: Upload Logs
with:
name: logs
path: "${{ env.SW_INFRA_E2E_LOG_DIR }}"
path: "${{ env.SW_INFRA_E2E_LOG_DIR }}"

7 changes: 4 additions & 3 deletions .github/workflows/e2e-native.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ jobs:
name: Native E2E test
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.17
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: 1.17
go-version: 1.21
id: go
- uses: actions/checkout@v2
with:
Expand All @@ -57,4 +57,5 @@ jobs:
name: Upload Logs
with:
name: logs
path: "${{ env.SW_INFRA_E2E_LOG_DIR }}"
path: "${{ env.SW_INFRA_E2E_LOG_DIR }}"

8 changes: 0 additions & 8 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,6 @@ linters-settings:
goconst:
min-len: 2
min-occurrences: 2
depguard:
list-type: blacklist
packages:
-
include-go-root: true
packages-with-error-messages:
fmt: "logging is allowed only by logutils.Log"
misspell:
locale: US
lll:
Expand All @@ -61,7 +54,6 @@ linters:
enable:
- bodyclose
- deadcode
- depguard
- dogsled
- dupl
- errcheck
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ all: deps verify build gen-docs check

.PHONY: tools
tools:
$(GO_LINT) version || curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GO_PATH)/bin v1.48.0
$(GO_LINT) version || curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(GO_PATH)/bin v1.55.0

deps: tools
$(GO_GET) -v -t -d ./...
Expand Down
2 changes: 1 addition & 1 deletion docs/en/guides/compile/How-to-compile.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Go version

Go version `1.19` is required for compilation.
Go version `1.21` is required for compilation.

## Platform
Linux, MacOS and Windows are supported in SkyWalking Satellite. However, some components don't fit the Windows platform, including:
Expand Down
Empty file modified docs/en/setup/plugins/forwarder_native-clr-grpc-forwarder.md
100644 → 100755
Empty file.
Empty file modified docs/en/setup/plugins/receiver_grpc-native-clr-receiver.md
100644 → 100755
Empty file.
29 changes: 14 additions & 15 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
module github.com/apache/skywalking-satellite

go 1.19
go 1.21

require (
github.com/Shopify/sarama v1.27.2
github.com/enriquebris/goconcurrentqueue v0.6.0
github.com/google/go-cmp v0.5.9
github.com/google/go-cmp v0.6.0
github.com/grandecola/mmap v0.6.0
github.com/hashicorp/go-multierror v1.1.1
github.com/prometheus/client_golang v1.14.0
Expand All @@ -16,18 +16,18 @@ require (
github.com/spf13/viper v1.7.1
github.com/urfave/cli/v2 v2.3.0
go.uber.org/automaxprocs v1.5.1
golang.org/x/mod v0.9.0
golang.org/x/text v0.14.0
google.golang.org/grpc v1.59.0
google.golang.org/protobuf v1.33.0
golang.org/x/mod v0.17.0
golang.org/x/text v0.16.0
google.golang.org/grpc v1.65.0
google.golang.org/protobuf v1.34.2
gopkg.in/yaml.v3 v3.0.1
k8s.io/apimachinery v0.26.2
skywalking.apache.org/repo/goapi v0.0.0-20240118085825-a7fa70cc38b7
)

require (
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/eapache/go-resiliency v1.2.0 // indirect
Expand All @@ -44,7 +44,7 @@ require (
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/golang/snappy v0.0.4 // indirect
github.com/google/gnostic v0.6.9 // indirect
github.com/google/gofuzz v1.2.0 // indirect
Expand Down Expand Up @@ -82,14 +82,13 @@ require (
github.com/tklauser/go-sysconf v0.3.9 // indirect
github.com/tklauser/numcpus v0.3.0 // indirect
github.com/yusufpapurcu/wmi v1.2.2 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.11.0 // indirect
golang.org/x/sys v0.14.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/crypto v0.25.0 // indirect
golang.org/x/net v0.27.0 // indirect
golang.org/x/oauth2 v0.20.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/term v0.22.0 // indirect
golang.org/x/time v0.3.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240709173604-40e1e62336c5 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/jcmturner/aescts.v1 v1.0.1 // indirect
Expand Down
Loading

0 comments on commit 5f104ea

Please sign in to comment.