Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: bump to go 1.22 and fix automations #1183

Merged
merged 2 commits into from
Sep 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .docker/Dockerfile-build
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Workaround for https://github.com/GoogleContainerTools/distroless/issues/1342
FROM golang:1.21-bullseye AS builder
FROM golang:1.22-bullseye AS builder

WORKDIR /go/src/github.com/ory/oathkeeper

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
key: ${{ needs.sdk-generate.outputs.sdk-cache-key }}
- uses: actions/setup-go@v2
with:
go-version: "1.21"
go-version: "1.22"
- run: go list -json > go.list
- name: Run nancy
uses: sonatype-nexus-community/[email protected]
Expand Down Expand Up @@ -70,7 +70,7 @@ jobs:
- uses: ory/ci/checkout@master
- uses: actions/setup-go@v2
with:
go-version: "1.21"
go-version: "1.22"
- run: |
./test/${{ matrix.name }}/run.sh

Expand All @@ -86,7 +86,7 @@ jobs:
output-dir: docs/oathkeeper/cli
- uses: actions/setup-go@v2
with:
go-version: "1.21"
go-version: "1.22"

changelog:
name: Generate changelog
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/format.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
with:
go-version: "1.21"
go-version: "1.22"
- run: make format
- name: Indicate formatting issues
run: git diff HEAD --exit-code --color
2 changes: 1 addition & 1 deletion .github/workflows/licenses.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-go@v2
with:
go-version: "1.21"
go-version: "1.22"
- uses: actions/setup-node@v2
with:
node-version: "18"
Expand Down
5 changes: 5 additions & 0 deletions .orycli.yml
Original file line number Diff line number Diff line change
@@ -1 +1,6 @@
project: oathkeeper

pre_release_hooks:
- ./scripts/render-schemas.sh
- git config --unset user.email
- git config --unset user.name
2 changes: 2 additions & 0 deletions .schema/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Do not edit files in this directory. They are generated by CI using
render-schemas.sh and other automation. Edit spec/config.schema.json instead.
32 changes: 30 additions & 2 deletions .schema/config.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,11 @@
}
]
},
"prefix": {
"title": "Token Prefix",
"type": "string",
"description": "The token is considered only if it starts with this string."
},
"preserve_query": {
"title": "Preserve Query",
"type": "boolean",
Expand Down Expand Up @@ -822,6 +827,17 @@
"type": "string"
}
},
"prefix": {
"title": "Token Prefix",
"type": "string",
"description": "The token is considered only if it starts with this string."
},
"preserve_host": {
"title": "Preserve Host",
"type": "boolean",
"description": "When set to true the HTTP Header X-Forwarded-Host will be set to the original HTTP host.",
"default": false
},
"introspection_request_headers": {
"title": "Introspection Request Headers",
"description": "Additional headers to be added to the introspection request.",
Expand Down Expand Up @@ -974,6 +990,12 @@
"description": "The URL of the remote authorizer. The remote authorizer is expected to return either 200 OK or 403 Forbidden to allow/deny access.\n\n>If this authorizer is enabled, this value is required.",
"examples": ["https://host/path"]
},
"headers": {
"type": "object",
"additionalProperties": {
"type": "string"
}
},
"payload": {
"title": "JSON Payload",
"type": "string",
Expand Down Expand Up @@ -1176,6 +1198,12 @@
"title": "Host",
"description": "The network interface to listen on. Leave empty to listen on all interfaces."
},
"trust_forwarded_headers": {
"type": "boolean",
"default": false,
"title": "Trust X-Forwarded Headers",
"description": "Trust the X-Forwarded-* headers from the reverse proxy. This is useful when running behind a load balancer or similar. Set this to false if you are not running behind a reverse proxy that prevents Hop-by-Hop attacks."
},
"timeout": {
"$ref": "#/definitions/serverTimeout"
},
Expand Down Expand Up @@ -1843,10 +1871,10 @@
}
},
"log": {
"$ref": "https://raw.githubusercontent.com/ory/x/v0.0.532/logrusx/config.schema.json"
"$ref": "https://raw.githubusercontent.com/ory/x/v0.0.605/logrusx/config.schema.json"
},
"tracing": {
"$ref": "https://raw.githubusercontent.com/ory/x/v0.0.532/tracing/config.schema.json"
"$ref": "https://raw.githubusercontent.com/ory/x/v0.0.605/otelx/config.schema.json"
},
"profiling": {
"title": "Profiling",
Expand Down
Loading
Loading