Refactoring out of internal and dsn parsing

Moved implementation out of internal.
Allow specifying auth type and parameters in dsn string.
Refactored dsn parsing.
Added tests to dsn parsing.
Change default authenticator back to Noop
Signed-off-by: Raymond Cypher <raymond.cypher@databricks.com>

Author: rcypher-databricks

auth/auth.go

@@ -1,7 +1,40 @@
 package auth
 
-import "net/http"
+import (
+	"net/http"
+	"strings"
+)
 
 type Authenticator interface {
 	Authenticate(*http.Request) error
 }
+
+type AuthType int
+
+const (
+	AuthTypeUnknown AuthType = iota
+	AuthTypePat
+	AuthTypeOauthU2M
+	AuthTypeOauthM2M
+)
+
+var authTypeNames []string = []string{"Unknown", "Pat", "OauthU2m", "OauthM2M"}
+
+func (at AuthType) String() string {
+	if at >= 0 && int(at) < len(authTypeNames) {
+		return authTypeNames[at]
+	}
+
+	return authTypeNames[0]
+}
+
+func ParseAuthType(typeString string) AuthType {
+	typeString = strings.ToLower(typeString)
+	for i, n := range authTypeNames {
+		if strings.ToLower(n) == typeString {
+			return AuthType(i)
+		}
+	}
+
+	return AuthTypeUnknown
+}

internal/auth/oauth/m2m/m2m.go auth/oauth/m2m/m2m.gointernal/auth/oauth/m2m/m2m.go renamed to auth/oauth/m2m/m2m.go

@@ -16,7 +16,7 @@ import (
 	"golang.org/x/oauth2/clientcredentials"
 )
 
-func NewClient(clientID, clientSecret, hostName string) auth.Authenticator {
+func NewAuthenticator(clientID, clientSecret, hostName string) auth.Authenticator {
 	scopes := oauth.GetScopes(hostName, []string{})
 	return &authClient{
 		clientID:     clientID,

auth/oauth/oauth.go

@@ -11,7 +11,11 @@ import (
 )
 
 const (
-	azureEnterpriseAppId = "2ff814a6-3304-4ab8-85cb-cd0e6f879c1d"
+	azureClientId   = "96eecda7-19ea-49cc-abb5-240097d554f5"
+	azureTenantId   = "4a67d088-db5c-48f1-9ff2-0aace800ae68"
+	azureRedirctURL = "localhost:8030"
+	awsClientId     = "databricks-sql-connector"
+	awsRedirctURL   = "localhost:8030"
 )
 
 func GetEndpoint(ctx context.Context, hostName string) (oauth2.Endpoint, error) {
@@ -44,15 +48,15 @@ func GetEndpoint(ctx context.Context, hostName string) (oauth2.Endpoint, error)
 }
 
 func GetScopes(hostName string, scopes []string) []string {
-	for _, s := range []string{oidc.ScopeOfflineAccess, oidc.ScopeOpenID} {
+	for _, s := range []string{oidc.ScopeOfflineAccess} {
 		if !hasScope(scopes, s) {
 			scopes = append(scopes, s)
 		}
 	}
 
 	cloudType := InferCloudFromHost(hostName)
 	if cloudType == Azure {
-		userImpersonationScope := fmt.Sprintf("%s/user_impersonation", azureEnterpriseAppId)
+		userImpersonationScope := fmt.Sprintf("%s/user_impersonation", azureTenantId)
 		if !hasScope(scopes, userImpersonationScope) {
 			scopes = append(scopes, userImpersonationScope)
 		}
@@ -85,14 +89,11 @@ var databricksAzureDomains []string = []string{
 	".databricks.azure.us",
 }
 
-var databricksGCPDomains []string = []string{".gcp.databricks.com"}
-
 type CloudType int
 
 const (
 	AWS = iota
 	Azure
-	GCP
 	Unknown
 )
 
@@ -102,8 +103,6 @@ func (cl CloudType) String() string {
 		return "AWS"
 	case Azure:
 		return "Azure"
-	case GCP:
-		return "GCP"
 	}
 
 	return "Unknown"
@@ -123,11 +122,5 @@ func InferCloudFromHost(hostname string) CloudType {
 		}
 	}
 
-	for _, d := range databricksGCPDomains {
-		if strings.Contains(hostname, d) {
-			return GCP
-		}
-	}
-
 	return Unknown
 }