feat: move examples/proto to proto

The proto schemas are not strictly examples, and are better housed one
level up.

BREAKING CHANGE: Import path of example freight API has been updated.

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "examples/proto/api-common-protos"]
-	path = examples/proto/api-common-protos
+[submodule "proto/api-common-protos"]
+	path = proto/api-common-protos
 	url = https://github.com/googleapis/api-common-protos

Makefile

@@ -26,8 +26,8 @@ include tools/protoc/rules.mk
 include tools/semantic-release/rules.mk
 include tools/stringer/rules.mk
 
-.PHONY: examples/proto/api-common-protos
-examples/proto/api-common-protos:
+.PHONY: proto/api-common-protos
+proto/api-common-protos:
 	@git submodule update --init --recursive $@
 
 .PHONY: go-generate
@@ -53,12 +53,12 @@ api-linter-lint: $(api_linter_wrapper)
 	$(info [$@] linting APIs...)
 	@$(api_linter_wrapper) \
 		--config api-linter.yaml \
-		-I examples/proto/api-common-protos \
-		-I examples/proto/src \
-		$(shell find examples/proto/src -type f -name '*.proto' | cut -d '/' -f 4-)
+		-I proto/api-common-protos \
+		-I proto/src \
+		$(shell find proto/src -type f -name '*.proto' | cut -d '/' -f 4-)
 
 .PHONY: buf-lint
-buf-lint: $(buf) examples/proto/api-common-protos
+buf-lint: $(buf) proto/api-common-protos
 	$(info [$@] linting protobuf schemas...)
 	@$(buf) lint
 
@@ -68,7 +68,7 @@ protoc_plugins := \
 	$(protoc_gen_gapic_validator)
 
 .PHONY: buf-generate
-buf-generate: $(buf) $(protoc) $(protoc_plugins) examples/proto/api-common-protos
+buf-generate: $(buf) $(protoc) $(protoc_plugins) proto/api-common-protos
 	$(info [$@] generating protobuf stubs...)
-	@rm -rf examples/proto/gen
-	@$(buf) generate --path examples/proto/src/einride
+	@rm -rf proto/gen
+	@$(buf) generate --path proto/src/einride

aipmiddleware/parentvalidator_test.go

@@ -6,7 +6,7 @@ import (
 	"sync"
 	"testing"
 
-	examplefreightv1 "go.einride.tech/aip/examples/proto/gen/einride/example/freight/v1"
+	examplefreightv1 "go.einride.tech/aip/proto/gen/einride/example/freight/v1"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"

buf.gen.yaml

@@ -5,9 +5,9 @@ plugins:
     out: .
 
   - name: go
-    out: examples/proto/gen
-    opt: module=go.einride.tech/aip/examples/proto/gen
+    out: proto/gen
+    opt: module=go.einride.tech/aip/proto/gen
 
   - name: go-grpc
-    out: examples/proto/gen
-    opt: module=go.einride.tech/aip/examples/proto/gen,require_unimplemented_servers=false
+    out: proto/gen
+    opt: module=go.einride.tech/aip/proto/gen,require_unimplemented_servers=false

buf.yaml

@@ -2,8 +2,8 @@ version: v1beta1
 
 build:
   roots:
-    - examples/proto/src
-    - examples/proto/api-common-protos
+    - proto/src
+    - proto/api-common-protos
 
 lint:
   use:

fieldbehavior/fieldbehavior_test.go

@@ -3,7 +3,7 @@ package fieldbehavior
 import (
 	"testing"
 
-	examplefreightv1 "go.einride.tech/aip/examples/proto/gen/einride/example/freight/v1"
+	examplefreightv1 "go.einride.tech/aip/proto/gen/einride/example/freight/v1"
 	"google.golang.org/genproto/googleapis/api/annotations"
 	"google.golang.org/genproto/googleapis/example/library/v1"
 	"google.golang.org/protobuf/types/known/fieldmaskpb"

fieldmask/update_test.go

@@ -3,7 +3,7 @@ package fieldmask
 import (
 	"testing"
 
-	syntaxv1 "go.einride.tech/aip/examples/proto/gen/einride/example/syntax/v1"
+	syntaxv1 "go.einride.tech/aip/proto/gen/einride/example/syntax/v1"
 	"google.golang.org/genproto/googleapis/example/library/v1"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/testing/protocmp"

filtering/checker_test.go

@@ -3,7 +3,7 @@ package filtering
 import (
 	"testing"
 
-	syntaxv1 "go.einride.tech/aip/examples/proto/gen/einride/example/syntax/v1"
+	syntaxv1 "go.einride.tech/aip/proto/gen/einride/example/syntax/v1"
 	"gotest.tools/v3/assert"
 )
 

examples/proto/src/einride/example/freight/v1/freight_service.proto → proto/src/einride/example/freight/v1/freight_service.proto

@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package einride.example.freight.v1;
 
-option go_package = "go.einride.tech/aip/examples/proto/gen/einride/example/freight/v1;examplefreightv1";
+option go_package = "go.einride.tech/aip/proto/gen/einride/example/freight/v1;examplefreightv1";
 option java_multiple_files = true;
 option java_outer_classname = "FreightServiceProto";
 option java_package = "tech.einride.example.freight.v1";

examples/proto/src/einride/example/freight/v1/shipment.proto → proto/src/einride/example/freight/v1/shipment.proto

@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package einride.example.freight.v1;
 
-option go_package = "go.einride.tech/aip/examples/proto/gen/einride/example/freight/v1;examplefreightv1";
+option go_package = "go.einride.tech/aip/proto/gen/einride/example/freight/v1;examplefreightv1";
 option java_multiple_files = true;
 option java_outer_classname = "ShipmentProto";
 option java_package = "tech.einride.example.freight.v1";

examples/proto/src/einride/example/freight/v1/shipper.proto → proto/src/einride/example/freight/v1/shipper.proto

@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package einride.example.freight.v1;
 
-option go_package = "go.einride.tech/aip/examples/proto/gen/einride/example/freight/v1;examplefreightv1";
+option go_package = "go.einride.tech/aip/proto/gen/einride/example/freight/v1;examplefreightv1";
 option java_multiple_files = true;
 option java_outer_classname = "ShipperProto";
 option java_package = "tech.einride.example.freight.v1";

examples/proto/src/einride/example/freight/v1/site.proto → proto/src/einride/example/freight/v1/site.proto

@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package einride.example.freight.v1;
 
-option go_package = "go.einride.tech/aip/examples/proto/gen/einride/example/freight/v1;examplefreightv1";
+option go_package = "go.einride.tech/aip/proto/gen/einride/example/freight/v1;examplefreightv1";
 option java_multiple_files = true;
 option java_outer_classname = "SiteProto";
 option java_package = "tech.einride.example.freight.v1";

examples/proto/src/einride/example/syntax/v1/syntax.proto → proto/src/einride/example/syntax/v1/syntax.proto

@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package einride.example.syntax.v1;
 
-option go_package = "go.einride.tech/aip/examples/proto/gen/einride/example/syntax/v1;syntaxv1";
+option go_package = "go.einride.tech/aip/proto/gen/einride/example/syntax/v1;syntaxv1";
 option java_multiple_files = true;
 option java_outer_classname = "SyntaxProto";
 option java_package = "tech.einride.example.syntax.v1";

reflect/aipreflect/resourcedescriptor_test.go

@@ -3,7 +3,7 @@ package aipreflect
 import (
 	"testing"
 
-	examplefreightv1 "go.einride.tech/aip/examples/proto/gen/einride/example/freight/v1"
+	examplefreightv1 "go.einride.tech/aip/proto/gen/einride/example/freight/v1"
 	"google.golang.org/genproto/googleapis/api/annotations"
 	"google.golang.org/protobuf/proto"
 	"google.golang.org/protobuf/reflect/protoreflect"

reflect/aipregistry/resources_test.go

@@ -3,7 +3,7 @@ package aipregistry
 import (
 	"testing"
 
-	examplefreightv1 "go.einride.tech/aip/examples/proto/gen/einride/example/freight/v1"
+	examplefreightv1 "go.einride.tech/aip/proto/gen/einride/example/freight/v1"
 	"go.einride.tech/aip/reflect/aipreflect"
 	"google.golang.org/protobuf/reflect/protoreflect"
 	"google.golang.org/protobuf/reflect/protoregistry"