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(deps): update dependency go to v1.23.4 #277

Merged
merged 2 commits into from
Dec 5, 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 .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# [Choice] Go version (use -bullseye variants on local arm64/Apple Silicon): 1, 1.18, 1.17, 1-bullseye, 1.18-bullseye, 1.17-bullseye, 1-buster, 1.18-buster, 1.17-buster
FROM mcr.microsoft.com/vscode/devcontainers/go:1-1.22-bullseye
FROM mcr.microsoft.com/vscode/devcontainers/go:1-1.23-bullseye

# [Choice] Node.js version: none, lts/*, 16, 14, 12, 10
ARG NODE_VERSION="none"
Expand Down
2 changes: 1 addition & 1 deletion .devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ services:
context: .
dockerfile: Dockerfile
args:
VARIANT: 1.22-bullseye
VARIANT: 1.23-bullseye
NODE_VERSION: "none"
command: sleep infinity
# uncomment along with bind volume to use SSH for dev container access
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ NATS_CREDS?=/tmp/user.creds

# Tool Versions
GCI_REPO = github.com/daixiang0/gci
GCI_VERSION = v0.10.1
GCI_VERSION = v0.13.5

GOLANGCI_LINT_REPO = github.com/golangci/golangci-lint
GOLANGCI_LINT_VERSION = v1.59.1
GOLANGCI_LINT_VERSION = v1.62.2

NATS_CLI_REPO = github.com/nats-io/natscli
NATS_CLI_VERSION = v0.0.35
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
module go.infratographer.com/permissions-api

go 1.22.5
go 1.23

toolchain go1.22.6
toolchain go1.23.4

require (
github.com/authzed/authzed-go v0.14.0
Expand Down
4 changes: 3 additions & 1 deletion internal/api/roles_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ import (
"go.infratographer.com/permissions-api/internal/types"
)

var contextKeyEngine = struct{}{}
type engineContextKey struct{}

var contextKeyEngine = engineContextKey{}

func TestRoleCreate(t *testing.T) {
ctx := context.Background()
Expand Down
4 changes: 3 additions & 1 deletion internal/pubsub/subscriber_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ import (
"github.com/stretchr/testify/require"
)

var contextKeyEngine = struct{}{}
type engineContextKey struct{}

var contextKeyEngine = engineContextKey{}

func setupEvents(t *testing.T, engine query.Engine) (*eventtools.TestNats, events.AuthRelationshipPublisher, *Subscriber) {
ctx := context.Background()
Expand Down
2 changes: 1 addition & 1 deletion internal/testauth/testauth.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ func (s *Server) serve(srv *http.Server, listener net.Listener) {

func (s *Server) handleOIDC(c echo.Context) error {
return c.JSON(http.StatusOK, echo.Map{
"jwks_uri": fmt.Sprintf(s.Issuer + "/.well-known/jwks.json"),
"jwks_uri": s.Issuer + "/.well-known/jwks.json",
})
}

Expand Down
Loading