Skip to content

Commit b0ff33f

Browse files
damondouglasdamondouglas
committed
Reconcile errors with playgroundPrecommit output
1 parent 9e240cf commit b0ff33f

21 files changed

Lines changed: 357 additions & 239 deletions

File tree

‎playground/README.md‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,23 @@ The following requirements are needed for development, testing, and deploying.
3535

3636
# Available Gradle Tasks
3737

38-
To see available gradle tasks for playground:
38+
## Perform overall pre-commit checks
39+
40+
```
41+
cd beam
42+
./gradlew playgroundPrecommit
43+
```
44+
45+
## To see available gradle tasks for playground:
3946

4047
```
4148
cd beam
4249
./gradlew playground:tasks
43-
```
50+
```
51+
52+
## Re-generate protobuf
53+
54+
```
55+
cd beam
56+
./gradlew playground:generateProto
57+
```

playground/playground/v1/playground.proto renamed to playground/api/v1/api.proto

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@
1717
*/
1818

1919
syntax = "proto3";
20+
option go_package = "beam.apache.org/playground/backend/internal;playground";
2021

21-
option go_package = "github.com/apache/beam/playground/v1;playground";
22-
package playground.v1;
22+
package api.v1;
2323

2424
enum Sdk {
2525
SDK_UNSPECIFIED = 0;
@@ -92,4 +92,4 @@ service PlaygroundService {
9292

9393
// Get the result of pipeline compilation.
9494
rpc GetCompileOutput(GetCompileOutputRequest) returns (GetCompileOutputResponse);
95-
}
95+
}

‎playground/backend/cmd/server/controller.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515
package main
1616

1717
import (
18-
pb "beam.apache.org/playground/backend/internal/api"
1918
"context"
19+
20+
pb "beam.apache.org/playground/backend/internal/api/v1"
2021
"github.com/google/uuid"
2122
)
2223

‎playground/backend/cmd/server/controller_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
package main
1616

1717
import (
18-
pb "beam.apache.org/playground/backend/internal/api"
18+
pb "beam.apache.org/playground/backend/internal/api/v1"
1919
"context"
2020
"github.com/google/uuid"
2121
"google.golang.org/grpc"

‎playground/backend/cmd/server/server.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,15 @@
1616
package main
1717

1818
import (
19-
pb "beam.apache.org/playground/backend/internal/api"
20-
"beam.apache.org/playground/backend/internal/environment"
2119
"context"
20+
"log"
21+
"os"
22+
23+
pb "beam.apache.org/playground/backend/internal/api/v1"
24+
"beam.apache.org/playground/backend/internal/environment"
2225
"github.com/improbable-eng/grpc-web/go/grpcweb"
2326
"google.golang.org/grpc"
2427
"google.golang.org/grpc/grpclog"
25-
"log"
26-
"os"
2728
)
2829

2930
// runServer is starting http server wrapped on grpc
@@ -39,7 +40,7 @@ func runServer() error {
3940
handler := Wrap(grpcServer, getGrpcWebOptions())
4041
errChan := make(chan error)
4142

42-
go listenHttp(ctx, errChan, envService.ServerEnvs, handler)
43+
go listenHttp(ctx, errChan, envService, handler)
4344

4445
for {
4546
select {

0 commit comments

Comments
 (0)