Merge pull request #2857 from dexidp/fix-verify

Fix verify
dexidp · Mar 19, 2023 · f88ebc4 · f88ebc4
2 parents 47dac4f + 15c7180
commit f88ebc4
Show file tree

Hide file tree

Showing 15 changed files with 107 additions and 33 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -38,8 +38,8 @@ linters:
         - nakedret
         - nolintlint
         - prealloc
-        - revive
-        - sqlclosecheck
+        # - revive
+        # - sqlclosecheck
         - staticcheck
         - stylecheck
         - unconvert
@@ -55,6 +55,9 @@ linters:
         # Disable temporarily until everything works with Go 1.18
         - typecheck
 
+        # Disable temporarily until the following issue is resolved: https://github.com/golangci/golangci-lint/issues/3086
+        # - sqlclosecheck
+
         # TODO: fix linter errors before enabling
         # - exhaustivestruct
         # - gochecknoglobals
@@ -63,6 +66,7 @@ linters:
         # - godot
         # - nlreturn
         # - noctx
+        # - revive
         # - wrapcheck
 
         # TODO: fix linter errors before enabling (from original config)

diff --git a/Makefile b/Makefile
@@ -16,8 +16,8 @@ export GOBIN=$(PWD)/bin
 LD_FLAGS="-w -X main.version=$(VERSION)"
 
 # Dependency versions
-GOLANGCI_VERSION   = 1.51.2
-GOTESTSUM_VERSION ?= 1.7.0
+GOLANGCI_VERSION   = 1.52.0
+GOTESTSUM_VERSION ?= 1.9.0
 
 PROTOC_VERSION             = 3.15.6
 PROTOC_GEN_GO_VERSION      = 1.26.0

diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -9,19 +9,19 @@
   outputs = { self, nixpkgs, flake-utils, ... }:
     flake-utils.lib.eachDefaultSystem (
       system:
-        let
-          pkgs = nixpkgs.legacyPackages.${system};
-          buildDeps = with pkgs; [ git go_1_19 gnumake ];
-          devDeps = with pkgs;
-            buildDeps ++ [
-              golangci-lint
-              gotestsum
-              protobuf
-              protoc-gen-go
-              protoc-gen-go-grpc
-              kind
-            ];
-        in
-          { devShell = pkgs.mkShell { buildInputs = devDeps; }; }
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+        buildDeps = with pkgs; [ git go_1_20 gnumake ];
+        devDeps = with pkgs;
+          buildDeps ++ [
+            golangci-lint
+            gotestsum
+            protobuf
+            protoc-gen-go
+            protoc-gen-go-grpc
+            kind
+          ];
+      in
+      { devShell = pkgs.mkShell { buildInputs = devDeps; }; }
     );
 }
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/dexidp/dex
 go 1.20
 
 require (
-	entgo.io/ent v0.11.9
+	entgo.io/ent v0.11.10
 	github.com/AppsFlyer/go-sundheit v0.5.0
 	github.com/Masterminds/semver v1.5.0
 	github.com/Masterminds/sprig/v3 v3.2.3
@@ -41,7 +41,7 @@ require (
 )
 
 require (
-	ariga.io/atlas v0.9.1 // indirect
+	ariga.io/atlas v0.9.2-0.20230303073438-03a4779a6338 // indirect
 	cloud.google.com/go/compute v1.18.0 // indirect
 	cloud.google.com/go/compute/metadata v0.2.3 // indirect
 	github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e // indirect

diff --git a/go.sum b/go.sum
@@ -1,5 +1,5 @@
-ariga.io/atlas v0.9.1 h1:EpoPMnwsQG0vn9c0sYExpwSYtr7bvuSUXzQclU2pMjc=
-ariga.io/atlas v0.9.1/go.mod h1:T230JFcENj4ZZzMkZrXFDSkv+2kXkUgpJ5FQQ5hMcKU=
+ariga.io/atlas v0.9.2-0.20230303073438-03a4779a6338 h1:8kmSV3mbQKn0niZ/EdE11uhFvFKiW1VlaqVBIYOyahM=
+ariga.io/atlas v0.9.2-0.20230303073438-03a4779a6338/go.mod h1:T230JFcENj4ZZzMkZrXFDSkv+2kXkUgpJ5FQQ5hMcKU=
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
@@ -40,8 +40,8 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
-entgo.io/ent v0.11.9 h1:dbbCkAiPVTRBIJwoZctiSYjB7zxQIBOzVSU5H9VYIQI=
-entgo.io/ent v0.11.9/go.mod h1:KWHOcDZn1xk3mz3ipWdKrQpMvwqa/9B69TUuAPP9W6g=
+entgo.io/ent v0.11.10 h1:iqn32ybY5HRW3xSAyMNdNKpZhKgMf1Zunsej9yPKUI8=
+entgo.io/ent v0.11.10/go.mod h1:mzTZ0trE+jCQw/fnzijbm5Mck/l8Gbg7gC/+L1COyzM=
 github.com/AppsFlyer/go-sundheit v0.5.0 h1:/VxpyigCfJrq1r97mn9HPiAB2qrhcTFHwNIIDr15CZM=
 github.com/AppsFlyer/go-sundheit v0.5.0/go.mod h1:2ZM0BnfqT/mljBQO224VbL5XH06TgWuQ6Cn+cTtCpTY=
 github.com/Azure/go-ntlmssp v0.0.0-20220621081337-cb9428e4ac1e h1:NeAW1fUYUEWhft7pkxDf6WoUvEZJ/uOKsvtpjLnn8MU=

diff --git a/storage/ent/db/authcode/where.go b/storage/ent/db/authcode/where.go
diff --git a/storage/ent/db/authrequest/where.go b/storage/ent/db/authrequest/where.go
diff --git a/storage/ent/db/connector/where.go b/storage/ent/db/connector/where.go
diff --git a/storage/ent/db/ent.go b/storage/ent/db/ent.go
diff --git a/storage/ent/db/keys/where.go b/storage/ent/db/keys/where.go
diff --git a/storage/ent/db/oauth2client/where.go b/storage/ent/db/oauth2client/where.go
diff --git a/storage/ent/db/offlinesession/where.go b/storage/ent/db/offlinesession/where.go
diff --git a/storage/ent/db/refreshtoken/where.go b/storage/ent/db/refreshtoken/where.go
diff --git a/storage/ent/db/runtime/runtime.go b/storage/ent/db/runtime/runtime.go