chore(proto): update import path

Signed-off-by: GiteaBot <teabot@gitea.io>

go.mod

@@ -5,9 +5,8 @@ go 1.18
 require (
 	code.gitea.io/gitea-vet v0.2.2-0.20220122151748-48ebc902541b
 	code.gitea.io/sdk/gitea v0.15.1
-	gitea.com/gitea/proto v0.0.0-20220813120843-ce4b5dd68c1f
-	gitea.com/go-chi/binding v0.0.0-20220309004920-114340dabecb
 	codeberg.org/gusted/mcaptcha v0.0.0-20220723083913-4f3072e1d570
+	gitea.com/gitea/proto-go v0.0.0-20220817054638-17fb0016dd41
 	gitea.com/go-chi/binding v0.0.0-20221013104517-b29891619681
 	gitea.com/go-chi/cache v0.2.0
 	gitea.com/go-chi/captcha v0.0.0-20211013065431-70641c1a35d5
@@ -19,6 +18,9 @@ require (
 	github.com/PuerkitoBio/goquery v1.8.0
 	github.com/alecthomas/chroma/v2 v2.3.0
 	github.com/blevesearch/bleve/v2 v2.3.4
+	github.com/bufbuild/connect-go v1.0.0
+	github.com/bufbuild/connect-grpchealth-go v1.0.0
+	github.com/bufbuild/connect-grpcreflect-go v1.0.0
 	github.com/buildkite/terminal-to-html/v3 v3.7.0
 	github.com/caddyserver/certmagic v0.17.2
 	github.com/chi-middleware/proxy v1.1.1
@@ -175,6 +177,7 @@ require (
 	github.com/go-asn1-ber/asn1-ber v1.5.4 // indirect
 	github.com/go-enry/go-oniguruma v1.2.1 // indirect
 	github.com/go-git/gcfg v1.5.0 // indirect
+	github.com/go-ini/ini v1.62.0 // indirect
 	github.com/go-openapi/analysis v0.21.4 // indirect
 	github.com/go-openapi/errors v0.20.3 // indirect
 	github.com/go-openapi/inflect v0.19.0 // indirect

routers/api/bots/ping.go

@@ -7,11 +7,11 @@ package bots
 import (
 	"context"
 	"fmt"
-	"log"
 
+	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/web"
-	v1 "gitea.com/gitea/proto/gen/proto/v1"
+	pingv1 "gitea.com/gitea/proto-go/ping/v1"
-	"gitea.com/gitea/proto/gen/proto/v1/v1connect"
+	"gitea.com/gitea/proto-go/ping/v1/pingv1connect"
 
 	"github.com/bufbuild/connect-go"
 	grpchealth "github.com/bufbuild/connect-grpchealth-go"
@@ -22,11 +22,12 @@ type PingService struct{}
 
 func (s *PingService) Ping(
 	ctx context.Context,
-	req *connect.Request[v1.PingRequest],
+	req *connect.Request[pingv1.PingRequest],
-) (*connect.Response[v1.PingResponse], error) {
+) (*connect.Response[pingv1.PingResponse], error) {
-	log.Println("Content-Type: ", req.Header().Get("Content-Type"))
+	log.Info("Content-Type: %s", req.Header().Get("Content-Type"))
-	log.Println("User-Agent: ", req.Header().Get("User-Agent"))
+	log.Info("User-Agent: %s", req.Header().Get("User-Agent"))
-	res := connect.NewResponse(&v1.PingResponse{
+	log.Info("X-Gitea-Token: %s", req.Header().Get("X-Gitea-Token"))
+	res := connect.NewResponse(&pingv1.PingResponse{
 		Data: fmt.Sprintf("Hello, %s!", req.Msg.Data),
 	})
 	res.Header().Set("Gitea-Version", "v1")
@@ -37,26 +38,26 @@ func pingServiceRoute(r *web.Route) {
 	compress1KB := connect.WithCompressMinBytes(1024)
 
 	pingService := &PingService{}
-	connectPath, connecthandler := v1connect.NewPingServiceHandler(
+	connectPath, connecthandler := pingv1connect.NewPingServiceHandler(
 		pingService,
 		compress1KB,
 	)
 
 	// grpcV1
 	grpcPath, gHandler := grpcreflect.NewHandlerV1(
-		grpcreflect.NewStaticReflector(v1connect.PingServiceName),
+		grpcreflect.NewStaticReflector(pingv1connect.PingServiceName),
 		compress1KB,
 	)
 
 	// grpcV1Alpha
 	grpcAlphaPath, gAlphaHandler := grpcreflect.NewHandlerV1Alpha(
-		grpcreflect.NewStaticReflector(v1connect.PingServiceName),
+		grpcreflect.NewStaticReflector(pingv1connect.PingServiceName),
 		compress1KB,
 	)
 
 	// grpcHealthCheck
 	grpcHealthPath, gHealthHandler := grpchealth.NewHandler(
-		grpchealth.NewStaticChecker(v1connect.PingServiceName),
+		grpchealth.NewStaticChecker(pingv1connect.PingServiceName),
 		compress1KB,
 	)
 

routers/api/bots/runner.go

@@ -9,8 +9,8 @@ import (
 
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/web"
-	v1 "gitea.com/gitea/proto/gen/proto/v1"
+	runnerv1 "gitea.com/gitea/proto-go/runner/v1"
-	"gitea.com/gitea/proto/gen/proto/v1/v1connect"
+	"gitea.com/gitea/proto-go/runner/v1/runnerv1connect"
 
 	"github.com/bufbuild/connect-go"
 	grpchealth "github.com/bufbuild/connect-grpchealth-go"
@@ -21,25 +21,28 @@ type RunnerService struct{}
 
 func (s *RunnerService) Connect(
 	ctx context.Context,
-	req *connect.Request[v1.ConnectRequest],
+	req *connect.Request[runnerv1.ConnectRequest],
-) (*connect.Response[v1.ConnectResponse], error) {
+) (*connect.Response[runnerv1.ConnectResponse], error) {
 	log.Info("Request headers: %v", req.Header())
-	res := connect.NewResponse(&v1.ConnectResponse{
+	res := connect.NewResponse(&runnerv1.ConnectResponse{
-		JobId: 100,
+		Stage: &runnerv1.Stage{
+			RunnerUuid: "foobar",
+			BuildUuid:  "foobar",
+		},
 	})
-	res.Header().Set("Gitea-Version", "v1")
+	res.Header().Set("Gitea-Version", "runnerv1")
 	return res, nil
 }
 
 func (s *RunnerService) Accept(
 	ctx context.Context,
-	req *connect.Request[v1.AcceptRequest],
+	req *connect.Request[runnerv1.AcceptRequest],
-) (*connect.Response[v1.AcceptResponse], error) {
+) (*connect.Response[runnerv1.AcceptResponse], error) {
 	log.Info("Request headers: %v", req.Header())
-	res := connect.NewResponse(&v1.AcceptResponse{
+	res := connect.NewResponse(&runnerv1.AcceptResponse{
 		JobId: 100,
 	})
-	res.Header().Set("Gitea-Version", "v1")
+	res.Header().Set("Gitea-Version", "runnerv1")
 	return res, nil
 }
 
@@ -47,26 +50,26 @@ func runnerServiceRoute(r *web.Route) {
 	compress1KB := connect.WithCompressMinBytes(1024)
 
 	runnerService := &RunnerService{}
-	connectPath, connecthandler := v1connect.NewRunnerServiceHandler(
+	connectPath, connecthandler := runnerv1connect.NewRunnerServiceHandler(
 		runnerService,
 		compress1KB,
 	)
 
 	// grpcV1
 	grpcPath, gHandler := grpcreflect.NewHandlerV1(
-		grpcreflect.NewStaticReflector(v1connect.RunnerServiceName),
+		grpcreflect.NewStaticReflector(runnerv1connect.RunnerServiceName),
 		compress1KB,
 	)
 
 	// grpcV1Alpha
 	grpcAlphaPath, gAlphaHandler := grpcreflect.NewHandlerV1Alpha(
-		grpcreflect.NewStaticReflector(v1connect.RunnerServiceName),
+		grpcreflect.NewStaticReflector(runnerv1connect.RunnerServiceName),
 		compress1KB,
 	)
 
 	// grpcHealthCheck
 	grpcHealthPath, gHealthHandler := grpchealth.NewHandler(
-		grpchealth.NewStaticChecker(v1connect.RunnerServiceName),
+		grpchealth.NewStaticChecker(runnerv1connect.RunnerServiceName),
 		compress1KB,
 	)