Skip to content

Commit 5061149

Browse files
fix: issue where runProto command was running for grpc client too.
1 parent 062a291 commit 5061149

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

core/internal/languages/golang/generator.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,21 @@ func Generate(ctx context.Context) error {
7272
if n.GrpcConfig.Template == templates.Compage {
7373
if n.GrpcConfig.Framework == GoGrpcServerFramework {
7474
goGrpcServerCopier := getGoGrpcServerCopier(goValues)
75+
// copy all files at root level
76+
if err := goGrpcServerCopier.CreateRootLevelFiles(); err != nil {
77+
log.Debugf("err : %s", err)
78+
return err
79+
}
7580
if n.GrpcConfig.Server != nil {
7681
if err := goGrpcServerCopier.CreateGrpcServer(); err != nil {
7782
log.Debugf("err : %s", err)
7883
return err
7984
}
85+
// generate protoc commands on proto file for the code generated
86+
if err := RunMakeProto(goValues.Values.NodeDirectoryName); err != nil {
87+
log.Debugf("err : %s", err)
88+
return err
89+
}
8090
}
8191
if n.GrpcConfig.Clients != nil {
8292
// grpcConfig.clients - present when client config is provided
@@ -85,16 +95,6 @@ func Generate(ctx context.Context) error {
8595
return err
8696
}
8797
}
88-
// copy all files at root level, fire this at last
89-
if err := goGrpcServerCopier.CreateRootLevelFiles(); err != nil {
90-
log.Debugf("err : %s", err)
91-
return err
92-
}
93-
// generate protoc commands on proto file for the code generated
94-
if err := RunMakeProto(goValues.Values.NodeDirectoryName); err != nil {
95-
log.Debugf("err : %s", err)
96-
return err
97-
}
9898
} else {
9999
return fmt.Errorf("unsupported framework %s for template %s for language %s", n.GrpcConfig.Framework, n.GrpcConfig.Template, n.Language)
100100
}

0 commit comments

Comments
 (0)