Merge branch 'main' into add_account_provisioning

Author: aldevv

baton_capabilities.json

@@ -1,89 +1,89 @@
 {
-  "@type": "type.googleapis.com/c1.connector.v2.ConnectorCapabilities",
-  "resourceTypeCapabilities": [
+  "@type":  "type.googleapis.com/c1.connector.v2.ConnectorCapabilities",
+  "resourceTypeCapabilities":  [
     {
-      "resourceType": {
-        "id": "account",
-        "displayName": "Account"
+      "resourceType":  {
+        "id":  "account",
+        "displayName":  "Account"
       },
-      "capabilities": [
+      "capabilities":  [
         "CAPABILITY_SYNC",
         "CAPABILITY_PROVISION"
       ]
     },
     {
-      "resourceType": {
-        "id": "group",
-        "displayName": "Group",
-        "traits": [
+      "resourceType":  {
+        "id":  "group",
+        "displayName":  "Group",
+        "traits":  [
           "TRAIT_GROUP"
         ]
       },
-      "capabilities": [
+      "capabilities":  [
         "CAPABILITY_SYNC",
         "CAPABILITY_PROVISION"
       ]
     },
     {
-      "resourceType": {
-        "id": "role",
-        "displayName": "Role",
-        "traits": [
+      "resourceType":  {
+        "id":  "role",
+        "displayName":  "Role",
+        "traits":  [
           "TRAIT_ROLE"
         ]
       },
-      "capabilities": [
+      "capabilities":  [
         "CAPABILITY_SYNC",
         "CAPABILITY_PROVISION"
       ]
     },
     {
-      "resourceType": {
-        "id": "service_principal",
-        "displayName": "Service Principal",
-        "traits": [
+      "resourceType":  {
+        "id":  "service_principal",
+        "displayName":  "Service Principal",
+        "traits":  [
           "TRAIT_GROUP"
         ]
       },
-      "capabilities": [
+      "capabilities":  [
         "CAPABILITY_SYNC",
         "CAPABILITY_PROVISION"
       ]
     },
     {
-      "resourceType": {
-        "id": "user",
-        "displayName": "User",
-        "traits": [
+      "resourceType":  {
+        "id":  "user",
+        "displayName":  "User",
+        "traits":  [
           "TRAIT_USER"
         ],
-        "annotations": [
+        "annotations":  [
           {
-            "@type": "type.googleapis.com/c1.connector.v2.SkipEntitlementsAndGrants"
+            "@type":  "type.googleapis.com/c1.connector.v2.SkipEntitlementsAndGrants"
           }
         ]
       },
-      "capabilities": [
+      "capabilities":  [
         "CAPABILITY_SYNC"
       ]
     },
     {
-      "resourceType": {
-        "id": "workspace",
-        "displayName": "Workspace",
-        "traits": [
+      "resourceType":  {
+        "id":  "workspace",
+        "displayName":  "Workspace",
+        "traits":  [
           "TRAIT_GROUP"
         ]
       },
-      "capabilities": [
+      "capabilities":  [
         "CAPABILITY_SYNC",
         "CAPABILITY_PROVISION"
       ]
     }
   ],
-  "connectorCapabilities": [
+  "connectorCapabilities":  [
     "CAPABILITY_PROVISION",
     "CAPABILITY_SYNC"
   ],
-  "credentialDetails": {}
+  "credentialDetails":  {}
 }

pkg/config/schema.go cmd/baton-databricks/config/schema.gopkg/config/schema.go renamed to cmd/baton-databricks/config/schema.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/conductorone/baton-databricks/pkg/config"
+	"github.com/conductorone/baton-databricks/cmd/baton-databricks/config"
 	configSchema "github.com/conductorone/baton-sdk/pkg/config"
 	"github.com/conductorone/baton-sdk/pkg/connectorbuilder"
 	"github.com/conductorone/baton-sdk/pkg/types"
@@ -20,6 +20,7 @@ import (
 var (
 	connectorName = "baton-databricks"
 	version       = "dev"
+	defaultHost   = "cloud.databricks.com"
 )
 
 func main() {
@@ -58,7 +59,7 @@ func prepareClientAuth(ctx context.Context, cfg *viper.Viper) databricks.Auth {
 	password := cfg.GetString(config.PasswordField.FieldName)
 	workspaces := cfg.GetStringSlice(config.WorkspacesField.FieldName)
 	tokens := cfg.GetStringSlice(config.TokensField.FieldName)
-	accountHostname := databricks.GetAccountHostname(databricks.GetHostname(cfg))
+	accountHostname := databricks.GetAccountHostname(getHostname(cfg))
 
 	switch {
 	case username != "" && password != "":
@@ -108,8 +109,8 @@ func getConnector(ctx context.Context, cfg *viper.Viper) (types.ConnectorServer,
 		return nil, err
 	}
 
-	hostname := databricks.GetHostname(cfg)
-	accountHostname := databricks.GetAccountHostname(databricks.GetHostname(cfg))
+	hostname := getHostname(cfg)
+	accountHostname := databricks.GetAccountHostname(getHostname(cfg))
 	auth := prepareClientAuth(ctx, cfg)
 	cb, err := connector.New(
 		ctx,
@@ -132,3 +133,10 @@ func getConnector(ctx context.Context, cfg *viper.Viper) (types.ConnectorServer,
 
 	return c, nil
 }
+
+func getHostname(cfg *viper.Viper) string {
+	if cfg.GetString(config.HostnameField.FieldName) == "" {
+		return defaultHost
+	}
+	return cfg.GetString(config.HostnameField.FieldName)
+}

pkg/config/schema_test.go …d/baton-databricks/config/schema_test.gopkg/config/schema_test.go renamed to cmd/baton-databricks/config/schema_test.go pkg/config/schema_test.go renamed to cmd/baton-databricks/config/schema_test.go

@@ -7,16 +7,15 @@ import (
 	"net/url"
 	"strings"
 
-	"github.com/conductorone/baton-databricks/pkg/config"
 	v2 "github.com/conductorone/baton-sdk/pb/c1/connector/v2"
 	"github.com/conductorone/baton-sdk/pkg/uhttp"
-	"github.com/spf13/viper"
 )
 
 const (
+
 	defaultHost = "cloud.databricks.com" // aws
-	azureHost   = "azuredatabricks.net"
-	gcpHost     = "gcp.databricks.net"
+	azureHost = "azuredatabricks.net"
+	gcpHost   = "gcp.databricks.net"
 
 	// Some of these are case sensitive.
 	usersEndpoint             = "/api/2.0/preview/scim/v2/Users"
@@ -47,13 +46,6 @@ type Client struct {
 	isWSAPIAvailable  bool
 }
 
-func GetHostname(cfg *viper.Viper) string {
-	if cfg.GetString(config.HostnameField.FieldName) == "" {
-		return defaultHost
-	}
-	return cfg.GetString(config.HostnameField.FieldName)
-}
-
 func GetAccountHostname(hostname string) string {
 	if strings.HasSuffix(hostname, azureHost) {
 		return "accounts." + azureHost