aserto-dev · gertd · May 14, 2025 · May 14, 2025 · May 14, 2025
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -145,7 +145,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: test
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
-    name: release to maven central
+    name: Release to maven central
     steps:
       -
         name: Read configuration

diff --git a/buf.gen.yaml b/buf.gen.yaml
@@ -1,12 +1,14 @@
-version: v1
+version: v2
 
 managed:
   enabled: true
-  java_package_prefix: com
-
+  override:
+    - file_option: java_package_prefix
+      value: com
+
 plugins:
-  - plugin: buf.build/grpc/java:v1.64.0
+  - remote: buf.build/grpc/java:v1.64.0
     out: src/main/java
 
-  - plugin: buf.build/protocolbuffers/java:v25.3
+  - remote: buf.build/protocolbuffers/java:v25.3
     out: src/main/java
diff --git a/buf.yaml b/buf.yaml
@@ -1,20 +1,2 @@
-version: v1
+version: v2
 
-deps:
-  - buf.build/aserto-dev/aserto
-
-lint:
-  use:
-    - DEFAULT
-  except:
-    - PACKAGE_DIRECTORY_MATCH
-    - SERVICE_SUFFIX
-    - PACKAGE_VERSION_SUFFIX
-  enum_zero_value_suffix: _UNKNOWN
-
-breaking:
-  use:
-    - FILE
-    - PACKAGE
-    - WIRE
-    - WIRE_JSON
diff --git a/examples/README.md b/examples/README.md
@@ -35,7 +35,7 @@ topaz configure -d -s -r ghcr.io/aserto-policies/policy-todo:v2 todo
 
 ```bash
 topaz stop 
-wget https://raw.githubusercontent.com/aserto-dev/topaz/main/pkg/testing/assets/eds-citadel.db -O ~/.config/topaz/db/directory.db
+wget https://www.topaz.sh/assets/templates/v32/citadel/db/citadel.db -O ~/.config/topaz/db/directory.db
 ```
 
 * Start topaz

diff --git a/makefile b/makefile
@@ -1,33 +1,34 @@
-SHELL 	   		:= $(shell which bash)
+SHELL              := $(shell which bash)
 
-NO_COLOR   		:= \033[0m
-OK_COLOR   		:= \033[32;01m
-ERR_COLOR  		:= \033[31;01m
-WARN_COLOR 		:= \033[36;01m
-ATTN_COLOR 		:= \033[33;01m
+NO_COLOR           := \033[0m
+OK_COLOR           := \033[32;01m
+ERR_COLOR          := \033[31;01m
+WARN_COLOR         := \033[36;01m
+ATTN_COLOR         := \033[33;01m
 
-GOOS          := $(shell go env GOOS)
-GOARCH        := $(shell go env GOARCH)
-GOPRIVATE     := "github.com/aserto-dev"
+GOOS               := $(shell go env GOOS)
+GOARCH             := $(shell go env GOARCH)
+GOPRIVATE          := "github.com/aserto-dev"
 
-EXT_DIR       := ${PWD}/.ext
-EXT_BIN_DIR   := ${EXT_DIR}/bin
-EXT_TMP_DIR   := ${EXT_DIR}/tmp
+EXT_DIR            := ${PWD}/.ext
+EXT_BIN_DIR        := ${EXT_DIR}/bin
+EXT_TMP_DIR        := ${EXT_DIR}/tmp
 
-VAULT_VERSION := 1.8.12
-SVU_VERSION   := 1.12.0
-BUF_VERSION   := 1.30.0
-GRPC_GATEWAY  := 2.20.0
-PROTO_VALIDATE:= 0.6.2
+VAULT_VER          := 1.8.12
+SVU_VER            := 3.2.3
+BUF_VER            := 1.52.1
+GRPC_GATEWAY       := 2.20.0
 
-BUF_REPO      := "buf.build/aserto-dev/authorizer"
-BUF_DEV_IMAGE := "../pb-authorizer/bin/authorzer.bin"
-BUF_USER      ?= $(shell vault kv get -field ASERTO_BUF_USER kv/buf.build)
-BUF_TOKEN     ?= $(shell vault kv get -field ASERTO_BUF_TOKEN kv/buf.build)
-BUF_LATEST		:= $(shell BUF_BETA_SUPPRESS_WARNINGS=1 ${EXT_BIN_DIR}/buf beta registry tag list ${BUF_REPO} --format json --reverse | jq -r '.results[0].name')
+PROJECT            := authorizer
+BUF_TOKEN          := $(shell vault kv get -field ASERTO_BUF_TOKEN kv/buf.build)
+BUF_REPO           := "buf.build/aserto-dev/${PROJECT}"
+BUF_LATEST         := $(shell ${EXT_BIN_DIR}/buf registry module label list ${BUF_REPO} --format json | jq -r '.labels[0].name')
+BUF_DEV_IMAGE      := "../pb-${PROJECT}/bin/${PROJECT}.bin"
 
-RELEASE_TAG   := $$(svu)
-NEXT_VERSION  := $$(svu patch --strip-prefix)
+RELEASE_TAG        := $$(${EXT_BIN_DIR}/svu current)
+NEXT_VERSION       := $$(svu patch --strip-prefix)
+
+.DEFAULT_GOAL      := buf-generate
 
 .PHONY: deps
 deps: info install-vault install-buf install-svu
@@ -62,14 +63,14 @@ vault-login:
 .PHONY: buf-login
 buf-login:
 	@echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)"
-	@echo ${BUF_TOKEN} | ${EXT_BIN_DIR}/buf registry login --username ${BUF_USER} --token-stdin
+	@echo ${BUF_TOKEN} | ${EXT_BIN_DIR}/buf registry login --token-stdin
 
 .PHONY: buf-generate
 buf-generate:
 	@echo -e "$(ATTN_COLOR)==> $@ ${BUF_REPO}:${BUF_LATEST}$(NO_COLOR)"
 	@${EXT_BIN_DIR}/buf generate ${BUF_REPO}:${BUF_LATEST}
 	@${EXT_BIN_DIR}/buf generate buf.build/grpc-ecosystem/grpc-gateway:v${GRPC_GATEWAY}
-
+	
 .PHONY: buf-generate-dev
 buf-generate-dev:
 	@echo -e "$(ATTN_COLOR)==> $@ ${BUF_DEV_IMAGE}$(NO_COLOR)"
@@ -87,41 +88,28 @@ info:
 	@echo "BUF_REPO:      ${BUF_REPO}"
 	@echo "BUF_LATEST:    ${BUF_LATEST}"
 	@echo "BUF_DEV_IMAGE: ${BUF_DEV_IMAGE}"
-
+	
 .PHONY: install-vault
 install-vault: ${EXT_BIN_DIR} ${EXT_TMP_DIR}
 	@echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)"
-	@curl -s -o ${EXT_TMP_DIR}/vault.zip https://releases.hashicorp.com/vault/${VAULT_VERSION}/vault_${VAULT_VERSION}_${GOOS}_${GOARCH}.zip
+	@curl -s -o ${EXT_TMP_DIR}/vault.zip https://releases.hashicorp.com/vault/${VAULT_VER}/vault_${VAULT_VER}_${GOOS}_${GOARCH}.zip
 	@unzip -o ${EXT_TMP_DIR}/vault.zip vault -d ${EXT_BIN_DIR}/  &> /dev/null
 	@chmod +x ${EXT_BIN_DIR}/vault
 	@${EXT_BIN_DIR}/vault --version 
 
 .PHONY: install-buf
 install-buf: ${EXT_BIN_DIR}
 	@echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)"
-	@gh release download v${BUF_VERSION} --repo https://github.com/bufbuild/buf --dir ${EXT_TMP_DIR}/buf --clobber
-	@mv ${EXT_TMP_DIR}/buf/"buf-$$(uname -s)-$$(uname -m)" ${EXT_BIN_DIR}/buf
+	@gh release download v${BUF_VER} --repo https://github.com/bufbuild/buf --pattern "buf-$$(uname -s)-$$(uname -m)" --output "${EXT_BIN_DIR}/buf" --clobber
 	@chmod +x ${EXT_BIN_DIR}/buf
 	@${EXT_BIN_DIR}/buf --version
 
 .PHONY: install-svu
-install-svu: install-svu-${GOOS}
+install-svu: ${EXT_BIN_DIR} ${EXT_TMP_DIR}
 	@echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)"
-	@chmod +x ${EXT_BIN_DIR}/svu
+	@GOBIN=${EXT_BIN_DIR} go install github.com/caarlos0/svu/v3@v${SVU_VER}
 	@${EXT_BIN_DIR}/svu --version
 
-.PHONY: install-svu-darwin
-install-svu-darwin: ${EXT_TMP_DIR} ${EXT_BIN_DIR}
-	@echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)"
-	@gh release download --repo https://github.com/caarlos0/svu --pattern "svu_*_darwin_all.tar.gz" --output "${EXT_TMP_DIR}/svu.tar.gz" --clobber
-	@tar -xvf ${EXT_TMP_DIR}/svu.tar.gz --directory ${EXT_BIN_DIR} svu &> /dev/null
-
-.PHONY: install-svu-linux
-install-svu-linux: ${EXT_TMP_DIR} ${EXT_BIN_DIR}
-	@echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)"
-	@gh release download --repo https://github.com/caarlos0/svu --pattern "svu_*_linux_${GOARCH}.tar.gz" --output "${EXT_TMP_DIR}/svu.tar.gz" --clobber
-	@tar -xvf ${EXT_TMP_DIR}/svu.tar.gz --directory ${EXT_BIN_DIR} svu &> /dev/null
-
 .PHONY: clean
 clean: clean-gen
 	@echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)"
@@ -135,6 +123,10 @@ clean-gen:
 	@rm -rf ./src/main/java/com
 	@rm -rf ./target
 
+${BIN_DIR}:
+	@echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)"
+	@mkdir -p ${BIN_DIR}
+
 ${EXT_BIN_DIR}:
 	@echo -e "$(ATTN_COLOR)==> $@ $(NO_COLOR)"
 	@mkdir -p ${EXT_BIN_DIR}

diff --git a/src/main/java/com/aserto/authorizer/v2/AuthorizerProto.java b/src/main/java/com/aserto/authorizer/v2/AuthorizerProto.java