Skip to content

Commit 767f6e4

Browse files
authored
Merge pull request #97 from authzed/java-multiple-files-option
generate multiple java files
2 parents 435e22f + db4a5c7 commit 767f6e4

10 files changed

Lines changed: 26 additions & 3 deletions

File tree

.github/workflows/lint.yaml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ on:
1010
- "*"
1111
jobs:
1212
lint:
13-
name: "Lint"
13+
name: "Lint & Publish Draft/Branch"
1414
runs-on: "ubuntu-latest"
1515
steps:
1616
- uses: "actions/checkout@v3"
1717
- uses: "authzed/actions/yaml-lint@main"
18-
- uses: "bufbuild/buf-setup-action@v1"
18+
- uses: "bufbuild/buf-setup-action@v1.30.0"
1919
with:
20-
version: "1.22.0"
20+
version: "1.30.0"
2121
- uses: "bufbuild/buf-lint-action@v1"
2222
- uses: "bufbuild/buf-breaking-action@v1"
2323
if: "github.event_name == 'pull_request'"
@@ -33,3 +33,15 @@ jobs:
3333
env:
3434
BUF_TOKEN: "${{ secrets.BUF_REGISTRY_TOKEN }}"
3535
run: "buf push --draft ${{ github.sha }}"
36+
- name: "Push to BSR a Draft"
37+
if: "github.event_name == 'push' && github.ref == 'refs/heads/main'"
38+
shell: "bash"
39+
env:
40+
BUF_TOKEN: "${{ secrets.BUF_REGISTRY_TOKEN }}"
41+
run: "buf push --draft ${{ github.sha }}"
42+
- name: "Push to BSR a Branch"
43+
if: "github.event_name == 'push' && github.ref != 'refs/heads/main'"
44+
shell: "bash"
45+
env:
46+
BUF_TOKEN: "${{ secrets.BUF_REGISTRY_TOKEN }}"
47+
run: "buf push --branch ${{ github.sha }}"

authzed/api/v1/core.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package authzed.api.v1;
33

44
option go_package = "github.com/authzed/authzed-go/proto/authzed/api/v1";
55
option java_package = "com.authzed.api.v1";
6+
option java_multiple_files = true;
67

78
import "google/protobuf/struct.proto";
89
import "validate/validate.proto";

authzed/api/v1/debug.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import "google/protobuf/duration.proto";
88

99
option go_package = "github.com/authzed/authzed-go/proto/authzed/api/v1";
1010
option java_package = "com.authzed.api.v1";
11+
option java_multiple_files = true;
1112

1213
// DebugInformation defines debug information returned by an API call in a footer when
1314
// requested with a specific debugging header.

authzed/api/v1/error_reason.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package authzed.api.v1;
33

44
option go_package = "github.com/authzed/authzed-go/proto/authzed/api/v1";
55
option java_package = "com.authzed.api.v1";
6+
option java_multiple_files = true;
67

78
// Defines the supported values for `google.rpc.ErrorInfo.reason` for the
89
// `authzed.com` error domain.

authzed/api/v1/experimental_service.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package authzed.api.v1;
33

44
option go_package = "github.com/authzed/authzed-go/proto/authzed/api/v1";
55
option java_package = "com.authzed.api.v1";
6+
option java_multiple_files = true;
67

78
import "google/api/annotations.proto";
89
import "validate/validate.proto";

authzed/api/v1/openapi.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package authzed.api.v1;
33

44
option go_package = "github.com/authzed/authzed-go/proto/authzed/api/v1";
55
option java_package = "com.authzed.api.v1";
6+
option java_multiple_files = true;
67

78
import "protoc-gen-openapiv2/options/annotations.proto";
89

authzed/api/v1/permission_service.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package authzed.api.v1;
33

44
option go_package = "github.com/authzed/authzed-go/proto/authzed/api/v1";
55
option java_package = "com.authzed.api.v1";
6+
option java_multiple_files = true;
67

78
import "google/protobuf/struct.proto";
89
import "google/api/annotations.proto";

authzed/api/v1/schema_service.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package authzed.api.v1;
33

44
option go_package = "github.com/authzed/authzed-go/proto/authzed/api/v1";
55
option java_package = "com.authzed.api.v1";
6+
option java_multiple_files = true;
67

78
import "google/api/annotations.proto";
89
import "validate/validate.proto";

authzed/api/v1/watch_service.proto

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package authzed.api.v1;
33

44
option go_package = "github.com/authzed/authzed-go/proto/authzed/api/v1";
55
option java_package = "com.authzed.api.v1";
6+
option java_multiple_files = true;
67

78
import "google/api/annotations.proto";
89
import "validate/validate.proto";

buf.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,6 @@ deps:
88
lint:
99
ignore:
1010
- "authzed/api/v0" # legacy from before we used buf
11+
breaking:
12+
use:
13+
- "WIRE_JSON"

0 commit comments

Comments
 (0)