chore(policy): address merge conflict in proto gencode (#1711)

1. merge with `main` latest 2. `make proto-generate` to build latest gencode from protos to handle the merge conflict in `protocol/go/policy/objects.pb.go`
opentdf · Nov 4, 2024 · 394052a · 394052a
1 parent f64e0cd
commit 394052a
Show file tree

Hide file tree

Showing 15 changed files with 775 additions and 243 deletions.
diff --git a/docs/grpc/index.html b/docs/grpc/index.html
diff --git a/docs/openapi/policy/attributes/attributes.swagger.json b/docs/openapi/policy/attributes/attributes.swagger.json
diff --git a/docs/openapi/policy/kasregistry/key_access_server_registry.swagger.json b/docs/openapi/policy/kasregistry/key_access_server_registry.swagger.json
diff --git a/docs/openapi/policy/namespaces/namespaces.swagger.json b/docs/openapi/policy/namespaces/namespaces.swagger.json
diff --git a/docs/openapi/policy/resourcemapping/resource_mapping.swagger.json b/docs/openapi/policy/resourcemapping/resource_mapping.swagger.json
diff --git a/docs/openapi/policy/subjectmapping/subject_mapping.swagger.json b/docs/openapi/policy/subjectmapping/subject_mapping.swagger.json
diff --git a/docs/openapi/policy/unsafe/unsafe.swagger.json b/docs/openapi/policy/unsafe/unsafe.swagger.json