From 09144137f206ab70fe29fb172c606b8309018fc7 Mon Sep 17 00:00:00 2001 From: Jaime Martinez Date: Tue, 19 Jan 2021 16:05:39 +1100 Subject: Simplify domain and resolver checks Return domain not found Returns ErrDomainDoesNotExist when the lookup path cannot be found for a specific project. Closes https://gitlab.com/gitlab-org/gitlab-pages/issues/353 Return ErrDomainDoesNotExist in group resolver --- app.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'app.go') diff --git a/app.go b/app.go index 70ad6e1e..ec0c36a5 100644 --- a/app.go +++ b/app.go @@ -33,7 +33,6 @@ import ( "gitlab.com/gitlab-org/gitlab-pages/internal/request" "gitlab.com/gitlab-org/gitlab-pages/internal/serving/disk/zip" "gitlab.com/gitlab-org/gitlab-pages/internal/source" - "gitlab.com/gitlab-org/gitlab-pages/internal/source/gitlab/client" "gitlab.com/gitlab-org/gitlab-pages/internal/tlsconfig" "gitlab.com/gitlab-org/gitlab-pages/metrics" ) @@ -153,7 +152,7 @@ func (a *theApp) routingMiddleware(handler http.Handler) http.Handler { // if we could not retrieve a domain from domains source we break the // middleware chain and simply respond with 502 after logging this host, d, err := a.getHostAndDomain(r) - if err != nil && !errors.Is(err, client.ErrDomainDoesNotExist) { + if err != nil && !errors.Is(err, domain.ErrDomainDoesNotExist) { metrics.DomainsSourceFailures.Inc() log.WithError(err).Error("could not fetch domain information from a source") -- cgit v1.2.3