fix: resolve all golangci-lint issues

- Replace fmt.Printf with log.Printf to satisfy forbidigo - Fix ineffectual assignment to err in proxy block by avoiding variable shadowing - Format long lines with golines - Use assert.Error/NoError instead of NotNil/Nil for error assertions - Use assert.True/False instead of Equal for boolean assertions - Use assert.Empty instead of Equal with len check - Use require for mid-test error assertions that guard subsequent operations - Add testify/require import
2026-06-04 18:23:45 +08:00 · 2026-04-08 22:47:32 +08:00
parent 8587a97ab1
commit 0bc6220388
2 changed files with 89 additions and 47 deletions
@@ -157,7 +157,7 @@ func globList(keys []string) []string {
 		pattern = strings.Trim(pattern, " ")
 		matches, err := filepath.Glob(pattern)
 		if err != nil {
-			fmt.Printf("Glob error for %q: %s\n", pattern, err)
+			log.Printf("Glob error for %q: %s", pattern, err)
 			continue
 		}
 		newKeys = append(newKeys, matches...)
@@ -276,18 +276,30 @@ func (p *Plugin) Exec() (err error) {
 	if p.Config.TemplateVars != "" {
 		p.Tpl = make(map[string]string)
 		if err = json.Unmarshal([]byte(p.Config.TemplateVars), &p.Tpl); err != nil {
-			return fmt.Errorf("unable to unmarshal template vars from JSON string '%s': %w", p.Config.TemplateVars, err)
+			return fmt.Errorf(
+				"unable to unmarshal template vars from JSON string '%s': %w",
+				p.Config.TemplateVars,
+				err,
+			)
 		}
 	}

 	if p.Config.TemplateVarsFile != "" {
 		content, err := os.ReadFile(p.Config.TemplateVarsFile)
 		if err != nil {
-			return fmt.Errorf("unable to read file with template vars '%s': %w", p.Config.TemplateVarsFile, err)
+			return fmt.Errorf(
+				"unable to read file with template vars '%s': %w",
+				p.Config.TemplateVarsFile,
+				err,
+			)
 		}
 		vars := make(map[string]string)
 		if err = json.Unmarshal(content, &vars); err != nil {
-			return fmt.Errorf("unable to unmarshal template vars from JSON file '%s': %w", p.Config.TemplateVarsFile, err)
+			return fmt.Errorf(
+				"unable to unmarshal template vars from JSON file '%s': %w",
+				p.Config.TemplateVarsFile,
+				err,
+			)
 		}
 		// Merging templates variables from file to the variables form plugin settings (variables from file takes precedence)
 		if p.Tpl == nil {
@@ -301,7 +313,8 @@ func (p *Plugin) Exec() (err error) {

 	var bot *tgbotapi.BotAPI
 	if len(p.Config.Socks5) > 0 {
-		proxyURL, err := url.Parse(p.Config.Socks5)
+		var proxyURL *url.URL
+		proxyURL, err = url.Parse(p.Config.Socks5)
 		if err != nil {
 			return fmt.Errorf("unable to parse socks5 proxy URL '%s': %w", p.Config.Socks5, err)
 		}
@@ -429,7 +442,13 @@ func (p *Plugin) Exec() (err error) {
 				continue
 			}

-			msg := tgbotapi.NewVenue(user, location.Title, location.Address, location.Latitude, location.Longitude)
+			msg := tgbotapi.NewVenue(
+				user,
+				location.Title,
+				location.Address,
+				location.Latitude,
+				location.Longitude,
+			)
 			if err := p.Send(bot, msg); err != nil {
 				return err
 			}
@@ -475,14 +494,16 @@ func (p *Plugin) Message() []string {
 	//  chore: update default template
 	//
 	// 🌐 https://cloud.drone.io/appleboy/drone-telegram/106
-	return []string{fmt.Sprintf("%s Build #%d of `%s` %s.\n\n📝 Commit by %s on `%s`:\n``` %s ```\n\n🌐 %s",
-		icon,
-		p.Build.Number,
-		p.Repo.FullName,
-		p.Build.Status,
-		p.Commit.Author,
-		p.Commit.Branch,
-		p.Commit.Message,
-		p.Build.Link,
-	)}
+	return []string{
+		fmt.Sprintf("%s Build #%d of `%s` %s.\n\n📝 Commit by %s on `%s`:\n``` %s ```\n\n🌐 %s",
+			icon,
+			p.Build.Number,
+			p.Repo.FullName,
+			p.Build.Status,
+			p.Commit.Author,
+			p.Commit.Branch,
+			p.Commit.Message,
+			p.Build.Link,
+		),
+	}
 }
@@ -7,6 +7,7 @@ import (

 	"github.com/appleboy/drone-template-lib/template"
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )

 func TestMissingDefaultConfig(t *testing.T) {
@@ -14,7 +15,7 @@ func TestMissingDefaultConfig(t *testing.T) {

 	err := plugin.Exec()

-	assert.NotNil(t, err)
+	assert.Error(t, err)
 }

 func TestMissingUserConfig(t *testing.T) {
@@ -26,7 +27,7 @@ func TestMissingUserConfig(t *testing.T) {

 	err := plugin.Exec()

-	assert.NotNil(t, err)
+	assert.Error(t, err)
 }

 func TestDefaultMessageFormat(t *testing.T) {
@@ -51,7 +52,13 @@ func TestDefaultMessageFormat(t *testing.T) {

 	message := plugin.Message()

-	assert.Equal(t, []string{"✅ Build #101 of `appleboy/go-hello` success.\n\n📝 Commit by Bo-Yi Wu on `master`:\n``` update travis ```\n\n🌐 https://github.com/appleboy/go-hello"}, message)
+	assert.Equal(
+		t,
+		[]string{
+			"✅ Build #101 of `appleboy/go-hello` success.\n\n📝 Commit by Bo-Yi Wu on `master`:\n``` update travis ```\n\n🌐 https://github.com/appleboy/go-hello",
+		},
+		message,
+	)
 }

 func TestDefaultMessageFormatFromGitHub(t *testing.T) {
@@ -73,7 +80,11 @@ func TestDefaultMessageFormatFromGitHub(t *testing.T) {

 	message := plugin.Message()

-	assert.Equal(t, []string{"appleboy/go-hello/test-workflow triggered by appleboy (push)"}, message)
+	assert.Equal(
+		t,
+		[]string{"appleboy/go-hello/test-workflow triggered by appleboy (push)"},
+		message,
+	)
 }

 func TestSendMessage(t *testing.T) {
@@ -97,8 +108,13 @@ func TestSendMessage(t *testing.T) {
 		},

 		Config: Config{
-			Token:    os.Getenv("TELEGRAM_TOKEN"),
-			To:       []string{os.Getenv("TELEGRAM_TO"), os.Getenv("TELEGRAM_TO") + ":appleboy@gmail.com", "中文ID", "1234567890"},
+			Token: os.Getenv("TELEGRAM_TOKEN"),
+			To: []string{
+				os.Getenv("TELEGRAM_TO"),
+				os.Getenv("TELEGRAM_TO") + ":appleboy@gmail.com",
+				"中文ID",
+				"1234567890",
+			},
 			Message:  "Test Telegram Chat Bot From Travis or Local, commit message: 『{{ build.message }}』",
 			Photo:    []string{"tests/github.png", "1234", " "},
 			Document: []string{"tests/gophercolor.png", "1234", " "},
@@ -106,24 +122,29 @@ func TestSendMessage(t *testing.T) {
 			Audio:    []string{"tests/audio.mp3", "1234", " "},
 			Voice:    []string{"tests/voice.ogg", "1234", " "},
 			Location: []string{"24.9163213 121.1424972", "1", " "},
-			Venue:    []string{"35.661777 139.704051 竹北體育館 新竹縣竹北市", "24.9163213 121.1424972", "1", " "},
-			Video:    []string{"tests/video.mp4", "1234", " "},
-			Debug:    false,
+			Venue: []string{
+				"35.661777 139.704051 竹北體育館 新竹縣竹北市",
+				"24.9163213 121.1424972",
+				"1",
+				" ",
+			},
+			Video: []string{"tests/video.mp4", "1234", " "},
+			Debug: false,
 		},
 	}

 	err := plugin.Exec()
-	assert.NotNil(t, err)
+	require.Error(t, err)

 	plugin.Config.Format = formatMarkdown
 	plugin.Config.Message = "Test escape under_score"
 	err = plugin.Exec()
-	assert.NotNil(t, err)
+	require.Error(t, err)

 	// disable message
 	plugin.Config.Message = ""
 	err = plugin.Exec()
-	assert.NotNil(t, err)
+	assert.Error(t, err)
 }

 func TestDisableWebPagePreviewMessage(t *testing.T) {
@@ -138,13 +159,13 @@ func TestDisableWebPagePreviewMessage(t *testing.T) {

 	plugin.Config.Message = "DisableWebPagePreview https://www.google.com.tw"
 	err := plugin.Exec()
-	assert.Nil(t, err)
+	require.NoError(t, err)

 	// disable message
 	plugin.Config.DisableWebPagePreview = false
 	plugin.Config.Message = "EnableWebPagePreview https://www.google.com.tw"
 	err = plugin.Exec()
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 }

 func TestDisableNotificationMessage(t *testing.T) {
@@ -159,13 +180,13 @@ func TestDisableNotificationMessage(t *testing.T) {

 	plugin.Config.Message = "DisableNotification https://www.google.com.tw"
 	err := plugin.Exec()
-	assert.Nil(t, err)
+	require.NoError(t, err)

 	// disable message
 	plugin.Config.DisableNotification = false
 	plugin.Config.Message = "EnableNotification https://www.google.com.tw"
 	err = plugin.Exec()
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 }

 func TestBotError(t *testing.T) {
@@ -194,7 +215,7 @@ func TestBotError(t *testing.T) {
 	}

 	err := plugin.Exec()
-	assert.NotNil(t, err)
+	assert.Error(t, err)
 }

 func TestTrimElement(t *testing.T) {
@@ -270,7 +291,7 @@ func TestParseTo(t *testing.T) {

 	// test empty ids
 	ids = parseTo([]string{"", " ", "   "}, "a@gmail.com", true)
-	assert.Equal(t, 0, len(ids))
+	assert.Empty(t, ids)
 }

 func TestGlobList(t *testing.T) {
@@ -294,27 +315,27 @@ func TestConvertLocation(t *testing.T) {
 	input = "1"
 	result, empty = convertLocation(input)

-	assert.Equal(t, true, empty)
+	assert.True(t, empty)
 	assert.Equal(t, Location{}, result)

 	// strconv.ParseInt: parsing "測試": invalid syntax
 	input = "測試 139.704051"
 	result, empty = convertLocation(input)

-	assert.Equal(t, true, empty)
+	assert.True(t, empty)
 	assert.Equal(t, Location{}, result)

 	// strconv.ParseInt: parsing "測試": invalid syntax
 	input = "35.661777 測試"
 	result, empty = convertLocation(input)

-	assert.Equal(t, true, empty)
+	assert.True(t, empty)
 	assert.Equal(t, Location{}, result)

 	input = "35.661777 139.704051"
 	result, empty = convertLocation(input)

-	assert.Equal(t, false, empty)
+	assert.False(t, empty)
 	assert.Equal(t, Location{
 		Latitude:  float64(35.661777),
 		Longitude: float64(139.704051),
@@ -323,7 +344,7 @@ func TestConvertLocation(t *testing.T) {
 	input = "35.661777 139.704051 title"
 	result, empty = convertLocation(input)

-	assert.Equal(t, false, empty)
+	assert.False(t, empty)
 	assert.Equal(t, Location{
 		Title:     "title",
 		Address:   "",
@@ -334,7 +355,7 @@ func TestConvertLocation(t *testing.T) {
 	input = "35.661777 139.704051 title address"
 	result, empty = convertLocation(input)

-	assert.Equal(t, false, empty)
+	assert.False(t, empty)
 	assert.Equal(t, Location{
 		Title:     "title",
 		Address:   "address",
@@ -374,10 +395,10 @@ Test HTML Format
 		},
 	}

-	assert.Nil(t, plugin.Exec())
+	assert.NoError(t, plugin.Exec())

 	plugin.Config.MessageFile = "tests/message_html.txt"
-	assert.Nil(t, plugin.Exec())
+	assert.NoError(t, plugin.Exec())
 }

 func TestMessageFile(t *testing.T) {
@@ -408,7 +429,7 @@ func TestMessageFile(t *testing.T) {
 	}

 	err := plugin.Exec()
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 }

 func TestTemplateVars(t *testing.T) {
@@ -441,7 +462,7 @@ func TestTemplateVars(t *testing.T) {
 	}

 	err := plugin.Exec()
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 }

 func TestTemplateVarsFile(t *testing.T) {
@@ -472,7 +493,7 @@ func TestTemplateVarsFile(t *testing.T) {
 	}

 	err := plugin.Exec()
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 }

 func TestProxySendMessage(t *testing.T) {
@@ -505,7 +526,7 @@ func TestProxySendMessage(t *testing.T) {
 	}

 	err := plugin.Exec()
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 }

 func TestBuildTemplate(t *testing.T) {
@@ -533,5 +554,5 @@ Commit msg:  {{uppercasefirst commit.message}}

 duration: {{duration build.started build.finished}}
 `, plugin)
-	assert.Nil(t, err)
+	assert.NoError(t, err)
 }