Skip to content

Commit

Permalink
chore(deps): Update dependencies and protobuf definitions (#96)
Browse files Browse the repository at this point in the history
Signed-off-by: Oğuzhan Durgun <[email protected]>
  • Loading branch information
oguzhand95 authored Aug 9, 2024
1 parent a35d139 commit 4996284
Show file tree
Hide file tree
Showing 23 changed files with 685 additions and 66 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -137,15 +137,15 @@ jobs:
- name: Install dependencies
run: composer install --prefer-dist --no-progress --no-suggest

- name: Run docker-compose
run: docker-compose up -d
- name: Run docker compose
run: docker compose up -d

- name: Run unit tests
shell: bash
run: make test

- name: Stop docker-compose
run: docker-compose down
- name: Stop docker compose
run: docker compose down

- name: Check repo status
shell: bash
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ validate-composer:

.PHONY: test
test:
docker-compose up -d
docker compose up -d
vendor/bin/phpunit --no-coverage
docker-compose down
docker compose down

.PHONY: generate-proto-code
generate-proto-code:
Expand Down
96 changes: 52 additions & 44 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions protos/cerbos/audit/v1/audit.proto
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ message DecisionLogEntry {
google.protobuf.Timestamp timestamp = 2;
Peer peer = 3;
// Deprecated. Use method.check_resources.inputs instead.
repeated cerbos.engine.v1.CheckInput inputs = 4;
repeated cerbos.engine.v1.CheckInput inputs = 4 [deprecated = true];
// Deprecated. Use method.check_resources.outputs instead.
repeated cerbos.engine.v1.CheckOutput outputs = 5;
repeated cerbos.engine.v1.CheckOutput outputs = 5 [deprecated = true];
// Deprecated. Use method.check_resources.error instead.
string error = 6;
string error = 6 [deprecated = true];
oneof method {
CheckResources check_resources = 7;
PlanResources plan_resources = 8;
Expand Down
6 changes: 6 additions & 0 deletions protos/cerbos/engine/v1/engine.proto
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,7 @@ message Trace {
KIND_VARIABLE = 12;
KIND_VARIABLES = 13;
KIND_OUTPUT = 14;
KIND_ROLE_POLICY_SCOPE = 15;
}

message Variable {
Expand All @@ -325,6 +326,7 @@ message Trace {
string scope = 9;
Variable variable = 10;
string output = 11;
string role_policy_scope = 12;
}
}

Expand Down Expand Up @@ -352,12 +354,16 @@ message Request {
string id = 1;
repeated string roles = 2;
map<string, google.protobuf.Value> attr = 3;
string policy_version = 4;
string scope = 5;
}

message Resource {
string kind = 1;
string id = 2;
map<string, google.protobuf.Value> attr = 3;
string policy_version = 4;
string scope = 5;
}

Principal principal = 1;
Expand Down
Loading

0 comments on commit 4996284

Please sign in to comment.