Merge branch 'master' into feat/distroless

.docker/Dockerfile-alpine

@@ -2,7 +2,7 @@ FROM alpine:3.18
 
 RUN addgroup -S ory; \
     adduser -S ory -G ory -D -H -s /bin/nologin
-RUN apk --no-cache --upgrade --latest add ca-certificates
+RUN apk --no-cache --upgrade add ca-certificates
 
 COPY hydra /usr/bin/hydra
 

.docker/Dockerfile-build

@@ -1,4 +1,5 @@
-FROM golang:1.19 AS builder
+FROM golang:1.20-alpine3.17 AS builder
+
 
 WORKDIR /go/src/github.com/ory/hydra
 

.docker/Dockerfile-hsm

@@ -1,4 +1,4 @@
-FROM golang:1.19 AS builder
+FROM golang:1.20-alpine3.18 AS builder
 
 WORKDIR /go/src/github.com/ory/hydra
 

.dockerignore

@@ -3,7 +3,6 @@
 docs
 node_modules
 .circleci
-.docker-home
 .github
 scripts
 sdk/js

.github/workflows/ci.yaml

@@ -23,9 +23,9 @@ jobs:
           # We must fetch at least the immediate parents so that if this is
           # a pull request then we can checkout the head.
           fetch-depth: 2
-      - uses: actions/setup-go@v2
+      - uses: actions/setup-go@v3
         with:
-          go-version: "1.19"
+          go-version: "1.20"
       - name: Start service
         run: ./test/conformance/start.sh
       - name: Run tests
@@ -80,22 +80,21 @@ jobs:
           path: |
             internal/httpclient
           key: ${{ needs.sdk-generate.outputs.sdk-cache-key }}
-      - uses: actions/setup-go@v2
+      - uses: actions/setup-go@v4
         with:
-          go-version: "1.19"
+          go-version: "1.20"
       - run: go list -json > go.list
       - name: Run nancy
         uses: sonatype-nexus-community/[email protected]
         with:
           nancyVersion: v1.0.42
       - name: Run golangci-lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3
         env:
           GOGC: 100
         with:
           args: --timeout 10m0s
-          version: v1.47.3
-          skip-go-installation: true
+          version: v1.53.2
           skip-pkg-cache: true
       - name: Run go-acc (tests)
         run: |
@@ -124,9 +123,9 @@ jobs:
           path: |
             internal/httpclient
           key: ${{ needs.sdk-generate.outputs.sdk-cache-key }}
-      - uses: actions/setup-go@v2
+      - uses: actions/setup-go@v3
         with:
-          go-version: "1.19"
+          go-version: "1.20"
       - name: Setup HSM libs and packages
         run: |
           sudo apt install -y softhsm opensc
@@ -175,9 +174,9 @@ jobs:
           docker start cockroach
         name: Start CockroachDB
       - uses: ory/ci/checkout@master
-      - uses: actions/setup-go@v2
+      - uses: actions/setup-go@v3
         with:
-          go-version: "1.19"
+          go-version: "1.20"
       - uses: actions/cache@v2
         with:
           path: ./test/e2e/hydra

.github/workflows/format.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: "1.20"
       - run: make format
       - name: Indicate formatting issues
         run: git diff HEAD --exit-code --color

.github/workflows/licenses.yml

@@ -11,10 +11,10 @@ jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-go@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v3
         with:
-          go-version: "1.18"
+          go-version: "1.20"
       - uses: actions/setup-node@v2
         with:
           node-version: "18"

.golangci.yml

@@ -5,9 +5,7 @@ linters:
     - gosimple
     - bodyclose
     - staticcheck
-    # Disabled due to Go 1.19 changes and Go-Swagger incompatibility
-    # https://github.com/ory/hydra/issues/3227
-    # - goimports
+    - goimports
   disable:
     - ineffassign
     - deadcode

.grype.yml

@@ -0,0 +1,2 @@
+ignore:
+  - vulnerability: CVE-2023-2650

.schema/config.schema.json

@@ -1040,7 +1040,7 @@
       "examples": ["cpu"]
     },
     "tracing": {
-      "$ref": "https://raw.githubusercontent.com/ory/x/v0.0.555/otelx/config.schema.json"
+      "$ref": "https://raw.githubusercontent.com/ory/x/v0.0.559/otelx/config.schema.json"
     },
     "sqa": {
       "type": "object",

.schema/version.schema.json

@@ -2,6 +2,23 @@
     "$id": "https://github.com/ory/hydra/.schema/versions.config.schema.json",
     "$schema": "http://json-schema.org/draft-07/schema#",
     "oneOf": [
+        {
+            "allOf": [
+                {
+                    "properties": {
+                        "version": {
+                            "const": "v2.2.0-rc.2"
+                        }
+                    },
+                    "required": [
+                        "version"
+                    ]
+                },
+                {
+                    "$ref": "https://raw.githubusercontent.com/ory/hydra/v2.2.0-rc.2/.schema/config.schema.json"
+                }
+            ]
+        },
         {
             "allOf": [
                 {

.trivyignore

@@ -0,0 +1 @@
+CVE-2023-2650