Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-pages.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'internal/source/gitlab/client')
-rw-r--r--internal/source/gitlab/client/client.go16
-rw-r--r--internal/source/gitlab/client/client_test.go84
2 files changed, 0 insertions, 100 deletions
diff --git a/internal/source/gitlab/client/client.go b/internal/source/gitlab/client/client.go
index 31071fa8..30185143 100644
--- a/internal/source/gitlab/client/client.go
+++ b/internal/source/gitlab/client/client.go
@@ -128,22 +128,6 @@ func (gc *Client) GetLookup(ctx context.Context, host string) api.Lookup {
return lookup
}
-// Status checks that Pages can reach the rails internal Pages API
-// for source domain configuration.
-// Timeout is the same as -gitlab-client-http-timeout
-func (gc *Client) Status() error {
- res, err := gc.get(context.Background(), "/api/v4/internal/pages/status", url.Values{})
- if err != nil {
- return fmt.Errorf("%s: %v", ConnectionErrorMsg, err)
- }
-
- if res != nil && res.Body != nil {
- res.Body.Close()
- }
-
- return nil
-}
-
func (gc *Client) get(ctx context.Context, path string, params url.Values) (*http.Response, error) {
endpoint, err := gc.endpoint(path, params)
if err != nil {
diff --git a/internal/source/gitlab/client/client_test.go b/internal/source/gitlab/client/client_test.go
index 12bc026e..131ddd9d 100644
--- a/internal/source/gitlab/client/client_test.go
+++ b/internal/source/gitlab/client/client_test.go
@@ -234,90 +234,6 @@ func TestGetVirtualDomainAuthenticatedRequest(t *testing.T) {
require.Equal(t, "mygroup/myproject/public/", lookupPath.Source.Path)
}
-func TestClientStatus(t *testing.T) {
- tests := []struct {
- name string
- status int
- wantErr bool
- }{
- {
- name: "api_enabled",
- status: http.StatusNoContent,
- },
- {
- name: "api_unauthorized",
- status: http.StatusUnauthorized,
- wantErr: true,
- },
- {
- name: "server_error",
- status: http.StatusInternalServerError,
- wantErr: true,
- },
- {
- name: "gateway_timeout",
- status: http.StatusGatewayTimeout,
- wantErr: true,
- },
- }
-
- for _, tt := range tests {
- t.Run(tt.name, func(t *testing.T) {
- mux := http.NewServeMux()
- mux.HandleFunc("/api/v4/internal/pages/status", func(w http.ResponseWriter, r *http.Request) {
- w.WriteHeader(tt.status)
- })
-
- server := httptest.NewServer(mux)
- defer server.Close()
-
- client := defaultClient(t, server.URL)
-
- err := client.Status()
- if tt.wantErr {
- require.Error(t, err)
- require.Contains(t, err.Error(), ConnectionErrorMsg)
- return
- }
-
- require.NoError(t, err)
- })
- }
-}
-
-func TestClientStatusClientTimeout(t *testing.T) {
- timeout := 20 * time.Millisecond
-
- mux := http.NewServeMux()
- mux.HandleFunc("/api/v4/internal/pages/status", func(w http.ResponseWriter, r *http.Request) {
- time.Sleep(timeout * 3)
-
- w.WriteHeader(http.StatusOK)
- })
-
- server := httptest.NewServer(mux)
- defer server.Close()
-
- client := defaultClient(t, server.URL)
- client.httpClient.Timeout = timeout
-
- err := client.Status()
- require.Error(t, err)
- // we can receive any of these messages
- // - context deadline exceeded (Client.Timeout exceeded while awaiting headers)
- // - net/http: request canceled (Client.Timeout exceeded while awaiting headers)
- // - context deadline exceeded
- require.Contains(t, err.Error(), "exceeded")
-}
-
-func TestClientStatusConnectionRefused(t *testing.T) {
- client := defaultClient(t, "http://127.0.0.1:1234")
-
- err := client.Status()
- require.Error(t, err)
- require.Contains(t, err.Error(), "connection refused")
-}
-
func validateToken(t *testing.T, tokenString string) {
t.Helper()
token, err := jwt.Parse(tokenString, func(token *jwt.Token) (interface{}, error) {