From 2c16074176559e9c07e5cc0ed3d53a789e7abc5c Mon Sep 17 00:00:00 2001 From: Jonsy13 Date: Thu, 9 Jan 2025 11:24:12 +0530 Subject: [PATCH 1/4] Added changes for fixing vuln in toxiprocy Signed-off-by: Jonsy13 --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 875af06e..7311bd6e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/Shopify/toxiproxy/v2 -go 1.19 +go 1.23 require ( github.com/gorilla/mux v1.8.0 From 98be3d2d7ac388165cdc5db0e38015a1b8c184a3 Mon Sep 17 00:00:00 2001 From: Jonsy13 Date: Thu, 9 Jan 2025 11:37:41 +0530 Subject: [PATCH 2/4] Added changes for fixing vuln in toxiprocy Signed-off-by: Jonsy13 --- .github/workflows/analysis.yml | 2 +- .github/workflows/push.yaml | 2 +- .github/workflows/release.yml | 2 +- .github/workflows/test.yml | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml index 17a1c209..f1bd7d23 100644 --- a/.github/workflows/analysis.yml +++ b/.github/workflows/analysis.yml @@ -23,7 +23,7 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@537aa1903e5d359d0b27dbc19ddd22c5087f3fbc with: - version: v1.43.0 + version: v1.63.4 - name: shellcheck uses: azohra/shell-linter@6bbeaa868df09c34ddc008e6030cfe89c03394a1 diff --git a/.github/workflows/push.yaml b/.github/workflows/push.yaml index 26c783a1..1ab792b5 100644 --- a/.github/workflows/push.yaml +++ b/.github/workflows/push.yaml @@ -15,7 +15,7 @@ jobs: # Install golang - uses: actions/setup-go@v2 with: - go-version: 1.17 + go-version: 1.23 # Checkout to the latest commit # On specific directory/path diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 4d29e42f..7efaaa14 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -56,7 +56,7 @@ jobs: name: Set up Go uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.23 - name: Build release changelog diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 4b34c60a..b7fd1503 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: true matrix: - go: ["1.19", "1.18", "1.17"] + go: ["1.23"] name: Go ${{ matrix.go }} steps: - name: Checkout @@ -44,7 +44,7 @@ jobs: - name: Setup go uses: actions/setup-go@v3 with: - go-version: 1.19 + go-version: 1.23 - name: E2E tests run: make test-e2e From babf1009ecd7c920d3e9bd59beb1e50212bab7fb Mon Sep 17 00:00:00 2001 From: Jonsy13 Date: Thu, 9 Jan 2025 12:11:00 +0530 Subject: [PATCH 3/4] Added changes for fixing vuln in toxiprocy Signed-off-by: Jonsy13 --- .github/workflows/analysis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml index f1bd7d23..c4b47543 100644 --- a/.github/workflows/analysis.yml +++ b/.github/workflows/analysis.yml @@ -7,8 +7,6 @@ on: branches: [ master ] pull_request: branches: [ master ] - schedule: - - cron: 13 7 * * 6 jobs: linting: From b9e0be9e650fbfd788cf5598e356e75ac8273a27 Mon Sep 17 00:00:00 2001 From: Jonsy13 Date: Thu, 9 Jan 2025 12:20:14 +0530 Subject: [PATCH 4/4] Added changes for fixing vuln in toxiprocy Signed-off-by: Jonsy13 --- .github/workflows/analysis.yml | 3 ++- .golangci.yml | 4 ---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml index c4b47543..b8acd171 100644 --- a/.github/workflows/analysis.yml +++ b/.github/workflows/analysis.yml @@ -19,9 +19,10 @@ jobs: fetch-depth: 0 - name: golangci-lint - uses: golangci/golangci-lint-action@537aa1903e5d359d0b27dbc19ddd22c5087f3fbc + uses: golangci/golangci-lint-action@v6 with: version: v1.63.4 + only-new-issues: true - name: shellcheck uses: azohra/shell-linter@6bbeaa868df09c34ddc008e6030cfe89c03394a1 diff --git a/.golangci.yml b/.golangci.yml index 4bf13d65..186dca52 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -5,8 +5,6 @@ linters: disable-all: true enable: - bodyclose - - deadcode - - depguard - dogsled - exhaustive - funlen @@ -22,10 +20,8 @@ linters: - lll - misspell - staticcheck - - structcheck - typecheck - unused - - varcheck - whitespace fast: false linters-settings: