CLOUDP-72727: Fix LDAPConfigurationsService.Save to pass LDAPConfiguration as input (#136)

Author: andreaangiolillo

mongodbatlas/ldap_configurations.go

@@ -7,8 +7,9 @@ import (
 )
 
 const (
-	ldapConfigurationPath       = "groups/%s/userSecurity"
-	ldapVerifyConfigurationPath = ldapConfigurationPath + "/ldap/verify"
+	ldapConfigurationPath                = "groups/%s/userSecurity"
+	ldapConfigurationPathuserToDNMapping = ldapConfigurationPath + "/ldap/userToDNMapping"
+	ldapVerifyConfigurationPath          = ldapConfigurationPath + "/ldap/verify"
 )
 
 // LDAPConfigurationsService is an interface of the LDAP Configuration
@@ -19,7 +20,7 @@ type LDAPConfigurationsService interface {
 	Verify(context.Context, string, *LDAP) (*LDAPConfiguration, *Response, error)
 	Get(context.Context, string) (*LDAPConfiguration, *Response, error)
 	GetStatus(context.Context, string, string) (*LDAPConfiguration, *Response, error)
-	Save(context.Context, string, *LDAP) (*LDAPConfiguration, *Response, error)
+	Save(context.Context, string, *LDAPConfiguration) (*LDAPConfiguration, *Response, error)
 	Delete(context.Context, string) (*LDAPConfiguration, *Response, error)
 }
 
@@ -131,7 +132,7 @@ func (s *LDAPConfigurationsServiceOp) GetStatus(ctx context.Context, groupID, re
 // Save saves an LDAP configuration for a Atlas project.
 //
 // See more: https://docs.atlas.mongodb.com/reference/api/ldaps-configuration-save/
-func (s *LDAPConfigurationsServiceOp) Save(ctx context.Context, groupID string, configuration *LDAP) (*LDAPConfiguration, *Response, error) {
+func (s *LDAPConfigurationsServiceOp) Save(ctx context.Context, groupID string, configuration *LDAPConfiguration) (*LDAPConfiguration, *Response, error) {
 	if groupID == "" {
 		return nil, nil, NewArgError("groupID", "must be set")
 	}
@@ -188,7 +189,7 @@ func (s *LDAPConfigurationsServiceOp) Delete(ctx context.Context, groupID string
 		return nil, nil, NewArgError("groupID", "must be set")
 	}
 
-	path := fmt.Sprintf(ldapConfigurationPath, groupID)
+	path := fmt.Sprintf(ldapConfigurationPathuserToDNMapping, groupID)
 
 	req, err := s.Client.NewRequest(ctx, http.MethodDelete, path, nil)
 	if err != nil {

mongodbatlas/ldap_configurations_test.go

@@ -28,7 +28,12 @@ func TestLDAPConfigurations_Verify(t *testing.T) {
 		}`)
 	})
 
-	request := &LDAP{}
+	request := &LDAP{
+		Hostname:     "atlas-ldaps-01.ldap.myteam.com",
+		Port:         636,
+		BindUsername: "CN=Administrator,CN=Users,DC=atlas-ldaps-01,DC=myteam,DC=com",
+		BindPassword: "admin",
+	}
 	ldap, _, err := client.LDAPConfigurations.Verify(ctx, groupID, request)
 	if err != nil {
 		t.Fatalf("LDAPConfigurations.Verify returned error: %v", err)
@@ -133,7 +138,16 @@ func TestLDAPConfigurations_Save(t *testing.T) {
 		}`)
 	})
 
-	request := &LDAP{}
+	request := &LDAPConfiguration{
+		LDAP: &LDAP{
+			AuthenticationEnabled: true,
+			AuthorizationEnabled:  true,
+			Hostname:              "atlas-ldaps-01.ldap.myteam.com",
+			Port:                  636,
+			BindUsername:          "CN=Administrator,CN=Users,DC=atlas-ldaps-01,DC=myteam,DC=com",
+			BindPassword:          "admin",
+		},
+	}
 	ldap, _, err := client.LDAPConfigurations.Save(ctx, groupID, request)
 	if err != nil {
 		t.Fatalf("LDAPConfigurations.Save returned error: %v", err)
@@ -218,7 +232,7 @@ func TestLDAPConfigurations_Delete(t *testing.T) {
 
 	groupID := "535683b3794d371327b"
 
-	mux.HandleFunc(fmt.Sprintf("/groups/%s/userSecurity", groupID), func(w http.ResponseWriter, r *http.Request) {
+	mux.HandleFunc(fmt.Sprintf("/groups/%s/userSecurity/ldap/userToDNMapping", groupID), func(w http.ResponseWriter, r *http.Request) {
 		testMethod(t, r, http.MethodDelete)
 		fmt.Fprint(w, `{
 			  "ldap" : {
@@ -227,11 +241,7 @@ func TestLDAPConfigurations_Delete(t *testing.T) {
 				"authzQueryTemplate" : "{USER}?memberOf?base",
 				"bindUsername" : "CN=Administrator,CN=Users,DC=atlas-ldaps-01,DC=myteam,DC=com",
 				"hostname" : "atlas-ldaps-01.ldap.myteam.com",
-				"port" : 636,
-				"userToDNMapping" : [ {
-				  "match" : "(.*)",
-				  "substitution" : "CN={0},CN=Users,DC=atlas-ldaps-01,DC=myteam,DC=com"
-				} ]
+				"port" : 636
 			  }
 		}`)
 	})
@@ -248,13 +258,7 @@ func TestLDAPConfigurations_Delete(t *testing.T) {
 			Hostname:              "atlas-ldaps-01.ldap.myteam.com",
 			Port:                  636,
 			BindUsername:          "CN=Administrator,CN=Users,DC=atlas-ldaps-01,DC=myteam,DC=com",
-			UserToDNMapping: []*UserToDNMapping{
-				{
-					Match:        "(.*)",
-					Substitution: "CN={0},CN=Users,DC=atlas-ldaps-01,DC=myteam,DC=com",
-				},
-			},
-			AuthzQueryTemplate: "{USER}?memberOf?base",
+			AuthzQueryTemplate:    "{USER}?memberOf?base",
 		},
 	}