Skip to content

Commit 0f10d8d

Browse files
author
Emre Savcı
committed
merge main into current & resolve conflict
2 parents c1939b2 + f7b420a commit 0f10d8d

File tree

17 files changed

+113
-87
lines changed

17 files changed

+113
-87
lines changed

‎.github/dependabot.yml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
version: 2
44
updates:
5+
- package-ecosystem: "github-actions"
6+
directory: "/"
7+
schedule:
8+
interval: "daily"
9+
labels:
10+
- "🤖 Dependencies"
511
- package-ecosystem: "gomod"
612
directory: "/paseto/" # Location of package manifests
713
labels:

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
steps:
1818
- name: Checkout repository
19-
uses: actions/checkout@v2
19+
uses: actions/checkout@v3
2020
with:
2121
# We must fetch at least the immediate parents so that if this is
2222
# a pull request then we can checkout the head.
@@ -29,15 +29,15 @@ jobs:
2929

3030
# Initializes the CodeQL tools for scanning.
3131
- name: Initialize CodeQL
32-
uses: github/codeql-action/init@v1
32+
uses: github/codeql-action/init@v2
3333
# Override language selection by uncommenting this and choosing your languages
3434
with:
3535
languages: go
3636

3737
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
3838
# If this step fails, then you should remove it and run the build manually (see below)
3939
- name: Autobuild
40-
uses: github/codeql-action/autobuild@v1
40+
uses: github/codeql-action/autobuild@v2
4141

4242
# ℹ️ Command-line programs to run using the OS shell.
4343
# 📚 https://git.io/JvXDl
@@ -51,4 +51,4 @@ jobs:
5151
# make release
5252

5353
- name: Perform CodeQL Analysis
54-
uses: github/codeql-action/analyze@v1
54+
uses: github/codeql-action/analyze@v2

‎.github/workflows/linter.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ jobs:
55
runs-on: ubuntu-latest
66
steps:
77
- name: Fetch Repository
8-
uses: actions/checkout@v2
8+
uses: actions/checkout@v3
99
- name: Run Golint
10-
uses: reviewdog/action-golangci-lint@v1
10+
uses: reviewdog/action-golangci-lint@v2
1111
with:
1212
golangci_lint_flags: "--tests=false"

‎.github/workflows/security.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ jobs:
55
runs-on: ubuntu-latest
66
steps:
77
- name: Fetch Repository
8-
uses: actions/checkout@v2
8+
uses: actions/checkout@v3
99
- name: Install Go
10-
uses: actions/setup-go@v2
10+
uses: actions/setup-go@v3
1111
with:
1212
go-version: '^1.17.6'
1313
- name: Install Gosec

‎.github/workflows/test.yml‎

Lines changed: 52 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,54 @@
1-
'on':
2-
- push
3-
- pull_request
1+
on:
2+
push:
3+
branches:
4+
- master
5+
- main
6+
pull_request:
47
name: Tests
58
jobs:
6-
Tests:
7-
strategy:
8-
matrix:
9-
go-version:
10-
- 1.15.x
11-
- 1.16.x
12-
- 1.17.x
13-
platform:
14-
- ubuntu-latest
15-
- windows-latest
16-
runs-on: '${{ matrix.platform }}'
17-
steps:
18-
- name: Install Go
19-
uses: actions/setup-go@v1
20-
with:
21-
go-version: '${{ matrix.go-version }}'
22-
- name: Fetch Repository
23-
uses: actions/checkout@v2
24-
- name: Test PASETO Middleware
25-
run: cd ./paseto && go test ./... -v -race
26-
- name: Test Fiberzap Middleware
27-
run: cd ./fiberzap && go test ./... -v -race
28-
- name: Test otelfiber Middleware
29-
run: cd ./otelfiber && go test ./... -v -race
30-
- name: Test swagger Middleware
31-
run: cd ./swagger && go test ./... -v -race
32-
- name: Test casbin Middleware
33-
run: cd ./casbin && go test ./... -v -race
34-
- name: Test fibernewrelic Middleware
35-
run: cd ./fibernewrelic && go test ./... -v -race
9+
Tests:
10+
strategy:
11+
matrix:
12+
go-version:
13+
- 1.15.x
14+
- 1.16.x
15+
- 1.18.x
16+
platform:
17+
- ubuntu-latest
18+
- windows-latest
19+
runs-on: '${{ matrix.platform }}'
20+
steps:
21+
- name: Install Go
22+
uses: actions/setup-go@v3
23+
with:
24+
go-version: '${{ matrix.go-version }}'
25+
- name: Setup Golang caches
26+
uses: actions/cache@v3
27+
with:
28+
# In order:
29+
# * Module download cache
30+
# * Build cache (Linux)
31+
# * Build cache (Mac)
32+
# * Build cache (Windows)
33+
path: |
34+
~/go/pkg/mod
35+
~/.cache/go-build
36+
~/Library/Caches/go-build
37+
~\AppData\Local\go-build
38+
key: ${{ runner.os }}-go-${{ matrix.go-version }}-${{ hashFiles('**/go.sum') }}
39+
restore-keys: |
40+
${{ runner.os }}-go-${{ matrix.go-version }}-
41+
- name: Fetch Repository
42+
uses: actions/checkout@v3
43+
- name: Test PASETO Middleware
44+
run: cd ./paseto && go test ./... -v -race
45+
- name: Test Fiberzap Middleware
46+
run: cd ./fiberzap && go test ./... -v -race
47+
- name: Test otelfiber Middleware
48+
run: cd ./otelfiber && go test ./... -v -race
49+
- name: Test swagger Middleware
50+
run: cd ./swagger && go test ./... -v -race
51+
- name: Test casbin Middleware
52+
run: cd ./casbin && go test ./... -v -race
53+
- name: Test fibernewrelic Middleware
54+
run: cd ./fibernewrelic && go test ./... -v -race

‎casbin/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ module github.com/gofiber/contrib/casbin
33
go 1.16
44

55
require (
6-
github.com/casbin/casbin/v2 v2.50.0
7-
github.com/gofiber/fiber/v2 v2.35.0
6+
github.com/casbin/casbin/v2 v2.51.2
7+
github.com/gofiber/fiber/v2 v2.36.0
88
)

‎casbin/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible h1
22
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
33
github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
44
github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
5-
github.com/casbin/casbin/v2 v2.50.0 h1:EyuvIAnGSxRVH0V/GZLd9B4RXTa2enUR4fQgvym2Fis=
6-
github.com/casbin/casbin/v2 v2.50.0/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg=
7-
github.com/gofiber/fiber/v2 v2.35.0 h1:ct+jKw8Qb24WEIZx3VV3zz9VXyBZL7mcEjNaqj3g0h0=
8-
github.com/gofiber/fiber/v2 v2.35.0/go.mod h1:tgCr+lierLwLoVHHO/jn3Niannv34WRkQETU8wiL9fQ=
5+
github.com/casbin/casbin/v2 v2.51.2 h1:ZbZR3tEmPu+8fnVfPueJPfkARlXLBs/ZIb1sZyh2/bU=
6+
github.com/casbin/casbin/v2 v2.51.2/go.mod h1:vByNa/Fchek0KZUgG5wEsl7iFsiviAYKRtgrQfcJqHg=
7+
github.com/gofiber/fiber/v2 v2.36.0 h1:1qLMe5rhXFLPa2SjK10Wz7WFgLwYi4TYg7XrjztJHqA=
8+
github.com/gofiber/fiber/v2 v2.36.0/go.mod h1:tgCr+lierLwLoVHHO/jn3Niannv34WRkQETU8wiL9fQ=
99
github.com/golang/mock v1.4.4 h1:l75CXGRSwbaYNpl/Z2X1XIIAMSCquvXgpVZDhwEIJsc=
1010
github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4=
1111
github.com/klauspost/compress v1.15.0 h1:xqfchp4whNFxn5A4XFyyYtitiWI8Hy5EW59jEwcyL6U=

‎fiberzap/go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.14
44

55
require (
66
github.com/benbjohnson/clock v1.3.0 // indirect
7-
github.com/gofiber/fiber/v2 v2.35.0
7+
github.com/gofiber/fiber/v2 v2.36.0
88
github.com/kr/pretty v0.3.0 // indirect
99
github.com/pkg/errors v0.9.1 // indirect
1010
github.com/rogpeppe/go-internal v1.8.1 // indirect

‎fiberzap/go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3
77
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
88
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
99
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
10-
github.com/gofiber/fiber/v2 v2.35.0 h1:ct+jKw8Qb24WEIZx3VV3zz9VXyBZL7mcEjNaqj3g0h0=
11-
github.com/gofiber/fiber/v2 v2.35.0/go.mod h1:tgCr+lierLwLoVHHO/jn3Niannv34WRkQETU8wiL9fQ=
10+
github.com/gofiber/fiber/v2 v2.36.0 h1:1qLMe5rhXFLPa2SjK10Wz7WFgLwYi4TYg7XrjztJHqA=
11+
github.com/gofiber/fiber/v2 v2.36.0/go.mod h1:tgCr+lierLwLoVHHO/jn3Niannv34WRkQETU8wiL9fQ=
1212
github.com/klauspost/compress v1.15.0 h1:xqfchp4whNFxn5A4XFyyYtitiWI8Hy5EW59jEwcyL6U=
1313
github.com/klauspost/compress v1.15.0/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk=
1414
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=

‎otelfiber/example/go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ replace github.com/gofiber/contrib/otelfiber => ../
66

77
require (
88
github.com/gofiber/contrib/otelfiber v0.23.0
9-
github.com/gofiber/fiber/v2 v2.35.0
10-
go.opentelemetry.io/otel v1.8.0
11-
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.8.0
12-
go.opentelemetry.io/otel/sdk v1.8.0
13-
go.opentelemetry.io/otel/trace v1.8.0
9+
github.com/gofiber/fiber/v2 v2.36.0
10+
go.opentelemetry.io/otel v1.9.0
11+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.9.0
12+
go.opentelemetry.io/otel/sdk v1.9.0
13+
go.opentelemetry.io/otel/trace v1.9.0
1414

1515
)

0 commit comments

Comments
 (0)