@@ -16,17 +16,16 @@ EXT_BIN_DIR := ${EXT_DIR}/bin
1616EXT_TMP_DIR := ${EXT_DIR}/tmp
1717
1818VAULT_VER := 1.8.12
19- SVU_VER := 3.1.0
19+ SVU_VER := 3.2.3
2020BUF_VER := 1.52.1
2121
2222PROJECT := authorizer
23- BUF_USER := $(shell ${EXT_BIN_DIR}/vault kv get -field ASERTO_BUF_USER kv/buf.build)
2423BUF_TOKEN := $(shell ${EXT_BIN_DIR}/vault kv get -field ASERTO_BUF_TOKEN kv/buf.build)
2524BUF_REPO := "buf.build/aserto-dev/${PROJECT}"
2625BUF_LATEST := $(shell ${EXT_BIN_DIR}/buf registry module label list ${BUF_REPO} --format json | jq -r '.labels[0].name')
27- BUF_DEV_IMAGE := "${PROJECT}.bin"
28- PROTO_REPO := "pb-${PROJECT}"
26+ BUF_DEV_IMAGE := ${BIN_DIR}/${PROJECT}.bin
2927GIT_ORG := "https://github.com/aserto-dev"
28+ PROTO_REPO := "pb-${PROJECT}"
3029
3130RELEASE_TAG := $$(${EXT_BIN_DIR}/svu current )
3231
@@ -44,7 +43,7 @@ vault-login:
4443.PHONY : buf-login
4544buf-login :
4645 @echo -e " $( ATTN_COLOR) ==> $@ $( NO_COLOR) "
47- @echo ${BUF_TOKEN} | ${EXT_BIN_DIR} /buf registry login --token-stdin
46+ @echo ${BUF_TOKEN} | ${EXT_BIN_DIR} /buf registry login --token-stdin
4847
4948.PHONY : buf-format
5049buf-format :
@@ -64,7 +63,7 @@ buf-breaking:
6463.PHONY : buf-build
6564buf-build : ${BIN_DIR}
6665 @echo -e " $( ATTN_COLOR) ==> $@ $( NO_COLOR) "
67- @${EXT_BIN_DIR} /buf build --output ${BIN_DIR} / ${ BUF_DEV_IMAGE}
66+ @${EXT_BIN_DIR} /buf build --output ${BUF_DEV_IMAGE}
6867
6968.PHONY : buf-push
7069buf-push :
@@ -76,16 +75,6 @@ buf-dep-update:
7675 @echo -e " $( ATTN_COLOR) ==> $@ $( NO_COLOR) "
7776 @${EXT_BIN_DIR} /buf dep update
7877
79- .PHONY : buf-generate
80- buf-generate :
81- @echo -e " $( ATTN_COLOR) ==> $@ ${BUF_REPO} :${BUF_LATEST} $( NO_COLOR) "
82- @${EXT_BIN_DIR} /buf generate ${BUF_REPO} :${BUF_LATEST}
83-
84- .PHONY : buf-generate-dev
85- buf-generate-dev :
86- @echo -e " $( ATTN_COLOR) ==> $@ ../${PROTO_REPO} /bin/${BUF_DEV_IMAGE} $( NO_COLOR) "
87- @${EXT_BIN_DIR} /buf generate " ../${PROTO_REPO} /bin/${BUF_DEV_IMAGE} "
88-
8978.PHONY : info
9079info :
9180 @echo -e " $( ATTN_COLOR) ==> $@ $( NO_COLOR) "
0 commit comments