Merge pull request #29 from ConductorOne/felipelucero/fix-create-account

[BB-1227]Fix Create Account

Author: FeliLucero1

pkg/connector/connector.go

@@ -59,7 +59,7 @@ func (d *Databricks) Metadata(ctx context.Context) (*v2.ConnectorMetadata, error
 						StringField: &v2.ConnectorAccountCreationSchema_StringField{},
 					},
 					Placeholder: "Display Name",
-					Order:       4,
+					Order:       2,
 				},
 				"givenName": {
 					DisplayName: "Given Name",
@@ -69,7 +69,7 @@ func (d *Databricks) Metadata(ctx context.Context) (*v2.ConnectorMetadata, error
 						StringField: &v2.ConnectorAccountCreationSchema_StringField{},
 					},
 					Placeholder: "Given Name",
-					Order:       2,
+					Order:       3,
 				},
 				"familyName": {
 					DisplayName: "Family Name",
@@ -79,7 +79,7 @@ func (d *Databricks) Metadata(ctx context.Context) (*v2.ConnectorMetadata, error
 						StringField: &v2.ConnectorAccountCreationSchema_StringField{},
 					},
 					Placeholder: "Family Name",
-					Order:       3,
+					Order:       4,
 				},
 				"active": {
 					DisplayName: "Active",
@@ -89,7 +89,7 @@ func (d *Databricks) Metadata(ctx context.Context) (*v2.ConnectorMetadata, error
 						BoolField: &v2.ConnectorAccountCreationSchema_BoolField{},
 					},
 					Placeholder: "active",
-					Order:       4,
+					Order:       5,
 				},
 			},
 		},

pkg/connector/users.go

@@ -175,11 +175,14 @@ func (o *userBuilder) CreateAccount(ctx context.Context, accountInfo *v2.Account
 	pMap := accountInfo.Profile.AsMap()
 	body := &databricks.CreateUserBody{}
 
-	if username, ok := pMap["userName"]; ok {
-		if username == "" {
-			return nil, nil, nil, fmt.Errorf("baton-databricks: username is required to create a user")
+	// Use email as userName since Databricks API expects email in userName field
+	if email, ok := pMap["email"]; ok {
+		if email == "" {
+			return nil, nil, nil, fmt.Errorf("baton-databricks: email is required to create a user")
 		}
-		body.UserName = username.(string)
+		body.UserName = email.(string)
+	} else {
+		return nil, nil, nil, fmt.Errorf("baton-databricks: email field is required in profile")
 	}
 
 	if displayName, ok := pMap["displayName"]; ok {
@@ -224,8 +227,9 @@ func (o *userBuilder) CreateAccount(ctx context.Context, accountInfo *v2.Account
 		return nil, nil, nil, fmt.Errorf("baton-databricks: failed to create user resource: %w", err)
 	}
 
-	return &v2.CreateAccountResponse_ActionRequiredResult{
-		Resource: resource,
+	return &v2.CreateAccountResponse_SuccessResult{
+		Resource:              resource,
+		IsCreateAccountResult: true,
 	}, nil, nil, nil
 }