Skip to content

Commit

Permalink
Merge pull request #427 from eko/update-deps
Browse files Browse the repository at this point in the history
Updated dependencies
  • Loading branch information
eko authored Sep 10, 2023
2 parents f0552c7 + f0632d6 commit b519995
Show file tree
Hide file tree
Showing 284 changed files with 10,720 additions and 20,937 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/branches.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
backend-lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
with:
go-version: '1.20'
Expand All @@ -26,7 +26,7 @@ jobs:
backend-test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
with:
go-version: '1.20'
Expand All @@ -38,7 +38,7 @@ jobs:
backend-functional-test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
with:
go-version: '1.20'
Expand Down Expand Up @@ -80,7 +80,7 @@ jobs:
frontend-test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v3
with:
node-version: 19
Expand All @@ -93,7 +93,7 @@ jobs:
sdk-lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
with:
go-version: '1.20'
Expand All @@ -106,7 +106,7 @@ jobs:
sdk-test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
with:
go-version: '1.20'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/codeql.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/tag.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
matrix:
go_version: [ '1.20' ]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
with:
go-version: ${{ matrix.go_version }}
Expand All @@ -28,7 +28,7 @@ jobs:
runs-on: ubuntu-latest
needs: test
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: azure/docker-login@v1
with:
Expand Down Expand Up @@ -64,7 +64,7 @@ jobs:
runs-on: ubuntu-latest
needs: test
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: azure/docker-login@v1
with:
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
goarch: arm64
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions/setup-go@v4
with:
go-version: '1.20'
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.standalone
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ RUN --mount=type=cache,target=/go/pkg/mod \
--mount=type=cache,target=/root/.cache/go-build \
CGO_ENABLED=1 go build -mod vendor -ldflags "-s -w" -o authz ./cmd/

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

ARG REACT_APP_API_BASE_URI=http://localhost:8080/v1
ARG REACT_APP_DEMO_ENABLED=false
Expand Down
2 changes: 1 addition & 1 deletion backend/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Here are the available configuration options available as environment variable:
| APP_METRICS_ENABLED | `false` | Enable Prometheus metrics observability (available under `/v1/metrics` URL) |
| APP_TRACE_ENABLED | `false` | Enable tracing observability using OpenTelemetry |
| APP_TRACE_EXPORTER | `jaeger` | Exporter you want to use. Could be `jaeger`, `zipkin` or `otlpgrpc` |
| APP_TRACE_JAEGER_URL | `http://localhost:14268/api/traces` | Jaeger API URL to be used |
| APP_TRACE_JAEGER_ENDPOINT | `localhost:14250` | Jaeger endpoint to be used |
| APP_TRACE_OTLP_DIAL_TIMEOUT | `3s` | OTLP gRPC exporter dial timeout value |
| APP_TRACE_OTLP_ENDPOINT | `localhost:30080` | OTLP gRPC endpoint value |
| APP_TRACE_SAMPLE_RATIO | `1.0` | Sampling ratio value defines how many traces should be sent to your exporter |
Expand Down
4 changes: 2 additions & 2 deletions backend/configs/app.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type App struct {
StatsResourceKindRegex string `config:"app_stats_resource_kind_regex"`
TraceEnabled bool `config:"app_trace_enabled"`
TraceExporter string `config:"app_trace_exporter"`
TraceJaegerURL string `config:"app_trace_jaeger_url"`
TraceJaegerEndpoint string `config:"app_trace_jaeger_endpoint"`
TraceOtlpDialTimeout time.Duration `config:"app_trace_otlp_dial_timeout"`
TraceOtlpEndpoint string `config:"app_trace_otlp_endpoint"`
TraceZipkinURL string `config:"app_trace_zipkin_url"`
Expand All @@ -36,7 +36,7 @@ func newApp() *App {
StatsResourceKindRegex: `.*`,
TraceEnabled: false,
TraceExporter: "jaeger",
TraceJaegerURL: "http://localhost:14268/api/traces",
TraceJaegerEndpoint: "localhost:14250",
TraceOtlpDialTimeout: 3 * time.Second,
TraceOtlpEndpoint: "localhost:30080",
TraceZipkinURL: "http://localhost:9411/api/v2/spans",
Expand Down
50 changes: 24 additions & 26 deletions backend/go.mod
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
module github.com/eko/authz/backend

go 1.20
go 1.21

require (
github.com/coreos/go-oidc/v3 v3.6.0
github.com/cucumber/godog v0.12.6
github.com/glebarez/sqlite v1.9.0
github.com/go-oauth2/oauth2/v4 v4.5.2
github.com/go-playground/validator/v10 v10.15.1
github.com/go-playground/validator/v10 v10.15.3
github.com/gofiber/adaptor/v2 v2.2.1
github.com/gofiber/contrib/otelfiber v1.0.10
github.com/gofiber/fiber/v2 v2.48.0
github.com/gofiber/swagger v0.1.12
github.com/gofiber/fiber/v2 v2.49.1
github.com/gofiber/swagger v0.1.13
github.com/golang-jwt/jwt/v4 v4.5.0
github.com/golang/mock v1.6.0
github.com/google/uuid v1.3.1
Expand All @@ -20,18 +20,17 @@ require (
github.com/prometheus/client_golang v1.16.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.4
github.com/swaggo/swag v1.16.1
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.42.0
go.opentelemetry.io/otel v1.16.0
go.opentelemetry.io/otel/exporters/jaeger v1.16.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.16.0
go.opentelemetry.io/otel/exporters/zipkin v1.16.0
go.opentelemetry.io/otel/sdk v1.16.0
github.com/swaggo/swag v1.16.2
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.43.0
go.opentelemetry.io/otel v1.17.0
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.17.0
go.opentelemetry.io/otel/exporters/zipkin v1.17.0
go.opentelemetry.io/otel/sdk v1.17.0
go.uber.org/fx v1.20.0
golang.org/x/crypto v0.12.0
golang.org/x/exp v0.0.0-20230817173708-d852ddb80c63
golang.org/x/oauth2 v0.11.0
google.golang.org/grpc v1.57.0
golang.org/x/crypto v0.13.0
golang.org/x/exp v0.0.0-20230905200255-921286631fa9
golang.org/x/oauth2 v0.12.0
google.golang.org/grpc v1.58.0
google.golang.org/protobuf v1.31.0
gorm.io/datatypes v1.2.0
gorm.io/driver/mysql v1.5.1
Expand Down Expand Up @@ -91,23 +90,22 @@ require (
github.com/rivo/uniseg v0.4.4 // indirect
github.com/swaggo/files/v2 v2.0.0 // indirect
github.com/valyala/bytebufferpool v1.0.0 // indirect
github.com/valyala/fasthttp v1.48.0 // indirect
github.com/valyala/fasthttp v1.49.0 // indirect
github.com/valyala/tcplisten v1.0.0 // indirect
go.opentelemetry.io/contrib v1.17.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.16.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.16.0 // indirect
go.opentelemetry.io/otel/metric v1.16.0 // indirect
go.opentelemetry.io/otel/trace v1.16.0 // indirect
go.opentelemetry.io/contrib v1.18.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.17.0 // indirect
go.opentelemetry.io/otel/metric v1.17.0 // indirect
go.opentelemetry.io/otel/trace v1.17.0 // indirect
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
go.uber.org/atomic v1.11.0 // indirect
go.uber.org/dig v1.17.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.uber.org/zap v1.25.0 // indirect
golang.org/x/net v0.14.0 // indirect
golang.org/x/sys v0.11.0 // indirect
golang.org/x/text v0.12.0 // indirect
golang.org/x/tools v0.12.1-0.20230815132531-74c255bcf846 // indirect
google.golang.org/appengine v1.6.7 // indirect
golang.org/x/net v0.15.0 // indirect
golang.org/x/sys v0.12.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/tools v0.13.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
Expand Down
Loading

0 comments on commit b519995

Please sign in to comment.