[MM-59350] Include LDAP vendor errors in Support Packet (mattermost#2…

…7571)

server/channels/app/support_packet.go

@@ -123,8 +123,19 @@ func (a *App) generateSupportPacketYaml(c request.CTX) (*model.FileData, error)
 	/* LDAP */
 
 	var vendorName, vendorVersion string
-	if ldapInterface := a.Ldap(); ldapInterface != nil {
-		vendorName, vendorVersion = ldapInterface.GetVendorNameAndVendorVersion(c)
+	ldap := a.Ldap()
+	if ldap != nil {
+		vendorName, vendorVersion, err = ldap.GetVendorNameAndVendorVersion(c)
+		if err != nil {
+			rErr = multierror.Append(errors.Wrap(err, "error while getting LDAP vendor info"))
+		}
+
+		if vendorName == "" {
+			vendorName = "unknown"
+		}
+		if vendorVersion == "" {
+			vendorVersion = "unknown"
+		}
 	}
 
 	/* Elastic Search */

server/channels/app/support_packet_test.go

@@ -9,13 +9,15 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
 	"github.com/stretchr/testify/require"
 	"gopkg.in/yaml.v2"
 
 	"github.com/mattermost/mattermost/server/public/model"
 	"github.com/mattermost/mattermost/server/v8/channels/app/platform"
 	smocks "github.com/mattermost/mattermost/server/v8/channels/store/storetest/mocks"
 	"github.com/mattermost/mattermost/server/v8/config"
+	emocks "github.com/mattermost/mattermost/server/v8/einterfaces/mocks"
 	fmocks "github.com/mattermost/mattermost/server/v8/platform/shared/filestore/mocks"
 )
 
@@ -46,7 +48,7 @@ func TestGenerateSupportPacketYaml(t *testing.T) {
 	defer th.TearDown()
 
 	licenseUsers := 100
-	license := model.NewTestLicense()
+	license := model.NewTestLicense("ldap")
 	license.Features.Users = model.NewInt(licenseUsers)
 	th.App.Srv().SetLicense(license)
 
@@ -148,6 +150,34 @@ func TestGenerateSupportPacketYaml(t *testing.T) {
 		assert.Equal(t, "mock", packet.FileDriver)
 		assert.Equal(t, "FAIL: all broken", packet.FileStatus)
 	})
+
+	t.Run("no LDAP vendor info", func(t *testing.T) {
+		ldapMock := &emocks.LdapInterface{}
+		ldapMock.On(
+			"GetVendorNameAndVendorVersion",
+			mock.AnythingOfType("*request.Context"),
+		).Return("", "", nil)
+		th.App.Channels().Ldap = ldapMock
+
+		packet := generateSupportPacket(t)
+
+		assert.Equal(t, "unknown", packet.LdapVendorName)
+		assert.Equal(t, "unknown", packet.LdapVendorVersion)
+	})
+
+	t.Run("found LDAP vendor info", func(t *testing.T) {
+		ldapMock := &emocks.LdapInterface{}
+		ldapMock.On(
+			"GetVendorNameAndVendorVersion",
+			mock.AnythingOfType("*request.Context"),
+		).Return("some vendor", "v1.0.0", nil)
+		th.App.Channels().Ldap = ldapMock
+
+		packet := generateSupportPacket(t)
+
+		assert.Equal(t, "some vendor", packet.LdapVendorName)
+		assert.Equal(t, "v1.0.0", packet.LdapVendorVersion)
+	})
 }
 
 func TestGenerateSupportPacket(t *testing.T) {

server/einterfaces/ldap.go

@@ -26,5 +26,5 @@ type LdapInterface interface {
 	UpdateProfilePictureIfNecessary(request.CTX, model.User, model.Session)
 	GetADLdapIdFromSAMLId(c request.CTX, authData string) string
 	GetSAMLIdFromADLdapId(c request.CTX, authData string) string
-	GetVendorNameAndVendorVersion(rctx request.CTX) (string, string)
+	GetVendorNameAndVendorVersion(rctx request.CTX) (string, string, error)
 }