chore(runner): add runner uuid in http header.

Signed-off-by: Bo-Yi.Wu <appleboy.tw@gmail.com>
This commit is contained in:
Bo-Yi.Wu 2022-10-15 16:40:35 +08:00 committed by Jason Song
parent a503f7429f
commit bf5e3dc302
3 changed files with 21 additions and 2 deletions

View file

@ -7,6 +7,7 @@ import (
"net/http"
"time"
"gitea.com/gitea/act_runner/core"
"gitea.com/gitea/proto-go/ping/v1/pingv1connect"
"gitea.com/gitea/proto-go/runner/v1/runnerv1connect"
@ -26,7 +27,7 @@ func New(endpoint, secret string, opts ...Option) *HTTPClient {
interceptor := connect.UnaryInterceptorFunc(func(next connect.UnaryFunc) connect.UnaryFunc {
return func(ctx context.Context, req connect.AnyRequest) (connect.AnyResponse, error) {
req.Header().Set("X-Runner-Token", secret)
req.Header().Set(core.UUIDHeader, secret)
return next(ctx, req)
}
})

View file

@ -1,10 +1,14 @@
package config
import (
"encoding/json"
"fmt"
"io"
"os"
"runtime"
"gitea.com/gitea/act_runner/core"
"github.com/appleboy/com/file"
"github.com/joho/godotenv"
"github.com/kelseyhightower/envconfig"
)
@ -52,7 +56,19 @@ func FromEnviron() (Config, error) {
return cfg, err
}
cfg.Client.Secret = cfg.Runner.Token
// check runner config exist
if file.IsFile(cfg.Runner.File) {
jsonFile, _ := os.Open(cfg.Runner.File)
defer jsonFile.Close()
byteValue, _ := io.ReadAll(jsonFile)
var runner core.Runner
if err := json.Unmarshal(byteValue, &runner); err != nil {
return cfg, err
}
if runner.UUID != "" {
cfg.Client.Secret = runner.UUID
}
}
// runner config
if cfg.Runner.Environ == nil {

View file

@ -1,5 +1,7 @@
package core
const UUIDHeader = "x-runner-uuid"
// Runner struct
type Runner struct {
ID int64 `json:"id"`