Skip to content

Commit e4160c5

Browse files
committed
fixup! Add proxy support to Telegram notifier
Signed-off-by: cappyzawa <[email protected]>
1 parent fc4adfd commit e4160c5

File tree

2 files changed

+20
-4
lines changed

2 files changed

+20
-4
lines changed

internal/notifier/telegram.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ func NewTelegram(apiURL, proxyURL, channel, token string) (*Telegram, error) {
3939
return nil, errors.New("empty Telegram token")
4040
}
4141

42-
if apiURL == "" {
43-
apiURL = fmt.Sprintf(defaultTelegramBaseURL, token)
44-
}
42+
// Note: Always ignore apiURL parameter for backward compatibility.
43+
// The address field was ignored until v1.6.0.
44+
apiURL = fmt.Sprintf(defaultTelegramBaseURL, token)
4545

4646
return &Telegram{
4747
URL: apiURL,

internal/notifier/telegram_test.go

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,11 +60,27 @@ func TestTelegram_Post(t *testing.T) {
6060
}))
6161
defer ts.Close()
6262

63-
telegram, err := NewTelegram(ts.URL, "", "channel", "token")
63+
telegram, err := NewTelegram("", "", "channel", "token")
6464
require.NoError(t, err)
6565

66+
telegram.URL = ts.URL
67+
6668
ev := testEvent()
6769
ev.Metadata["kubernetes.io/somekey"] = "some.value"
6870
err = telegram.Post(context.TODO(), ev)
6971
require.NoError(t, err)
7072
}
73+
74+
func TestTelegram_NewTelegram_IgnoresAddress(t *testing.T) {
75+
telegram, err := NewTelegram("https://api.telegram.org", "", "channel", "token")
76+
require.NoError(t, err)
77+
require.Equal(t, "https://api.telegram.org/bottoken", telegram.URL)
78+
79+
telegram2, err := NewTelegram("https://custom.example.com", "", "channel", "token")
80+
require.NoError(t, err)
81+
require.Equal(t, "https://api.telegram.org/bottoken", telegram2.URL)
82+
83+
telegram3, err := NewTelegram("", "", "channel", "token")
84+
require.NoError(t, err)
85+
require.Equal(t, "https://api.telegram.org/bottoken", telegram3.URL)
86+
}

0 commit comments

Comments
 (0)