fix: add import for error only proto

asynkron · Mar 8, 2024 · f9650ee · f9650ee
1 parent 1426311
commit f9650ee
Show file tree

Hide file tree

Showing 17 changed files with 442 additions and 437 deletions.
diff --git a/protobuf/protoc-gen-go-grain/Makefile b/protobuf/protoc-gen-go-grain/Makefile
@@ -1,9 +1,9 @@
 .PHONY: testdata
 testdata:
-	protoc --go_out=. --go_opt=paths=source_relative --plugin=protoc-gen-go-grain=protoc-gen-go-grain.sh --go-grain_out=. --go-grain_opt=paths=source_relative -I../../ -I. testdata/hello/*.proto
-	protoc --go_out=. --go_opt=paths=source_relative --plugin=protoc-gen-go-grain=protoc-gen-go-grain.sh --go-grain_out=. --go-grain_opt=paths=source_relative -I../../ -I. testdata/reenter/*.proto
-	protoc --go_out=. --go_opt=paths=source_relative --plugin=protoc-gen-go-grain=protoc-gen-go-grain.sh --go-grain_out=. --go-grain_opt=paths=source_relative -I../../ -I. testdata/multi-services/*.proto
-	protoc --go_out=. --go_opt=paths=source_relative --plugin=protoc-gen-go-grain=protoc-gen-go-grain.sh --go-grain_out=. --go-grain_opt=paths=source_relative -I../../ -I. testdata/error/*.proto
+	protoc --go_out=. --go_opt=paths=source_relative --plugin=protoc-gen-go-grain=protoc-gen-go-grain.sh --go-grain_out=. --go-grain_opt=paths=source_relative -I../../ -I. test/hello/*.proto
+	protoc --go_out=. --go_opt=paths=source_relative --plugin=protoc-gen-go-grain=protoc-gen-go-grain.sh --go-grain_out=. --go-grain_opt=paths=source_relative -I../../ -I. test/reenter/*.proto
+	protoc --go_out=. --go_opt=paths=source_relative --plugin=protoc-gen-go-grain=protoc-gen-go-grain.sh --go-grain_out=. --go-grain_opt=paths=source_relative -I../../ -I. test/multi-services/*.proto
+	protoc --go_out=. --go_opt=paths=source_relative --plugin=protoc-gen-go-grain=protoc-gen-go-grain.sh --go-grain_out=. --go-grain_opt=paths=source_relative -I../../ -I. test/error/*.proto
 
 .PHONY: options
 options:

diff --git a/protobuf/protoc-gen-go-grain/generate.go b/protobuf/protoc-gen-go-grain/generate.go
@@ -64,6 +64,9 @@ func generateHeader(gen *protogen.Plugin, g *protogen.GeneratedFile, file *proto
 func generateContent(g *protogen.GeneratedFile, file *protogen.File) {
 	g.P("package ", file.GoPackageName)
 
+	g.QualifiedGoIdent(clusterPackage.Ident(""))
+	g.QualifiedGoIdent(fmtPackage.Ident(""))
+
 	for _, enum := range file.Enums {
 		if enum.Desc.Name() == "ErrorReason" {
 			generateErrorReasons(g, enum)
@@ -75,9 +78,7 @@ func generateContent(g *protogen.GeneratedFile, file *protogen.File) {
 	}
 
 	g.QualifiedGoIdent(actorPackage.Ident(""))
-	g.QualifiedGoIdent(clusterPackage.Ident(""))
 	g.QualifiedGoIdent(protoPackage.Ident(""))
-	g.QualifiedGoIdent(fmtPackage.Ident(""))
 	g.QualifiedGoIdent(timePackage.Ident(""))
 	g.QualifiedGoIdent(slogPackage.Ident(""))
 

diff --git a/protobuf/protoc-gen-go-grain/test/error/error.pb.go b/protobuf/protoc-gen-go-grain/test/error/error.pb.go
diff --git a/...c-gen-go-grain/testdata/error/hello.proto → ...rotoc-gen-go-grain/test/error/error.proto b/...c-gen-go-grain/testdata/error/hello.proto → ...rotoc-gen-go-grain/test/error/error.proto
diff --git a/...go-grain/testdata/error/hello_grain.pb.go → ...gen-go-grain/test/error/error_grain.pb.go b/...go-grain/testdata/error/hello_grain.pb.go → ...gen-go-grain/test/error/error_grain.pb.go
diff --git a/protobuf/protoc-gen-go-grain/test/hello/hello.pb.go b/protobuf/protoc-gen-go-grain/test/hello/hello.pb.go
diff --git a/...c-gen-go-grain/testdata/hello/hello.proto → ...rotoc-gen-go-grain/test/hello/hello.proto b/...c-gen-go-grain/testdata/hello/hello.proto → ...rotoc-gen-go-grain/test/hello/hello.proto
diff --git a/...go-grain/testdata/hello/hello_grain.pb.go → ...gen-go-grain/test/hello/hello_grain.pb.go b/...go-grain/testdata/hello/hello_grain.pb.go → ...gen-go-grain/test/hello/hello_grain.pb.go