Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add v2 modules to integration tests #2682

Merged
merged 9 commits into from
Dec 29, 2023
Merged

Add v2 modules to integration tests #2682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fc3a10b
Add `v2` modules to buf/cmd/buf integration tests
doriable Dec 13, 2023
0d135b5
Merge branch 'bufmod' into BSR-3130-v2-workspace-tests
bufdev Dec 27, 2023
87fb7c7
Merge remote-tracking branch 'origin/bufmod' into BSR-3130-v2-workspa…
doriable Dec 27, 2023
288719f
Add v2 workspace ignores test to buflint
doriable Dec 27, 2023
2e4fa06
Remove extraneous code
doriable Dec 27, 2023
9fca240
Merge remote-tracking branch 'origin/bufmod' into BSR-3130-v2-workspa…
doriable Dec 27, 2023
ec4c347
Add back missing err check in test
doriable Dec 27, 2023
0b912b7
Merge remote-tracking branch 'origin/bufmod' into BSR-3130-v2-workspa…
doriable Dec 28, 2023
05eefe9
Address comments
doriable Dec 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/fail/v2/absolute/buf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
version: v2
modules:
- directory: /home/buf
3 changes: 3 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/fail/v2/absolute/windows/buf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
version: v2
modules:
- directory: C:\buf
4 changes: 4 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/fail/v2/duplicate/buf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
version: v2
modules:
- directory: other/proto
- directory: proto
7 changes: 7 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/fail/v2/duplicate/other/proto/foo.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
syntax = "proto3";

package foo;

message Foo {}

message Bar {}
5 changes: 5 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/fail/v2/duplicate/proto/foo.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
syntax = "proto3";

package foo;

message Foo {}
3 changes: 3 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/fail/v2/jumpcontext/buf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
version: v2
modules:
- directory: ../breaking/other/proto
3 changes: 3 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/fail/v2/notexist/buf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
version: v2
modules:
- directory: notexist
9 changes: 9 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/fail/v2/symlink/a/a.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
syntax = "proto3";

package a;

import "b.proto";

message A {
b.B b = 1;
}
1 change: 1 addition & 0 deletions private/buf/cmd/buf/testdata/workspace/fail/v2/symlink/b
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../success/v2/transitive/private/proto
4 changes: 4 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/fail/v2/symlink/buf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
version: v2
modules:
- directory: a
- directory: b
5 changes: 5 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/success/v2/breaking/a/proto/a/v1/a.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
syntax = "proto3";

package a.v1;

message A {}
7 changes: 7 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/success/v2/breaking/buf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
version: v2
modules:
- directory: a/proto
- directory: other/proto
name: bufbuild.test/workspace/request
- directory: proto
name: bufbuild.test/workspace/rpc
5 changes: 5 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/success/v2/breaking/other/proto/request.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
syntax = "proto3";

package request;

message Request {}
9 changes: 9 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/success/v2/breaking/proto/rpc.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
syntax = "proto3";

package example;

import "request.proto";

message RPC {
request.Request request = 1;
}
3 changes: 3 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/success/v2/detached/buf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
version: v2
modules:
- directory: other/proto
7 changes: 7 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/success/v2/detached/other/proto/request.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
syntax = "proto3";

package request;

message Request {
string name = 1;
}
9 changes: 9 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/success/v2/detached/proto/rpc.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
syntax = "proto3";

package example;

import "request.proto";

message RPC {
request.Request req = 1;
}
12 changes: 12 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/success/v2/diamond/buf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
version: v2
modules:
- directory: other/proto
- directory: private/proto
- directory: proto
name: bufbuild.test/workspace/first
lint:
except:
- PACKAGE_NO_IMPORT_CYCLE
deps:
- bufbuild.test/workspace/second
- bufbuild.test/workspace/third
5 changes: 5 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/success/v2/diamond/other/proto/c.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
syntax = "proto3";

package c;

message C {}
9 changes: 9 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/success/v2/diamond/private/proto/b.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
syntax = "proto3";

package b;

import "c.proto";

message B {
c.C c = 1;
}
11 changes: 11 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/success/v2/diamond/proto/a.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
syntax = "proto3";

package a;

import "b.proto";
import "c.proto";

message A {
b.B b = 1;
c.C c = 2;
}
5 changes: 5 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/success/v2/diamond/proto/buf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
version: v1
name: bufbuild.test/workspace/first
deps:
- bufbuild.test/workspace/second
- bufbuild.test/workspace/third
5 changes: 5 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/success/v2/dir/a/proto/a/v1/a.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
syntax = "proto3";

package a.v1;

message A {}
7 changes: 7 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/success/v2/dir/buf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
version: v2
modules:
- directory: a/proto
- directory: other/proto
name: bufbuild.test/workspace/request
- directory: proto
name: bufbuild.test/workspace/rpc
7 changes: 7 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/success/v2/dir/other/proto/request.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
syntax = "proto3";

package request;

message Request {
string name = 1;
}
9 changes: 9 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/success/v2/dir/proto/rpc.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
syntax = "proto3";

package example;

import "request.proto";

message RPC {
request.Request req = 1;
}
8 changes: 8 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/success/v2/nested/proto/buf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
version: v2
modules:
- directory: external
name: bufbuild.test/workspace/external
- directory: internal
name: bufbuild.test/workspace/internal
deps:
- bufbuild.test/workspace/external
7 changes: 7 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/success/v2/nested/proto/external/external.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
syntax = "proto3";

package external;

message External {
string name = 1;
}
9 changes: 9 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/success/v2/nested/proto/internal/internal.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
syntax = "proto3";

package internal;

import "external.proto";

message Internal {
external.External external = 1;
}
9 changes: 9 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/success/v2/symlink/a/a.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
syntax = "proto3";

package a;

import "b.proto";

message A {
b.B b = 1;
}
1 change: 1 addition & 0 deletions private/buf/cmd/buf/testdata/workspace/success/v2/symlink/b
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../transitive/private/proto
5 changes: 5 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/success/v2/symlink/buf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
version: v2
modules:
- directory: a
- directory: b
- directory: c
5 changes: 5 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/success/v2/symlink/c/c.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
syntax = "proto3";

package c;

message C {}
17 changes: 17 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/success/v2/transitive/buf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
version: v2
modules:
- directory: other/proto
name: bufbuild.test/workspace/third
lint:
except:
- PACKAGE_NO_IMPORT_CYCLE
- directory: private/proto
name: bufbuild.test/workspace/second
lint:
except:
- PACKAGE_NO_IMPORT_CYCLE
- directory: proto
name: bufbuild.test/workspace/first
lint:
except:
- PACKAGE_NO_IMPORT_CYCLE
5 changes: 5 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/success/v2/transitive/other/proto/c.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
syntax = "proto3";

package c;

message C {}
9 changes: 9 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/success/v2/transitive/private/proto/b.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
syntax = "proto3";

package b;

import "c.proto";

message B {
c.C c = 1;
}
9 changes: 9 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/success/v2/transitive/proto/a.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
syntax = "proto3";

package a;

import "b.proto";

message A {
b.B b = 1;
}
4 changes: 4 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/success/v2/wkt/buf.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
version: v2
modules:
- directory: other/proto
- directory: proto
11 changes: 11 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/success/v2/wkt/other/proto/c/c.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
syntax = "proto3";

import "a/a.proto";
import "google/protobuf/empty.proto";

package c;

message C {
a.A a = 1;
google.protobuf.Empty empty = 2;
}
11 changes: 11 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/success/v2/wkt/proto/a/a.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
syntax = "proto3";

package a;

import "b/b.proto";
import "google/protobuf/empty.proto";

message A {
b.B b = 1;
google.protobuf.Empty empty = 2;
}
10 changes: 10 additions & 0 deletions private/buf/cmd/buf/testdata/workspace/success/v2/wkt/proto/b/b.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
syntax = "proto3";

package b;

import "google/protobuf/empty.proto";

message B {
google.protobuf.Empty empty = 1;
}

Loading
Loading