mirror of
https://gitea.com/gitea/act_runner.git
synced 2026-08-13 22:41:54 +02:00
Lunny Xiao
a8dcd5b67c
Gitea needs the workflow model and the expression evaluator to parse workflows and to build the task payload this runner consumes, so today it depends on `gitea.com/gitea/runner` just for `act/model` and `act/exprparser`. Both packages now live in `gitea.dev/actionslib` (`pkg/model`, `pkg/exprparser`), the module both sides already share, and this repository consumes them from there. ### Changes - `act/model` and `act/exprparser` are deleted, all imports point at `gitea.dev/actionslib/pkg/...`. - New `act/ghcontext` package: the `GithubContext` helpers that need a git checkout on disk (`SetRef`, `SetSha`, `SetRepositoryAndOwner`) are runner only and would drag a git client plus the act context logger into the shared module, so they stay here as functions, with their tests. Only caller is `RunContext.getGithubContext`. - `act/common.CartesianProduct` moved to the shared model package, `act/model` was its only user. - `act/model/testdata/container-volumes` moved to `act/runner/testdata/container-volumes`, its only user is `runner_test.go`. - `internal/pkg/client.UUIDHeader` / `TokenHeader` now alias `pkg/protocol`, so the header names cannot drift apart from Gitea. ### Notes - No behaviour change intended: the moved files are unchanged apart from the import paths and the split described above. - `go.mod` depends on the released `gitea.dev/actionslib v0.7.0`, which carries both https://gitea.com/gitea/actionslib/pulls/11 and the `model.UsesHash` port in https://gitea.com/gitea/actionslib/pulls/14 that `main` needs after https://gitea.com/gitea/runner/pulls/1150. - Verified with `go build ./...`, `go vet ./...` and `go test ./act/... ./internal/...`; the docker based `act/runner` integration tests (`TestRunEvent`, `TestRunMatrixWithUserDefinedInclusions`) fail identically with and without this change in my environment. Assisted-by: Codet:GPT-5.1-Codex Reviewed-on: https://gitea.com/gitea/runner/pulls/1143 Reviewed-by: silverwind <[email protected]>
96 lines
3.0 KiB
Go
96 lines
3.0 KiB
Go
// Copyright 2026 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package client
|
|
|
|
import (
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"strings"
|
|
"testing"
|
|
|
|
"connectrpc.com/connect"
|
|
pingv1 "gitea.dev/actionslib/ping/v1"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func TestGetHTTPClientUsesProxyFromEnvironment(t *testing.T) {
|
|
t.Setenv("HTTP_PROXY", "http://proxy.example.com:8080")
|
|
|
|
client := getHTTPClient("http://gitea.example.com", false)
|
|
transport, ok := client.Transport.(*http.Transport)
|
|
require.True(t, ok)
|
|
|
|
req, err := http.NewRequest(http.MethodGet, "http://gitea.example.com/api/actions/ping", nil)
|
|
require.NoError(t, err)
|
|
|
|
proxyURL, err := transport.Proxy(req)
|
|
require.NoError(t, err)
|
|
require.NotNil(t, proxyURL)
|
|
require.Equal(t, "http://proxy.example.com:8080", proxyURL.String())
|
|
}
|
|
|
|
func TestGetHTTPClientInsecureTLS(t *testing.T) {
|
|
// insecure only takes effect for https endpoints
|
|
httpsInsecure := getHTTPClient("https://gitea.example.com", true)
|
|
transport, ok := httpsInsecure.Transport.(*http.Transport)
|
|
require.True(t, ok)
|
|
require.NotNil(t, transport.TLSClientConfig)
|
|
require.True(t, transport.TLSClientConfig.InsecureSkipVerify)
|
|
|
|
for _, tc := range []struct {
|
|
name string
|
|
endpoint string
|
|
insecure bool
|
|
}{
|
|
{"https secure", "https://gitea.example.com", false},
|
|
{"http insecure ignored", "http://gitea.example.com", true},
|
|
} {
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
c := getHTTPClient(tc.endpoint, tc.insecure)
|
|
tr, ok := c.Transport.(*http.Transport)
|
|
require.True(t, ok)
|
|
require.Nil(t, tr.TLSClientConfig)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestNewSetsBaseURLAndHeaders(t *testing.T) {
|
|
var gotPath string
|
|
gotHeaders := make(http.Header)
|
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
gotPath = r.URL.Path
|
|
gotHeaders = r.Header.Clone()
|
|
w.WriteHeader(http.StatusInternalServerError)
|
|
}))
|
|
defer server.Close()
|
|
|
|
// trailing slash must be trimmed before "/api/actions" is appended
|
|
c := New(server.URL+"/", false, "the-uuid", "the-token")
|
|
// Address returns the endpoint as supplied (untrimmed)
|
|
require.Equal(t, server.URL+"/", c.Address())
|
|
require.False(t, c.Insecure())
|
|
|
|
// the call is expected to fail (server returns 500), we only assert what was sent
|
|
_, _ = c.Ping(t.Context(), connect.NewRequest(&pingv1.PingRequest{Data: "hi"}))
|
|
|
|
require.True(t, strings.HasPrefix(gotPath, "/api/actions/"), "unexpected path %q", gotPath)
|
|
require.Equal(t, "the-uuid", gotHeaders.Get(UUIDHeader))
|
|
require.Equal(t, "the-token", gotHeaders.Get(TokenHeader))
|
|
}
|
|
|
|
func TestNewOmitsEmptyHeaders(t *testing.T) {
|
|
gotHeaders := make(http.Header)
|
|
server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
|
|
gotHeaders = r.Header.Clone()
|
|
w.WriteHeader(http.StatusInternalServerError)
|
|
}))
|
|
defer server.Close()
|
|
|
|
c := New(server.URL, false, "", "")
|
|
_, _ = c.Ping(t.Context(), connect.NewRequest(&pingv1.PingRequest{Data: "hi"}))
|
|
|
|
require.Empty(t, gotHeaders.Get(UUIDHeader))
|
|
require.Empty(t, gotHeaders.Get(TokenHeader))
|
|
}
|