[MM-56653] Improve license loading errors (#26050)

server/channels/utils/license_test.go

@@ -19,12 +19,12 @@ var validTestLicense = []byte("eyJpZCI6InpvZ3c2NW44Z2lmajVkbHJoYThtYnUxcGl3Iiwia
 func TestValidateLicense(t *testing.T) {
 	t.Run("should fail with junk data", func(t *testing.T) {
 		b1 := []byte("junk")
-		ok, _ := LicenseValidator.ValidateLicense(b1)
-		require.False(t, ok, "should have failed - bad license")
+		_, err := LicenseValidator.ValidateLicense(b1)
+		require.Error(t, err, "should have failed - bad license")
 
 		b2 := []byte("junkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunkjunk")
-		ok, _ = LicenseValidator.ValidateLicense(b2)
-		require.False(t, ok, "should have failed - bad license")
+		_, err = LicenseValidator.ValidateLicense(b2)
+		require.Error(t, err, "should have failed - bad license")
 	})
 
 	t.Run("should not panic on shorter than expected input", func(t *testing.T) {
@@ -42,8 +42,8 @@ func TestValidateLicense(t *testing.T) {
 		err = encoder.Close()
 		require.NoError(t, err)
 
-		ok, str := LicenseValidator.ValidateLicense(licenseData.Bytes())
-		require.False(t, ok)
+		str, err := LicenseValidator.ValidateLicense(licenseData.Bytes())
+		require.Error(t, err)
 		require.Empty(t, str)
 	})
 
@@ -61,8 +61,8 @@ func TestValidateLicense(t *testing.T) {
 		err = encoder.Close()
 		require.NoError(t, err)
 
-		ok, str := LicenseValidator.ValidateLicense(licenseData.Bytes())
-		require.False(t, ok)
+		str, err := LicenseValidator.ValidateLicense(licenseData.Bytes())
+		require.Error(t, err)
 		require.Empty(t, str)
 	})
 
@@ -70,8 +70,8 @@ func TestValidateLicense(t *testing.T) {
 		os.Setenv("MM_SERVICEENVIRONMENT", model.ServiceEnvironmentTest)
 		defer os.Unsetenv("MM_SERVICEENVIRONMENT")
 
-		ok, str := LicenseValidator.ValidateLicense(nil)
-		require.False(t, ok)
+		str, err := LicenseValidator.ValidateLicense(nil)
+		require.Error(t, err)
 		require.Empty(t, str)
 	})
 
@@ -79,8 +79,8 @@ func TestValidateLicense(t *testing.T) {
 		os.Setenv("MM_SERVICEENVIRONMENT", model.ServiceEnvironmentTest)
 		defer os.Unsetenv("MM_SERVICEENVIRONMENT")
 
-		ok, str := LicenseValidator.ValidateLicense(validTestLicense)
-		require.True(t, ok)
+		str, err := LicenseValidator.ValidateLicense(validTestLicense)
+		require.NoError(t, err)
 		require.NotEmpty(t, str)
 	})
 
@@ -88,8 +88,8 @@ func TestValidateLicense(t *testing.T) {
 		os.Setenv("MM_SERVICEENVIRONMENT", model.ServiceEnvironmentProduction)
 		defer os.Unsetenv("MM_SERVICEENVIRONMENT")
 
-		ok, str := LicenseValidator.ValidateLicense(validTestLicense)
-		require.False(t, ok)
+		str, err := LicenseValidator.ValidateLicense(validTestLicense)
+		require.Error(t, err)
 		require.Empty(t, str)
 	})
 }
@@ -117,7 +117,7 @@ func TestGetLicenseFileFromDisk(t *testing.T) {
 		fileBytes := GetLicenseFileFromDisk(f.Name())
 		require.NotEmpty(t, fileBytes, "should have read the file")
 
-		success, _ := LicenseValidator.ValidateLicense(fileBytes)
-		assert.False(t, success, "should have been an invalid file")
+		_, err = LicenseValidator.ValidateLicense(fileBytes)
+		assert.Error(t, err, "should have been an invalid file")
 	})
 }