From e383c3b42f92e2d802a557fa3df733370de7719c Mon Sep 17 00:00:00 2001 From: Ewan Harris Date: Fri, 9 Oct 2026 12:01:43 +0100 Subject: [PATCH 1/3] chore: update to mapper tagged release --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 8e5712a9..d00d589e 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/openfga/api/proto v0.0.0-20260319214821-f153694bfc20 github.com/openfga/go-sdk v0.8.3 github.com/openfga/language/pkg/go v0.3.2 - github.com/openfga/mapper v0.0.0-20261008093810-15f546b69fc9 + github.com/openfga/mapper v0.1.1 github.com/openfga/openfga v1.21.0 github.com/schollz/progressbar/v3 v3.19.1 github.com/spf13/cobra v1.10.2 diff --git a/go.sum b/go.sum index 5454bbfc..1c0bb5bb 100644 --- a/go.sum +++ b/go.sum @@ -235,8 +235,8 @@ github.com/openfga/go-sdk v0.8.3 h1:I4haME2GkR+gzmJY3vuGjuaLfdNyuMixsqj0lQbB4zE= github.com/openfga/go-sdk v0.8.3/go.mod h1:4EwBqOVHnIfCsQZ6e7LTbgr+jKfngu3YibPPV1mLXCc= github.com/openfga/language/pkg/go v0.3.2 h1:QN/cBYzL50RzEh46e+7ILvFeBs0exge7Sia0B6uXjms= github.com/openfga/language/pkg/go v0.3.2/go.mod h1:Ia3Luc0WcZdLogjjnFFKbce8+427wwlDaUG3dREZVCY= -github.com/openfga/mapper v0.0.0-20261008093810-15f546b69fc9 h1:e131oeOLuT7rGfk8k2N2ib1Nb4omjDrnYH9dV9ADh6Q= -github.com/openfga/mapper v0.0.0-20261008093810-15f546b69fc9/go.mod h1:UdSK58M1OLJ1v+l3hElBFfeCuU3WncuG6H2pySWqNaY= +github.com/openfga/mapper v0.1.1 h1:PfqGJzEGE/+/00uVELAnyS7IrEu6S0J+kujeixQzN9g= +github.com/openfga/mapper v0.1.1/go.mod h1:UdSK58M1OLJ1v+l3hElBFfeCuU3WncuG6H2pySWqNaY= github.com/openfga/openfga v1.21.0 h1:NQIrzLjUaWw+ZgFr78+qMcoYnHroPfqeQ8Z8ZMA530Y= github.com/openfga/openfga v1.21.0/go.mod h1:yO9enSlCudWGsiuYgD3DZDHwZJTlz3hSiyUCda8NGfk= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= From 7847d221baab7c5a91ddc44a33ed83abadce2b35 Mon Sep 17 00:00:00 2001 From: Ewan Harris Date: Fri, 9 Oct 2026 12:17:45 +0100 Subject: [PATCH 2/3] build: bump to latest go for toolchain to solve vulncheck warning --- go.mod | 8 ++++---- go.sum | 6 ++++++ 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index d00d589e..d4b44cf8 100644 --- a/go.mod +++ b/go.mod @@ -2,7 +2,7 @@ module github.com/openfga/cli go 1.26.0 // floor: support one version back; run with the latest (toolchain below) -toolchain go1.27.1 +toolchain go1.27.2 require ( github.com/charmbracelet/huh v1.0.0 @@ -102,10 +102,10 @@ require ( go.uber.org/zap v1.28.0 // indirect go.yaml.in/yaml/v3 v3.0.5 // indirect golang.org/x/exp v0.0.0-20260718201538-764159d718ef // indirect - golang.org/x/net v0.58.0 // indirect - golang.org/x/sync v0.22.0 // indirect + golang.org/x/net v0.60.0 // indirect + golang.org/x/sync v0.23.0 // indirect golang.org/x/sys v0.48.0 // indirect - golang.org/x/text v0.41.0 // indirect + golang.org/x/text v0.42.0 // indirect gonum.org/v1/gonum v0.17.0 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20260803160001-6ac0973c030d // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20260803160001-6ac0973c030d // indirect diff --git a/go.sum b/go.sum index 1c0bb5bb..9b6e64e3 100644 --- a/go.sum +++ b/go.sum @@ -361,6 +361,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.58.0 h1:ynWG7rqYi4ccpTEuPZ2QGWHktVEM9DMCj9yzDE0Q7To= golang.org/x/net v0.58.0/go.mod h1:YwCddHnFlT7eLQqVprV19OnhLGtc5xOKgE0RyqgfWAU= +golang.org/x/net v0.60.0 h1:79p50tfZlm0J9YfoDsSi639qSXNGVwEzOPLCxM2FsYU= +golang.org/x/net v0.60.0/go.mod h1:2DA/G1UfVbCpQPeWTmMPGY7Cs2PkBkwu743bVX5PIVg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -369,6 +371,8 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.22.0 h1:SZjpbeLmrCk4xhRSZFNZW5gFUeCeFgjekvI/+gfScek= golang.org/x/sync v0.22.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= +golang.org/x/sync v0.23.0 h1:KameEIfc1IkluZyXWLn39Wd4tURc6GbCiISGiZm2bQk= +golang.org/x/sync v0.23.0/go.mod h1:sUUOizhqBxiL6pEWpqNLUiaJn1ShEbZ6BBqskPbjZm0= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -386,6 +390,8 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.41.0 h1:vz/seA0lnX87Othu2f/0L24RcgrXD9/YFTSuGjj3rH8= golang.org/x/text v0.41.0/go.mod h1:jvf1O8ajNzZqhSrQBPbutR/EB83Cc0CFrezNQIwbb5M= +golang.org/x/text v0.42.0 h1:JbOZXgfeCPU9gacVtYliJqOhD+zhrEqK4LfdpmlUZqI= +golang.org/x/text v0.42.0/go.mod h1:ojzP1Z+2QtioaF8DTtO8K5q7JWVVYwZKenzujK0Zd0E= golang.org/x/time v0.16.0 h1:vMb6ptszcQMkcwiRTAuNNU50gom6++Q/6gY2hDM6VDE= golang.org/x/time v0.16.0/go.mod h1:rVKOqvZeKvrDKTQiAHJ7wmwP0RzleSphoEA9RcdLA0s= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= From 38e6a96a9488860c92e2a8fe40441dd4db300c0c Mon Sep 17 00:00:00 2001 From: Ewan Harris Date: Fri, 9 Oct 2026 12:27:34 +0100 Subject: [PATCH 3/3] build: bump golangci-lint to v2.14.0 for go1.27 support The go1.27.2 toolchain writes stdlib export data in format version 5. golangci-lint v2.13.2 depends on golang.org/x/tools v0.49.0, whose importer only reads up to version 4, so lint failed with a typecheck error on the first stdlib import. v2.14.0 moves to x/tools v0.50.0 and adds go1.27 support. It also bundles gofumpt v0.12.0, which fixes the mis-indent that required the gofumpt exclusion for internal/storetest/conversion.go, so the exclusion is removed. --- .github/workflows/main.yaml | 2 +- .golangci.yaml | 4 ---- Makefile | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index e3b3b791..a23f02dc 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -30,7 +30,7 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@ba0d7d2ec06a0ea1cb5fa41b2e4a3ab91d21278a # v9.3.0 with: - version: v2.13.2 + version: v2.14.0 args: -v -c .golangci.yaml audit: diff --git a/.golangci.yaml b/.golangci.yaml index ea95c75d..91416d5d 100644 --- a/.golangci.yaml +++ b/.golangci.yaml @@ -97,10 +97,6 @@ linters: - linters: [revive] text: "avoid package names that conflict with Go standard library package names" path: internal/slices - # gofumpt v0.11.0 (bundled in golangci-lint v2.13.2) mis-indents the - # multi-return composite literal here; remove when golangci-lint bundles - # gofumpt >= v0.12.0. See openfga/cli#750. - - { linters: [gofumpt], path: internal/storetest/conversion.go } paths: - third_party$ - builtin$ diff --git a/Makefile b/Makefile index 12e959f1..53619f19 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ MOCK_SRC_DIR ?= mocks #----------------------------------------------------------------------------------------------------------------------- $(GO_BIN)/golangci-lint: @echo "==> Installing golangci-lint within "${GO_BIN}"" - @go install -v github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.13.2 + @go install -v github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.14.0 $(GO_BIN)/govulncheck: @echo "==> Installing govulncheck within "${GO_BIN}""