Merge pull request #141 from fluxcd/revert-136

reverting pr #136

Author: souleb

gitlab/auth.go

@@ -17,8 +17,6 @@ limitations under the License.
 package gitlab
 
 import (
-	"net/url"
-
 	"github.com/fluxcd/go-git-providers/gitprovider"
 	gogitlab "github.com/xanzy/go-gitlab"
 )
@@ -39,21 +37,6 @@ func NewClient(token string, tokenType string, optFns ...gitprovider.ClientOptio
 		return nil, err
 	}
 
-	// Ensure that the URL includes a scheme when using a custom domain.
-	if opts.Domain != nil && *opts.Domain != "" {
-		d, err := url.Parse(*opts.Domain)
-		if err != nil {
-			return nil, err
-		}
-		if d.Scheme != "http" && d.Scheme != "https" {
-			u := url.URL{
-				Scheme: "https",
-				Host:   *opts.Domain,
-			}
-			*opts.Domain = u.String()
-		}
-	}
-
 	// Create a *http.Client using the transport chain
 	httpClient, err := gitprovider.BuildClientFromTransportChain(opts.GetTransportChain())
 	if err != nil {

gitlab/auth_test.go

@@ -20,7 +20,6 @@ import (
 	"testing"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
-	gogitlab "github.com/xanzy/go-gitlab"
 )
 
 func TestSupportedDomain(t *testing.T) {
@@ -40,31 +39,16 @@ func TestSupportedDomain(t *testing.T) {
 			opts: gitprovider.WithDomain("my-gitlab.dev.com"),
 			want: "https://my-gitlab.dev.com",
 		},
-		{
-			name: "custom domain without protocol with port",
-			opts: gitprovider.WithDomain("my-gitlab.dev.com:1234"),
-			want: "https://my-gitlab.dev.com:1234",
-		},
 		{
 			name: "custom domain with https protocol",
 			opts: gitprovider.WithDomain("https://my-gitlab.dev.com"),
 			want: "https://my-gitlab.dev.com",
 		},
-		{
-			name: "custom domain with https protocol with port",
-			opts: gitprovider.WithDomain("https://my-gitlab.dev.com:1234"),
-			want: "https://my-gitlab.dev.com:1234",
-		},
 		{
 			name: "custom domain with http protocol",
 			opts: gitprovider.WithDomain("http://my-gitlab.dev.com"),
 			want: "http://my-gitlab.dev.com",
 		},
-		{
-			name: "custom domain with http protocol with port",
-			opts: gitprovider.WithDomain("http://my-gitlab.dev.com:1234"),
-			want: "http://my-gitlab.dev.com:1234",
-		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -77,61 +61,6 @@ func TestSupportedDomain(t *testing.T) {
 	}
 }
 
-func TestBaseURL(t *testing.T) {
-	tests := []struct {
-		name     string
-		opts     gitprovider.ClientOption
-		expected string
-	}{
-		{
-			name:     "gitlab.com domain",
-			opts:     gitprovider.WithDomain("gitlab.com"),
-			expected: "https://gitlab.com/api/v4/",
-		},
-		{
-			name:     "custom domain without protocol",
-			opts:     gitprovider.WithDomain("my-gitlab.dev.com"),
-			expected: "https://my-gitlab.dev.com/api/v4/",
-		},
-		{
-			name:     "custom domain without protocol with port",
-			opts:     gitprovider.WithDomain("my-gitlab.dev.com:1234"),
-			expected: "https://my-gitlab.dev.com:1234/api/v4/",
-		},
-		{
-			name:     "custom domain with https protocol",
-			opts:     gitprovider.WithDomain("https://my-gitlab.dev.com"),
-			expected: "https://my-gitlab.dev.com/api/v4/",
-		},
-		{
-			name:     "custom domain with https protocol with port",
-			opts:     gitprovider.WithDomain("https://my-gitlab.dev.com:1234"),
-			expected: "https://my-gitlab.dev.com:1234/api/v4/",
-		},
-		{
-			name:     "custom domain with http protocol",
-			opts:     gitprovider.WithDomain("http://my-gitlab.dev.com"),
-			expected: "http://my-gitlab.dev.com/api/v4/",
-		},
-		{
-			name:     "custom domain with http protocol with port",
-			opts:     gitprovider.WithDomain("http://my-gitlab.dev.com:1234"),
-			expected: "http://my-gitlab.dev.com:1234/api/v4/",
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			c1, _ := NewClient("token", "oauth2", tt.opts)
-			gc1 := c1.Raw().(*gogitlab.Client)
-			assertEqual(t, tt.expected, gc1.BaseURL().String())
-
-			c2, _ := NewClient("token", "pat", tt.opts)
-			gc2 := c2.Raw().(*gogitlab.Client)
-			assertEqual(t, tt.expected, gc2.BaseURL().String())
-		})
-	}
-}
-
 func assertEqual(t *testing.T, a interface{}, b interface{}) {
 	if a != b {
 		t.Fatalf("%s != %s", a, b)

gitlab/util.go

@@ -4,7 +4,6 @@ import (
 	"errors"
 	"fmt"
 	"net/http"
-	"net/url"
 	"strings"
 
 	"github.com/fluxcd/go-git-providers/gitprovider"
@@ -193,16 +192,6 @@ func validateOrganizationRef(ref gitprovider.OrganizationRef, expectedDomain str
 func validateIdentityFields(ref gitprovider.IdentityRef, expectedDomain string) error {
 	// Make sure the expected domain is used
 
-	// For custom domains ensure the expected domain only includes host
-	// and port information but not the scheme.
-	if expectedDomain != DefaultDomain {
-		d, err := url.Parse(expectedDomain)
-		if err != nil {
-			return err
-		}
-		expectedDomain = d.Host
-	}
-
 	if ref.GetDomain() != expectedDomain {
 		return fmt.Errorf("domain %q not supported by this client: %w", ref.GetDomain(), gitprovider.ErrDomainUnsupported)
 	}