yume/act_runner
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

still pass version by request header

Browse source
This commit is contained in:
sillyguodong 2023-06-06 17:16:48 +08:00
parent 71a61d161b
commit e8873419aa
No known key found for this signature in database
GPG key ID: 4A0646FA86256DF4
3 changed files with 8 additions and 1 deletions
internal
app/cmd
daemon.goregister.go
pkg/client
http.go

2
internal/app/cmd/daemon.go
View file

@ -24,6 +24,7 @@ import (
"gitea.com/gitea/act_runner/internal/pkg/envcheck"
"gitea.com/gitea/act_runner/internal/pkg/labels"
"gitea.com/gitea/act_runner/internal/pkg/utils"
"gitea.com/gitea/act_runner/internal/pkg/ver"
)
func runDaemon(ctx context.Context, configFile *string) func(cmd *cobra.Command, args []string) error {
@ -78,6 +79,7 @@ func runDaemon(ctx context.Context, configFile *string) func(cmd *cobra.Command,
cfg.Runner.Insecure,
reg.UUID,
reg.Token,
ver.Version(),
)
runner := run.NewRunner(cfg, reg, cli)

1
internal/app/cmd/register.go
View file

@ -296,6 +296,7 @@ func doRegister(cfg *config.Config, inputs *registerInputs) error {
cfg.Runner.Insecure,
"",
"",
ver.Version(),
)
for {

6
internal/pkg/client/http.go
View file

@ -28,7 +28,7 @@ func getHttpClient(endpoint string, insecure bool) *http.Client {
}
// New returns a new runner client.
func New(endpoint string, insecure bool, uuid, token string, opts ...connect.ClientOption) *HTTPClient {
func New(endpoint string, insecure bool, uuid, token, version string, opts ...connect.ClientOption) *HTTPClient {
baseURL := strings.TrimRight(endpoint, "/") + "/api/actions"
opts = append(opts, connect.WithInterceptors(connect.UnaryInterceptorFunc(func(next connect.UnaryFunc) connect.UnaryFunc {
@ -39,6 +39,10 @@ func New(endpoint string, insecure bool, uuid, token string, opts ...connect.Cli
if token != "" {
req.Header().Set(TokenHeader, token)
}
// TODO: version will be removed from request header after Gitea 1.20 released.
if version != "" {
req.Header().Set(VersionHeader, version)
}
return next(ctx, req)
}
})))