Skip to content

Commit 1f397e9

Browse files
fix: handle null email in notifications (#17648)
1 parent ec8bf14 commit 1f397e9

File tree

3 files changed

+24
-12
lines changed

3 files changed

+24
-12
lines changed

airbyte-notification/src/main/kotlin/io/airbyte/notification/CustomerioNotificationClient.kt

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,11 @@ class CustomerioNotificationClient(
9999

100100
override fun notifyJobFailure(
101101
summary: SyncSummary,
102-
receiverEmail: String,
102+
receiverEmail: String?,
103103
): Boolean {
104+
if (receiverEmail == null) {
105+
return false
106+
}
104107
val node = buildSyncCompletedJson(summary, receiverEmail, SYNC_FAILURE_MESSAGE_ID)
105108
val payload = Jsons.serialize(node)
106109
return try {
@@ -113,8 +116,11 @@ class CustomerioNotificationClient(
113116

114117
override fun notifyJobSuccess(
115118
summary: SyncSummary,
116-
receiverEmail: String,
119+
receiverEmail: String?,
117120
): Boolean {
121+
if (receiverEmail == null) {
122+
return false
123+
}
118124
val node = buildSyncCompletedJson(summary, receiverEmail, SYNC_SUCCEED_MESSAGE_ID)
119125
val payload = Jsons.serialize(node)
120126
return try {
@@ -130,8 +136,11 @@ class CustomerioNotificationClient(
130136
// instead of being passed in
131137
override fun notifyConnectionDisabled(
132138
summary: SyncSummary,
133-
receiverEmail: String,
139+
receiverEmail: String?,
134140
): Boolean {
141+
if (receiverEmail == null) {
142+
return false
143+
}
135144
val node = buildSyncCompletedJson(summary, receiverEmail, AUTO_DISABLE_TRANSACTION_MESSAGE_ID)
136145
val payload = Jsons.serialize(node)
137146
return try {
@@ -144,8 +153,11 @@ class CustomerioNotificationClient(
144153

145154
override fun notifyConnectionDisableWarning(
146155
summary: SyncSummary,
147-
receiverEmail: String,
156+
receiverEmail: String?,
148157
): Boolean {
158+
if (receiverEmail == null) {
159+
return false
160+
}
149161
val node = buildSyncCompletedJson(summary, receiverEmail, AUTO_DISABLE_WARNING_TRANSACTION_MESSAGE_ID)
150162
val payload = Jsons.serialize(node)
151163
return try {

airbyte-notification/src/main/kotlin/io/airbyte/notification/NotificationClient.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,22 +17,22 @@ import java.util.UUID
1717
abstract class NotificationClient {
1818
abstract fun notifyJobFailure(
1919
summary: SyncSummary,
20-
receiverEmail: String,
20+
receiverEmail: String?,
2121
): Boolean
2222

2323
abstract fun notifyJobSuccess(
2424
summary: SyncSummary,
25-
receiverEmail: String,
25+
receiverEmail: String?,
2626
): Boolean
2727

2828
abstract fun notifyConnectionDisabled(
2929
summary: SyncSummary,
30-
receiverEmail: String,
30+
receiverEmail: String?,
3131
): Boolean
3232

3333
abstract fun notifyConnectionDisableWarning(
3434
summary: SyncSummary,
35-
receiverEmail: String,
35+
receiverEmail: String?,
3636
): Boolean
3737

3838
abstract fun notifyBreakingChangeWarning(

airbyte-notification/src/main/kotlin/io/airbyte/notification/SlackNotificationClient.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ class SlackNotificationClient : NotificationClient {
5858

5959
override fun notifyJobFailure(
6060
summary: SyncSummary,
61-
receiverEmail: String,
61+
receiverEmail: String?,
6262
): Boolean {
6363
val legacyMessage: String
6464
try {
@@ -97,7 +97,7 @@ class SlackNotificationClient : NotificationClient {
9797

9898
override fun notifyJobSuccess(
9999
summary: SyncSummary,
100-
receiverEmail: String,
100+
receiverEmail: String?,
101101
): Boolean {
102102
val legacyMessage: String
103103
try {
@@ -136,7 +136,7 @@ class SlackNotificationClient : NotificationClient {
136136

137137
override fun notifyConnectionDisabled(
138138
summary: SyncSummary,
139-
receiverEmail: String,
139+
receiverEmail: String?,
140140
): Boolean {
141141
val legacyMessage: String
142142
try {
@@ -179,7 +179,7 @@ class SlackNotificationClient : NotificationClient {
179179

180180
override fun notifyConnectionDisableWarning(
181181
summary: SyncSummary,
182-
receiverEmail: String,
182+
receiverEmail: String?,
183183
): Boolean {
184184
val legacyMessage: String
185185
try {

0 commit comments

Comments
 (0)