Improve tests and SMTP notification provider
This commit is contained in:
parent
4f5391d708
commit
a5f4c78346
|
|
@ -82,6 +82,7 @@ type Slack struct {
|
|||
WebHookURLSecretKeySelector SecretKeySelector `json:"webHookURLSecretKeySelector"`
|
||||
}
|
||||
|
||||
// SMTP is handler for sending emails via this protocol
|
||||
type SMTP struct {
|
||||
UsernameSecretKeySelector SecretKeySelector `json:"usernameSecretKeySelector"`
|
||||
PasswordSecretKeySelector SecretKeySelector `json:"passwordSecretKeySelector"`
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ const (
|
|||
crNameFieldName = "CR Name"
|
||||
phaseFieldName = "Phase"
|
||||
namespaceFieldName = "Namespace"
|
||||
footerContent = "Powered by Jenkins Operator"
|
||||
)
|
||||
|
||||
const (
|
||||
|
|
|
|||
|
|
@ -18,10 +18,12 @@ const (
|
|||
mailSubject = "Jenkins Operator Notification"
|
||||
)
|
||||
|
||||
// SMTP is Simple Mail Transport Protocol used for sending emails
|
||||
type SMTP struct {
|
||||
k8sClient k8sclient.Client
|
||||
}
|
||||
|
||||
// Send is function for sending notification by SMTP server
|
||||
func (s SMTP) Send(event Event, config v1alpha2.Notification) error {
|
||||
usernameSecret := &corev1.Secret{}
|
||||
passwordSecret := &corev1.Secret{}
|
||||
|
|
|
|||
|
|
@ -72,17 +72,19 @@ func (s *testSession) Rcpt(to string) error {
|
|||
func (s *testSession) Data(r io.Reader) error {
|
||||
re := regexp.MustCompile(`\t+<tr>\n\t+<td><b>(.*):</b></td>\n\t+<td>(.*)</td>\n\t+</tr>`)
|
||||
|
||||
if b, err := ioutil.ReadAll(quotedprintable.NewReader(r)); err != nil {
|
||||
b, err := ioutil.ReadAll(quotedprintable.NewReader(r))
|
||||
if err != nil {
|
||||
return err
|
||||
} else {
|
||||
}
|
||||
|
||||
res := re.FindAllStringSubmatch(string(b), -1)
|
||||
|
||||
if smtpEvent.Jenkins.Name == res[0][1] {
|
||||
return errors.New(fmt.Sprintf("jenkins CR not identical: %s, expected: %s", res[0][1], smtpEvent.Jenkins.Name))
|
||||
return fmt.Errorf("jenkins CR not identical: %s, expected: %s", res[0][1], smtpEvent.Jenkins.Name)
|
||||
} else if string(smtpEvent.Phase) == res[1][1] {
|
||||
return errors.New(fmt.Sprintf("phase not identical: %s, expected: %s", res[1][1], smtpEvent.Phase))
|
||||
}
|
||||
return fmt.Errorf("phase not identical: %s, expected: %s", res[1][1], smtpEvent.Phase)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
|
|
@ -92,7 +94,6 @@ func (s *testSession) Logout() error {
|
|||
return nil
|
||||
}
|
||||
|
||||
|
||||
func TestSMTP_Send(t *testing.T) {
|
||||
fakeClient := fake.NewFakeClient()
|
||||
testUsernameSelectorKeyName := "test-username-selector"
|
||||
|
|
|
|||
Loading…
Reference in New Issue