Skip to content

Commit b519995

Browse files
authored
Merge pull request #427 from eko/update-deps
Updated dependencies
2 parents f0552c7 + f0632d6 commit b519995

File tree

284 files changed

+10720
-20937
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

284 files changed

+10720
-20937
lines changed

.github/workflows/branches.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
backend-lint:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v3
15+
- uses: actions/checkout@v4
1616
- uses: actions/setup-go@v4
1717
with:
1818
go-version: '1.20'
@@ -26,7 +26,7 @@ jobs:
2626
backend-test:
2727
runs-on: ubuntu-latest
2828
steps:
29-
- uses: actions/checkout@v3
29+
- uses: actions/checkout@v4
3030
- uses: actions/setup-go@v4
3131
with:
3232
go-version: '1.20'
@@ -38,7 +38,7 @@ jobs:
3838
backend-functional-test:
3939
runs-on: ubuntu-latest
4040
steps:
41-
- uses: actions/checkout@v3
41+
- uses: actions/checkout@v4
4242
- uses: actions/setup-go@v4
4343
with:
4444
go-version: '1.20'
@@ -80,7 +80,7 @@ jobs:
8080
frontend-test:
8181
runs-on: ubuntu-latest
8282
steps:
83-
- uses: actions/checkout@v3
83+
- uses: actions/checkout@v4
8484
- uses: actions/setup-node@v3
8585
with:
8686
node-version: 19
@@ -93,7 +93,7 @@ jobs:
9393
sdk-lint:
9494
runs-on: ubuntu-latest
9595
steps:
96-
- uses: actions/checkout@v3
96+
- uses: actions/checkout@v4
9797
- uses: actions/setup-go@v4
9898
with:
9999
go-version: '1.20'
@@ -106,7 +106,7 @@ jobs:
106106
sdk-test:
107107
runs-on: ubuntu-latest
108108
steps:
109-
- uses: actions/checkout@v3
109+
- uses: actions/checkout@v4
110110
- uses: actions/setup-go@v4
111111
with:
112112
go-version: '1.20'

.github/workflows/codeql.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
steps:
2222
- name: Checkout repository
23-
uses: actions/checkout@v3
23+
uses: actions/checkout@v4
2424

2525
- name: Initialize CodeQL
2626
uses: github/codeql-action/init@v2

.github/workflows/tag.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
matrix:
1313
go_version: [ '1.20' ]
1414
steps:
15-
- uses: actions/checkout@v3
15+
- uses: actions/checkout@v4
1616
- uses: actions/setup-go@v4
1717
with:
1818
go-version: ${{ matrix.go_version }}
@@ -28,7 +28,7 @@ jobs:
2828
runs-on: ubuntu-latest
2929
needs: test
3030
steps:
31-
- uses: actions/checkout@v3
31+
- uses: actions/checkout@v4
3232

3333
- uses: azure/docker-login@v1
3434
with:
@@ -64,7 +64,7 @@ jobs:
6464
runs-on: ubuntu-latest
6565
needs: test
6666
steps:
67-
- uses: actions/checkout@v3
67+
- uses: actions/checkout@v4
6868

6969
- uses: azure/docker-login@v1
7070
with:
@@ -134,7 +134,7 @@ jobs:
134134
goarch: arm64
135135
runs-on: ${{ matrix.os }}
136136
steps:
137-
- uses: actions/checkout@v3
137+
- uses: actions/checkout@v4
138138
- uses: actions/setup-go@v4
139139
with:
140140
go-version: '1.20'

Dockerfile.standalone

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \
1616
--mount=type=cache,target=/root/.cache/go-build \
1717
CGO_ENABLED=1 go build -mod vendor -ldflags "-s -w" -o authz ./cmd/
1818

19-
FROM node:20.5-alpine3.18 as frontend-builder
19+
FROM node:20.6-alpine3.18 as frontend-builder
2020

2121
ARG REACT_APP_API_BASE_URI=http://localhost:8080/v1
2222
ARG REACT_APP_DEMO_ENABLED=false

backend/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Here are the available configuration options available as environment variable:
3333
| APP_METRICS_ENABLED | `false` | Enable Prometheus metrics observability (available under `/v1/metrics` URL) |
3434
| APP_TRACE_ENABLED | `false` | Enable tracing observability using OpenTelemetry |
3535
| APP_TRACE_EXPORTER | `jaeger` | Exporter you want to use. Could be `jaeger`, `zipkin` or `otlpgrpc` |
36-
| APP_TRACE_JAEGER_URL | `http://localhost:14268/api/traces` | Jaeger API URL to be used |
36+
| APP_TRACE_JAEGER_ENDPOINT | `localhost:14250` | Jaeger endpoint to be used |
3737
| APP_TRACE_OTLP_DIAL_TIMEOUT | `3s` | OTLP gRPC exporter dial timeout value |
3838
| APP_TRACE_OTLP_ENDPOINT | `localhost:30080` | OTLP gRPC endpoint value |
3939
| APP_TRACE_SAMPLE_RATIO | `1.0` | Sampling ratio value defines how many traces should be sent to your exporter |

backend/configs/app.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type App struct {
1515
StatsResourceKindRegex string `config:"app_stats_resource_kind_regex"`
1616
TraceEnabled bool `config:"app_trace_enabled"`
1717
TraceExporter string `config:"app_trace_exporter"`
18-
TraceJaegerURL string `config:"app_trace_jaeger_url"`
18+
TraceJaegerEndpoint string `config:"app_trace_jaeger_endpoint"`
1919
TraceOtlpDialTimeout time.Duration `config:"app_trace_otlp_dial_timeout"`
2020
TraceOtlpEndpoint string `config:"app_trace_otlp_endpoint"`
2121
TraceZipkinURL string `config:"app_trace_zipkin_url"`
@@ -36,7 +36,7 @@ func newApp() *App {
3636
StatsResourceKindRegex: `.*`,
3737
TraceEnabled: false,
3838
TraceExporter: "jaeger",
39-
TraceJaegerURL: "http://localhost:14268/api/traces",
39+
TraceJaegerEndpoint: "localhost:14250",
4040
TraceOtlpDialTimeout: 3 * time.Second,
4141
TraceOtlpEndpoint: "localhost:30080",
4242
TraceZipkinURL: "http://localhost:9411/api/v2/spans",

backend/go.mod

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
module github.com/eko/authz/backend
22

3-
go 1.20
3+
go 1.21
44

55
require (
66
github.com/coreos/go-oidc/v3 v3.6.0
77
github.com/cucumber/godog v0.12.6
88
github.com/glebarez/sqlite v1.9.0
99
github.com/go-oauth2/oauth2/v4 v4.5.2
10-
github.com/go-playground/validator/v10 v10.15.1
10+
github.com/go-playground/validator/v10 v10.15.3
1111
github.com/gofiber/adaptor/v2 v2.2.1
1212
github.com/gofiber/contrib/otelfiber v1.0.10
13-
github.com/gofiber/fiber/v2 v2.48.0
14-
github.com/gofiber/swagger v0.1.12
13+
github.com/gofiber/fiber/v2 v2.49.1
14+
github.com/gofiber/swagger v0.1.13
1515
github.com/golang-jwt/jwt/v4 v4.5.0
1616
github.com/golang/mock v1.6.0
1717
github.com/google/uuid v1.3.1
@@ -20,18 +20,17 @@ require (
2020
github.com/prometheus/client_golang v1.16.0
2121
github.com/spf13/pflag v1.0.5
2222
github.com/stretchr/testify v1.8.4
23-
github.com/swaggo/swag v1.16.1
24-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0
25-
go.opentelemetry.io/otel v1.16.0
26-
go.opentelemetry.io/otel/exporters/jaeger v1.16.0
27-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0
28-
go.opentelemetry.io/otel/exporters/zipkin v1.16.0
29-
go.opentelemetry.io/otel/sdk v1.16.0
23+
github.com/swaggo/swag v1.16.2
24+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.43.0
25+
go.opentelemetry.io/otel v1.17.0
26+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.17.0
27+
go.opentelemetry.io/otel/exporters/zipkin v1.17.0
28+
go.opentelemetry.io/otel/sdk v1.17.0
3029
go.uber.org/fx v1.20.0
31-
golang.org/x/crypto v0.12.0
32-
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63
33-
golang.org/x/oauth2 v0.11.0
34-
google.golang.org/grpc v1.57.0
30+
golang.org/x/crypto v0.13.0
31+
golang.org/x/exp v0.0.0-20230905200255-921286631fa9
32+
golang.org/x/oauth2 v0.12.0
33+
google.golang.org/grpc v1.58.0
3534
google.golang.org/protobuf v1.31.0
3635
gorm.io/datatypes v1.2.0
3736
gorm.io/driver/mysql v1.5.1
@@ -91,23 +90,22 @@ require (
9190
github.com/rivo/uniseg v0.4.4 // indirect
9291
github.com/swaggo/files/v2 v2.0.0 // indirect
9392
github.com/valyala/bytebufferpool v1.0.0 // indirect
94-
github.com/valyala/fasthttp v1.48.0 // indirect
93+
github.com/valyala/fasthttp v1.49.0 // indirect
9594
github.com/valyala/tcplisten v1.0.0 // indirect
96-
go.opentelemetry.io/contrib v1.17.0 // indirect
97-
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect
98-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 // indirect
99-
go.opentelemetry.io/otel/metric v1.16.0 // indirect
100-
go.opentelemetry.io/otel/trace v1.16.0 // indirect
95+
go.opentelemetry.io/contrib v1.18.0 // indirect
96+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.17.0 // indirect
97+
go.opentelemetry.io/otel/metric v1.17.0 // indirect
98+
go.opentelemetry.io/otel/trace v1.17.0 // indirect
10199
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
102100
go.uber.org/atomic v1.11.0 // indirect
103101
go.uber.org/dig v1.17.0 // indirect
104102
go.uber.org/multierr v1.11.0 // indirect
105103
go.uber.org/zap v1.25.0 // indirect
106-
golang.org/x/net v0.14.0 // indirect
107-
golang.org/x/sys v0.11.0 // indirect
108-
golang.org/x/text v0.12.0 // indirect
109-
golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect
110-
google.golang.org/appengine v1.6.7 // indirect
104+
golang.org/x/net v0.15.0 // indirect
105+
golang.org/x/sys v0.12.0 // indirect
106+
golang.org/x/text v0.13.0 // indirect
107+
golang.org/x/tools v0.13.0 // indirect
108+
google.golang.org/appengine v1.6.8 // indirect
111109
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
112110
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
113111
gopkg.in/yaml.v3 v3.0.1 // indirect

0 commit comments

Comments
 (0)