diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 592029f..65bc106 100644 --- 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 index a6a2bb7..363aede 100644 --- 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 index f5a7a22..31d8685 100644 --- 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 index b1cfe03..9dc6bc5 100644 --- 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 index 5db4582..610aa52 100644 --- 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,11 +88,11 @@ 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 @@ -99,29 +100,16 @@ install-vault: ${EXT_BIN_DIR} ${EXT_TMP_DIR} .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 index 465e374..97ac630 100644 --- a/src/main/java/com/aserto/authorizer/v2/AuthorizerProto.java +++ b/src/main/java/com/aserto/authorizer/v2/AuthorizerProto.java @@ -110,15 +110,15 @@ public static void registerAllExtensions( static { java.lang.String[] descriptorData = { "\n%aserto/authorizer/v2/authorizer.proto\022" + - "\024aserto.authorizer.v2\032\034google/api/annota" + - "tions.proto\032.protoc-gen-openapiv2/option" + - "s/annotations.proto\032\034google/protobuf/str" + - "uct.proto\032 google/protobuf/field_mask.pr" + - "oto\032/aserto/authorizer/v2/api/identity_c" + - "ontext.proto\032-aserto/authorizer/v2/api/p" + - "olicy_context.proto\032%aserto/authorizer/v" + - "2/api/module.proto\032.aserto/authorizer/v2" + - "/api/policy_instance.proto\"\r\n\013InfoReques" + + "\024aserto.authorizer.v2\032/aserto/authorizer" + + "/v2/api/identity_context.proto\032%aserto/a" + + "uthorizer/v2/api/module.proto\032-aserto/au" + + "thorizer/v2/api/policy_context.proto\032.as" + + "erto/authorizer/v2/api/policy_instance.p" + + "roto\032\034google/api/annotations.proto\032 goog" + + "le/protobuf/field_mask.proto\032\034google/pro" + + "tobuf/struct.proto\032.protoc-gen-openapiv2" + + "/options/annotations.proto\"\r\n\013InfoReques" + "t\"x\n\014InfoResponse\022\030\n\007version\030\001 \001(\tR\007vers" + "ion\022\026\n\006commit\030\002 \001(\tR\006commit\022\022\n\004date\030\003 \001(" + "\tR\004date\022\016\n\002os\030\004 \001(\tR\002os\022\022\n\004arch\030\005 \001(\tR\004a" + @@ -273,14 +273,14 @@ public static void registerAllExtensions( descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - com.google.api.AnnotationsProto.getDescriptor(), - com.grpc.gateway.protoc_gen_openapiv2.options.AnnotationsProto.getDescriptor(), - com.google.protobuf.StructProto.getDescriptor(), - com.google.protobuf.FieldMaskProto.getDescriptor(), com.aserto.authorizer.v2.api.IdentityContextProto.getDescriptor(), - com.aserto.authorizer.v2.api.PolicyContextProto.getDescriptor(), com.aserto.authorizer.v2.api.ModuleProto.getDescriptor(), + com.aserto.authorizer.v2.api.PolicyContextProto.getDescriptor(), com.aserto.authorizer.v2.api.PolicyInstanceProto.getDescriptor(), + com.google.api.AnnotationsProto.getDescriptor(), + com.google.protobuf.FieldMaskProto.getDescriptor(), + com.google.protobuf.StructProto.getDescriptor(), + com.grpc.gateway.protoc_gen_openapiv2.options.AnnotationsProto.getDescriptor(), }); internal_static_aserto_authorizer_v2_InfoRequest_descriptor = getDescriptor().getMessageTypes().get(0); @@ -391,14 +391,14 @@ public static void registerAllExtensions( registry.add(com.grpc.gateway.protoc_gen_openapiv2.options.AnnotationsProto.openapiv2Swagger); com.google.protobuf.Descriptors.FileDescriptor .internalUpdateFileDescriptor(descriptor, registry); - com.google.api.AnnotationsProto.getDescriptor(); - com.grpc.gateway.protoc_gen_openapiv2.options.AnnotationsProto.getDescriptor(); - com.google.protobuf.StructProto.getDescriptor(); - com.google.protobuf.FieldMaskProto.getDescriptor(); com.aserto.authorizer.v2.api.IdentityContextProto.getDescriptor(); - com.aserto.authorizer.v2.api.PolicyContextProto.getDescriptor(); com.aserto.authorizer.v2.api.ModuleProto.getDescriptor(); + com.aserto.authorizer.v2.api.PolicyContextProto.getDescriptor(); com.aserto.authorizer.v2.api.PolicyInstanceProto.getDescriptor(); + com.google.api.AnnotationsProto.getDescriptor(); + com.google.protobuf.FieldMaskProto.getDescriptor(); + com.google.protobuf.StructProto.getDescriptor(); + com.grpc.gateway.protoc_gen_openapiv2.options.AnnotationsProto.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/main/java/com/aserto/authorizer/v2/api/Decision.java b/src/main/java/com/aserto/authorizer/v2/api/Decision.java index d37c66d..7ae9fca 100644 --- a/src/main/java/com/aserto/authorizer/v2/api/Decision.java +++ b/src/main/java/com/aserto/authorizer/v2/api/Decision.java @@ -235,7 +235,7 @@ public com.aserto.authorizer.v2.api.DecisionUserOrBuilder getUserOrBuilder() { private com.aserto.authorizer.v2.api.DecisionPolicy policy_; /** * 
-   * info about policy used for the decision    
+   * info about policy used for the decision
    *
* * .aserto.authorizer.v2.api.DecisionPolicy policy = 5 [json_name = "policy"]; @@ -247,7 +247,7 @@ public boolean hasPolicy() { } /** * 
-   * info about policy used for the decision    
+   * info about policy used for the decision
    *
* * .aserto.authorizer.v2.api.DecisionPolicy policy = 5 [json_name = "policy"]; @@ -259,7 +259,7 @@ public com.aserto.authorizer.v2.api.DecisionPolicy getPolicy() { } /** * 
-   * info about policy used for the decision    
+   * info about policy used for the decision
    *
* * .aserto.authorizer.v2.api.DecisionPolicy policy = 5 [json_name = "policy"]; @@ -428,7 +428,7 @@ public int getAnnotationsCount() { } /** * 
-   * annotations that may be added to a decision    
+   * annotations that may be added to a decision
    *
* * map<string, string> annotations = 8 [json_name = "annotations"]; @@ -449,7 +449,7 @@ public java.util.Map getAnnotations() { } /** * 
-   * annotations that may be added to a decision    
+   * annotations that may be added to a decision
    *
* * map<string, string> annotations = 8 [json_name = "annotations"]; @@ -460,7 +460,7 @@ public java.util.Map getAnnotationsMap() { } /** * 
-   * annotations that may be added to a decision    
+   * annotations that may be added to a decision
    *
* * map<string, string> annotations = 8 [json_name = "annotations"]; @@ -478,7 +478,7 @@ java.lang.String getAnnotationsOrDefault( } /** * 
-   * annotations that may be added to a decision    
+   * annotations that may be added to a decision
    *
* * map<string, string> annotations = 8 [json_name = "annotations"]; @@ -1704,7 +1704,7 @@ public com.aserto.authorizer.v2.api.DecisionUserOrBuilder getUserOrBuilder() { com.aserto.authorizer.v2.api.DecisionPolicy, com.aserto.authorizer.v2.api.DecisionPolicy.Builder, com.aserto.authorizer.v2.api.DecisionPolicyOrBuilder> policyBuilder_; /** * 
-     * info about policy used for the decision    
+     * info about policy used for the decision
      *
* * .aserto.authorizer.v2.api.DecisionPolicy policy = 5 [json_name = "policy"]; @@ -1715,7 +1715,7 @@ public boolean hasPolicy() { } /** * 
-     * info about policy used for the decision    
+     * info about policy used for the decision
      *
* * .aserto.authorizer.v2.api.DecisionPolicy policy = 5 [json_name = "policy"]; @@ -1730,7 +1730,7 @@ public com.aserto.authorizer.v2.api.DecisionPolicy getPolicy() { } /** * 
-     * info about policy used for the decision    
+     * info about policy used for the decision
      *
* * .aserto.authorizer.v2.api.DecisionPolicy policy = 5 [json_name = "policy"]; @@ -1750,7 +1750,7 @@ public Builder setPolicy(com.aserto.authorizer.v2.api.DecisionPolicy value) { } /** * 
-     * info about policy used for the decision    
+     * info about policy used for the decision
      *
* * .aserto.authorizer.v2.api.DecisionPolicy policy = 5 [json_name = "policy"]; @@ -1768,7 +1768,7 @@ public Builder setPolicy( } /** * 
-     * info about policy used for the decision    
+     * info about policy used for the decision
      *
* * .aserto.authorizer.v2.api.DecisionPolicy policy = 5 [json_name = "policy"]; @@ -1793,7 +1793,7 @@ public Builder mergePolicy(com.aserto.authorizer.v2.api.DecisionPolicy value) { } /** * 
-     * info about policy used for the decision    
+     * info about policy used for the decision
      *
* * .aserto.authorizer.v2.api.DecisionPolicy policy = 5 [json_name = "policy"]; @@ -1810,7 +1810,7 @@ public Builder clearPolicy() { } /** * 
-     * info about policy used for the decision    
+     * info about policy used for the decision
      *
* * .aserto.authorizer.v2.api.DecisionPolicy policy = 5 [json_name = "policy"]; @@ -1822,7 +1822,7 @@ public com.aserto.authorizer.v2.api.DecisionPolicy.Builder getPolicyBuilder() { } /** * 
-     * info about policy used for the decision    
+     * info about policy used for the decision
      *
* * .aserto.authorizer.v2.api.DecisionPolicy policy = 5 [json_name = "policy"]; @@ -1837,7 +1837,7 @@ public com.aserto.authorizer.v2.api.DecisionPolicyOrBuilder getPolicyOrBuilder() } /** * 
-     * info about policy used for the decision    
+     * info about policy used for the decision
      *
* * .aserto.authorizer.v2.api.DecisionPolicy policy = 5 [json_name = "policy"]; @@ -2194,7 +2194,7 @@ public int getAnnotationsCount() { } /** * 
-     * annotations that may be added to a decision    
+     * annotations that may be added to a decision
      *
* * map<string, string> annotations = 8 [json_name = "annotations"]; @@ -2215,7 +2215,7 @@ public java.util.Map getAnnotations() { } /** * 
-     * annotations that may be added to a decision    
+     * annotations that may be added to a decision
      *
* * map<string, string> annotations = 8 [json_name = "annotations"]; @@ -2226,7 +2226,7 @@ public java.util.Map getAnnotationsMap() { } /** * 
-     * annotations that may be added to a decision    
+     * annotations that may be added to a decision
      *
* * map<string, string> annotations = 8 [json_name = "annotations"]; @@ -2244,7 +2244,7 @@ java.lang.String getAnnotationsOrDefault( } /** * 
-     * annotations that may be added to a decision    
+     * annotations that may be added to a decision
      *
* * map<string, string> annotations = 8 [json_name = "annotations"]; @@ -2268,7 +2268,7 @@ public Builder clearAnnotations() { } /** * 
-     * annotations that may be added to a decision    
+     * annotations that may be added to a decision
      *
* * map<string, string> annotations = 8 [json_name = "annotations"]; @@ -2291,7 +2291,7 @@ public Builder removeAnnotations( } /** * 
-     * annotations that may be added to a decision    
+     * annotations that may be added to a decision
      *
* * map<string, string> annotations = 8 [json_name = "annotations"]; @@ -2308,7 +2308,7 @@ public Builder putAnnotations( } /** * 
-     * annotations that may be added to a decision    
+     * annotations that may be added to a decision
      *
* * map<string, string> annotations = 8 [json_name = "annotations"]; diff --git a/src/main/java/com/aserto/authorizer/v2/api/DecisionLogsProto.java b/src/main/java/com/aserto/authorizer/v2/api/DecisionLogsProto.java index 069e567..d26f831 100644 --- a/src/main/java/com/aserto/authorizer/v2/api/DecisionLogsProto.java +++ b/src/main/java/com/aserto/authorizer/v2/api/DecisionLogsProto.java @@ -50,12 +50,12 @@ public static void registerAllExtensions( static { java.lang.String[] descriptorData = { "\n,aserto/authorizer/v2/api/decision_logs" + - ".proto\022\030aserto.authorizer.v2.api\032\034google" + - "/protobuf/struct.proto\032\037google/protobuf/" + - "timestamp.proto\032-aserto/authorizer/v2/ap" + - "i/policy_context.proto\032/aserto/authorize" + - "r/v2/api/identity_context.proto\032.aserto/" + - "authorizer/v2/api/policy_instance.proto\"" + + ".proto\022\030aserto.authorizer.v2.api\032/aserto" + + "/authorizer/v2/api/identity_context.prot" + + "o\032-aserto/authorizer/v2/api/policy_conte" + + "xt.proto\032.aserto/authorizer/v2/api/polic" + + "y_instance.proto\032\034google/protobuf/struct" + + ".proto\032\037google/protobuf/timestamp.proto\"" + "\355\004\n\010Decision\022\016\n\002id\030\001 \001(\tR\002id\0228\n\ttimestam" + "p\030\002 \001(\0132\032.google.protobuf.TimestampR\ttim" + "estamp\022\022\n\004path\030\003 \001(\tR\004path\022:\n\004user\030\004 \001(\013" + @@ -94,11 +94,11 @@ public static void registerAllExtensions( descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { - com.google.protobuf.StructProto.getDescriptor(), - com.google.protobuf.TimestampProto.getDescriptor(), - com.aserto.authorizer.v2.api.PolicyContextProto.getDescriptor(), com.aserto.authorizer.v2.api.IdentityContextProto.getDescriptor(), + com.aserto.authorizer.v2.api.PolicyContextProto.getDescriptor(), com.aserto.authorizer.v2.api.PolicyInstanceProto.getDescriptor(), + com.google.protobuf.StructProto.getDescriptor(), + com.google.protobuf.TimestampProto.getDescriptor(), }); internal_static_aserto_authorizer_v2_api_Decision_descriptor = getDescriptor().getMessageTypes().get(0); @@ -130,11 +130,11 @@ public static void registerAllExtensions( com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_aserto_authorizer_v2_api_DecisionPolicy_descriptor, new java.lang.String[] { "Context", "RegistryService", "RegistryImage", "RegistryTag", "RegistryDigest", "PolicyInstance", }); - com.google.protobuf.StructProto.getDescriptor(); - com.google.protobuf.TimestampProto.getDescriptor(); - com.aserto.authorizer.v2.api.PolicyContextProto.getDescriptor(); com.aserto.authorizer.v2.api.IdentityContextProto.getDescriptor(); + com.aserto.authorizer.v2.api.PolicyContextProto.getDescriptor(); com.aserto.authorizer.v2.api.PolicyInstanceProto.getDescriptor(); + com.google.protobuf.StructProto.getDescriptor(); + com.google.protobuf.TimestampProto.getDescriptor(); } // @@protoc_insertion_point(outer_class_scope) diff --git a/src/main/java/com/aserto/authorizer/v2/api/DecisionOrBuilder.java b/src/main/java/com/aserto/authorizer/v2/api/DecisionOrBuilder.java index 555c578..991f7de 100644 --- a/src/main/java/com/aserto/authorizer/v2/api/DecisionOrBuilder.java +++ b/src/main/java/com/aserto/authorizer/v2/api/DecisionOrBuilder.java @@ -104,7 +104,7 @@ public interface DecisionOrBuilder extends /** * 
-   * info about policy used for the decision    
+   * info about policy used for the decision
    *
* * .aserto.authorizer.v2.api.DecisionPolicy policy = 5 [json_name = "policy"]; @@ -113,7 +113,7 @@ public interface DecisionOrBuilder extends boolean hasPolicy(); /** * 
-   * info about policy used for the decision    
+   * info about policy used for the decision
    *
* * .aserto.authorizer.v2.api.DecisionPolicy policy = 5 [json_name = "policy"]; @@ -122,7 +122,7 @@ public interface DecisionOrBuilder extends com.aserto.authorizer.v2.api.DecisionPolicy getPolicy(); /** * 
-   * info about policy used for the decision    
+   * info about policy used for the decision
    *
* * .aserto.authorizer.v2.api.DecisionPolicy policy = 5 [json_name = "policy"]; @@ -210,7 +210,7 @@ boolean getOutcomesOrThrow( /** * 
-   * annotations that may be added to a decision    
+   * annotations that may be added to a decision
    *
* * map<string, string> annotations = 8 [json_name = "annotations"]; @@ -218,7 +218,7 @@ boolean getOutcomesOrThrow( int getAnnotationsCount(); /** * 
-   * annotations that may be added to a decision    
+   * annotations that may be added to a decision
    *
* * map<string, string> annotations = 8 [json_name = "annotations"]; @@ -233,7 +233,7 @@ boolean containsAnnotations( getAnnotations(); /** * 
-   * annotations that may be added to a decision    
+   * annotations that may be added to a decision
    *
* * map<string, string> annotations = 8 [json_name = "annotations"]; @@ -242,7 +242,7 @@ boolean containsAnnotations( getAnnotationsMap(); /** * 
-   * annotations that may be added to a decision    
+   * annotations that may be added to a decision
    *
* * map<string, string> annotations = 8 [json_name = "annotations"]; @@ -254,7 +254,7 @@ java.lang.String getAnnotationsOrDefault( java.lang.String defaultValue); /** * 
-   * annotations that may be added to a decision    
+   * annotations that may be added to a decision
    *
* * map<string, string> annotations = 8 [json_name = "annotations"]; diff --git a/src/main/java/com/aserto/authorizer/v2/api/DecisionPolicy.java b/src/main/java/com/aserto/authorizer/v2/api/DecisionPolicy.java index b036238..f326f09 100644 --- a/src/main/java/com/aserto/authorizer/v2/api/DecisionPolicy.java +++ b/src/main/java/com/aserto/authorizer/v2/api/DecisionPolicy.java @@ -232,7 +232,7 @@ public java.lang.String getRegistryTag() { private volatile java.lang.Object registryDigest_ = ""; /** * 
-   * digest of the policy image 
+   * digest of the policy image
    *
* * string registry_digest = 5 [json_name = "registryDigest"]; @@ -253,7 +253,7 @@ public java.lang.String getRegistryDigest() { } /** * 
-   * digest of the policy image 
+   * digest of the policy image
    *
* * string registry_digest = 5 [json_name = "registryDigest"]; @@ -1233,7 +1233,7 @@ public Builder setRegistryTagBytes( private java.lang.Object registryDigest_ = ""; /** * 
-     * digest of the policy image 
+     * digest of the policy image
      *
* * string registry_digest = 5 [json_name = "registryDigest"]; @@ -1253,7 +1253,7 @@ public java.lang.String getRegistryDigest() { } /** * 
-     * digest of the policy image 
+     * digest of the policy image
      *
* * string registry_digest = 5 [json_name = "registryDigest"]; @@ -1274,7 +1274,7 @@ public java.lang.String getRegistryDigest() { } /** * 
-     * digest of the policy image 
+     * digest of the policy image
      *
* * string registry_digest = 5 [json_name = "registryDigest"]; @@ -1291,7 +1291,7 @@ public Builder setRegistryDigest( } /** * 
-     * digest of the policy image 
+     * digest of the policy image
      *
* * string registry_digest = 5 [json_name = "registryDigest"]; @@ -1305,7 +1305,7 @@ public Builder clearRegistryDigest() { } /** * 
-     * digest of the policy image 
+     * digest of the policy image
      *
* * string registry_digest = 5 [json_name = "registryDigest"]; diff --git a/src/main/java/com/aserto/authorizer/v2/api/DecisionPolicyOrBuilder.java b/src/main/java/com/aserto/authorizer/v2/api/DecisionPolicyOrBuilder.java index 7a6a69d..122dca9 100644 --- a/src/main/java/com/aserto/authorizer/v2/api/DecisionPolicyOrBuilder.java +++ b/src/main/java/com/aserto/authorizer/v2/api/DecisionPolicyOrBuilder.java @@ -97,7 +97,7 @@ public interface DecisionPolicyOrBuilder extends /** * 
-   * digest of the policy image 
+   * digest of the policy image
    *
* * string registry_digest = 5 [json_name = "registryDigest"]; @@ -106,7 +106,7 @@ public interface DecisionPolicyOrBuilder extends java.lang.String getRegistryDigest(); /** * 
-   * digest of the policy image 
+   * digest of the policy image
    *
* * string registry_digest = 5 [json_name = "registryDigest"]; diff --git a/src/main/java/com/aserto/authorizer/v2/api/DecisionUser.java b/src/main/java/com/aserto/authorizer/v2/api/DecisionUser.java index 5f5dafd..0fdc335 100644 --- a/src/main/java/com/aserto/authorizer/v2/api/DecisionUser.java +++ b/src/main/java/com/aserto/authorizer/v2/api/DecisionUser.java @@ -89,7 +89,7 @@ public com.aserto.authorizer.v2.api.IdentityContextOrBuilder getContextOrBuilder private volatile java.lang.Object id_ = ""; /** * 
-   * id of the user the identity resolved to    
+   * id of the user the identity resolved to
    *
* * string id = 2 [json_name = "id"]; @@ -110,7 +110,7 @@ public java.lang.String getId() { } /** * 
-   * id of the user the identity resolved to    
+   * id of the user the identity resolved to
    *
* * string id = 2 [json_name = "id"]; @@ -737,7 +737,7 @@ public com.aserto.authorizer.v2.api.IdentityContextOrBuilder getContextOrBuilder private java.lang.Object id_ = ""; /** * 
-     * id of the user the identity resolved to    
+     * id of the user the identity resolved to
      *
* * string id = 2 [json_name = "id"]; @@ -757,7 +757,7 @@ public java.lang.String getId() { } /** * 
-     * id of the user the identity resolved to    
+     * id of the user the identity resolved to
      *
* * string id = 2 [json_name = "id"]; @@ -778,7 +778,7 @@ public java.lang.String getId() { } /** * 
-     * id of the user the identity resolved to    
+     * id of the user the identity resolved to
      *
* * string id = 2 [json_name = "id"]; @@ -795,7 +795,7 @@ public Builder setId( } /** * 
-     * id of the user the identity resolved to    
+     * id of the user the identity resolved to
      *
* * string id = 2 [json_name = "id"]; @@ -809,7 +809,7 @@ public Builder clearId() { } /** * 
-     * id of the user the identity resolved to    
+     * id of the user the identity resolved to
      *
* * string id = 2 [json_name = "id"]; diff --git a/src/main/java/com/aserto/authorizer/v2/api/DecisionUserOrBuilder.java b/src/main/java/com/aserto/authorizer/v2/api/DecisionUserOrBuilder.java index 653a912..47da50e 100644 --- a/src/main/java/com/aserto/authorizer/v2/api/DecisionUserOrBuilder.java +++ b/src/main/java/com/aserto/authorizer/v2/api/DecisionUserOrBuilder.java @@ -37,7 +37,7 @@ public interface DecisionUserOrBuilder extends /** * 
-   * id of the user the identity resolved to    
+   * id of the user the identity resolved to
    *
* * string id = 2 [json_name = "id"]; @@ -46,7 +46,7 @@ public interface DecisionUserOrBuilder extends java.lang.String getId(); /** * 
-   * id of the user the identity resolved to    
+   * id of the user the identity resolved to
    *
* * string id = 2 [json_name = "id"];